Changeset 804 for soft/giet_vm/applications/transpose/transpose.c

Timestamp:

Mar 14, 2016, 3:35:05 PM (8 years ago)

Author:

alain

Message:

cosmetic.

File:

• soft/giet_vm/applications/transpose/transpose.c (modified) (8 diffs)

soft/giet_vm/applications/transpose/transpose.c

@@ -92 +92 @@
 int  fd_out;
 
-////////////////////////////////////////////
-__attribute__ ((constructor)) void execute()
-////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+__attribute__ ((constructor)) void execute( unsigned int* tid )
+////////////////////////////////////////////////////////////////
 {
     unsigned int l;                            // line index for loops
@@ -118 +118 @@
     unsigned int cluster_id    = (x_id * y_size) + y_id;        // "continuous" index   
     unsigned int thread_id     = (cluster_id * nprocs) + p_id;  // "continuous" index
+
+    if ( VERBOSE )
+    {
+        printf("\n@@@ thread %d / %d running on P[%d,%d,%d]\n",
+               *tid , nthreads , x_id , y_id , p_id );
+    }
 
     // parallel load of image:
@@ -146 +152 @@
         if ( VERBOSE )
         {
-            printf("\n@@@ Thread[%d,%d,%d] call mmap for input file\n"
+            printf("\n@@@ thread %d running on P[%d,%d,%d] call mmap for input file\n"
                    " length = %x / offset = %x / buf_in = %x\n",
-                   x_id , y_id , p_id , length , offset , buf_in[cluster_id] );
+                   *tid , x_id , y_id , p_id , length , offset , buf_in[cluster_id] );
         }
 
@@ -168 +174 @@
         if ( VERBOSE )
         {
-            printf("\n@@@ Thread[%d,%d,%d] call mmap for output file\n"
+            printf("\n@@@ thread %d running on P[%d,%d,%d] call mmap for output file\n"
                    " length = %x / offset = %x / buf_out = %x\n",
-                   x_id , y_id , p_id , length , offset , buf_out[cluster_id] );
+                   *tid , x_id , y_id , p_id , length , offset , buf_out[cluster_id] );
         }
        
@@ -482 +488 @@
     }
 
-    // allocate thread[] array
+    // allocate thread[] array : thread identidiers defined by the kernel
     pthread_t* thread = malloc( nthreads * sizeof(pthread_t) );
+
+    // allocate tid[] array : continuous thred index defined by the user
+    unsigned int* tid = malloc( nthreads * sizeof(unsigned int) );
 
     // barrier initialisation
@@ -494 +503 @@
     for ( n = 1 ; n < nthreads ; n++ )
     {
+        tid[n] = n;
         if ( giet_pthread_create( &thread[n],
                                   NULL,                  // no attribute
                                   &execute,
-                                  NULL ) )               // no argument
-        {
-            printf("\n[TRANSPOSE ERROR] creating thread %x\n", thread[n] );
+                                  &tid[n] ) )            // pointer on thread index
+        {
+            printf("\n[TRANSPOSE ERROR] creating thread %d / id = %x\n", tid[n] , thread[n] );
             giet_pthread_exit( NULL );
         }
@@ -505 +515 @@
 
     // run the execute() function
-    execute();
+    execute( &tid[0] );
 
     // wait other threads completion
@@ -512 +522 @@
         if ( giet_pthread_join( thread[n], NULL ) )
         {
-            printf("\n[TRANSPOSE ERROR] joining thread %x\n", thread[n] );
+            printf("\n[TRANSPOSE ERROR] joining thread %d / id = %x\n", tid[n] , thread[n] );
             giet_pthread_exit( NULL );
         }