Changeset 268

Timestamp:

05/29/09 17:15:15 (15 years ago)

Author:

wrodgers

Message:

Minor changes to support SML.

Location:

vtcross/trunk/src

Files:

• cognitive_engines/CognitiveEngine.cpp (modified) (1 diff)
• include/vtcross/components.h (modified) (10 diffs)
• include/vtcross/containers.h (modified) (3 diffs)

vtcross/trunk/src/cognitive_engines/CognitiveEngine.cpp

@@ -25 +25 @@
 #include "cbr.c"
 
-#include <sqlite3.h>
-#include <sqlite3ext.h>
+#include "sqlite3.h"
+#include "sqlite3ext.h"
 
 

vtcross/trunk/src/include/vtcross/components.h

@@ -57 +57 @@
         /* Wait for a command signal containing task instructions.
          */
-        virtual void WaitForSignal() = 0;
+        //virtual void WaitForSignal() = 0;
 
         /* Completely shutdown the radio and all operations.
@@ -97 +97 @@
          */
         virtual void RegisterServices() = 0;
-        virtual void DeregisterServices() = 0;
+        //virtual void DeregisterServices() = 0;
 };
 
@@ -114 +114 @@
          * shell with the passed hostname and port.
          */
-        ServiceManagementLayer(const char* serverName, const char* serverPort);
+        ServiceManagementLayer(const char* SML_Config, const char* serverName, const char* serverPort);
 
         /* Connect and register with the shell component at the passed hostname
@@ -122 +122 @@
                 const char* serverPort);
         void SendComponentType();
-        void ShellSignalHandler();
-        void CESignalHandler(int32_t ID);
+        void MessageHandler(int32_t ID);
         void Shutdown();
         void Reset();
@@ -129 +128 @@
         void DeregisterComponent();
 
+        /* Starts the SML Server and watches it for incoming messages
+         */
+        void StartSMLServer();
+
     private: 
         /* Receive the radio configuration settings from the shell and pass them
@@ -161 +164 @@
          */
         void ReloadConfiguration();
-        void LoadConfiguration();
+        void LoadConfiguration(const char *SML_Config, Mission* &mList);
 
         /* Create and initialize the DB to hold the services
@@ -167 +170 @@
         void CreateServicesDB();
 
-        /* Starts the SML Server and watches it for incoming messages
-         */
-        void StartSMLServer();
+        void PerformActiveMission();
+        void TransactData(int32_t sourceID, int32_t destID);
+
 
         /* The socket file descriptor information for the shell which this SML
@@ -180 +183 @@
         uint16_t numberOfCognitiveEngines;
         uint32_t Current_ID; 
+        Mission *miss;
         bool CE_Present;
+        int32_t activeMission;
 };
 
@@ -262 +267 @@
 
         void RegisterServices();
-        void DeregisterServices();
+        //void DeregisterServices();
 
     private:
@@ -343 +348 @@
         
         /* Start all the socket servers */
-        void StartShellServer();
+        void StartShellServer(); 
 
         int32_t LoadRadioConfiguration(const char* radioConfig, Parameter* &pList, \

vtcross/trunk/src/include/vtcross/containers.h

@@ -83 +83 @@
 struct Service {
     std::string name;
-    uint16_t socketFD;
+    int32_t socketFD;
+    int32_t componentID;
+    uint16_t num_conds;
+    bool cond_flag;
+    std::string input[3];
+    std::string output[3];
 }; 
 
@@ -95 +100 @@
     uint32_t numServices;
     Service *services;
+    std::string input[3];
+    std::string output[3];
 };
 
@@ -101 +108 @@
 struct CE_Reg {
     int32_t ID_num;
-    sockaddr_in *sock_ptr;
-    socklen_t sock_len;
+    //sockaddr_in *sock_ptr;
+    //socklen_t sock_len;
+    int32_t FD;
 };