Changeset 3039

Timestamp:

03/05/07 17:26:16 (6 years ago)

Author:

jgaeddert

Message:

adding packet error counter

Location:

experimental/components/DataComparator

Files:

• DataComparator.cpp (modified) (8 diffs)
• DataComparator.h (modified) (1 diff)
• main.cpp (modified) (1 diff)

experimental/components/DataComparator/DataComparator.cpp

@@ -97 +97 @@
 CORBA::Object_ptr DataComparator_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort)
 {
-    DEBUG(5, DataComparator, "DataComparator_i getPort called with : " << portName)
+    DEBUG(5, DataComparator, "getPort() invoked with : " << portName)
     
     CORBA::Object_var p;
@@ -117 +117 @@
 void DataComparator_i::start() throw (CORBA::SystemException, CF::Resource::StartError)
 {
-    DEBUG(5, DataComparator, "start invoked")
+    DEBUG(5, DataComparator, "start() invoked")
 }
 
 void DataComparator_i::stop() throw (CORBA::SystemException, CF::Resource::StopError) 
 {  
-    DEBUG(5, DataComparator, "stop invoked")
+    DEBUG(5, DataComparator, "stop() invoked")
 }
 
 void DataComparator_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError)
 {
-    DEBUG(5, DataComparator, "releaseObject invoked")
+    DEBUG(5, DataComparator, "releaseObject() invoked")
     
     component_running->signal();
@@ -134 +134 @@
 void DataComparator_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException)
 {
-    DEBUG(5, DataComparator, "initialize invoked")
+    DEBUG(5, DataComparator, "initialize() invoked")
 }
 
 void DataComparator_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration)
 {
-    DEBUG(5, DataComparator, "configure invoked")
+    DEBUG(5, DataComparator, "configure() invoked")
     
     DEBUG(5, DataComparator, "props length : " << props.length())
@@ -160 +160 @@
 void DataComparator_i::run_loop()
 {
-    DEBUG(5, DataComparator, "DataComparator's run_loop thread started")
+    DEBUG(5, DataComparator, "run_loop() thread started")
 
 #ifdef LOGGING
@@ -169 +169 @@
 
     unsigned int i, N, num_errors;
-    unsigned int packet_id(0);
+    unsigned int packet_id(0), prev_packet_id(0);
+    signed int packet_index_diff(0);
+    unsigned int num_dropped_packets(0);
+    unsigned int num_packets_to_observe(100);
+    unsigned int num_received_packets(0);
     unsigned int M(control_data_length);
+
+    bool first_packet(true);
+
     packet_length = 400;
     if ( packet != NULL )
@@ -186 +193 @@
         dataIn_0->getData(data_bits_in);
         N = data_bits_in->length();
-        DEBUG(1, DataComparator, "received " << N << " data samples")
+        DEBUG(7, DataComparator, "received " << N << " data samples")
 
         dataIn_1->getData(control_bits_in);
         M = control_bits_in->length();
-        DEBUG(1, DataComparator, "received " << M << " control samples")
+        DEBUG(7, DataComparator, "received " << M << " control samples")
 
         if ( N != packet_length )
@@ -202 +209 @@
         else
         {
-            //TODO: compare control data
-            if ( ossieDebugLevel >= 7 )
+            // compare control data
+            if ( true )
             {
                 packet_id = 0;
-                std::cout << "DataComparator: control: ";
+               // std::cout << "DataComparator: control: ";
                 /*
                 for (i=0; i<M; i++)
@@ -251 +258 @@
                 ) > 2 ) ? 0x0001 : 0x0000;
 
-                std::cout << " " << packet_id << std::endl;
+                DEBUG(5, DataComparator, "packet id : " << packet_id);
+
+                if ( first_packet )
+                    first_packet = false;
+                else
+                {
+                    // determine if packets have been dropped
+                    if ( packet_id == 0 )
+                        packet_index_diff = 31 - prev_packet_id;
+                    else
+                        packet_index_diff = packet_id - prev_packet_id - 1;
+
+                    while (packet_index_diff<0)
+                        packet_index_diff += 31;
+
+                    num_dropped_packets += (unsigned int) packet_index_diff;
+                }
+
+                num_received_packets++;
+                prev_packet_id = packet_id;
+                
             }
             num_errors = 0;
 
-            // compare values
+            // compare data values
             for (i=0; i<N; i++)
                 num_errors += ( (signed char) (*data_bits_in)[i]==packet_tmp[i])
                     ? 0 : 1;
 
-            DEBUG(1, DataComparator, "errors: " << num_errors << " / " << N)
+            DEBUG(5, DataComparator, "data errors : " << num_errors << " / " << N)
+
+            if ( (num_received_packets+num_dropped_packets) >= num_packets_to_observe )
+            {
+                DEBUG(1, DataComparator, "------------------ dropped packets : " << num_dropped_packets << " / " << num_received_packets + num_dropped_packets)
+                num_received_packets = 0;
+                num_dropped_packets = 0;
+            }
 #ifdef LOGGING
             if ( log_size_counter < LOG_SIZE_MAX )

experimental/components/DataComparator/DataComparator.h

@@ -79 +79 @@
         signed char * control_data;
         unsigned int control_data_length;
-        
+
 };
 #endif

experimental/components/DataComparator/main.cpp

@@ -32 +32 @@
 
 {
-    ossieDebugLevel = 7;
+    ossieDebugLevel = 4;
 
     ossieSupport::ORB *orb = new ossieSupport::ORB;