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

soft/giet_vm/applications/mjpeg/mjpeg.c

@@ -31 +31 @@
 
 // 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);
 
 ///////////////////////////////////////////////
@@ -125 +125 @@
     if ( INTERACTIVE_MODE )
     {
-        PRINTF("\n[MJPEG] enter path for JPEG stream file (default is plan_48.mjpg)\n> ") 
+        PRINTF("\n[MJPEG] enter path for JPEG stream file (default is plan_48.mjpg)\n> ");
         giet_tty_gets( file_pathname , 256 );
 
@@ -136 +136 @@
         else
         {
-            PRINTF("\n[MJPEG] enter image width\n> ")  
+            PRINTF("\n[MJPEG] enter image width\n> ");
             giet_tty_getw( &image_width );
-            PRINTF("\n[MJPEG] enter image height\n> ")  
+            PRINTF("\n[MJPEG] enter image height\n> ");  
             giet_tty_getw( &image_height );
-            PRINTF("\n") 
+            PRINTF("\n");
         }
     }
@@ -154 +154 @@
  
     if ( USE_DCT_COPROC )
-    { PRINTF("\n\n[MJPEG] stream %s / %d clusters / %d cores / DCT COPROC\n\n",
-           file_pathname , x_size*y_size , nprocs ) }
+    {
+        PRINTF("\n\n[MJPEG] stream %s / %d clusters / %d cores / DCT COPROC\n\n",
+               file_pathname , x_size*y_size , nprocs );
+    }
     else
-    { PRINTF("\n\n[MJPEG] stream %s / %d clusters / %d cores / NO DCT COPROC\n\n",
-           file_pathname , x_size*y_size , nprocs ) }
+    { 
+        PRINTF("\n\n[MJPEG] stream %s / %d clusters / %d cores / NO DCT COPROC\n\n",
+               file_pathname , x_size*y_size , nprocs );
+    }
 
     // compute nblocks_h & nblocks_w
@@ -234 +238 @@
         pc = main_2_demux[n];
         PRINTF(" - main_2_demux[%d]  = %x / &lock = %x / &buf = %x / size = %d\n",
-               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 ) 
+               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 );
 
         pc = demux_2_vld_data[n];
         PRINTF(" - demux_2_vld[%d] = %x / &lock = %x / &buf = %x / size = %d\n",
-               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 ) 
+               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 );
 
         pc = vld_2_iqzz[n];
         PRINTF(" - vld_2_iqzz[%d]  = %x / &lock = %x / &buf = %x / size = %d\n",
-               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 ) 
+               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 );
 
         pc = iqzz_2_idct[n];
         PRINTF(" - iqzz_2_idct[%d] = %x / &lock = %x / &buf = %x / size = %d\n",
-               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 ) 
+               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 );
 
         pc = idct_2_libu[n];
         PRINTF(" - idct_2_libu[%d] = %x / &lock = %x / &buf = %x / size = %d\n",
-               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 ) 
+               n, pc, (uint32_t)&pc->lock, (uint32_t)pc->data, pc->depth<<2 );
     }
 
@@ -407 +411 @@
 #if DEBUG_MAIN
 PRINTF("\nMAIN send image %d to cluster %d at cycle %d : %d bytes\n",
-       image , cluster , giet_proctime() , bytes_count )
+       image , cluster , giet_proctime() , bytes_count );
 #endif
         // increment image index
@@ -429 +433 @@
 
             if ( giet_pthread_join( trdid_demux[index] , NULL ) )
-            { PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for demux[%d]\n", index ) }
+            PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for demux[%d]\n", index );
 
             if ( giet_pthread_join( trdid_vld[index] , NULL ) )
-            { PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for vld[%d]\n", index ) }
+            PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for vld[%d]\n", index );
 
             if ( giet_pthread_join( trdid_iqzz[index] , NULL ) )
-            { PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for iqzz[%d]\n", index ) }
+            PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for iqzz[%d]\n", index );
 
             if ( USE_DCT_COPROC == 0 )
             {
                 if ( giet_pthread_join( trdid_idct[index] , NULL ) )
-                { PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for idct[%d]\n", index ) }
+                PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for idct[%d]\n", index );
             }
 
             if ( giet_pthread_join( trdid_libu[index] , NULL ) )
-            { PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for libu[%d]\n", index ) }
+            PRINTF("\n[MJPEG ERROR] calling giet_pthread_join() for libu[%d]\n", index );
 
             if ( USE_DCT_COPROC )
@@ -459 +463 @@
     /////////////////////////////////////////////////////////////////////////////////////
 
-    PRINTF("\n[MJPEG] Instumentation Results\n" )
+    // display on TTY
+    PRINTF("\n[MJPEG] Instumentation Results\n" );
     for ( image = 0 ; image < MAX_IMAGES ; image++ )
-    { PRINTF(" - Image %d : completed at cycle %d\n", image , date[image]) }
-
+    PRINTF(" - Image %d : completed at cycle %d\n", image , date[image]);
+
+    // save on disk
+    unsigned int fdout = giet_fat_open( "/home/mjpeg_instrumentation" , O_CREATE );
+    if ( fdout < 0 ) 
+    PRINTF("\n[MJPEG ERROR] cannot open file /home/mjpeg_instrumentation\n");
+
+    int ret = giet_fat_lseek( fdout, 0 , SEEK_END );
+    if( ret < 0 )
+    PRINTF("\n[MJPEG ERROR] cannot seek file /home/mjpeg_instrumentation\n");
+
+    if( USE_DCT_COPROC )
+    {
+        giet_fat_fprintf( fdout, "\n*** stream %s / %d clusters / %d cores / DCT COPROC\n",
+                          file_pathname , x_size*y_size , nprocs );
+    }
+    else
+    {
+        giet_fat_fprintf( fdout, "stream %s / %d clusters / %d cores / NO DCT COPROC\n\n",
+                          file_pathname , x_size*y_size , nprocs );
+    }
+    for ( image = 0 ; image < MAX_IMAGES ; image++ )
+    {
+        giet_fat_fprintf( fdout, " - Image %d : completed at cycle %d\n", 
+                          image , date[image]);
+    } 
+
+    // completed
     giet_pthread_exit( "main completed" );