Changeset 498

Timestamp:

10/03/09 18:48:33 (15 years ago)

Author:

bhilburn

Message:

Numerous changes. A VTCROSS shell can now be remote relative to the radio host platform. The remote server/port is set through a new function in libvtcross, which has also been added as an option to the benchmark_dsa script. Other changes include bug fixes in the benchmark code and some SQL fixes.

Location:

vtcross/trunk/src

Files:

• cross-examples/python/gnuradio-examples/benchmark_dsa.py (modified) (7 diffs)
• include/vtcross/libvtcross.h (modified) (1 diff)
• lib/socketcomm/socketcomm.cpp (modified) (3 diffs)
• libvtcross/libvtcross.cpp (modified) (8 diffs)

vtcross/trunk/src/cross-examples/python/gnuradio-examples/benchmark_dsa.py

@@ -66 +66 @@
 def main():
 
-    global stats_array, count_array, time_array, n_rcvd, n_right,sync_status,mode,ch,traffic_flag,n_attempts,return_flag
+    global stats_array, count_array, time_array, n_rcvd
+    global n_right, sync_status, mode, ch, traffic_flag, 
+    global n_attempts, return_flag, crossShellHost, crossShellPort
+
     n_rcvd = 0
     n_right = 0
@@ -137 +140 @@
                     UpdateParameterPerformance(currentParameters,1,o,1)
                 except:
-                    print "fail"
             else:
                 # Get the average communication time
@@ -170 +172 @@
             if ok:
                 (pktno,) = struct.unpack('!H', payload[0:2])
-                   (sync_signal,) = struct.unpack('!s', payload[2]) 
+                (sync_signal,) = struct.unpack('!s', payload[2]) 
                 (data_channel,) = struct.unpack('!H', payload[3:5])
                                   
@@ -198 +200 @@
         ##############################################################
 
-       n_rcvd += 1
-       if ok:
-           n_right += 1
+        n_rcvd += 1
+        if ok:
+            n_right += 1
 
     mods = modulation_utils.type_1_mods()
     demods = modulation_utils.type_1_demods()
+
+    # Set default values for the CROSS shell location. These can be overridden
+    # via command-line parameters
+    crossShellHost = "localhost"
+    crossShellPort = "40000"
 
     #setting up the tx options parser
@@ -220 +227 @@
     parser_tx.add_option("","--from-file", default=None,
                           help="use file for packet contents")
+    parser_tx.add_option("-h", "--hostname", action="store", type="string", dest="crossShellHost",
+            default="localhost", help="Set the hostname/IP for the VTCROSS shell");
+    parser_tx.add_option("-p", "--port", action="store", type="string", dest="crossShellPort",
+            default="40000", help="Set the port for the VTCROSS shell");
  
     expert_grp_tx = parser_tx.add_option_group("Expert_tx")
@@ -268 +279 @@
     parser_rx.add_option("-T", "--threshold", type="eng_float", default=1.5e8,
                           help="set primary user sensing energy threshold [default=%default]")
-
+    parser_rx.add_option("-h", "--hostname", action="store", type="string", dest="crossShellHost",
+            default="localhost", help="Set the hostname/IP for the VTCROSS shell");
+    parser_rx.add_option("-p", "--port", action="store", type="string", dest="crossShellPort",
+            default="40000", help="Set the port for the VTCROSS shell");
+ 
 
 
@@ -290 +305 @@
         else:
             print "[[ Using the CROSS DSA Cognitive Engine ]]"
+            print "[[ VTCROSS shell located at " + crossShellHost + ":" + crossShellPort + " ]]"
+            SetCrossShellLocation(crossShellHost, crossShellPort)
     else:
         print "[[ Using the RANDOM channel selection algorithm ]]\n\n"

vtcross/trunk/src/include/vtcross/libvtcross.h

@@ -27 +27 @@
 
 #include <stdint.h>
+#include <string>
 
 #include "components.h"
 #include "containers.h"
+
+
+/* Sets the location of the shell component that the client code will be
+ * communicating with. Note that this can be a local or remote destination.
+ */
+void SetCrossShellLocation(std::string hostname, std::string port);
 
 

vtcross/trunk/src/lib/socketcomm/socketcomm.cpp

@@ -85 +85 @@
     server = gethostbyname(serverName);
     if(server == NULL)
-        ERROR(1, "No server found by that hostname.\n");
+        ERROR(1, "SocketComm::ClientSocket - No server found by that hostname.\n");
 
     portNumber = atoi(serverPort);
@@ -91 +91 @@
     socketFD = socket(AF_INET, SOCK_STREAM, 0);
     if(socketFD < 0) 
-        ERROR(1, "Error opening socket\n");
+        ERROR(1, "SocketComm::ClientSocket - Error opening socket\n");
 
     memset((void *) &serv_addr, 0, sizeof(serv_addr));
@@ -100 +100 @@
 
     if(connect(socketFD, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) 
-        ERROR(1, "Error connecting to remote socket.\n");
+        ERROR(1, "SocketComm::ClientSocket - Error connecting to remote socket.\n");
 
     return socketFD;

vtcross/trunk/src/libvtcross/libvtcross.cpp

@@ -22 +22 @@
 
 #include <cstdlib>
+#include <string>
 
 #include "vtcross/common.h"
@@ -27 +28 @@
 #include "vtcross/libvtcross.h"
 
-
-uint32_t
-ConnectToRemoteComponent()
-{
-    // TODO why is this hardcoded like this??
-       return ClientSocket("localhost", "40000");
-}
+using namespace std;
+
+
+/* Strings that store the remote (or local) shell location for use within the
+ * ConnectToShell() function.  Note that these values must be set with the
+ * SetCrossShellLocation public function within the client code. */
+string shellHostname;
+string shellPort;
+
+
+uint32_t
+ConnectToShell()
+{
+    return ClientSocket(shellHostname.c_str(), shellPort.c_str());
+}
+
+
+void
+SetCrossShellLocation(string hostname, string port)
+{
+    shellHostname = hostname;
+    shellPort = port;
+}
+
 
 // TODO the following three functions all do exactly the same thing.  Why not
@@ -42 +60 @@
     char buffer[256];
 
-    uint32_t socketfd = ConnectToRemoteComponent();
+    uint32_t socketfd = ConnectToShell();
     SendMessage(socketfd, "get_number_observables");
     
@@ -57 +75 @@
     char buffer[256];
 
-    uint32_t socketfd = ConnectToRemoteComponent();
+    uint32_t socketfd = ConnectToShell();
     SendMessage(socketfd, "get_number_utilities");
     
@@ -72 +90 @@
     char buffer[256];
     
-    uint32_t socketfd = ConnectToRemoteComponent();
+    uint32_t socketfd = ConnectToShell();
     SendMessage(socketfd, "set_active_mission");
 
@@ -88 +106 @@
     char buffer[256];
 
-    uint32_t socketfd = ConnectToRemoteComponent();
+    uint32_t socketfd = ConnectToShell();
     SendMessage(socketfd, "get_number_parameters");
     
@@ -117 +135 @@
     char buffer[256];
 
-    uint32_t socketFD = ConnectToRemoteComponent();
+    uint32_t socketFD = ConnectToShell();
     SendMessage(socketFD, "request_optimization");
 
@@ -170 +188 @@
     char var[50];
 
-    uint32_t socketFD = ConnectToRemoteComponent();
+    uint32_t socketFD = ConnectToShell();
     SendMessage(socketFD, "update_performance");