Changeset 255 for vtcross/trunk

Timestamp:

05/15/09 11:47:36 (15 years ago)

Author:

wrodgers

Message:

Implemented service DB, transfer methods

Location:

vtcross/trunk/src

Files:

• cognitive_engines/CognitiveEngine.cpp (modified) (5 diffs)
• include/vtcross/components.h (modified) (4 diffs)
• include/vtcross/containers.h (modified) (1 diff)
• include/vtcross/socketcomm.h (modified) (1 diff)

vtcross/trunk/src/cognitive_engines/CognitiveEngine.cpp

@@ -81 +81 @@
 
     if(SML) {
+        RegisterServices();
         RegisterComponent();
-        RegisterServices();
         LOG("Cognitive Engine connected to SML at %s.\n", serverName);
         ReceiveRadioConfiguration();
@@ -339 +339 @@
 {
     if(SML_present) {
-        DeregisterServices();
+        //DeregisterServices();
         DeregisterComponent();
     } 
@@ -363 +363 @@
 }
 
+        RegisterServices();
 
 void
@@ -402 +403 @@
 }
 
-
-void 
+//Combined with deregister component since those two things must happen togeather
+/*void 
 CognitiveEngine::DeregisterServices()
 {
@@ -420 +421 @@
     SendMessage(commandSocketFD, "jam_bluetooth");
 
-}
+}*/
 
 void 

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

@@ -121 +121 @@
         void ConnectToShell(const char* serverName, \
                 const char* serverPort);
-
         void SendComponentType();
-        void WaitForSignal();
+        void ShellSignalHandler();
+        void CESignalHandler(int32_t ID);
         void Shutdown();
         void Reset();
@@ -133 +133 @@
          * on to another component.
          */
-        void TransferRadioConfiguration();
+        void TransferRadioConfiguration(int32_t ID);
 
         /* Receive information regarding a completed 'experience' and pass it on
          * to the appropriate cognitive engine.
          */
-        void TransferExperience();
+        void TransferExperience(int32_t ID);
         
         /* Listen for other components registering their available services with
          * the SML. 
          */
-        void ReceiveServices();
+        void ReceiveServices(int32_t ID);
+        void DeregisterServices(int32_t ID);
 
         /* Change the active mission of the radio to a new one and adjust radio
@@ -150 +151 @@
         void SetActiveMission();
 
+        void RegisterCognitiveEngine(int32_t ID);
+        void DeregisterCognitiveEngine(int32_t ID);
+
         /* List all services provided to the radio by registered components.
          */
@@ -159 +163 @@
         void LoadConfiguration();
 
+        /* Create and initialize the DB to hold the services
+         */
+        void CreateServicesDB();
+
+        /* Starts the SML Server and watches it for incoming messages
+         */
+        void StartSMLServer();
+
         /* The socket file descriptor information for the shell which this SML
          * is connected to.
          */
         int32_t shellSocketFD;
-        CE_Reg *CEList;
-        int32_t cogEngServ;
+        CE_Reg *CE_List;
+        int32_t cogEngSrv;
         int16_t CEPort;
+        uint16_t numberOfCognitiveEngines;
+        uint32_t Current_ID; 
+        bool CE_Present;
 };
 

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

@@ -100 +100 @@
  */
 struct CE_Reg {
-    uint32_t IDnum;
+    int32_t ID_num;
     sockaddr_in *sock_ptr;
+    socklen_t sock_len;
 };
 

vtcross/trunk/src/include/vtcross/socketcomm.h

@@ -13 +13 @@
 #include <stdint.h>
 
-#include "vtcross/containers.h"
+#include "containers.h"