Changeset 748 for soft/giet_vm/applications/mjpeg/demux.c

Timestamp:

Dec 16, 2015, 1:03:16 PM (9 years ago)

Author:

alain

Message:

Modify instrumentation to save results on virtual disk.

File:

• soft/giet_vm/applications/mjpeg/demux.c (modified) (14 diffs)

soft/giet_vm/applications/mjpeg/demux.c

@@ -36 +36 @@
 
 // macro to use a shared TTY
-#define PRINTF(...)    lock_acquire( &tty_lock ); \
-                       giet_tty_printf(__VA_ARGS__);  \
-                       lock_release( &tty_lock );
+#define PRINTF(...)  do { lock_acquire( &tty_lock ); \
+                          giet_tty_printf(__VA_ARGS__);  \
+                          lock_release( &tty_lock ); } while(0);
 
 ///////////////////////////////////////////////////////////
@@ -87 +87 @@
 
     PRINTF("\n[MJPEG] thread DEMUX[%d] starts on P[%d,%d,%d] / trdid = %x\n", 
-           index , x , y , p, (uint32_t)trdid_demux[index] )
+           index , x , y , p, (uint32_t)trdid_demux[index] );
 
     // initialise BUFIO for MWMR channel <in>
@@ -97 +97 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%d] <in> : &mwmr = %x / &bufio = %x\n", 
-         index , mwmr_in , &bufio_in ) }
+PRINTF("\nDEMUX[%d] <in> : &mwmr = %x / &bufio = %x\n", 
+         index , mwmr_in , &bufio_in );
 #endif
 
@@ -109 +109 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%d] : <out_quanti> : mwmr = %x / &bufio = %x\n",
-         index , mwmr_out_quanti , &bufio_out_quanti ) }
+PRINTF("\nDEMUX[%d] : <out_quanti> : mwmr = %x / &bufio = %x\n",
+         index , mwmr_out_quanti , &bufio_out_quanti );
 #endif
 
@@ -121 +121 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%d] : <out_huff> : mwmr = %x / &bufio = %x\n",
-         index , mwmr_out_huff , &bufio_out_huff ) }
+PRINTF("\nDEMUX[%d] : <out_huff> : mwmr = %x / &bufio = %x\n",
+         index , mwmr_out_huff , &bufio_out_huff );
 #endif
 
@@ -133 +133 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%d] : <out_data> : mwmr = %x / &bufio = %x\n",
-         index , mwmr_out_data , &bufio_out_data ) }
+PRINTF("\nDEMUX[%d] : <out_data> : mwmr = %x / &bufio = %x\n",
+         index , mwmr_out_data , &bufio_out_data );
 #endif
 
@@ -160 +160 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%x] found Start of Image marker\n", index ) }
+PRINTF("\nDEMUX[%x] found Start of Image marker\n", index );
 #endif
 
@@ -181 +181 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%x] found Start of Frame marker\n", index ) }
+PRINTF("\nDEMUX[%x] found Start of Frame marker\n", index );
 #endif
                 // Only one component per image is supported
@@ -217 +217 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%x] found Quantization Table marker\n", index ) }
+PRINTF("\nDEMUX[%x] found Quantization Table marker\n", index );
 #endif
                 // The  quantisation table segment being fixed length, 
@@ -245 +245 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%x] found Huffman Table marker\n", index ) }
+PRINTF("\nDEMUX[%x] found Huffman Table marker\n", index );
 #endif
                 // The Huffman Table segment being variable length, 
@@ -290 +290 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%x] found Start of Scan marker\n", index ) }
+PRINTF("\nDEMUX[%x] found Start of Scan marker\n", index );
 #endif
                 // The scan segment has a variable length: 
@@ -342 +342 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%x] found End of Image marker\n", index ) }
+PRINTF("\nDEMUX[%x] found End of Image marker\n", index );
 #endif
                 mwmr_bufio_flush( &bufio_out_data );
@@ -354 +354 @@
 #if (DEBUG_DEMUX > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%x] found Comment or Application marker\n", index ) }
+PRINTF("\nDEMUX[%x] found Comment or Application marker\n", index );
 #endif
                 // read segment length from bufio_in
@@ -381 +381 @@
 #if DEBUG_DEMUX
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nDEMUX[%d] completes image %d at cycle %d\n", index , image , giet_proctime() ) }
+PRINTF("\nDEMUX[%d] completes image %d at cycle %d\n", index , image , giet_proctime() );
 #endif
         image = image + x_size * y_size;