merge branches

[simgrid.git] / examples / gras / p2p / can / can_tests.c

diff --git a/examples/gras/p2p/can/can_tests.c b/examples/gras/p2p/can/can_tests.c
index 8742379..44a7227 100644 (file)
--- a/examples/gras/p2p/can/can_tests.c
+++ b/examples/gras/p2p/can/can_tests.c
@@ -27,7 +27,6 @@ int start_war(int argc, char **argv)
 {
   gras_socket_t temp_sock = NULL;
   nuke_t nuke_msg;
-  xbt_ex_t e;                   // the error variable used in TRY.. CATCH tokens.
   //return 0; // in order to inhibit the War of the Nodes 
   gras_init(&argc, argv);
   gras_os_sleep((15 - gras_os_getpid()) * 20 + 200);    // wait a bit.
@@ -35,8 +34,9 @@ int start_war(int argc, char **argv)
 
   TRY {                         // contacting the bad guy that will launch the War.
     temp_sock = gras_socket_client(gras_os_myname(), atoi(argv[1]));
-  } CATCH(e) {
-    RETHROW0("Unable to connect known host so as to declare WAR!: %s");
+  }
+  CATCH_ANONYMOUS {
+    RETHROWF("Unable to connect known host so as to declare WAR!: %s");
   }
 
 
@@ -48,9 +48,10 @@ int start_war(int argc, char **argv)
 
   TRY {
     gras_msg_send(temp_sock, "can_nuke", &nuke_msg);
-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {
     gras_socket_close(temp_sock);
-    RETHROW0
+    RETHROWF
         ("Unable to contact known host so as to declare WAR!!!!!!!!!!!!!!!!!!!!!: %s");
   }
   gras_socket_close(temp_sock); // spare.
@@ -63,11 +64,10 @@ static int send_nuke(nuke_t * msg, int xId, int yId)
 {
   node_data_t *globals = (node_data_t *) gras_userdata_get();
   gras_socket_t temp_sock = NULL;
-  xbt_ex_t e;                   // the error variable used in TRY.. CATCH tokens.
 
   if (xId >= globals->x1 && xId <= globals->x2 && yId >= globals->y1
       && yId <= globals->y2) {
-    INFO0("Nuclear launch missed");
+    XBT_INFO("Nuclear launch missed");
     return 0;
   } else {
     char host[1024];
@@ -95,18 +95,18 @@ static int send_nuke(nuke_t * msg, int xId, int yId)
     TRY {                       // sending the nuke.
       temp_sock = gras_socket_client(host, port);
     }
-    CATCH(e) {
-      RETHROW0("Unable to connect the nuke!: %s");
+    CATCH_ANONYMOUS {
+      RETHROWF("Unable to connect the nuke!: %s");
     }
-    //INFO4("%s ON %s %d %d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",globals->host,host,xId,yId);
+    //XBT_INFO("%s ON %s %d %d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",globals->host,host,xId,yId);
     TRY {
       gras_msg_send(temp_sock, "can_nuke", msg);
     }
-    CATCH(e) {
-      RETHROW0("Unable to send the nuke!: %s");
+    CATCH_ANONYMOUS {
+      RETHROWF("Unable to send the nuke!: %s");
     }
     gras_socket_close(temp_sock);
-    INFO4("Nuke launched by %s to %s for (%d;%d)", globals->host, host,
+    XBT_INFO("Nuke launched by %s to %s for (%d;%d)", globals->host, host,
           msg->xId, msg->yId);
     return 1;
   }
@@ -127,7 +127,7 @@ static int node_nuke_handler(gras_msg_cb_ctx_t ctx, void *payload_data)
 
 
   if (incoming->xId == -1) {    // i must start the War
-    INFO2("%s:%d declare the WAR!!!!!!!!!!!!!!!!!", globals->host,
+    XBT_INFO("%s:%d declare the WAR!!!!!!!!!!!!!!!!!", globals->host,
           globals->port);
     srand((unsigned int) time((time_t *) NULL));
 
@@ -139,13 +139,13 @@ static int node_nuke_handler(gras_msg_cb_ctx_t ctx, void *payload_data)
 
   } else if (incoming->xId >= globals->x1 && incoming->xId <= globals->x2 && incoming->yId >= globals->y1 && incoming->yId <= globals->y2) {    // the nuke crash on my area..
     if (globals->version == incoming->version)  // ..but i'm dead.
-      INFO0("I'm already dead :p");
+      XBT_INFO("I'm already dead :p");
     else if ((incoming->xId - globals->xId) / 60 == 0 && (incoming->yId - globals->yId) / 60 == 0) {    // ..and it's on me, so i die :X.
       globals->version = incoming->version;
-      INFO2("Euuuaarrrgghhhh...   %s killed %s !!!!!!!!!!!!!!!!!",
+      XBT_INFO("Euuuaarrrgghhhh...   %s killed %s !!!!!!!!!!!!!!!!!",
             incoming->host, globals->host);
     } else {                    // and it miss me, i angry and i send my own nuke!
-      INFO1("%s was missed, and counteract!", globals->host);
+      XBT_INFO("%s was missed, and counteract!", globals->host);
       /*int x1=(int)(1000.0*rand()/(RAND_MAX+1.0));
          int y1=(int)(1000.0*rand()/(RAND_MAX+1.0));
          int x2=(int)(1000.0*rand()/(RAND_MAX+1.0));
@@ -190,16 +190,16 @@ static int node_nuke_handler(gras_msg_cb_ctx_t ctx, void *payload_data)
     TRY {
       temp_sock = gras_socket_client(host, port);
     }
-    CATCH(e) {
-      RETHROW0("Unable to connect the nuke!: %s");
+    CATCH_ANONYMOUS {
+      RETHROWF("Unable to connect the nuke!: %s");
     }
     TRY {
       gras_msg_send(temp_sock, "can_nuke", incoming);
     }
-    CATCH(e) {
-      RETHROW0("Unable to send the nuke!: %s");
+    CATCH_ANONYMOUS {
+      RETHROWF("Unable to send the nuke!: %s");
     }
-    INFO4("Nuke re-aimed by %s to %s for (%d;%d)", globals->host, host,
+    XBT_INFO("Nuke re-aimed by %s to %s for (%d;%d)", globals->host, host,
           incoming->xId, incoming->yId);
     gras_socket_close(temp_sock);
   }
@@ -209,9 +209,10 @@ static int node_nuke_handler(gras_msg_cb_ctx_t ctx, void *payload_data)
     gras_msg_handle(10000.0);   // wait a bit, in case of..
   }
   CATCH(e) {
-    INFO4("My area is [%d;%d;%d;%d]", globals->x1, globals->x2,
+    XBT_INFO("My area is [%d;%d;%d;%d]", globals->x1, globals->x2,
           globals->y1, globals->y2);
-    //INFO0("Closing node, all has been done!");
+    //XBT_INFO("Closing node, all has been done!");
+    xbt_ex_free(e);
   }
   return 0;
 }