Changeset 389

Timestamp:

07/28/09 23:23:14 (15 years ago)

Author:

trnewman

Message:

Added DSA CBR reference implementation.
Added simple python example application for DSA CBR.
Added GNUradio python application that uses CROSS and the DSA CBR.

Fixed several bugs in the socket interface.

Location:

vtcross/trunk/src

Files:

• cognitive_engines/DSA_CE/DSA_CognitiveEngine.cpp (modified) (5 diffs)
• cognitive_engines/DSA_CE/cbr.c (modified) (3 diffs)
• cognitive_engines/DSA_CE/examples (added)
• cognitive_engines/DSA_CE/examples/gnuradio-examples (added)
• cognitive_engines/DSA_CE/examples/gnuradio-examples/dsa.py (added)
• cognitive_engines/DSA_CE/examples/gnuradio-examples/generic_usrp.py (added)
• cognitive_engines/DSA_CE/examples/gnuradio-examples/pick_bitrate.py (added)
• cognitive_engines/DSA_CE/examples/gnuradio-examples/receive_path.py (added)
• cognitive_engines/DSA_CE/examples/gnuradio-examples/transmit_path.py (added)
• cognitive_engines/DSA_CE/examples/gnuradio-examples/usrp_options.py (added)
• cognitive_engines/DSA_CE/examples/libcross_demo.py (added)
• include/vtcross/components.h (modified) (1 diff)
• include/vtcross/socketcomm.h (modified) (1 diff)
• lib/socketcomm/socketcomm.cpp (modified) (5 diffs)
• libvtcross/libvtcross.cpp (modified) (1 diff)
• shell/CognitiveRadioShell.cpp (modified) (8 diffs)

vtcross/trunk/src/cognitive_engines/DSA_CE/DSA_CognitiveEngine.cpp

@@ -27 +27 @@
 #include "sqlite3.h"
 #include "sqlite3ext.h"
+
+#define INTERFERENCE 0
+#define COMMUNICATION_TIME 1
+#define CHANNEL 2
+#define ENERGY 3
+#define FITNESS 4
+
 
 
@@ -632 +639 @@
 }
 
+
+/* The core of the CE is this function */
+
 Parameter* 
 CognitiveEngine::GetSolution(Observable *observables, Parameter *currentParameters)
@@ -637 +647 @@
     LOG("Cognitive Engine:: Generating solution.\n");
 
-    char *searchNames[radioInfo->numUtilities];
+    /* Put together the CBR search array */
+
+    char *searchNames[radioInfo->numUtilities + 1];
+    float searchVals[radioInfo->numUtilities + 1];
+    int searchOps[radioInfo->numUtilities + 1];
+    uint32_t numberColumns = radioInfo->numUtilities +
+                                radioInfo->numParameters +
+                                radioInfo->numObservables + 1;
 
     for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        searchNames[i] = (char*)observables[i].name.c_str();
-    }
-
-    float searchVals[radioInfo->numUtilities];
-
-    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        searchVals[i] = uList[i].target;
-    }
-
-    uint32_t numberColumns = 
-        radioInfo->numUtilities +
-        radioInfo->numParameters +
-        radioInfo->numObservables + 1;
-    
-    float returnValues[numberColumns];
-    
-    int searchOps[radioInfo->numUtilities];
-    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-
-        /* If the goal is to maximum, set the search operation to
-         * return values greater than the target.
-         *
-         * If the goal is to minimize, set the search operation to
-         * return values less than the target.
-         */
+        searchNames[i] = (char*)uList[i].name.c_str();
+        
         if(strcmp(uList[i].goal.c_str(), "max") == 0) {
             searchOps[i] = GT;
@@ -670 +664 @@
             searchOps[i] = LT;
         }
-    }
-
-    /* CBR specific call */
+   
+        /* Set search target to utility target */
+        /* This may be bad if no target is set */ 
+        searchVals[i] = uList[i].target;
+    }
+   
+
+    /* Make sure we do not return any entries for the current channel */
+    searchNames[radioInfo->numUtilities+1] = "channel";
+    searchOps[radioInfo->numUtilities+1] = NE;
+    searchVals[radioInfo->numUtilities+1] = currentParameters[0].value; 
+ 
+    float returnValues[numberColumns];
+    
+    /* Execute CBR search and put output into returnValues */
     uint32_t rc = cbr_search(myCBR, searchNames, searchOps, searchVals,
             radioInfo->numUtilities, returnValues);
 
     if(rc == 0){
-        /* Adapt the returned parameters to meet the objective */
-        LOG("Cognitive Engine:: Found\n");
-
-        /* Should do a random adaptation.. */
+        /* Similiar environment was found. Adapt the returned parameters to 
+           meet the objective */
+
+        LOG("Cognitive Engine:: Previous similar environment found\n");
+
         if(returnValues[numberColumns-1] < 0) {
+        
             returnValues[2] = returnValues[2] - 15;
             returnValues[3] = returnValues[3] - 2;
+        
         } else {
+       
             returnValues[2] = returnValues[2] + 15;
             returnValues[3] = returnValues[3] + 2;
+        
         }
     } else if(rc == 31337) {
-        LOG("Cognitive Engine:: Not Found.\n");
-        /* No rows in the CBR, pick default parameters */
-        /* Currently this is hard coded and implementation specific! */
-        returnValues[2] = currentParameters[0].value + 5;
-        returnValues[3] = currentParameters[1].value + 10;
-        
+        /* No previous similar solution was found, use default. */
+        LOG("Cognitive Engine:: No previous similar environment found.\n");
+     
+        /* In the DSA case, the default is to select a random channel */
+ 
+        /* initialize random seed: */
+        srand ( time(NULL) );
+
+        /* generate random channel */
+        //returnValues[CHANNEL] = rand() % currentParameters[0].max + currentParameters[0].min; 
+        returnValues[CHANNEL] = rand() % 5; 
+       
+        printf("One: %i Two: %i\n",(int)currentParameters[0].max,(int)currentParameters[0].min);
+ 
     } else {
         LOG("Cognitive Engine:: Search return an invalid value.\n");
     }
+
+
+    /* Package up the new set of parameters in order to add
+       the new entry into the CBR database.  */
 
     size_t returnValueIndex = 0;
@@ -732 +755 @@
     allNames[allNameIndex] = "utility";
 
-    // Add row to CBR. 
+    /* Add the new optimized set to the CBR database */
     cbr_add_row(myCBR, allNames, returnValues, returnValueIndex+1);
 
+    /* Return the set of new parameter values.  */
     return pList;
 }

vtcross/trunk/src/cognitive_engines/DSA_CE/cbr.c

@@ -57 +57 @@
     char *zErrMsg = 0;
 
-    //printf("command: %s\n", _cbr->command);
+    printf("command: %s\n", _cbr->command);
     rc = sqlite3_exec(_cbr->db, _cbr->command, callback, 0, &zErrMsg);
     if( rc!=SQLITE_OK){
@@ -212 +212 @@
         strcat(_cbr->command, _names[i]);
         strcat(_cbr->command, ops_str[_ops[i]]);
-    printf("search command: %s\n", _cbr->command);
         sprintf(str_buffer, "%E", _vals[i]);
         strcat(_cbr->command, str_buffer);
-
 
         if (i<_n-1)
@@ -225 +223 @@
     //printf("search command: %s\n", _cbr->command);
 
-    //ExecuteCommand(_cbr);
     rc = ExecuteSearchCommand(_cbr, _retvals);
     

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

@@ -374 +374 @@
         /* Handle a message that is received from a component.
          */
-        void HandleMessage(int32_t socketFD);
+        int HandleMessage(int32_t socketFD);
        
         /* Send optimization request to primary port FD.

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

@@ -18 +18 @@
 /* TODO
  */
-void ReadMessage(int32_t socketFD, char *msgBuffer);
+int32_t ReadMessage(int32_t socketFD, char *msgBuffer);
 
 /* TODO

vtcross/trunk/src/lib/socketcomm/socketcomm.cpp

@@ -34 +34 @@
 // TODO also, it appears that this function can, at maximum, receive 256 bytes
 // without causing a buffer overflow. can someone confirm/deny?
-void
+int32_t
 ReadMessage(int32_t socketFD, char* msgBuffer)
 {
@@ -41 +41 @@
     // Messages are termination with a "\0" to denote EOM.
     ssize_t msgLength = recv(socketFD, msgBuffer, 256, MSG_PEEK);
-    if(msgLength < 0)
-        ERROR(1, "Error reading from socket.\n");
-    if(msgLength == 0)
-        ERROR(1, "Remote component closed connection. 1\n");
-
+    if(msgLength <= 0) {
+        //ERROR(1, "Remote component closed connection. 1\n");
+        //LOG("Client closed connection.\n");
+        return -1;
+    }
     size_t i;
     for(i = 0; i < 256; i++) {
@@ -54 +54 @@
     // Read the message into msgBuffer
     msgLength = recv(socketFD, msgBuffer, i + 1, 0);
-    if(msgLength < 0)
-        ERROR(1, "Error reading from socket.\n");
-    if(msgLength == 0)
-        ERROR(1, "Remote component closed connection. 2\n");
+    if(msgLength <= 0) {
+        //ERROR(1, "Remote component closed connection. 1\n");
+        //LOG("Client closed connection.\n");
+        return -1;
+    }
+
+    return 1;
 }
 
@@ -93 +96 @@
 
     
-/* TODO I'm fairly certain this function is unnecessary, see function below for more details...
-int32_t
-SendMessage(int32_t socketFD, char* message) 
-{
-     
-    // TODO explain this. What, exactly, does the below line do and how does it
-    // affect the rest of the function?
-    strcat(message, "\0000");
-
-    ssize_t numSentBytes = send(socketFD, message, (strlen(message) + 1), 0);
-    if(numSentBytes < 0) {
-        ERROR(1, "Error sending to server.");
-    }
-    else if(numSentBytes == 0) {
-        LOG("socket_comm::SendMessage - Server closed the socket.\n");
-    }
-   
-    return numSentBytes;
-}
-*/
-
 // TODO this function is here to handle calls to send const char* messages. Note
 // that the std::string.c_str() function auto-appends a null character at the
@@ -217 +199 @@
     if(clientSocket < 0) { 
         //WARNING("ALERT: Could not establish connection with client socket.\n");
-        return -1;
+        return clientSocket;
     }
     //LOG("Handling client %s\n", inet_ntoa(echoClientAddr.sin_addr));

vtcross/trunk/src/libvtcross/libvtcross.cpp

@@ -149 +149 @@
     }   
 
+    close(socketFD);
     return pList;
 }

vtcross/trunk/src/shell/CognitiveRadioShell.cpp

@@ -642 +642 @@
 
 
-void
+int
 CognitiveRadioShell::HandleMessage(int32_t socketFD)
 {
     char buffer[256];
-    //printf("here\n");
-    ReadMessage(socketFD, buffer);
+    int ret = 0;
+    
+    ret = ReadMessage(socketFD, buffer);
+    if(ret == -1) {
+        return ret;
+    }
 
     // TODO trying to read this code lock makes my eyes bleed
@@ -685 +689 @@
         //GetOptimalParametersService(socketFD);  
     }
+
+    return ret;
 }
 
@@ -699 +705 @@
     int32_t desc_ready = 1;
     int32_t timeout = 10;
+    int32_t ret = 0;;
     fd_set sockSet;
+   
+
 
     int32_t *servSock = new int32_t[3];
@@ -726 +735 @@
         ERROR(1,"Error initializing command port\n");
 
+    FD_ZERO(&sockSet);
+    
     while (running) {
         /* Zero socket descriptor vector and set for server sockets */
         /* This must be reset every time select() is called */
-        //FD_ZERO(&sockSet);
         FD_SET(servSock[primary], &sockSet);
         FD_SET(servSock[policy], &sockSet);
@@ -740 +750 @@
 
         /* Suspend program until descriptor is ready or timeout */
-        //printf("Waiting for signal...\n");
-        rc = select(maxDescriptor + 1, &sockSet, NULL, NULL, NULL); 
+        rc = select(maxDescriptor + 1, &sockSet, NULL, NULL, &selTimeout); 
         if(rc == 0)
             LOG("No echo requests for %i secs...Server still alive\n", timeout);
@@ -754 +763 @@
                         do {
                             new_sd = AcceptTCPConnection(port);
-                            if(new_sd < 0) 
+                            if(new_sd < 0) {
                                 break;
+                            }
                            
                             if(port == servSock[primary])
@@ -764 +774 @@
                                 policySocketFD = new_sd;
 
-                            HandleMessage(new_sd);
-                            FD_SET(new_sd,&sockSet);
+                            ret = HandleMessage(new_sd);
+
+                            if(ret == -1) {
+                                FD_CLR(new_sd,&sockSet);
+                                close(new_sd);
+                            }
+
+                            FD_SET(new_sd,&sockSet);
                             if(new_sd > maxDescriptor) 
                                 maxDescriptor = new_sd;
-                            //LOG("New incoming connection - %i\n\n",new_sd);
                         } while(new_sd != -1);
-                    } 
+                    } 
                     else {
-                        //LOG("Request on already open descriptor.\n\n");
-                        HandleMessage(port);
+                        ret = HandleMessage(port);
+                        if(ret == -1) {
+                            FD_CLR(port,&sockSet);
+                            close(port);
+                        }
                     }
                 }
@@ -780 +798 @@
     }
 
-
+    LOG("Closing it all.\n\n");
     /* Close sockets */
     close(servSock[primary]);