Changeset 191

Timestamp:

03/23/09 10:52:00 (15 years ago)

Author:

bhilburn

Message:

Renamed the private socketFD to commandSocketFD to make it easier to
distinguish (and it just makes more sense).

Location:

vtcross/trunk/src

Files:

• include/vtcross/components.h (modified) (4 diffs)
• policy_engines/PolicyEngine.cpp (modified) (8 diffs)

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

@@ -77 +77 @@
  * 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
@@ -148 +144 @@
          * is connected to.
          */
-        int32_t socketFD;
+        int32_t shellSocketFD;
 };
 
@@ -204 +200 @@
          */
         bool SML_present;
-        int32_t socketFD;
+        int32_t commandSocketFD;
 };
 
@@ -264 +260 @@
          */
         bool SML_present;
-        int32_t socketFD;
+        int32_t commandSocketFD;
 };
 

vtcross/trunk/src/policy_engines/PolicyEngine.cpp

@@ -41 +41 @@
     SML_present = SML;
 
-    socketFD = ClientSocket(serverName, portNumber);
+    commandSocketFD = ClientSocket(serverName, portNumber);
 
     if(SML_present) {
@@ -72 +72 @@
 
     // TODO should this be a GetRequest call or something else?
-    if(GetRequest(socketFD, pList, &ce_info)) {
+    if(GetRequest(commandSocketFD, pList, &ce_info)) {
         LOG("Policy Engine:: Validating Transmission Parameters.\n");
         ValidateParameters(pList, &ce_info, decision_array);    
@@ -97 +97 @@
     LOG("Resetting Policy Engine.\n");
     SML_present = false;
-    socketFD = -1;
+    commandSocketFD = -1;
     LoadPolicies();
 }
@@ -105 +105 @@
 PolicyEngine::RegisterComponent()
 {
-    SendMessage(socketFD, "register_engine_policy");
+    SendMessage(commandSocketFD, "register_engine_policy");
     LOG("Policy Engine:: Registration message sent.\n");
 
@@ -114 +114 @@
 PolicyEngine::DeregisterComponent()
 {
-    SendMessage(socketFD, "deregister_engine_policy");
+    SendMessage(commandSocketFD, "deregister_engine_policy");
     LOG("Policy Engine:: Registration message sent.\n");
 }
@@ -123 +123 @@
 {
     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");
+    SendMessage(commandSocketFD, "register_service_pe_geo");
+    SendMessage(commandSocketFD, "register_service_pe_time");
+    SendMessage(commandSocketFD, "register_service_pe_spectrum");
+    SendMessage(commandSocketFD, "register_service_pe_spacial");
 }
 
@@ -134 +134 @@
 {
     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");
+    SendMessage(commandSocketFD, "deregister_service_pe_geo");
+    SendMessage(commandSocketFD, "deregister_service_pe_time");
+    SendMessage(commandSocketFD, "deregister_service_pe_spectrum");
+    SendMessage(commandSocketFD, "deregister_service_pe_spacial");
 }
 
@@ -163 +163 @@
     for (size_t i = 0; i < ce_info->numParameters; i++) {
         sprintf(var, "%i", decision_array[i]);
-        SendMessage(socketFD, var);
+        SendMessage(commandSocketFD, var);
     }
 }