Changeset 8629

Timestamp:

01/30/09 17:28:46 (4 years ago)

Author:

mcarrick

Message:

reventing multiple threads to be created when start() is called several times without calling stop(). Threads are not leaked and memory seems to be handled correctly, merged carlos' changes from trunk

Location:

ossiedev/branches/0.7.x/components/TxDemo

Files:

• TxDemo.cpp (modified) (4 diffs)
• TxDemo.h (modified) (1 diff)

ossiedev/branches/0.7.x/components/TxDemo/TxDemo.cpp

@@ -33 +33 @@
     // initialize packet delay to be 5 seconds
     packet_delay = 5000;
-
-    //Create the thread for the writer's processing function 
-    processing_thread = new omni_thread(Run, (void *) this);
-
-    //Start the thread containing the writer's processing function 
-    processing_thread->start();
-
 }
 
@@ -73 +66 @@
 {
     DEBUG(3, TxDemo, "start() invoked")
-    thread_started=true;
+    omni_mutex_lock l(processing_mutex);
+    if (false == thread_started){
+        thread_started = true;    //initialize
+        //Create the thread for the writer's processing function 
+        processing_thread = new omni_thread(Run, (void *) this);
+
+        //Start the thread containing the writer's processing function 
+        processing_thread->start();
+    }
 }
 
@@ -79 +80 @@
 {  
     DEBUG(3, TxDemo, "stop() invoked")
+    omni_mutex_lock l(processing_mutex);
     thread_started=false;
 }
@@ -131 +133 @@
     }
 
-    while(true) {
-        if (thread_started) {
-            // push data to output
-            dataOutPort->pushPacket(I_out, Q_out);
-
-            // wait
-            usleep(packet_delay*1000);
-        }
-    }
-}
-
+    while(continue_processing()) {
+        // push data to output
+        dataOutPort->pushPacket(I_out, Q_out);
+
+        // wait
+        usleep(packet_delay*1000);
+    }
+}
+bool TxDemo_i::continue_processing(void)
+{
+    omni_mutex_lock l(processing_mutex);
+    return thread_started;
+}
 
 unsigned char data_i[512] = {

ossiedev/branches/0.7.x/components/TxDemo/TxDemo.h

@@ -85 +85 @@
     /// Main signal processing method
     void ProcessData();
-    bool thread_started;
+    bool continue_processing(void);     ///< for start - stop processing
+    volatile bool thread_started;
+    omni_mutex processing_mutex;
    
     omni_condition *component_running;  ///< for component shutdown