Changeset 498 for vtcross/trunk/src/libvtcross

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/libvtcross/libvtcross.cpp (modified) (8 diffs)

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");