Changeset 435

Timestamp:

08/25/09 13:35:50 (15 years ago)

Author:

bhilburn

Message:

Now outputting socketFD in of registered components in logs, returning
proper data type to support different platforms.

Files:

• vtcross/trunk/src/shell/CognitiveRadioShell.cpp (modified) (12 diffs)

vtcross/trunk/src/shell/CognitiveRadioShell.cpp

@@ -116 +116 @@
 CognitiveRadioShell::Shutdown()
 {
-    // TODO should something else be happening here?
+    LOG("Shutting down Cognitive Radio Shell.\n");
 }
 
@@ -127 +127 @@
 
 
-// TODO what is the point of always returning a 1?
 bool
 CognitiveRadioShell::SendRadioConfiguration(int32_t socketFD)
@@ -189 +188 @@
     if(strcmp(buffer, "receive_config_ack") != 0) {
         LOG("Cognitive Radio Shell:: Unexpected response: %s\n", buffer);
-        return 0;
-    }
-
-    return 1;
+        return false;
+    }
+
+    return true;
 }
 
@@ -204 +203 @@
 
     sprintf(numberExpString, "%d", numberExp);
-    SendMessage(socketFD, "test");  //TODO modified
+    SendMessage(socketFD, "test");
 
     char buffer[256];
@@ -210 +209 @@
     ReadMessage(socketFD, buffer);
     if(strcmp(buffer, "receive_exp_ack") != 0) {
-        // TODO perhaps this should be a WARNING instead of a LOG?
-        LOG("Cognitive Radio Shell:: Unexpected response: %s\n", buffer);
-        return 0;
-    }
-    //printf("done sending exp \n");
-    return 1;
+        WARNING("Cognitive Radio Shell:: Unexpected response: %s\n", buffer);
+        return false;
+    }
+    return true;
 }
 
@@ -222 +219 @@
 CognitiveRadioShell::RegisterCognitiveEngine(int32_t socketFD)
 {
-    LOG("Cognitive Radio Shell:: Received registration message from Cognitive Engine.\n");
+    LOG("Cognitive Radio Shell:: Received registration from Cognitive Engine on socket %d.\n" \
+            socketFD);
    
     SendMessage(socketFD, "register_ack");
@@ -229 +227 @@
 
     numberOfCognitiveEngines++;
+    
+    /* More efficient to always set to true than add a conditional branch to the
+     * code. */
     CE_present = true;
 }
@@ -245 +246 @@
     shutdown(socketFD, 2);
     close(socketFD);
-    LOG("Cognitive Radio Shell:: Socket closed.\n");
+    LOG("Cognitive Radio Shell:: Socket %d closed.\n", socketFD);
 }
 
@@ -252 +253 @@
 CognitiveRadioShell::RegisterPolicyEngine(int32_t socketFD)
 {
-    LOG("Cognitive Radio Shell:: Received registration message from Policy Engine.\n");
+    LOG("Cognitive Radio Shell:: Received registration from Policy Engine on socket %d.\n", \
+            socketFD);
+
     PE_present = true;
 }
@@ -267 +270 @@
     shutdown(socketFD, 2);
     close(socketFD);
-    LOG("Cognitive Radio Shell:: Socket closed.\n");
+    LOG("Cognitive Radio Shell:: Socket %d closed.\n", socketFD);
 }
 
@@ -274 +277 @@
 CognitiveRadioShell::RegisterSML(int32_t socketFD)
 {
-    LOG("Cognitive Radio Shell:: Received registration message from SML.\n");
+    LOG("Cognitive Radio Shell:: Received registration from SML on socket %d.\n", \
+            socketFD);
 
     SML_present = true;
@@ -290 +294 @@
     shutdown(socketFD, 2);
     close(socketFD);
-    LOG("Cognitive Radio Shell:: Socket closed.\n");
+    LOG("Cognitive Radio Shell:: Socket %d closed.\n", socketFD);
 }