Changeset 9595

Timestamp:

09/28/09 16:26:54 (4 years ago)

Author:

shereef

Message:

OWD back-end supports new impl of query/configure and proper comp start/stop, but only for std-ifs

Location:

ossiedev/trunk

Files:

• components/TxDemo/TxDemo.cpp (modified) (2 diffs)
• tools/WaveDev/wavedev/generate/templates/basic_ports/genStructure.py (modified) (4 diffs)
• tools/WaveDev/wavedev/generate/templates/basic_ports/sampleComp.cpp (modified) (5 diffs)
• tools/WaveDev/wavedev/generate/templates/basic_ports/sampleComp.h (modified) (2 diffs)

ossiedev/trunk/components/TxDemo/TxDemo.cpp

@@ -136 +136 @@
     if (init == 0)
     {
-        if ( props.length() == 0 )
-        {
+        if ( props.length() == 0  )     {
             std::cout << "TxDemo: configure called with invalid props.length() - " << props.length() << std::endl;
-            return;
+                        return;
         }
         
-        propertySet.length(props.length());
+                propertySet.length(props.length());
         for (unsigned int i=0; i < props.length(); i++) {
             std::cout << "Property Id : " << props[i].id << std::endl;
@@ -150 +149 @@
         init = 1;
     }
+
     for (unsigned int i = 0; i <props.length(); i++) {
         if (strcmp(props[i].id, "DCE:1b9ca208-8242-11dc-9ba3-00123f63025f") == 0) {

ossiedev/trunk/tools/WaveDev/wavedev/generate/templates/basic_ports/genStructure.py

@@ -953 +953 @@
     #make sure there are properties first
 
+    ts = " "*4 + 'static int init = 0;\n'
+    output.write(ts)
+    ts = " "*4 + "if( init == 0 ) {\n"
+    ts = ts + " "*8 + "if( props.length() == 0 ) {\n"
+    ts = ts + " "*12 + 'std::cout << "configure called with invalid props.length - " << props.length << std::endl;\n'
+    ts = ts + " "*12 + "return;\n"
+    ts = ts + " "*8 + "}\n"
+    output.write(ts)
+
+    ts = " "*8 + "propertySet.length(props.length());"
+    ts = " "*8 + "for( int j=0; j < props.length(); j++ ) {\n"
+    ts = " "*12 + "propertySet[j].id = CORBA::string_dup(props[j].id);"
+    ts = " "*12 + "propertySet[j].value = props[j].value;"
+    ts = " "*8 + "}\n"
+    ts = " "*8 + "init = 1;"
+    ts = " "*4 + "}\n\n"
+    output.write(ts)
+
+
     ts = " "*4 + 'std::cout << "props length : " << props.length() << std::endl;\n\n'
-    ts = ts + " "*4 + "for (unsigned int i = 0; i <props.length(); i++)\n"
+    ts = ts + " "*4 + "for ( int i = 0; i <props.length(); i++)\n"
     ts = ts + " "*4 + "{\n"; output.write(ts)
     ts = " "*8 + 'std::cout << "Property id : " << props[i].id << std::endl;\n\n'
@@ -981 +1000 @@
             ts = " "*12 + 'props[i].value >>= simple_temp;\n';
             ts = ts + " "*12 + 'simple_' + str(simpleCount) + '_value = simple_temp;\n';
+            ts = ts + " "*12 + "for( int k = 0; k < propertySet.length(); k++ ) {\n"
+            ts = ts + " "*16 + "if( strcmp(propertySet[k].id, props[i].id) == 0 ) {\n"
+            ts = ts + " "*20 + "propertySet[i].value = props[i].value;\n"
+            ts = ts + " "*20 + "break;\n"
+            ts = ts + " "*16 + "}\n"
+            ts = ts + " "*12 + "}\n"
             ts = ts + " "*8 + "}\n\n"
             output.write(ts)
@@ -1181 +1206 @@
     inCount = 0;
     outCount = 0;
-    ts = " "*4 + "while(1)\n" + " "*4 + "{\n";
+    ts = " "*4 + "while(continue_processing())\n" + " "*4 + "{\n";
     output.write(ts)
 
@@ -1330 +1355 @@
             continue
             #declare input values short, shortsequence, float, floatSequence, unsupported
-    #close the infinate while loop
+    #close while loop
 
     ts = " "*4 + "}\n"; output.write(ts)

ossiedev/trunk/tools/WaveDev/wavedev/generate/templates/basic_ports/sampleComp.cpp

@@ -10 +10 @@
 
     //Create the thread for the writer's processing function 
-    processing_thread = new omni_thread(Run, (void *) this);
+    //processing_thread = new omni_thread(Run, (void *) this);
 
     //Start the thread containing the writer's processing function 
-    processing_thread->start();
+    //processing_thread->start();
 
 }
@@ -43 +43 @@
 {
     DEBUG(3, __IncludeFile__, "start() invoked")
+        omni_mutex_lock  l(processing_mutex);
+        if( false == thread_started )
+        {
+                thread_started = true;
+                // 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();
+        }
 }
 
@@ -48 +58 @@
 {  
     DEBUG(3, __IncludeFile__, "stop() invoked")
+        omni_mutex_lock l(processing_mutex);
+        thread_started = false;
 }
 
@@ -62 +74 @@
 {
     DEBUG(3, __IncludeFile__, "initialize() invoked")
+}
+
+void __Class_name__::query( CF::Properties & configProperties )
+{
+        if( configProperties.length() == 0 )
+        {
+                configProperties.length( propertySet.length() );
+                for( int i = 0; i < propertySet.length(); i++ )
+                {
+                        configProperties[i].id = CORBA::string_dup( propertySet[i].id );
+                        configProperties[i].value = propertySet[i].value;
+                }
+                return;
+        } else {
+                for( int i = 0; i < configProperties.length(); i++ ) {
+                        for( int j = 0; j < propertySet.length(); j++ ) {
+                                if( strcmp(configProperties[i].value, propertySet[i].value) == 0 ) {
+                                        configProperties[i].value = propertySet[i].value;
+                                }
+                        }
+                }
+        } // end if-else
 }
 
@@ -83 +117 @@
 }
 
+bool __Class_name__::continue_processing()
+{
+        omni_mutex_lock l(processing_mutex);
+        return thread_started;
+}
+
 __ACE_SVC_DEF__
 

ossiedev/trunk/tools/WaveDev/wavedev/generate/templates/basic_ports/sampleComp.h

@@ -47 +47 @@
     void initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException);
 
+        /// Query properties from .prf.xml
+        void query(CF::Properties&)
+                throw (CORBA::SystemException,
+                                CF::UnknownProperties);
+
     /// Configures properties read from .prf.xml
     void configure(const CF::Properties&)
@@ -64 +69 @@
     /// Main signal processing method
     void ProcessData();
+        bool continue_processing();
+        volatile bool thread_started;
+        omni_mutex processing_mutex;
    
     omni_condition *component_running;  ///< for component shutdown