Changeset 188

Timestamp:

03/23/09 10:51:58 (15 years ago)

Author:

bhilburn

Message:

Finished migration to functions using private socketFD field rather than
passing around the socketFD by value.

Location:

vtcross/trunk/src

Files:

• include/vtcross/components.h (modified) (9 diffs)
• policy_engines/PolicyEngine.cpp (modified) (10 diffs)

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

@@ -35 +35 @@
          * string.
          */
-        virtual void GetRemoteComponentType(int32_t socketFD) = 0;
+        virtual void GetRemoteComponentType() = 0;
 
 
         /* Wait for a command signal containing task instructions.
          */
-        virtual void WaitForSignal(int32_t socketFD) = 0;
+        virtual void WaitForSignal() = 0;
 
 
@@ -57 +57 @@
         /* Register or deregister a component with the primary radio shell.
          */
-        virtual void RegisterComponent(int32_t socketFD) = 0;
-        virtual void DeregisterComponent(int32_t socketFD) = 0;
+        virtual void RegisterComponent() = 0;
+        virtual void DeregisterComponent() = 0;
 };
 
@@ -76 +76 @@
          * service management layer.
          */
-        virtual void RegisterServices(int32_t socketFD) = 0;
-        virtual void DeregisterServices(int32_t socketFD) = 0;
+        virtual void RegisterServices() = 0;
+        virtual void DeregisterServices() = 0;
 };
 
@@ -91 +91 @@
         ~ServiceManagementLayer();
 
-        void GetRemoteComponentType(int32_t socketFD);
-        void WaitForSignal(int32_t socketFD);
+        void GetRemoteComponentType();
+        void WaitForSignal();
         void Shutdown();
         void Reset();
-        void RegisterComponent(int32_t socketFD);
-        void DeregisterComponent(int32_t socketFD);
+        void RegisterComponent();
+        void DeregisterComponent();
 
     private: 
@@ -131 +131 @@
         void ReloadConfiguration();
         void LoadConfiguration();
+
+
+        /* The socket file descriptor information for the shell which this SML
+         * is connected to.
+         */
+        int32_t socketFD;
 };
 
@@ -150 +156 @@
                 const bool SML);
 
-        void GetRemoteComponentType(int32_t socketFD);
-        void WaitForSignal(int32_t socketFD);
+        void GetRemoteComponentType();
+        void WaitForSignal();
         void Shutdown();
         void Reset();
-        void RegisterComponent(int32_t socketFD);
-        void DeregisterComponent(int32_t socketFD);
-
-        void RegisterServices(int32_t socketFD);
-        void DeregisterServices(int32_t socketFD);
+        void RegisterComponent();
+        void DeregisterComponent();
+
+        void RegisterServices();
+        void DeregisterServices();
 
     private:
@@ -170 +176 @@
          * of transmission parameters.
          */
-        void SendPEDecision(int32_t socketFD, struct Parameter pList[], \
-                struct CE_Info *ce_info, int32_t decision_array[]);
+        void SendPEDecision(struct Parameter pList[], struct CE_Info *ce_info, \
+                int32_t decision_array[]);
 
 
@@ -199 +205 @@
         ~CognitiveEngine();
 
-        void GetRemoteComponentType(int32_t socketFD);
-        void WaitForSignal(int32_t socketFD);
+        void GetRemoteComponentType();
+        void WaitForSignal();
         void Shutdown();
         void Reset();
-        void RegisterComponent(int32_t socketFD);
-        void DeregisterComponent(int32_t socketFD);
-
-        void RegisterServices(int32_t socketFD);
-        void DeregisterServices(int32_t socketFD);
+        void RegisterComponent();
+        void DeregisterComponent();
+
+        void RegisterServices();
+        void DeregisterServices();
 
     private:
@@ -213 +219 @@
          * (the CE will not always be local to the radio).
          */
-        void ReceiveRadioConfiguration(int32_t socketFD);
+        void ReceiveRadioConfiguration();
 
 
         /* Receive an 'experience' report from the radio.
          */
-        void ReceiveExperience(int32_t socketFD);
+        void ReceiveExperience();
 
 

vtcross/trunk/src/policy_engines/PolicyEngine.cpp

@@ -44 +44 @@
 
     if(SML_present) {
-        RegisterServices(socketFD);
+        RegisterServices();
         LOG("Policy Engine connected to SML at %s.\n", serverName);
     }
     else {
-        RegisterComponent(socketFD);
+        RegisterComponent();
         LOG("Policy Engine connected to shell at %s.\n", serverName);
     }
@@ -57 +57 @@
 
 void 
-PolicyEngine::GetRemoteComponentType(int32_t socketFD)
+PolicyEngine::GetRemoteComponentType()
 {
 }
@@ -63 +63 @@
 
 void 
-PolicyEngine::WaitForSignal(int32_t socketFD)
+PolicyEngine::WaitForSignal()
 {
     LOG("Policy Engine:: Waiting for Policy Check Request.\n");
@@ -77 +77 @@
 
         LOG("Policy Engine:: Sending Policy decision to Server.\n");
-        SendPEDecision(socketFD, pList, &ce_info, decision_array);
+        SendPEDecision(pList, &ce_info, decision_array);
     }
 }
@@ -86 +86 @@
 {
     if(SML_present)
-        DeregisterServices(socketFD);
+        DeregisterServices();
     else
-        DeregisterComponent(socketFD);
+        DeregisterComponent();
 }
 
@@ -103 +103 @@
 
 void
-PolicyEngine::RegisterComponent(int32_t socketFD)
+PolicyEngine::RegisterComponent()
 {
     SendMessage(socketFD, "register_engine_policy");
@@ -112 +112 @@
 
 void 
-PolicyEngine::DeregisterComponent(int32_t socketFD)
+PolicyEngine::DeregisterComponent()
 {
     SendMessage(socketFD, "deregister_engine_policy");
@@ -120 +120 @@
 
 void 
-PolicyEngine::RegisterServices(int32_t socketFD)
+PolicyEngine::RegisterServices()
 {
     LOG("Policy Engine:: Registering services.\n");
@@ -131 +131 @@
 
 void 
-PolicyEngine::DeregisterServices(int32_t socketFD)
+PolicyEngine::DeregisterServices()
 {
     LOG("Policy Engine:: Deregistering services.\n");
@@ -156 +156 @@
 
 void 
-PolicyEngine::SendPEDecision(int32_t socketFD, struct Parameter pList[], \
+PolicyEngine::SendPEDecision(struct Parameter pList[], \
         struct CE_Info *ce_info, int32_t decision_array[])
 {