X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7520caa9b073050234990cd24b9bf3a5e6e2f1c..9eb42c5feb5b12390fee2dcf3cfb9a031d3c1fa0:/examples/gras/pmm/pmm.c

diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c
index 8916a8a679..f6d8b7a9eb 100755
--- a/examples/gras/pmm/pmm.c
+++ b/examples/gras/pmm/pmm.c
@@ -1,4 +1,5 @@
-/* pmm - paralel matrix multiplication "double diffusion"                       */
+/* $Id$ */
+/* pmm - parallel matrix multiplication "double diffusion"                       */
 
 /* Copyright (c) 2006- Ahmed Harbaoui. All rights reserved.                  */
 
@@ -6,59 +7,61 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "gras.h"
-#define MATRIX_SIZE 3
-#define SENSOR_NBR 9
+#define PROC_MATRIX_SIZE 3
+#define SLAVE_COUNT (PROC_MATRIX_SIZE*PROC_MATRIX_SIZE)
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(pmm,"Messages specific to this example");
+#define DATA_MATRIX_SIZE 3
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(pmm,"Parallel Matrix Multiplication");
 
 GRAS_DEFINE_TYPE(s_matrix,struct s_matrix {
-	int rows;
-	int cols;
-	double *data GRAS_ANNOTE(size, rows*cols);
+  int rows;
+  int cols;
+  double *data GRAS_ANNOTE(size, rows*cols);
 };)
 typedef struct s_matrix matrix_t;
 
 /* struct for recovering results */
 GRAS_DEFINE_TYPE(s_result,struct s_result {
-	int i;
-	int j;
-	double value;
+  int i;
+  int j;
+  double value;
 });
 typedef struct s_result result_t;
 
-/* struct to send initial data to sensor */
+/* 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;
+  int myrow;
+  int mycol;
+  double a;
+  double b;
 });
 typedef struct s_init_data init_data_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_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 sensor
-	gras_msgtype_declare("init_data", init_data_type);  // send from maestro to sensor to initialize data bA,bB
-
-	gras_msgtype_declare("ask_result", gras_datadesc_by_name("int")); // send from maestro to sensor to ask a final result	
-	gras_msgtype_declare("step", gras_datadesc_by_name("int"));// send from maestro to sensor to indicate the begining of step 
-	gras_msgtype_declare("step_ack", gras_datadesc_by_name("int"));//send from sensor to maestro to indicate the end of the current step
-	gras_msgtype_declare("dataA", gras_datadesc_by_name("double"));// send data between sensor
-	gras_msgtype_declare("dataB", gras_datadesc_by_name("double"));// send data between sensor
+  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
 }
 
 /* Function prototypes */
-int sensor (int argc,char *argv[]);
-int maestro (int argc,char *argv[]);
+int slave (int argc,char *argv[]);
+int master (int argc,char *argv[]);
 
 
 /* **********************************************************************
- * Maestro code
+ * master code
  * **********************************************************************/
 
 /* Global private data */
@@ -66,16 +69,16 @@ typedef struct {
   int nbr_col,nbr_row;
   int remaining_step;
   int remaining_ack;
-} maestro_data_t;
+} master_data_t;
 
 
 /***  Function initilaze matrixs ***/
 
 static void initmatrix(matrix_t *X){
-int i;
+  int i;
 
-for(i=0 ; i<(X->rows)*(X->cols); i++)
-	X->data[i]=1.0;//*rand()/(RAND_MAX+1.0);
+  for(i=0 ; i<(X->rows)*(X->cols); i++)
+    X->data[i]=1.0;//*rand()/(RAND_MAX+1.0);
 } /* end_of_initmatrixs */
 
 /***  Function Scatter Sequentiel ***/
@@ -106,140 +109,143 @@ static void gather(){
 
 static void display(matrix_t X){
 	
-int i,j,t=0;
+  int i,j,t=0;
 
   printf("      ");
   for(j=0;j<X.cols;j++)
     printf("%.3d ",j);
-    printf("\n");
-    printf("    __");
+  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("____");
-	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");
+      printf("%.3g ",X.data[t++]);
+    printf("|\n");
+  }
+  printf("    --");
+  for(j=0;j<X.cols;j++)
+    printf("----");
+  printf("-\n");
 
 }/* end_of_display */
 
-int maestro (int argc,char *argv[]) {
+int master (int argc,char *argv[]) {
 
-xbt_ex_t e;
+  xbt_ex_t e;
 
-int i,port,ask_result,step;
+  int i,port,ask_result,step;
 
-matrix_t A,B,C;
-result_t result;
+  matrix_t A,B,C;
+  result_t result;
 
-gras_socket_t from;
+  gras_socket_t from;
 
-	/*  Init the GRAS's infrastructure */
-	gras_init(&argc, argv);
+  /*  Init the GRAS's infrastructure */
+  gras_init(&argc, argv);
 
-        gras_socket_t socket[MATRIX_SIZE*MATRIX_SIZE]; /* sockets for brodcast to other sensor */
+  gras_socket_t socket[SLAVE_COUNT]; /* sockets for brodcast to slaves */
 
-        /*  Initialize Matrixs */
+  /*  Initialize Matrixs */
 
-	A.rows=A.cols=MATRIX_SIZE;
-	B.rows=B.cols=MATRIX_SIZE;
-	C.rows=C.cols=MATRIX_SIZE;
+  A.rows=A.cols=DATA_MATRIX_SIZE;
+  B.rows=B.cols=DATA_MATRIX_SIZE;
+  C.rows=C.cols=DATA_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);
+  A.data=xbt_malloc0(sizeof(double)*DATA_MATRIX_SIZE*DATA_MATRIX_SIZE);
+  B.data=xbt_malloc0(sizeof(double)*DATA_MATRIX_SIZE*DATA_MATRIX_SIZE);
+  C.data=xbt_malloc0(sizeof(double)*DATA_MATRIX_SIZE*DATA_MATRIX_SIZE);
 	
-	initmatrix(&A);
-	initmatrix(&B);
+  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);
+  /*  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.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)];;
+    mydata.a=A.data[(mydata.myrow-1)*PROC_MATRIX_SIZE+(mydata.mycol-1)];
+    mydata.b=B.data[(mydata.myrow-1)*PROC_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");
+    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< SENSOR_NBR; 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 sensor to begin a %d th step",step);
-	/* wait for computing and sensor messages exchange */
-	i=0;
+  for (step=1; step <= PROC_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< SENSOR_NBR){
-		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 sensor : %s");
-		}
-		i++;
-		INFO1("Recive Ack step ack from %s",gras_socket_peer_name(from));
-	}
-	}
-	/*********************************  gather ***************************************/
+    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);
+  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)*DATA_MATRIX_SIZE+(result.j-1)]=result.value;
+  }
+  /*    end of gather   */
+  INFO0 ("The Result of Multiplication is :");
+  display(C);
 
-return 0;
-} /* end_of_maestro */
+  return 0;
+} /* end_of_master */
 
 /* **********************************************************************
- * Sensor code
+ * slave code
  * **********************************************************************/
 
-int sensor(int argc,char *argv[]) {
+int slave(int argc,char *argv[]) {
 
   xbt_ex_t e; 
 
@@ -250,13 +256,15 @@ int sensor(int argc,char *argv[]) {
   double mydataA,mydataB;
   double bC=0;
   
-  static end_step;
+  //  static end_step;
 
   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 sensor */
+  /* sockets for brodcast to other slave */
+  gras_socket_t socket_row[PROC_MATRIX_SIZE-1];
+  gras_socket_t socket_column[PROC_MATRIX_SIZE-1];
 
   /* Init the GRAS's infrastructure */
 
@@ -269,12 +277,12 @@ int sensor(int argc,char *argv[]) {
   /*  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 sensor 
+  gras_os_sleep(1); //wait to start all slaves 
 
   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);
+  for (i=1;i<PROC_MATRIX_SIZE;i++){
+    socket_row[i-1]=gras_socket_client(argv[i+1],port);
+    socket_column[i-1]=gras_socket_client(argv[i+PROC_MATRIX_SIZE],port);
   }
 
   /*  Register the known messages */
@@ -284,9 +292,9 @@ int sensor(int argc,char *argv[]) {
   init_data_t mydata;
   INFO0("wait for init Data");
   TRY {
-	  gras_msg_wait(600,gras_msgtype_by_name("init_data"),&from,&mydata);
+    gras_msg_wait(600,gras_msgtype_by_name("init_data"),&from,&mydata);
   } CATCH(e) {
-	RETHROW0("I Can't get a init Data message from Maestro : %s");
+    RETHROW0("I Can't get a init Data message from master : %s");
   }
   myrow=mydata.myrow;
   mycol=mydata.mycol;
@@ -297,91 +305,91 @@ int sensor(int argc,char *argv[]) {
   step=1;
   
   do {  //repeat until compute Cb
-	step=MATRIX_SIZE+1;  // just intilization for loop
+    step=PROC_MATRIX_SIZE+1;  // just intilization for loop
 	
-  TRY {
-	gras_msg_wait(60,gras_msgtype_by_name("step"),&from,&step);
- } CATCH(e) {
-	  RETHROW0("I Can't get a Next Step message from Maestro : %s");
- }
-  INFO1("Recive a step message from maestro: step = %d ",step);
-
-  if (step < MATRIX_SIZE ){
-	  /* a row brodcast */
-	  gras_os_sleep(3);  // IL FAUT EXPRIMER LE TEMPS D'ATTENTE EN FONCTION DE "SENSOR_NBR"
-	  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);  
-		}
+    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 < PROC_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 < PROC_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 < PROC_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(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));
+      }
+
+      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");
 	}
-	  bC+=bA*bB;
-	  INFO1(">>>>>>>> My BC = %.3g",bC);
+	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 Maestro */
+      /* send a ack msg to master */
 	
-	  gras_msg_send(from,gras_msgtype_by_name("step_ack"),&step);
+      gras_msg_send(from,gras_msgtype_by_name("step_ack"),&step);
 	
-	  INFO1("Send ack to maestro for to end %d th step",step);
-	}
-	  if(step==MATRIX_SIZE-1) break;
+      INFO1("Send ack to master for to end %d th step",step);
+    }
+    if(step==PROC_MATRIX_SIZE-1) break;
 	
-  } while (step < MATRIX_SIZE);
-    /*  wait Message from maestro to send the result */
+  } while (step < PROC_MATRIX_SIZE);
+  /*  wait Message from master to send the result */
  
-	result.value=bC;
-	result.i=myrow;
-	result.j=mycol;
+  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 Maestro */
-	  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_sensor */
\ No newline at end of file
+  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 */