Changeset 748 for soft/giet_vm/applications/mjpeg/vld.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/vld.c (modified) (14 diffs)

soft/giet_vm/applications/mjpeg/vld.c

@@ -23 +23 @@
 
 // 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);
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -166 +166 @@
     uint32_t type = ( is_ac ) ? 1 : 0;
 
-    if ( is_ac ) { PRINTF("\n AC Huffman Table\n\n") }
-    else         { PRINTF("\n DC Huffman Table\n\n") }
+    if ( is_ac )
+    { 
+        PRINTF("\n AC Huffman Table\n\n");
+    }
+    else
+    {
+        PRINTF("\n DC Huffman Table\n\n");
+    }
 
     for ( j = 0; j < 16; j++ ) // j = code_length - 1
     {
         PRINTF(" length = %d / mincode = %x / maxcode = %x / valptr = %d\n",
-        j+1 , huff->MinCode[type][j] , huff->MaxCode[type][j] , huff->ValPtr[type][j] )
-    }
-
-    PRINTF("\n")
+        j+1 , huff->MinCode[type][j] , huff->MaxCode[type][j] , huff->ValPtr[type][j]);
+    }
+
+    PRINTF("\n");
 
     for ( j = 0 ; j < 16 ; j++ )  // j == code_length - 1
@@ -186 +192 @@
 
             PRINTF(" Symbol[%d] = %x / code[%d] = %x\n", 
-            index , huff->HT[type][index] , index , code )
+            index , huff->HT[type][index] , index , code );
         }
     }
  
-    PRINTF("\n")
+    PRINTF("\n");
 }
 
@@ -342 +348 @@
 #if (DEBUG_VLD > 2)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] : DC[0] = %d / reformat( %x , %d ) = %d\n",
-         index , buf[0], temp , symbol , value ) }
+PRINTF("\nVLD[%d] : DC[0] = %d / reformat( %x , %d ) = %d\n",
+         index , buf[0], temp , symbol , value );
 #endif
 
@@ -357 +363 @@
 #if (DEBUG_VLD > 2)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] : EOB found at i = %d\n", index , i ) }
+PRINTF("\nVLD[%d] : EOB found at i = %d\n", index , i );
 #endif 
             break;
@@ -379 +385 @@
 #if (DEBUG_VLD > 2)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] : AC[%d] = %d / reformat( %x , %d ) = %d\n",
-         index , i , buf[i] , temp , cat , value ) }
+PRINTF("\nVLD[%d] : AC[%d] = %d / reformat( %x , %d ) = %d\n",
+         index , i , buf[i] , temp , cat , value );
 #endif
 
@@ -390 +396 @@
 #if (DEBUG_VLD > 1 )
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] completes block %d/%d in image %d\n"
+PRINTF("\nVLD[%d] completes block %d/%d in image %d\n"
          "  %d  %d  %d  %d  %d  %d  %d  %d\n"
          "  %d  %d  %d  %d  %d  %d  %d  %d\n"
@@ -407 +413 @@
          buf[40], buf[41], buf[42], buf[43], buf[44], buf[45], buf[46], buf[47],
          buf[48], buf[49], buf[50], buf[51], buf[52], buf[53], buf[54], buf[55],
-         buf[56], buf[57], buf[58], buf[59], buf[60], buf[61], buf[62], buf[63]) }
+         buf[56], buf[57], buf[58], buf[59], buf[60], buf[61], buf[62], buf[63]);
 #endif
 
@@ -442 +448 @@
 
     PRINTF("\n[MJPEG] thread VLD[%d] starts on P[%d,%d,%d] / trdid = %x\n",
-           index , x , y , p, (uint32_t)trdid_vld[index] )
+           index , x , y , p, (uint32_t)trdid_vld[index] );
 
 
@@ -452 +458 @@
 #if (DEBUG_VLD > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] <in_data> : &mwmr = %x / &bufio = %x\n",
-         index , mwmr_in_data , &bufio_in_data ) }
+PRINTF("\nVLD[%d] <in_data> : &mwmr = %x / &bufio = %x\n",
+         index , mwmr_in_data , &bufio_in_data );
 #endif
 
@@ -463 +469 @@
 #if (DEBUG_VLD > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] <in_huff> : &mwmr = %x / &bufio = %x\n",
+PRINTF("\nVLD[%d] <in_huff> : &mwmr = %x / &bufio = %x\n",
          index , mwmr_in_huff , &bufio_in_huff ) }
 #endif
@@ -483 +489 @@
 #if (DEBUG_VLD > 1)
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] load Huffman tables for image %d\n", index , image ) }
+PRINTF("\nVLD[%d] load Huffman tables for image %d\n", index , image );
 #endif
 
@@ -501 +507 @@
 #if (DEBUG_VLD > 1) 
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] uncompress block %d/%d in image %d\n", index, block, nblocks, image ) }
+PRINTF("\nVLD[%d] uncompress block %d/%d in image %d\n", index, block, nblocks, image );
 #endif
             prev_dc = vld_unpack_block( index,
@@ -514 +520 @@
 #if DEBUG_VLD 
 if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
-{ PRINTF("\nVLD[%d] completes image %d at cycle %d\n", index , image , giet_proctime() ) }
+PRINTF("\nVLD[%d] completes image %d at cycle %d\n", index , image , giet_proctime() );
 #endif
         image = image + x_size*y_size;