Changeset 498 for vtcross/trunk/src/cross-examples

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.

Files:

• vtcross/trunk/src/cross-examples/python/gnuradio-examples/benchmark_dsa.py (modified) (7 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"