X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a5c4a0d5915bb7a2b308e061bbf5f5c90e20575..6ee7e9c2e455536ab817ae0136acfbb53822eecd:/examples/gras/pmm/pmm.c?ds=sidebyside

diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c
old mode 100755
new mode 100644
index 15412760cd..bb48e39a8d
--- a/examples/gras/pmm/pmm.c
+++ b/examples/gras/pmm/pmm.c
@@ -1,60 +1,75 @@
-/* pmm - paralel matrix multiplication "double diffusion"                       */
+/* pmm - parallel matrix multiplication "double diffusion"                  */
 
-/* Copyright (c) 2006- Ahmed Harbaoui. All rights reserved.                  */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "gras.h"
-#define MATRIX_SIZE 3
-#define SLAVE_COUNT 9
+#include "xbt/matrix.h"
+#include "amok/peermanagement.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(pmm,"Parallel Matrix Multiplication");
+#define PROC_MATRIX_SIZE 3
+#define NEIGHBOR_COUNT PROC_MATRIX_SIZE - 1
+#define SLAVE_COUNT (PROC_MATRIX_SIZE*PROC_MATRIX_SIZE)
 
-GRAS_DEFINE_TYPE(s_matrix,struct s_matrix {
-	int rows;
-	int cols;
-	double *data GRAS_ANNOTE(size, rows*cols);
-};)
-typedef struct s_matrix matrix_t;
+#define DATA_MATRIX_SIZE 18
+const int submatrix_size = DATA_MATRIX_SIZE / PROC_MATRIX_SIZE;
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(pmm, "Parallel Matrix Multiplication");
 
 /* struct for recovering results */
-GRAS_DEFINE_TYPE(s_result,struct s_result {
-	int i;
-	int j;
-	double value;
-});
+GRAS_DEFINE_TYPE(s_result, struct s_result {
+                 int linepos; int rowpos;
+                 xbt_matrix_t C GRAS_ANNOTE(subtype, double);
+                 });
+
 typedef struct s_result result_t;
 
 /* struct to send initial data to slave */
-GRAS_DEFINE_TYPE(s_init_data,struct s_init_data {
-	int myrow;
-	int mycol;
-	double a;
-	double b;
-});
-typedef struct s_init_data init_data_t;
+GRAS_DEFINE_TYPE(s_pmm_assignment, struct s_pmm_assignment {
+                 int linepos;
+                 int rowpos;
+                 xbt_peer_t line[NEIGHBOR_COUNT];
+                 xbt_peer_t row[NEIGHBOR_COUNT];
+                 xbt_matrix_t A GRAS_ANNOTE(subtype, double);
+                 xbt_matrix_t B GRAS_ANNOTE(subtype, double);
+                 });
+
+typedef struct s_pmm_assignment s_pmm_assignment_t;
 
 /* register messages which may be sent (common to client and server) */
-static void register_messages(void) {
-	gras_datadesc_type_t result_type;
-	gras_datadesc_type_t init_data_type;
-	result_type=gras_datadesc_by_symbol(s_result);
-	init_data_type=gras_datadesc_by_symbol(s_init_data);
-	
-	gras_msgtype_declare("result", result_type);  // recieve a final result from slave
-	gras_msgtype_declare("init_data", init_data_type);  // send from master to slave to initialize data bA,bB
-
-	gras_msgtype_declare("ask_result", gras_datadesc_by_name("int")); // send from master to slave to ask a final result	
-	gras_msgtype_declare("step", gras_datadesc_by_name("int"));// send from master to slave to indicate the begining of step 
-	gras_msgtype_declare("step_ack", gras_datadesc_by_name("int"));//send from slave to master to indicate the end of the current step
-	gras_msgtype_declare("dataA", gras_datadesc_by_name("double"));// send data between slave
-	gras_msgtype_declare("dataB", gras_datadesc_by_name("double"));// send data between slave
+static void register_messages(void)
+{
+  gras_datadesc_type_t result_type;
+  gras_datadesc_type_t pmm_assignment_type;
+
+  gras_datadesc_set_const("NEIGHBOR_COUNT", NEIGHBOR_COUNT);
+  result_type = gras_datadesc_by_symbol(s_result);
+  pmm_assignment_type = gras_datadesc_by_symbol(s_pmm_assignment);
+
+  /* receive a final result from slave */
+  gras_msgtype_declare("result", result_type);
+
+  /* send from master to slave to assign a position and some data */
+  gras_msgtype_declare("pmm_slave", pmm_assignment_type);
+
+  /* send data between slaves */
+  gras_msgtype_declare("dataA",
+                       gras_datadesc_matrix(gras_datadesc_by_name
+                                            ("double"), NULL));
+  gras_msgtype_declare("dataB",
+                       gras_datadesc_matrix(gras_datadesc_by_name
+                                            ("double"), NULL));
+
+  /* synchronization message */
+  gras_msgtype_declare("pmm_sync", 0);
 }
 
 /* Function prototypes */
-int slave (int argc,char *argv[]);
-int master (int argc,char *argv[]);
+int slave(int argc, char *argv[]);
+int master(int argc, char *argv[]);
 
 
 /* **********************************************************************
@@ -63,327 +78,351 @@ int master (int argc,char *argv[]);
 
 /* Global private data */
 typedef struct {
-  int nbr_col,nbr_row;
+  int nbr_row, nbr_line;
   int remaining_step;
   int remaining_ack;
 } master_data_t;
 
+int master(int argc, char *argv[])
+{
 
-/***  Function initilaze matrixs ***/
+  int i;
 
-static void initmatrix(matrix_t *X){
-int i;
+  xbt_matrix_t A, B, C;
+  result_t result;
 
-for(i=0 ; i<(X->rows)*(X->cols); i++)
-	X->data[i]=1.0;//*rand()/(RAND_MAX+1.0);
-} /* end_of_initmatrixs */
+  gras_socket_t from;
+
+  xbt_dynar_t peers;            /* group of slaves */
+  xbt_peer_t grid[SLAVE_COUNT]; /* The slaves as an array */
+  gras_socket_t socket[SLAVE_COUNT];    /* sockets for brodcast to slaves */
+
+  /* Init the GRAS's infrastructure */
+  gras_init(&argc, argv);
+  amok_pm_init();
+  register_messages();
 
-/***  Function Scatter Sequentiel ***/
+  /* Initialize data 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);
+
+  /* Create the connexions */
+  xbt_assert0(argc > 1, "Usage: master <port>");
+  gras_socket_server(atoi(argv[1]));
+  peers = amok_pm_group_new("pmm");
+
+  /* friends, we're ready. Come and play */
+  XBT_INFO("Wait for peers for 2 sec");
+  gras_msg_handleall(2);
+  while (xbt_dynar_length(peers) < SLAVE_COUNT) {
+    XBT_INFO("Got only %ld pals (of %d). Wait 2 more seconds",
+        xbt_dynar_length(peers),SLAVE_COUNT);
+    gras_msg_handleall(2);
+  }
+  XBT_INFO("Good. Got %ld pals", xbt_dynar_length(peers));
 
-static void scatter(){
+  for (i = 0; i < xbt_dynar_length(peers) && i < SLAVE_COUNT; i++) {
+    xbt_dynar_get_cpy(peers, i, &grid[i]);
+    socket[i] = gras_socket_client(grid[i]->name, grid[i]->port);
+  }
+  xbt_assert2(i == SLAVE_COUNT,
+              "Not enough slaves for this setting (got %d of %d). Change the deployment file",
+              i, SLAVE_COUNT);
+
+  /* Kill surnumerous slaves */
+  for (i = SLAVE_COUNT; i < xbt_dynar_length(peers);) {
+    xbt_peer_t h;
+
+    xbt_dynar_remove_at(peers, i, &h);
+    XBT_INFO("Too much slaves. Killing %s:%d", h->name, h->port);
+    amok_pm_kill_hp(h->name, h->port);
+    free(h);
+  }
 
-}/* end_of_Scatter */
 
-/***  Function: Scatter // ***/
+  /* Assign job to slaves */
+  int row = 0, line = 0;
+  XBT_INFO("XXXXXXXXXXXXXXXXXXXXXX begin Multiplication");
+  for (i = 0; i < SLAVE_COUNT; i++) {
+    s_pmm_assignment_t assignment;
+    int j, k;
+
+    assignment.linepos = line;  // assigned line
+    assignment.rowpos = row;    // assigned row
+
+    /* Neiborhood */
+    for (j = 0, k = 0; j < PROC_MATRIX_SIZE; j++) {
+      if (i != j * PROC_MATRIX_SIZE + (row)) {
+        assignment.row[k] = grid[j * PROC_MATRIX_SIZE + (row)];
+        k++;
+      }
+    }
+    for (j = 0, k = 0; j < PROC_MATRIX_SIZE; j++) {
+      if (i != (line) * PROC_MATRIX_SIZE + j) {
+        assignment.line[k] = grid[(line) * PROC_MATRIX_SIZE + j];
+        k++;
+      }
+    }
+
+    assignment.A = xbt_matrix_new_sub(A,
+                                      submatrix_size, submatrix_size,
+                                      submatrix_size * line,
+                                      submatrix_size * row, NULL);
+    assignment.B =
+        xbt_matrix_new_sub(B, submatrix_size, submatrix_size,
+                           submatrix_size * line, submatrix_size * row,
+                           NULL);
+    row++;
+    if (row >= PROC_MATRIX_SIZE) {
+      row = 0;
+      line++;
+    }
+
+    gras_msg_send(socket[i], "pmm_slave", &assignment);
+    xbt_matrix_free(assignment.A);
+    xbt_matrix_free(assignment.B);
+  }
 
-static void scatter_parl(){
+  /* synchronize slaves */
+  for (i = 0; i < PROC_MATRIX_SIZE; i++) {
+    int j;
+    for (j = 0; j < SLAVE_COUNT; j++)
+      gras_msg_wait(600, "pmm_sync", NULL, NULL);
+    for (j = 0; j < SLAVE_COUNT; j++)
+      gras_msg_send(socket[j], "pmm_sync", NULL);
+  }
 
-}/* end_of_Scatter // */
+  /* Retrieve the results */
+  for (i = 0; i < SLAVE_COUNT; i++) {
+    gras_msg_wait(6000, "result", &from, &result);
+    XBT_VERB("%d slaves are done already. Waiting for %d", i + 1,
+          SLAVE_COUNT);
+    xbt_matrix_copy_values(C, result.C, submatrix_size, submatrix_size,
+                           submatrix_size * result.linepos,
+                           submatrix_size * result.rowpos, 0, 0, NULL);
+    xbt_matrix_free(result.C);
+  }
+  /*    end of gather   */
+
+  if (xbt_matrix_double_is_seq(C))
+    XBT_INFO("XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations");
+  else {
+    XBT_WARN("the result seems wrong");
+    if (DATA_MATRIX_SIZE < 30) {
+      XBT_INFO("The Result of Multiplication is :");
+      xbt_matrix_dump(C, "C:res", 0, xbt_matrix_dump_display_double);
+    } else {
+      XBT_INFO("Matrix size too big (%d>30) to be displayed here",
+            DATA_MATRIX_SIZE);
+    }
+  }
 
-/***  Function: multiplication ***/
+  amok_pm_group_shutdown("pmm");        /* Ok, we're out of here */
 
-static void multiplication(){
+  for (i = 0; i < SLAVE_COUNT; i++)
+    gras_socket_close(socket[i]);
 
-}/* end_of_multiplication */
-
-/***  Function: gather ***/
-
-static void gather(){
-
-}/* end_of_gather */
-
-/***  Function: Display Matrix ***/
-
-static void display(matrix_t X){
-	
-int i,j,t=0;
-
-  printf("      ");
-  for(j=0;j<X.cols;j++)
-    printf("%.3d ",j);
-    printf("\n");
-    printf("    __");
-    for(j=0;j<X.cols;j++)
-	printf("____");
-	printf("_\n");
-
-	for(i=0;i<X.rows;i++){
-	  printf("%.3d | ",i);
-	  for(j=0;j<X.cols;j++)
-	    printf("%.3g ",X.data[t++]);
-	  printf("|\n");
-	}
-	printf("    --");
-	for(j=0;j<X.cols;j++)
-		printf("----");
-	printf("-\n");
-
-}/* end_of_display */
-
-int master (int argc,char *argv[]) {
-
-xbt_ex_t e;
-
-int i,port,ask_result,step;
-
-matrix_t A,B,C;
-result_t result;
-
-gras_socket_t from;
-
-	/*  Init the GRAS's infrastructure */
-	gras_init(&argc, argv);
-
-        gras_socket_t socket[MATRIX_SIZE*MATRIX_SIZE]; /* sockets for brodcast to other slave */
-
-        /*  Initialize Matrixs */
-
-	A.rows=A.cols=MATRIX_SIZE;
-	B.rows=B.cols=MATRIX_SIZE;
-	C.rows=C.cols=MATRIX_SIZE;
-	
-	A.data=xbt_malloc0(sizeof(double)*MATRIX_SIZE*MATRIX_SIZE);
-	B.data=xbt_malloc0(sizeof(double)*MATRIX_SIZE*MATRIX_SIZE);
-	C.data=xbt_malloc0(sizeof(double)*MATRIX_SIZE*MATRIX_SIZE);
-	
-	initmatrix(&A);
-	initmatrix(&B);
-	
-	/*  Get arguments and create sockets */
-	port=atoi(argv[1]);
-	//scatter();
-	//scatter_parl();
-	//multiplication();
-	//gather();
-	//display(A);
-	/****************************** Init Data Send *********************************/
-	int step_ack,j=0;
-	init_data_t mydata;
-	gras_os_sleep(60);                                                // MODIFIER LES TEMPS D'ATTENTE 60 c trop normalement
-	for( i=2;i< argc;i+=3){
-		TRY {
-		socket[j]=gras_socket_client(argv[i],port);
-		} CATCH(e) {
-			RETHROW0("Unable to connect to the server: %s");
-		}
-		INFO2("Connected to %s:%d.",argv[i],port);
-		
-		mydata.myrow=atoi(argv[i+1]);  // My row
-		mydata.mycol=atoi(argv[i+2]);  // My column
-		
-		mydata.a=A.data[(mydata.myrow-1)*MATRIX_SIZE+(mydata.mycol-1)];
-		mydata.b=B.data[(mydata.myrow-1)*MATRIX_SIZE+(mydata.mycol-1)];;
-		
-		gras_msg_send(socket[j],gras_msgtype_by_name("init_data"),&mydata);
-		INFO3("Send Init Data to %s : data A= %.3g & data B= %.3g",gras_socket_peer_name(socket[j]),mydata.a,mydata.b);
-		j++;
-	} // end init Data Send
-
-	/******************************* multiplication ********************************/
-	INFO0("begin Multiplication");
-	
-	for (step=1; step <= MATRIX_SIZE; step++){
-		gras_os_sleep(50);
-		for (i=0; i< SLAVE_COUNT; i++){
-		TRY {
-		gras_msg_send(socket[i], gras_msgtype_by_name("step"), &step);  /* initialize Mycol, MyRow, mydataA,mydataB*/
-		} CATCH(e) {
-		gras_socket_close(socket[i]);
-		RETHROW0("Unable to send the msg : %s");
-		}
-	}
-	INFO1("send to slave to begin a %d th step",step);
-	/* wait for computing and slave messages exchange */
-	i=0;
-	
-	while  ( i< SLAVE_COUNT){
-		TRY {
-		gras_msg_wait(1300,gras_msgtype_by_name("step_ack"),&from,&step_ack);
-		} CATCH(e) {
-		RETHROW0("I Can't get a Ack step message from slave : %s");
-		}
-		i++;
-		INFO3("Receive Ack step ack from %s (got %d of %d)",
-		      gras_socket_peer_name(from),
-		      i, SLAVE_COUNT);
-	}
-	}
-	/*********************************  gather ***************************************/
-
-	ask_result=0;
-	for( i=1;i< argc;i++){
-		gras_msg_send(socket[i],gras_msgtype_by_name("ask_result"),&ask_result);
-		INFO1("Send (Ask Result) message to %s",gras_socket_peer_name(socket[i]));
-	}
-	/* wait for results */
-	for( i=1;i< argc;i++){
-		gras_msg_wait(600,gras_msgtype_by_name("result"),&from,&result);
-		C.data[(result.i-1)*MATRIX_SIZE+(result.j-1)]=result.value;
-	}
-	/*    end of gather   */
-	INFO0 ("The Result of Multiplication is :");
-	display(C);
-
-return 0;
-} /* end_of_master */
+  xbt_matrix_free(A);
+  xbt_matrix_free(B);
+  xbt_matrix_free(C);
+  gras_exit();
+  return 0;
+}                               /* end_of_master */
 
 /* **********************************************************************
  * slave code
  * **********************************************************************/
 
-int slave(int argc,char *argv[]) {
+static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
+{
+  /* Recover my initialized Data and My Position */
+  s_pmm_assignment_t assignment = *(s_pmm_assignment_t *) payload;
+  gras_socket_t master = gras_msg_cb_ctx_from(ctx);
 
-  xbt_ex_t e; 
+  xbt_ex_t e;
 
-  int step,port,l,result_ack=0; 
-  double bA,bB;
+  int step, l;
+  xbt_matrix_t bA = xbt_matrix_new(submatrix_size, submatrix_size,
+                                   sizeof(double), NULL);
+  xbt_matrix_t bB = xbt_matrix_new(submatrix_size, submatrix_size,
+                                   sizeof(double), NULL);
 
-  int myrow,mycol;
-  double mydataA,mydataB;
-  double bC=0;
-  
-//  static end_step;
+  int myline, myrow;
+  xbt_matrix_t mydataA, mydataB;
+  xbt_matrix_t bC =
+      xbt_matrix_double_new_zeros(submatrix_size, submatrix_size);
 
   result_t result;
- 
-  gras_socket_t from,sock;  /* to recive from server for steps */
 
-  gras_socket_t socket_row[MATRIX_SIZE-1],socket_column[MATRIX_SIZE-1]; /* sockets for brodcast to other slave */
+  gras_socket_t from;           /* to exchange data with my neighbor */
 
-  /* Init the GRAS's infrastructure */
+  /* sockets for brodcast to other slave */
+  gras_socket_t socket_line[PROC_MATRIX_SIZE - 1];
+  gras_socket_t socket_row[PROC_MATRIX_SIZE - 1];
+  memset(socket_line, 0, sizeof(socket_line));
+  memset(socket_row, 0, sizeof(socket_row));
 
-  gras_init(&argc, argv);
+  int i;
 
-  /* Get arguments and create sockets */
+  gras_os_sleep(1);             /* wait for my pals */
 
-  port=atoi(argv[1]);
-  
-  /*  Create my master socket */
-  sock = gras_socket_server(port);
-  INFO2("Launch %s (port=%d)",argv[0],port);
-  gras_os_sleep(1); //wait to start all slaves 
+  myline = assignment.linepos;
+  myrow = assignment.rowpos;
+  mydataA = assignment.A;
+  mydataB = assignment.B;
 
-  int i;
-  for (i=1;i<MATRIX_SIZE;i++){
-    socket_row[i-1]=gras_socket_client(argv[i+1],port);
-    socket_column[i-1]=gras_socket_client(argv[i+MATRIX_SIZE],port);
+  if (gras_if_RL())
+    XBT_INFO("Receive my pos and assignment");
+  else
+    XBT_INFO("Receive my pos (%d,%d) and assignment", myline, myrow);
+
+  /* Get my neighborhood from the assignment message (skipping myself) */
+  for (i = 0; i < PROC_MATRIX_SIZE - 1; i++) {
+    socket_line[i] = gras_socket_client(assignment.line[i]->name,
+                                        assignment.line[i]->port);
+    xbt_peer_free(assignment.line[i]);
+  }
+  for (i = 0; i < PROC_MATRIX_SIZE - 1; i++) {
+    socket_row[i] = gras_socket_client(assignment.row[i]->name,
+                                       assignment.row[i]->port);
+    xbt_peer_free(assignment.row[i]);
   }
 
-  /*  Register the known messages */
-  register_messages();
+  for (step = 0; step < PROC_MATRIX_SIZE; step++) {
+    gras_msg_send(master, "pmm_sync", NULL);
+    gras_msg_wait(600, "pmm_sync", NULL, NULL);
+
+    /* a line brodcast */
+    if (myline == step) {
+      XBT_VERB("LINE: step(%d) = Myline(%d). Broadcast my data.", step,
+            myline);
+      for (l = 0; l < PROC_MATRIX_SIZE - 1; l++) {
+        XBT_VERB("LINE:   Send to %s", gras_socket_peer_name(socket_row[l]));
+        gras_msg_send(socket_row[l], "dataB", &mydataB);
+      }
+
+
+      xbt_matrix_free(bB);
+      bB = xbt_matrix_new_sub(mydataB,
+                              submatrix_size, submatrix_size, 0, 0, NULL);
+    } else {
+      TRY {
+        xbt_matrix_free(bB);
+        gras_msg_wait(600, "dataB", &from, &bB);
+      }
+      CATCH(e) {
+        RETHROW0("Can't get a data message from line : %s");
+      }
+      XBT_VERB("LINE: step(%d) <> Myline(%d). Receive data from %s", step,
+            myline, gras_socket_peer_name(from));
+    }
+
+    /* a row brodcast */
+    if (myrow == step) {
+      XBT_VERB("ROW: step(%d)=myrow(%d). Broadcast my data.", step, myrow);
+      for (l = 1; l < PROC_MATRIX_SIZE; l++) {
+        XBT_VERB("ROW:   Send to %s",
+              gras_socket_peer_name(socket_line[l - 1]));
+        gras_msg_send(socket_line[l - 1], "dataA", &mydataA);
+      }
+      xbt_matrix_free(bA);
+      bA = xbt_matrix_new_sub(mydataA,
+                              submatrix_size, submatrix_size, 0, 0, NULL);
+    } else {
+      TRY {
+        xbt_matrix_free(bA);
+        gras_msg_wait(1200, "dataA", &from, &bA);
+      }
+      CATCH(e) {
+        RETHROW0("Can't get a data message from row : %s");
+      }
+      XBT_VERB("ROW: step(%d)<>myrow(%d). Receive data from %s", step, myrow,
+            gras_socket_peer_name(from));
+    }
+    xbt_matrix_double_addmult(bA, bB, bC);
+
+  };
+
+  /* send Result to master */
+  result.C = bC;
+  result.linepos = myline;
+  result.rowpos = myrow;
 
-  /* Recover my initialized Data and My Position*/
-  init_data_t mydata;
-  INFO0("wait for init Data");
   TRY {
-	  gras_msg_wait(600,gras_msgtype_by_name("init_data"),&from,&mydata);
-  } CATCH(e) {
-	RETHROW0("I Can't get a init Data message from master : %s");
+    gras_msg_send(master, "result", &result);
   }
-  myrow=mydata.myrow;
-  mycol=mydata.mycol;
-  mydataA=mydata.a;
-  mydataB=mydata.b;
-  INFO4("Recive MY POSITION (%d,%d) and MY INIT DATA ( A=%.3g | B=%.3g )",
-	myrow,mycol,mydataA,mydataB);
-  step=1;
-  
-  do {  //repeat until compute Cb
-	step=MATRIX_SIZE+1;  // just intilization for loop
-	
-  TRY {
-	gras_msg_wait(200,gras_msgtype_by_name("step"),&from,&step);
- } CATCH(e) {
-	  RETHROW0("I Can't get a Next Step message from master : %s");
- }
-  INFO1("Recive a step message from master: step = %d ",step);
-
-  if (step < MATRIX_SIZE ){
-	  /* a row brodcast */
-	  gras_os_sleep(3);  // IL FAUT EXPRIMER LE TEMPS D'ATTENTE EN FONCTION DE "SLAVE_COUNT"
-	  if(myrow==step){
-		INFO2("step(%d) = Myrow(%d)",step,myrow);
-		for (l=1;l < MATRIX_SIZE ;l++){
-		  gras_msg_send(socket_column[l-1], gras_msgtype_by_name("dataB"), &mydataB);
-		  bB=mydataB;
-		INFO1("send my data B (%.3g) to my (vertical) neighbors",bB);  
-		}
-	}
-	if(myrow != step){ 
-		INFO2("step(%d) <> Myrow(%d)",step,myrow);
-		TRY {
-		  gras_msg_wait(600,gras_msgtype_by_name("dataB"),
-				&from,&bB);
-		} CATCH(e) {
-		  RETHROW0("I Can't get a data message from row : %s");
-		}
-		INFO2("Recive data B (%.3g) from my neighbor: %s",bB,gras_socket_peer_name(from));
-	  }
-	  /* a column brodcast */
-	  if(mycol==step){
-		for (l=1;l < MATRIX_SIZE ;l++){
-			gras_msg_send(socket_row[l-1],gras_msgtype_by_name("dataA"), &mydataA);
-			bA=mydataA;
-			INFO1("send my data A (%.3g) to my (horizontal) neighbors",bA);
-		  }
-	  }
-
-	if(mycol != step){
-		TRY {
-		   gras_msg_wait(1200,gras_msgtype_by_name("dataA"),
-				&from,&bA);
-		} CATCH(e) {
-		  RETHROW0("I Can't get a data message from column : %s");
-		}
-		INFO2("Recive data A (%.3g) from my neighbor : %s ",bA,gras_socket_peer_name(from));
-	}
-	  bC+=bA*bB;
-	  INFO1(">>>>>>>> My BC = %.3g",bC);
-
-	  /* send a ack msg to master */
-	
-	  gras_msg_send(from,gras_msgtype_by_name("step_ack"),&step);
-	
-	  INFO1("Send ack to master for to end %d th step",step);
-	}
-	  if(step==MATRIX_SIZE-1) break;
-	
-  } while (step < MATRIX_SIZE);
-    /*  wait Message from master to send the result */
- 
-	result.value=bC;
-	result.i=myrow;
-	result.j=mycol;
- 
-	  TRY {
-		  gras_msg_wait(600,gras_msgtype_by_name("ask_result"),
-				&from,&result_ack);
-	  } CATCH(e) {
-		  RETHROW0("I Can't get a data message from row : %s");
-	  }
-	  /* send Result to master */
-	  TRY {
-		  gras_msg_send(from, gras_msgtype_by_name("result"),&result);
-	  } CATCH(e) {
-		 // gras_socket_close(from);
-		  RETHROW0("Failed to send PING to server: %s");
-	  }
-	  INFO3(">>>>>>>> Result: %.3f sent to %s:%d <<<<<<<<",
-		bC,
-		gras_socket_peer_name(from),gras_socket_peer_port(from));
-    /*  Free the allocated resources, and shut GRAS down */
-	  gras_socket_close(from);
-	  gras_exit();
-	  INFO0("Done.");
-	  return 0;
-} /* end_of_slave */
+  CATCH(e) {
+    RETHROW0("Failed to send answer to server: %s");
+  }
+  XBT_VERB(">>>>>>>> Result sent to %s:%d <<<<<<<<",
+        gras_socket_peer_name(master), gras_socket_peer_port(master));
+  /*  Free the allocated resources, and shut GRAS down */
+
+  xbt_matrix_free(bA);
+  xbt_matrix_free(bB);
+  xbt_matrix_free(bC);
+
+  xbt_matrix_free(mydataA);
+  xbt_matrix_free(mydataB);
+  /* FIXME: some are said to be unknown 
+     gras_socket_close(master);
+     gras_socket_close(from);
+     for (l=0; l < PROC_MATRIX_SIZE-1; l++) {
+     if (socket_line[l])
+     gras_socket_close(socket_line[l]);
+     if (socket_row[l])
+     gras_socket_close(socket_row[l]); 
+     } */
+
+  return 0;
+}
+
+int slave(int argc, char *argv[])
+{
+  gras_socket_t mysock;
+  gras_socket_t master = NULL;
+  int connected = 0;
+  int rank;
+
+  /* Init the GRAS's infrastructure */
+  gras_init(&argc, argv);
+  amok_pm_init();
+  if (argc != 3 && argc != 2)
+    xbt_die("Usage: slave masterhost:masterport [rank]");
+  if (argc == 2)
+    rank = -1;
+  else
+    rank = atoi(argv[2]);
+
+  /*  Register the known messages and my callback */
+  register_messages();
+  gras_cb_register("pmm_slave", pmm_worker_cb);
+
+  /* Create the connexions */
+  mysock = gras_socket_server_range(3000, 9999, 0, 0);
+  XBT_INFO("Sensor %d starting", rank);
+  while (!connected) {
+    xbt_ex_t e;
+    TRY {
+      master = gras_socket_client_from_string(argv[1]);
+      connected = 1;
+    }
+    CATCH(e) {
+      if (e.category != system_error)
+        RETHROW;
+      xbt_ex_free(e);
+      gras_os_sleep(0.5);
+    }
+  }
+
+  /* Join and run the group */
+  rank = amok_pm_group_join(master, "pmm");
+  amok_pm_mainloop(600);
+
+  /* housekeeping */
+  gras_socket_close(mysock);
+  //  gras_socket_close(master); Unknown
+  gras_exit();
+  return 0;
+}                               /* end_of_slave */