Changeset 4735

Timestamp:

08/15/07 17:58:37 (6 years ago)

Author:

jgaeddert

Message:

adding run_continuous property to DataGenerator

Location:

experimental/components/DataGenerator/branches/DataGenerator-metadata

Files:

• DataGenerator.cpp (modified) (5 diffs)
• DataGenerator.h (modified) (1 diff)
• DataGenerator.prf.xml (modified) (1 diff)

experimental/components/DataGenerator/branches/DataGenerator-metadata/DataGenerator.cpp

@@ -69 +69 @@
     num_received_packets = 0;
     num_packets = 64;
+    run_continuous = false;
 }
 
@@ -122 +123 @@
 {
     DEBUG(3, DataGenerator, "start invoked")
+    usleep(2000000);
 
     pause_component = false;
@@ -173 +175 @@
             props[i].value >>= simple_temp;
             num_packets = simple_temp;
+        } else if (strcmp(props[i].id, "DCE:513e6e6c-4b76-11dc-80ce-00123f63025f")==0) {
+            // run_continuous
+            CORBA::UShort simple_temp;
+            props[i].value >>= simple_temp;
+            run_continuous = (simple_temp==0) ? false : true;
         } else {
             std::cerr << "DataGenerator: unknown property " << props[i].id << std::endl;
@@ -193 +200 @@
 
         case SLAVE:
-            std::cout << "DataGen waiting for metadata..." << std::endl;
-            ready_to_generate->wait();
-            std::cout << "...metadata received!" << std::endl;
+            if (!run_continuous) {
+                std::cout << "DataGen waiting for metadata..." << std::endl;
+                ready_to_generate->wait();
+                std::cout << "...metadata received!" << std::endl;
+            }
             operational_mode = MASTER;
             break;
@@ -251 +260 @@
         std::cout << "DataGen received packet " << feedback_metadata->packet_id << std::endl;
 
-        if ( feedback_metadata->packet_id == num_packets-1 ) {
+        if ( (feedback_metadata->packet_id == num_packets-1) &&
+              run_continuous) {
             // signal mode change
             std::cout << "GetFeedbackMetaData: received final metadata packet.  Waiting 5 seconds..." << std::endl;

experimental/components/DataGenerator/branches/DataGenerator-metadata/DataGenerator.h

@@ -93 +93 @@
         bool pause_component;
 
+        bool run_continuous;
+
         // algorithm variables
         signed char * packet;

experimental/components/DataGenerator/branches/DataGenerator-metadata/DataGenerator.prf.xml

@@ -14 +14 @@
         <kind kindtype="configure"/>
     </simple>
+    <simple type="ushort" id="DCE:513e6e6c-4b76-11dc-80ce-00123f63025f" name="run_continuous" mode="readonly">
+        <description>Run data generator continuously?</description>
+        <value>0</value>
+        <kind kindtype="configure"/>
+    </simple>
 </properties>