Changeset 480

Timestamp:

Jan 1, 2015, 8:06:14 PM (9 years ago)

Author:

alain

Message:

Cosmetic

Location:

soft/giet_vm/applications

Files:

• classif/main.c (modified) (11 diffs)
• display/main.c (modified) (4 diffs)

soft/giet_vm/applications/classif/main.c

@@ -4 +4 @@
 // author : Alain Greiner
 /////////////////////////////////////////////////////////////////////////////////////////////
-// This multi-threaded application takes a Gigabit Ethernet packets stream, and
-// makes a packet analysis and classification, based on the source MAC address.
-// It uses the NIC peripheral, and the chained buffer build by the CMA component
-// to consume packets on the Gigabit Ethernet port. 
-//
-// It is described as a TCG (Task and Communication Graph) containing
+// This multi-threaded application takes a stream of Gigabit Ethernet packets,
+// and makes packet analysis and classification, based on the source MAC address.
+// It uses the NIC peripheral, and the distributed kernel chbuf filled by the CMA 
+// component to consume packets on the Gigabit Ethernet port. 
+//
+// This application is described as a TCG (Task and Communication Graph) containing
 // - one "load" task per cluster.
 // - from one to three "analyse" tasks per cluster.
 // In each cluster, the "load" task communicates with the local "analyse" tasks through 
 // a local MWMR fifo containing NB_PROCS_MAX containers (one item = one container).
-// The MWMR fifo descriptor and the data buffer containing the containers are defined
-// as global variables distributed in (up to) 16 clusters. 
+// The MWMR fifo descriptors array is defined as a global variable in cluster[0][0]. 
 //
 // Initialisation is done in two steps by the "load" tasks:
@@ -21 +20 @@
 //   the barrier between all "load" tasks. Other "load" tasks are waiting on the
 //   global_sync synchronisation variable.
-// - In each cluster[x][y], the load" task allocates the MWMR fifo descriptor & the data
-//   buffer in the local heap, and store the pointers on a global array of pointers. 
+// - In each cluster[x][y], the "load" task allocates the MWMR fifo descriptor and
+//   the data buffer in the local heap, and initializes the MWMR descriptor.
 //   The "analyse" tasks are waiting on the sync[x][y] variables.
 //     
@@ -35 +34 @@
 // 2) The "analyse" task transfer one container from the local MWMR fifo to a private
 //    local buffer. It analyse each packet contained in the container, compute the
-//    packet type, depending on the 4 MSB bits of the source MAC address,
-//    and increment the corresponding counters.
+//    packet type, depending on the source MAC address, and increment the counters.
 //
 // It uses the he following hardware parameters, defined in the hard_config.h file:
@@ -51 +49 @@
 #include "hard_config.h"
 
-#define LOAD_VERBOSE     0
-#define ANALYSE_VERBOSE  0
 #define CONTAINERS_MAX   10
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 //    Global variables
-// The communication channels are distributed in the clusters, 
-// but the pointers arrays are global variables in cluster[0][0]
+// The MWMR channels (descriptors and buffers) are distributed in the clusters, 
+// but the pointers array is stored in cluster[0][0]
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -73 +69 @@
 unsigned int     nic_channel;                 // allocated NIC channel index
 
-///////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////
 __attribute__ ((constructor)) void load()
-///////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////
 {
     // get processor identifiers
@@ -83 +79 @@
     giet_proc_xyp( &x, &y, &l );
 
-    if (X_SIZE > 4 )  giet_exit("The X_SIZE parameter cannot be larger than 4\n");
-    if (Y_SIZE > 4 )  giet_exit("The Y_SIZE parameter cannot be larger than 4\n");
-
     // local buffer to store one container in private stack
     unsigned int  temp[1024];
 
-// giet_shr_printf("\n@@@ P[%d,%d,%d] enters load task at cycle %d\n", 
-//                 x, y, l, giet_proctime() );
-
     // allocates data buffer for MWMR fifo in local heap
     unsigned int*  data = malloc( NB_PROCS_MAX<<12 );
 
-//giet_shr_printf("\n@@@ P[%d,%d,%d] completes data malloc at cycle %d "
-//                "/ &data = %x\n", x, y, l, giet_proctime(), (unsigned int)data );
-
     // allocates MWMR fifo descriptor in local heap
-    mwmr_channel_t*  fifo = malloc( sizeof(mwmr_channel_t) );
-
-//giet_shr_printf("\n@@@ P[%d,%d,%d] completes mwmr malloc at cycle %d "
-//                "/ &mwmr = %x\n", x, y, l, giet_proctime(), (unsigned int)mwmr );
-
-    // makes copy of pointer in global array for "analyse" tasks
-    mwmr[x][y] = fifo;
-
-    // display status for cluster[X_SIZE-1][Y_SIZE-1]
+    mwmr[x][y] = malloc( sizeof(mwmr_channel_t) );
+    mwmr_channel_t* fifo = mwmr[x][y];
+
+    // initialises local MWMR fifo : width = 4kbytes / depth = NB_PROCS_MAX
+    mwmr_init( fifo , data , 1024 , NB_PROCS_MAX );
+
+    // display for cluster[X_SIZE-1][Y_SIZE-1]
     if ( (x==X_SIZE-1) && (y==Y_SIZE-1) )
     giet_shr_printf("\n*** Task load starts on P[%d,%d,%d] at cycle %d\n"
-                    "      &fifo  = %x / &data  = %x / &sync  = %x\n"
+                    "      &mwmr  = %x / &data  = %x / &sync  = %x\n"
                     "      x_size = %d / y_size = %d / nprocs = %d\n",
                     x , y , l , giet_proctime() , 
-                    (unsigned int)fifo , (unsigned int)data, (unsigned int)(&local_sync[x][y]) ,
+                    (unsigned int)fifo, (unsigned int)data, (unsigned int)(&local_sync[x][y]),
                     X_SIZE, Y_SIZE, NB_PROCS_MAX ); 
 
     // Task load on cluster[0,0] makes global initialisation:
     // - NIC & CMA channels allocation & initialisation.
-    // - barrier for all load tasks initialisation.
+    // - barrier for load tasks initialisation.
     // Other load task wait completion.
     if ( (x==0) && (y==0) )
@@ -131 +116 @@
         barrier_init( &barrier, X_SIZE * Y_SIZE );
 
-        // clear NIC RX channels stats
-        giet_nic_rx_clear(); 
-
         global_sync = 1;
     }
@@ -141 +123 @@
     }    
 
-    // Each load task initialises local MWMR fifo (width = 4kbytes / depth = NB_PROCS_MAX)
-    mwmr_init( fifo , data , 1024 , NB_PROCS_MAX );
-
-    // signal MWMR fifo initialisation completion to analyse tasks
+    // "load" task signals MWMR initialisation to "analyse" tasks
     local_sync[x][y] = 1;
 
@@ -177 +156 @@
         giet_nic_rx_stop();
 
-        giet_shr_printf("\n@@@@ Clasification Results @@@\n"
+        giet_shr_printf("\n@@@@ Classification Results @@@\n"
                         " - TYPE 0 : %d packets\n"
                         " - TYPE 1 : %d packets\n"
@@ -232 +211 @@
     if ( (x==X_SIZE-1) && (y==Y_SIZE-1) )
     giet_shr_printf("\n*** Task analyse starts on P[%d,%d,%d] at cycle %d\n"
-                    "       &fifo = %x / &sync = %x\n",
+                    "       &mwmr = %x / &sync = %x\n",
                     x, y, l, giet_proctime(), 
                     (unsigned int)fifo, (unsigned int)(&local_sync[x][y]) );
@@ -267 +246 @@
             else                   length = temp[1+(p>>1)] & 0x0000FFFF;
 
-            // get packet type (source mac address 4 MSB bits)
-            type = (temp[word+1] & 0x0000F000) >> 12;
+            // get packet type (source mac address)
+            type = (temp[word+1] & 0x0000000F);
 
             // increment counter

soft/giet_vm/applications/display/main.c

@@ -68 +68 @@
     while ( image < NIMAGES )
     {
+        // load buf0
         giet_fat_read( fd, buf0, NBLOCKS, image*NBLOCKS );
 
@@ -73 +74 @@
                         x, y, lpid, image, giet_proctime() );
 
+        // display buf0
         giet_fbf_cma_display( 0 );
 
@@ -80 +82 @@
         image++;
 
+        // load buf1
         giet_fat_read( fd, buf1, NBLOCKS, image*NBLOCKS );
 
@@ -85 +88 @@
                         x, y, lpid, image, giet_proctime() );
 
+        // display buf1
         giet_fbf_cma_display( 1 );
 
         giet_shr_printf("\n[DISPLAY] Proc[%d,%d,%d] display image %d from buf1 at cycle %d\n", 
                         x, y, lpid, image, giet_proctime() );
-
 
         image++;