Fix usb data loss due to packet timeout

Author: mubes

Inc/nw.h

@@ -18,7 +18,7 @@ extern "C" {
 // ====================================================================================================
 
 #define NWCLIENT_SERVER_PORT (3443)           /* Server port definition */
-#define TRANSFER_SIZE (65536)
+#define TRANSFER_SIZE (256000)
 
 // ====================================================================================================
 

Src/orbmortem.c

@@ -35,7 +35,7 @@
 #define MAX_TAGS            (10)        /* How many tags we will allow */
 
 #define INTERVAL_TIME_MS    (1000)      /* Intervaltime between acculumator resets */
-#define HANG_TIME_MS        (990)       /* Time without a packet after which we dump the buffer */
+#define HANG_TIME_MS        (200)       /* Time without a packet after which we dump the buffer */
 #define TICK_TIME_MS        (100)       /* Time intervals for screen updates and keypress check */
 
 /* Record for options, either defaults or from command line */
@@ -696,16 +696,16 @@ static void _dumpBuffer( struct RunTime *r )
     /* Pump the received messages through the ETM decoder, it will callback to _etmCB with complete sentences */
     int bytesAvailable = ( ( r->wp + r->options->buflen ) - r->rp ) % r->options->buflen;
 
-    /* If we've started wrapping (i.e. the rx ring buffer is full) then any guesses about sync status are invalid */
-    if ( bytesAvailable == r->options->buflen - 1 )
+    /* If we started wrapping (i.e. the rx ring buffer got full) then any guesses about sync status are invalid */
+    if ( ( bytesAvailable == r->options->buflen - 1 ) && ( !r->singleShot ) )
     {
         ETMDecoderForceSync( &r->i, false );
     }
 
     if ( ( bytesAvailable + r->rp ) > r->options->buflen )
     {
         /* Buffer is wrapped - submit both parts */
-        ETMDecoderPump( &r->i, &r->pmBuffer[r->rp], r->options->buflen - r->rp, _etmCB, _etmReport, r );
+        ETMDecoderPump( &r->i, &r->pmBuffer[r->rp], r->options->buflen - r->rp - 1, _etmCB, _etmReport, r );
         ETMDecoderPump( &r->i, &r->pmBuffer[0], r->rp, _etmCB, _etmReport, r );
     }
     else

Src/orbuculum.c

@@ -69,10 +69,10 @@ static const struct deviceList
 //#define DUMP_BLOCK
 
 /* How many transfer buffers from the source to allocate */
-#define NUM_RAW_BLOCKS (10)
+#define NUM_RAW_BLOCKS (3)
 
 /* What time spread to defer them over (less than orbmortem timeout) */
-#define BLOCK_TOTAL_SPREAD (400)
+#define BLOCK_TOTAL_SPREAD (100)
 
 /* Interval between blocks for timeouts */
 #define BLOCK_TIMEOUT_INTERVAL_MS (BLOCK_TOTAL_SPREAD/NUM_RAW_BLOCKS)
@@ -247,6 +247,16 @@ static int _setSerialConfig ( int f, speed_t speed )
 }
 #endif
 // ====================================================================================================
+static void _doExit( void )
+
+{
+    _r.ending = true;
+
+    nwclientShutdown( _r.n );
+    /* Give them a bit of time, then we're leaving anyway */
+    usleep( 200 );
+}
+// ====================================================================================================
 void _printHelp( char *progName )
 
 {
@@ -499,12 +509,14 @@ void *_checkInterval( void *params )
         {
             struct TPIUCommsStats *c = TPIUGetCommsStats( &r->t );
 
+            /* For now we don't transmit this...
             genericsPrintf( C_RESET " LEDS: %s%s%s%s" C_RESET " Frames: "C_DATA "%u" C_RESET,
                             c->leds & 1 ? C_DATA_IND "d" : C_RESET "-",
                             c->leds & 2 ? C_TX_IND "t" : C_RESET "-",
                             c->leds & 0x20 ? C_OVF_IND "O" : C_RESET "-",
                             c->leds & 0x80 ? C_HB_IND "h" : C_RESET "-",
                             c->totalFrames );
+            */
 
             genericsReport( V_INFO, " Pending:%5d Lost:%5d",
                             c->pendingCount,
@@ -671,7 +683,8 @@ static void _usb_callback( struct libusb_transfer *t )
 /* For the USB case the ringbuffer isn't used .. packets are sent directly from this callback */
 
 {
-    if ( t->status == LIBUSB_TRANSFER_COMPLETED && ( t->actual_length > 0 ) )
+    /* Whatever the status that comes back, there may be data... */
+    if ( t->actual_length > 0 )
     {
         _r.intervalBytes += t->actual_length;
 
@@ -821,12 +834,24 @@ int usbFeeder( struct RunTime *r )
                                         BLOCK_TIMEOUT_INTERVAL_MS * ( t + 1 )
                                       );
 
-            libusb_submit_transfer( r->rawBlock[t].usbtfr );
+            int ret = libusb_submit_transfer( r->rawBlock[t].usbtfr );
+
+            if ( ret )
+            {
+                genericsReport( V_ERROR, "Error submitting USB requests %d" EOL, ret );
+                _doExit();
+            }
         }
 
         while ( !r->ending )
         {
-            libusb_handle_events_completed( NULL, ( int * )&r->ending );
+            int ret = libusb_handle_events_completed( NULL, ( int * )&r->ending );
+
+            if ( ret )
+            {
+                genericsReport( V_ERROR, "Error waiting for USB requests to complete %d" EOL, ret );
+                _doExit();
+            }
         }
 
         libusb_close( handle );
@@ -1013,16 +1038,6 @@ int fileFeeder( struct RunTime *r )
     return true;
 }
 // ====================================================================================================
-static void _doExit( void )
-
-{
-    _r.ending = true;
-
-    nwclientShutdown( _r.n );
-    /* Give them a bit of time, then we're leaving anyway */
-    usleep( 200 );
-}
-// ====================================================================================================
 int main( int argc, char *argv[] )
 
 {