Changeset 181

Timestamp:

03/22/09 00:38:35 (15 years ago)

Author:

bhilburn

Message:

Implemented a more standard way of registering/deregistering components and
engines.

Location:

vtcross/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• cognitive_engines/cbr_demo.c (modified) (1 diff)
• include/vtcross/components.h (modified) (5 diffs)
• policy_engines/PolicyEngine.cpp (modified) (5 diffs)
• service_management_layer/ServiceManagementLayer.cpp (modified) (1 diff)
• shell/cr_shell.cpp (modified) (1 diff)

vtcross/trunk/src/Makefile.am

@@ -1 @@
-SUBDIRS = lib policy_engines cognitive_engines service_management_layer \
-                  libvtcross shell include
+SUBDIRS = lib include policy_engines cognitive_engines service_management_layer \
+                  libvtcross shell

vtcross/trunk/src/cognitive_engines/cbr_demo.c

@@ -538 +538 @@
 {
     // Send register message to cognitive radio
-    SendMessage(sockfd, "c_register");
+    SendMessage(sockfd, "register_engine_cognitive");
     return 1;
     

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

@@ -65 +65 @@
  * inherit (e.g. cognitive and policy engines). Inherits all functions from the
  * ABC Component publically.
+ *
+ * TODO perhaps this shouldn't be an abstract base class? Some functions, like
+ * GetRemoteComponentType, are going to be the same for all child classes
+ * anyways...
  */
 class Engine : public Component
@@ -130 +134 @@
 
 
+/* Contains information regarding the SML in a VTCROSS system.  Note that if
+ * there is no SML present, the engine should have no instantiation of this
+ * struct.
+ */
+struct SML_Info {
+    std::string hostname;
+    std::string port;
+    int32_t socketFD;
+};
+
+
 /* Policy Engine class declaration.  All public functions are inherited from
  * parent classes.
@@ -138 +153 @@
         PolicyEngine();
         ~PolicyEngine();
+
+
+        /* Overloaded constructor that creates a policy engine object with SML
+         * information pre-defined.
+         */
+        PolicyEngine(const char* serverName, const char* portNumber);
 
         void GetRemoteComponentType(int32_t socketFD);
@@ -167 +188 @@
         void ValidateParameters(struct Parameter pList[], \
                 struct CE_Info *ce_info, int decision_array[]);
+
+
+        /* Contains information regarding the presence of a service management
+         * layer.  If this pointer is NULL, then there is no SML present in the
+         * radio system.
+         */
+        struct SML_Info *SML;
 };
 
@@ -219 +247 @@
         void ReceiveFeedback(Observable *observables, \
                 Parameter *parameters, std::string service);
+
+
+        /* Contains information regarding the presence of a service management
+         * layer.  If this pointer is NULL, then there is no SML present in the
+         * radio system.
+         */
+        struct SML_Info *SML;
+
 };
 

vtcross/trunk/src/policy_engines/PolicyEngine.cpp

@@ -24 +24 @@
 {
     LOG("Creating Policy Engine.\n");
+    SML = NULL;
     LoadPolicies();
 }
@@ -30 +31 @@
 PolicyEngine::~PolicyEngine()
 {
+    if(SML)
+        delete SML;
+}
+
+
+PolicyEngine::PolicyEngine(const char* serverName, const char* portNumber)
+{
+    LOG("Creating Policy Engine.\n");
+
+    SML = new SML_Info;
+    SML->hostname = std::string(serverName);
+    SML->port = std::string(portNumber);
+
+    SML->socketFD = ClientSocket(serverName, portNumber);
+    RegisterServices(SML->socketFD);
+
+    LOG("Policy Engine connected to SML at %s.\n", serverName);
+
+    LoadPolicies();
 }
 
@@ -74 +94 @@
 PolicyEngine::RegisterComponent(int32_t socketFD)
 {
-    SendMessage(socketFD, "p_register");
+    SendMessage(socketFD, "register_engine_policy");
     LOG("Policy Engine:: Registration message sent.\n");
+
 }
 
@@ -88 +109 @@
 PolicyEngine::RegisterServices(int32_t socketFD)
 {
+    LOG("Policy Engine:: Registering services.\n");
+    SendMessage(socketFD, "register_service_pe_geo");
+    SendMessage(socketFD, "register_service_pe_time");
+    SendMessage(socketFD, "register_service_pe_spectrum");
+    SendMessage(socketFD, "register_service_pe_spacial");
 }
 
@@ -94 +120 @@
 PolicyEngine::DeregisterServices(int32_t socketFD)
 {
+    LOG("Policy Engine:: Deregistering services.\n");
+    SendMessage(socketFD, "deregister_service_pe_geo");
+    SendMessage(socketFD, "deregister_service_pe_time");
+    SendMessage(socketFD, "deregister_service_pe_spectrum");
+    SendMessage(socketFD, "deregister_service_pe_spacial");
 }
 

vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp

@@ -72 +72 @@
 ServiceManagementLayer::RegisterComponent(int32_t socketFD)
 {
-    SendMessage(socketFD, "sml_register");
+    SendMessage(socketFD, "register_sml");
     LOG("ServiceManagementLayer:: Registration message sent.\n");
 }

vtcross/trunk/src/shell/cr_shell.cpp

@@ -512 +512 @@
     LOG("Cognitive Radio:: Message Received - %s.\n\n", buffer);
 
-    if(strcmp(buffer,"c_register") == 0) 
+    if(strcmp(buffer,"register_engine_cognitive") == 0) 
             InitializeCE(socketFD, uList, pList, oList, ce_info);
 
-    if(strcmp(buffer,"p_register") == 0)
+    if(strcmp(buffer,"register_engine_policy") == 0)
             InitializePE(socketFD, ce_info);