Changeset 52 in pacpussensors for trunk/Sick

Timestamp:

06/16/14 16:04:34 (10 years ago)

Author:

cfougera

Message:

Memory leak bug resolved (dynamic memory allocation is no longer used).

Location:

trunk/Sick

Files:

• SickComponent.h (modified) (2 diffs)
• SickLDMRSData.h (modified) (1 diff)
• SickLDMRSSensor.cpp (modified) (6 diffs)
• SickLDMRSSensor.h (modified) (2 diffs)

trunk/Sick/SickComponent.h

@@ -49 +49 @@
  */
 class SICK_API SickComponent
-        : public QThread
-        , public ComponentBase
+        : /*public QThread
+        , */
+        public QObject, public ComponentBase
 {
     Q_OBJECT
@@ -61 +62 @@
     ~SickComponent();
 
-    void run() {}
+   // void run() {}
 
     virtual void stopActivity(); /*!< To stop the processing thread */

trunk/Sick/SickLDMRSData.h

@@ -54 +54 @@
     u_int64_t ntpTime;              //!< Time of the sensor when the message is created
 };
-    
+
+
 /*!
  * \brief The ScanHeader struct

trunk/Sick/SickLDMRSSensor.cpp

@@ -320 +320 @@
         }
 
+        LOG_TRACE("(Packet reconstitution) Message complete ! ");
         // we have a complete message available that we can add to the list
-         MessageLDMRS msg;
+        MessageLDMRS msg;
 
         // we copy the bytes in the body message
-        char* messageData = (char*)malloc(msgSize);
-        memcpy(messageData, pendingBytes.data.c_str() + index, msgSize);
-
-        msg.body = messageData;
+//        char* messageData = (char*)malloc(msgSize);
+//        if(messageData == NULL){
+//            LOG_FATAL("(Packet reconstitution) Malloc FAILED. Packet lost.");
+//            return;
+//        }
+        memcpy(msg.body, pendingBytes.data.c_str() + index, msgSize);
+
+//        msg->body = messageData;
 
         // we set the timestamp of the message
@@ -358 +363 @@
 
         int index = 24 + 44; // data header + scan header
-        ScanPoint* scanPoints = (ScanPoint*) malloc(sizeof(ScanPoint) * msg.hScan.numPoints);
-        int position = 0;
-
+
+        if(sizeof(ScanPoint) * msg.hScan.numPoints > BODY_MAX_SIZE){
+            LOG_FATAL("Size of the message is too long !");
+            return 0;
+        }
+
+        ScanPoint scanPoints[msg.hScan.numPoints];
+
+        // replace memory with structured data
         for (int i = 0; i < msg.hScan.numPoints; ++i) {
-            ((ScanPoint*)(scanPoints + position))->layerEcho = *((uchar*)(msg.body + index));
-            ((ScanPoint*)(scanPoints + position))->flags = *((uchar*)(msg.body + index + 1));
-            ((ScanPoint*)(scanPoints + position))->angle = *((u_int16_t*)(msg.body + index + 2));
-            ((ScanPoint*)(scanPoints + position))->distance = *((u_int16_t*)(msg.body + index + 4));
-            ((ScanPoint*)(scanPoints + position))->echoPulseWidth = *((u_int16_t*)(msg.body + index + 6));
-            index += 10;
-            position += sizeof(ScanPoint);
-        }
-
-        // raw data (message) no longer needed, free memory and replace with structured data
-        free(msg.body);
-        msg.body = (char*) scanPoints;
+            scanPoints[i].layerEcho = *((uchar*)(msg.body + index));
+            scanPoints[i].flags = *((uchar*)(msg.body + index + 1));
+            scanPoints[i].angle = *((u_int16_t*)(msg.body + index + 2));
+            scanPoints[i].distance = *((u_int16_t*)(msg.body + index + 4));
+            scanPoints[i].echoPulseWidth = *((u_int16_t*)(msg.body + index + 6));
+        }
+
+        memcpy(msg.body, scanPoints, sizeof(ScanPoint) * msg.hScan.numPoints);
     }
     else if (msg.hData.dataType == SICKLDMRS_OBJECTDATA_TYPE){
         LOG_TRACE("(Process Message) Object Data Type!");
 
-
-
         // TODO
-
-        // raw message no longer needed, free memory
-        free(msg.body);
-        // msg.body = (char*) scanObjects;
-    }
-    else // irrelevant data type
-        free(msg.body); // free raw data
+    }
+    else {// irrelevant data type
+        // TODO
+    }
+
 
     return msg.hData.dataType;
@@ -405 +408 @@
 //    entry.timerange = msg.timerange;
 
+    LOG_TRACE("Writing into DBT + UTC files..");
+
     // write DBT
     try {
@@ -421 +426 @@
     dataFile_.write(reinterpret_cast<char*>(&(utcMagicWord)), sizeof(int32_t));
 
+    LOG_TRACE("Writing done !");
+
 }
 
@@ -446 +453 @@
     while ( !msgList.empty() )
     {
+        LOG_TRACE("Message waiting");
         // get the first (the eldest) message and process it
         MessageLDMRS msgToProcess = msgList.front();
         unsigned long type = processMessage(msgToProcess);
+        LOG_TRACE("Message processed !");
 
         if (type == SICKLDMRS_SCANDATA_TYPE)
@@ -480 +489 @@
 
         // removes the processed item of the list
+        // free(msgList.front().body);
         msgList.pop_front();
     }

trunk/Sick/SickLDMRSSensor.h

@@ -25 +25 @@
 #include <fstream>
 #include <string>
+
+#define BODY_MAX_SIZE   10000
 
 // Export macro for SickLDMRS DLL for Windows only
@@ -79 +81 @@
     //! An array of characters : raw data then array of points or objects, depending on data type.
     /** This array pointer points to allocated in memory (basically, in heap (malloc)) and then must be freed (free) when the whole message is decoded and stored. */
-    char* body;
+    char body[BODY_MAX_SIZE];
 
     //! Time when the message is received.