More debugging (and smaller matrices during the debugging on RL phase)

[simgrid.git] / examples / gras / pmm / pmm.c

diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c
index ec31ad199c279cb8b877a8ed98dc087b55314044..45f427e39bfb85ed366b2a3242bf0a79f99ac7a7 100755 (executable)
--- a/examples/gras/pmm/pmm.c
+++ b/examples/gras/pmm/pmm.c
@@ -10,10 +10,10 @@
 
 #include "gras.h"
 #include "xbt/matrix.h"
-#define PROC_MATRIX_SIZE 6
+#define PROC_MATRIX_SIZE 2
 #define SLAVE_COUNT (PROC_MATRIX_SIZE*PROC_MATRIX_SIZE)
 
-#define DATA_MATRIX_SIZE 600
+#define DATA_MATRIX_SIZE 8
 const int submatrix_size = DATA_MATRIX_SIZE/PROC_MATRIX_SIZE;
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(pmm,"Parallel Matrix Multiplication");
@@ -107,14 +107,15 @@ int master (int argc,char *argv[]) {
 
   gras_socket_t from;
 
-  /*  Init the GRAS's infrastructure */
-  gras_init(&argc, argv);
 
   xbt_host_t grid[SLAVE_COUNT]; /* The slaves */
   gras_socket_t socket[SLAVE_COUNT]; /* sockets for brodcast to slaves */
 
+  /*  Init the GRAS's infrastructure */
+  gras_init(&argc, argv);
+  register_messages();
+      
   /*  Initialize Matrices */
-
   A = xbt_matrix_double_new_id(DATA_MATRIX_SIZE,DATA_MATRIX_SIZE);
   B = xbt_matrix_double_new_seq(DATA_MATRIX_SIZE,DATA_MATRIX_SIZE);
   C = xbt_matrix_double_new_zeros(DATA_MATRIX_SIZE,DATA_MATRIX_SIZE);
@@ -126,7 +127,7 @@ int master (int argc,char *argv[]) {
   //multiplication();
   //gather();
   /************************* Init Data Send *********************************/
-  gras_os_sleep(5);
+  gras_os_sleep(2);
 
   for( i=1;i<argc && i<=SLAVE_COUNT;i++){
     grid[i-1]=xbt_host_from_string(argv[i]);
@@ -185,9 +186,13 @@ int master (int argc,char *argv[]) {
     xbt_matrix_free(result.C);
   }
   /*    end of gather   */
-  INFO0 ("The Result of Multiplication is :");
-  xbt_matrix_dump(C,"C:res",0,xbt_matrix_dump_display_double);
-   
+  if (DATA_MATRIX_SIZE < 50) {
+     INFO0 ("The Result of Multiplication is :");
+     xbt_matrix_dump(C,"C:res",0,xbt_matrix_dump_display_double);
+  } else {
+     INFO1("Matrix size too big (%d>50) to be displayed here",DATA_MATRIX_SIZE);
+  }
+
   for(i=0; i<SLAVE_COUNT; i++) {
      gras_socket_close(socket[i]);
      xbt_host_free(grid[i]);
@@ -277,7 +282,8 @@ int slave(int argc,char *argv[]) {
        
     /* a line brodcast */
     if(myline==step){
-       INFO2("LINE: step(%d) = Myline(%d). Broadcast my data.",step,myline);
+       INFO3("LINE: step(%d) = Myline(%d). Broadcast my data (myport=%d).",
+            step,myline,gras_os_myport());
        for (l=0;l < PROC_MATRIX_SIZE-1 ;l++)
         gras_msg_send(socket_row[l], 
                       gras_msgtype_by_name("dataB"), 
@@ -294,8 +300,8 @@ int slave(int argc,char *argv[]) {
       } CATCH(e) {
        RETHROW0("Can't get a data message from line : %s");
       }
-      INFO3("LINE: step(%d) <> Myline(%d). Receive data from %s",step,myline,
-           gras_socket_peer_name(from));
+      INFO4("LINE: step(%d) <> Myline(%d). Receive data from %s:%d",step,myline,
+           gras_socket_peer_name(from), gras_socket_peer_port(from));
     }
 
     /* a row brodcast */