refactored smpi into multiple source files.

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

diff --git a/examples/gras/all2all/all2all.c b/examples/gras/all2all/all2all.c
index fadca1c..63015fb 100644 (file)
--- a/examples/gras/all2all/all2all.c
+++ b/examples/gras/all2all/all2all.c
@@ -28,7 +28,7 @@ int receiver (int argc,char *argv[]) {
 
   int myport; /* port on which I receive stuff */
   int todo; /* amount of messages I should get */
-  int data; /* message content */
+  char *data; /* message content */
  
   gras_socket_t mysock;  /* socket on which other people contact me */
   gras_socket_t expeditor;  /* to notice who wrote me */
@@ -44,7 +44,7 @@ int receiver (int argc,char *argv[]) {
   mysock = gras_socket_server(myport);
 
   /* Register the known messages */
-  gras_msgtype_declare("data", gras_datadesc_by_name("int"));
+  gras_msgtype_declare("data", gras_datadesc_by_name("string"));
 
   /* Get the data */
 
@@ -53,21 +53,20 @@ int receiver (int argc,char *argv[]) {
        todo);
   while (todo>0) {
      gras_msg_wait(60 /* wait up to one minute */,
-                  gras_msgtype_by_name("data"),
+                  "data",
                   &expeditor,
                   &data);
      todo--;
      
-     INFO4("Got Data(%d) from %s:%d (still %d to go)",
-          data, 
+     INFO3("Got Data from %s:%d (still %d to go)",
           gras_socket_peer_name(expeditor), gras_socket_peer_port(expeditor),
           todo);
 
   }
-   
+
   /* Free the allocated resources, and shut GRAS down */
   gras_socket_close(mysock);
-     
+
   gras_exit();
   return 0;
 } /* end_of_receiver */
@@ -79,45 +78,65 @@ int receiver (int argc,char *argv[]) {
 int sender (int argc,char *argv[]) {
 
   int i; /* iterator */
-  int data; /* data exchanged */
- 
-  xbt_host_t h; /* iterator */
+  char *data; /* data exchanged */
+  int datasize; /* size of message */
+  xbt_peer_t h; /* iterator */
+  int connected = 0;
+  
+  gras_socket_t peer=NULL;  /* socket to node */
   
-  gras_socket_t peer;  /* socket to node */
  
-  /* xbt_dynar for hosts */
-  xbt_dynar_t hosts = xbt_dynar_new(sizeof(xbt_host_t),&xbt_host_free_voidp);
+  /* xbt_dynar for peers */
+  xbt_dynar_t peers = xbt_dynar_new(sizeof(xbt_peer_t),&xbt_peer_free_voidp);
  
   /* Init the GRAS infrastructure and declare my globals */
   gras_init(&argc,argv);
  
   /* Get the node location from argc/argv */
-  for (i=2; i<argc; i++){
-    xbt_host_t host = xbt_host_new(argv[i],atoi(argv[1]));
-    xbt_dynar_push(hosts,&host);
+  for (i=1; i<argc-1; i++){
+    xbt_peer_t peer = xbt_peer_from_string(argv[i]);
+    xbt_dynar_push(peers,&peer);
   }
+  
+  datasize=atoi(argv[argc-1]);
+  
+  data=(char *) malloc(datasize+1);  // allocation of datasize octets
+  memset(data, 32, datasize);
+  data[datasize] = '\0';
 
   INFO0("Launch current node");
 
   /* Register the known messages */
-  gras_msgtype_declare("data", gras_datadesc_by_name("int"));
-
-  /* Wait for receivers to startup */
-  gras_os_sleep(1);
-
-  /* write 'em */
-  data =1000;
-  xbt_dynar_foreach(hosts,i,h) {
-     
-     peer = gras_socket_client(h->name,h->port);
-     gras_msg_send(peer,gras_msgtype_by_name("data"),&data);
-     INFO3("  Sent Data (%d) from %s to %s",
-          data,gras_os_myname(),h->name);
+  gras_msgtype_declare("data", gras_datadesc_by_name("string"));
+
+
+  /* write to the receivers */
+  xbt_dynar_foreach(peers,i,h) {
+     connected = 0;
+     while (!connected) {
+       xbt_ex_t e;
+       TRY {
+          peer = gras_socket_client(h->name,h->port);
+          connected=1;
+       } CATCH(e) {
+          if (e.category != system_error /*in RL*/&& e.category != mismatch_error/*in SG*/)
+            RETHROW;
+          xbt_ex_free(e);
+          gras_os_sleep(0.01);
+       }
+     }
+     gras_msg_send(peer,"data",&data);
+     if (gras_if_SG()) {
+       INFO2("  Sent Data from %s to %s", gras_os_myname(),h->name);
+     } else {
+       INFO0("  Sent Data");
+     }     
+      
      gras_socket_close(peer);
   }
 
   /* Free the allocated resources, and shut GRAS down */
-  xbt_dynar_free(&hosts);
+  xbt_dynar_free(&peers);
      
   gras_exit();
   return 0;