Use CATCH_ANONYMOUS whenever possible, and remove unused variables.

diff --git a/examples/amok/saturate/env.c b/examples/amok/saturate/env.c
index 5ad45e3..e2d00f5 100644 (file)
--- a/examples/amok/saturate/env.c
+++ b/examples/amok/saturate/env.c
@@ -67,8 +67,6 @@ static void env_hosttohost_bw(int argc, char *argv[])
 /********************************************************************************************/
 static void env_Pairwisehost_bw(int argc, char *argv[])
 {
 /********************************************************************************************/
 static void env_Pairwisehost_bw(int argc, char *argv[])
 {

-  xbt_ex_t e;
-

   /* where are the sensors */
   xbt_dynar_t hosts = xbt_dynar_new(sizeof(xbt_host_t), &free_host);
   int nb_hosts;
   /* where are the sensors */
   xbt_dynar_t hosts = xbt_dynar_new(sizeof(xbt_host_t), &free_host);
   int nb_hosts;


@@ -107,7 +105,7 @@ static void env_Pairwisehost_bw(int argc, char *argv[])
       amok_bw_saturate_start(h1->name, h1->port, host_test, h1->port,   //"Ginette"
                              msg_size, 120);    // sturation of the link with msg_size to compute a concurent bandwidth MA //MB
     }
       amok_bw_saturate_start(h1->name, h1->port, host_test, h1->port,   //"Ginette"
                              msg_size, 120);    // sturation of the link with msg_size to compute a concurent bandwidth MA //MB
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Cannot ask hosts to saturate the link: %s");
     }
     // gras_os_sleep(1.0);
       RETHROWF("Cannot ask hosts to saturate the link: %s");
     }
     // gras_os_sleep(1.0);

diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c
index 8c033b1..b89dccc 100644 (file)
--- a/examples/amok/saturate/saturate.c
+++ b/examples/amok/saturate/saturate.c
@@ -171,7 +171,6 @@ static void simple_saturation(int argc, char *argv[])
 /********************************************************************************************/
 static void full_fledged_saturation(int argc, char *argv[])
 {
 /********************************************************************************************/
 static void full_fledged_saturation(int argc, char *argv[])
 {

-  xbt_ex_t e;

   double time1 = 5.0, bw1 = 5.0;        // 0.5 for test
   /* timers */
   double begin_simulated;
   double time1 = 5.0, bw1 = 5.0;        // 0.5 for test
   /* timers */
   double begin_simulated;


@@ -220,7 +219,7 @@ static void full_fledged_saturation(int argc, char *argv[])
         amok_bw_saturate_start(h1->name, h1->port, h2->name, h2->port, 0,       /* Be nice, compute msg_size yourself */
                                0 /* no timeout */ );
       }
         amok_bw_saturate_start(h1->name, h1->port, h2->name, h2->port, 0,       /* Be nice, compute msg_size yourself */
                                0 /* no timeout */ );
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         RETHROWF("Cannot ask peers to saturate the link: %s");
       }
       gras_os_sleep(5);
         RETHROWF("Cannot ask peers to saturate the link: %s");
       }
       gras_os_sleep(5);

diff --git a/examples/gras/console/ping_client.c b/examples/gras/console/ping_client.c
index 8489cc3..043fc26 100644 (file)
--- a/examples/gras/console/ping_client.c
+++ b/examples/gras/console/ping_client.c
@@ -62,7 +62,7 @@ int client(int argc, char *argv[])
   TRY {
     gras_msg_send(toserver, "ping", &ping);
   }
   TRY {
     gras_msg_send(toserver, "ping", &ping);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(toserver);
     RETHROWF("Failed to send PING to server: %s");
   }
     gras_socket_close(toserver);
     RETHROWF("Failed to send PING to server: %s");
   }


@@ -74,7 +74,7 @@ int client(int argc, char *argv[])
   TRY {
     gras_msg_wait(6000, "pong", &from, &pong);
   }
   TRY {
     gras_msg_wait(6000, "pong", &from, &pong);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(toserver);
     RETHROWF("Why can't I get my PONG message like everyone else: %s");
   }
     gras_socket_close(toserver);
     RETHROWF("Why can't I get my PONG message like everyone else: %s");
   }

diff --git a/examples/gras/console/ping_server.c b/examples/gras/console/ping_server.c
index 8b52d85..4e2af0a 100644 (file)
--- a/examples/gras/console/ping_server.c
+++ b/examples/gras/console/ping_server.c
@@ -19,8 +19,6 @@ typedef struct {
 
 static int server_cb_ping_handler(gras_msg_cb_ctx_t ctx, void *payload)
 {
 
 static int server_cb_ping_handler(gras_msg_cb_ctx_t ctx, void *payload)
 {

-
-  xbt_ex_t e;

   /* 1. Get the payload into the msg variable, and retrieve my caller */
   int msg = *(int *) payload;
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);
   /* 1. Get the payload into the msg variable, and retrieve my caller */
   int msg = *(int *) payload;
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);


@@ -43,7 +41,8 @@ static int server_cb_ping_handler(gras_msg_cb_ctx_t ctx, void *payload)
     gras_msg_send(expeditor, "pong", &msg);
 
     /* 6. Deal with errors: add some details to the exception */
     gras_msg_send(expeditor, "pong", &msg);
 
     /* 6. Deal with errors: add some details to the exception */

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     gras_socket_close(globals->sock);
     RETHROWF("Unable answer with PONG: %s");
   }
     gras_socket_close(globals->sock);
     RETHROWF("Unable answer with PONG: %s");
   }

diff --git a/examples/gras/mmrpc/mmrpc.c b/examples/gras/mmrpc/mmrpc.c
index 8f8e882..5ab834d 100644 (file)
--- a/examples/gras/mmrpc/mmrpc.c
+++ b/examples/gras/mmrpc/mmrpc.c
@@ -55,7 +55,6 @@ static int server_cb_request_handler(gras_msg_cb_ctx_t ctx,
 
 int server(int argc, char *argv[])
 {
 
 int server(int argc, char *argv[])
 {

-  xbt_ex_t e;

   gras_socket_t sock = NULL;
   int port = 4000;
 
   gras_socket_t sock = NULL;
   int port = 4000;
 


@@ -72,7 +71,7 @@ int server(int argc, char *argv[])
   TRY {
     sock = gras_socket_server(port);
   }
   TRY {
     sock = gras_socket_server(port);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to establish a server socket: %s");
   }
 
     RETHROWF("Unable to establish a server socket: %s");
   }
 


@@ -96,7 +95,6 @@ int server(int argc, char *argv[])
 
 int client(int argc, char *argv[])
 {
 
 int client(int argc, char *argv[])
 {

-  xbt_ex_t e;

   gras_socket_t toserver = NULL;        /* peer */
 
   gras_socket_t from;
   gras_socket_t toserver = NULL;        /* peer */
 
   gras_socket_t from;


@@ -125,7 +123,7 @@ int client(int argc, char *argv[])
   TRY {
     toserver = gras_socket_client(host, port);
   }
   TRY {
     toserver = gras_socket_client(host, port);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to connect to the server: %s");
   }
   XBT_INFO("Connected to %s:%d.", host, port);
     RETHROWF("Unable to connect to the server: %s");
   }
   XBT_INFO("Connected to %s:%d.", host, port);

diff --git a/examples/gras/mmrpc/mmrpc_server.c b/examples/gras/mmrpc/mmrpc_server.c
index a675d3e..7784d04 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_server.c
+++ b/examples/gras/mmrpc/mmrpc_server.c
@@ -40,7 +40,6 @@ static int server_cb_request_handler(gras_msg_cb_ctx_t ctx,
 
 int server(int argc, char *argv[])
 {
 
 int server(int argc, char *argv[])
 {

-  xbt_ex_t e;

   gras_socket_t sock = NULL;
   int port = 4002;
 
   gras_socket_t sock = NULL;
   int port = 4002;
 


@@ -57,7 +56,7 @@ int server(int argc, char *argv[])
   TRY {
     sock = gras_socket_server(port);
   }
   TRY {
     sock = gras_socket_server(port);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to establish a server socket: %s");
   }
 
     RETHROWF("Unable to establish a server socket: %s");
   }
 

diff --git a/examples/gras/mutual_exclusion/simple_token/simple_token.c b/examples/gras/mutual_exclusion/simple_token/simple_token.c
index 65a7d2d..f05e731 100644 (file)
--- a/examples/gras/mutual_exclusion/simple_token/simple_token.c
+++ b/examples/gras/mutual_exclusion/simple_token/simple_token.c
@@ -36,9 +36,6 @@ typedef struct {
 /* Callback function */
 static int node_cb_stoken_handler(gras_msg_cb_ctx_t ctx, void *payload)
 {
 /* Callback function */
 static int node_cb_stoken_handler(gras_msg_cb_ctx_t ctx, void *payload)
 {

-
-  xbt_ex_t e;
-

   /* 1. Get the payload into the msg variable, and retrieve my caller */
   int msg = *(int *) payload;
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);
   /* 1. Get the payload into the msg variable, and retrieve my caller */
   int msg = *(int *) payload;
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);


@@ -77,7 +74,7 @@ static int node_cb_stoken_handler(gras_msg_cb_ctx_t ctx, void *payload)
 
       /* 6. Deal with errors */
     }
 
       /* 6. Deal with errors */
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       gras_socket_close(globals->sock);
       RETHROWF("Unable to forward token: %s");
     }
       gras_socket_close(globals->sock);
       RETHROWF("Unable to forward token: %s");
     }


@@ -110,8 +107,6 @@ int node(int argc, char *argv[])
   int myport;
   int peerport;
 
   int myport;
   int peerport;
 

-  xbt_ex_t e;
-

   /* 1. Init the GRAS infrastructure and declare my globals */
   gras_init(&argc, argv);
   globals = gras_userdata_new(node_data_t);
   /* 1. Init the GRAS infrastructure and declare my globals */
   gras_init(&argc, argv);
   globals = gras_userdata_new(node_data_t);


@@ -170,7 +165,8 @@ int node(int argc, char *argv[])
 
     TRY {
       gras_msg_send(globals->tosuccessor, "stoken", &token);
 
     TRY {
       gras_msg_send(globals->tosuccessor, "stoken", &token);

-    } CATCH(e) {
+    }
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to send the freshly created token: %s");
     }
   }
       RETHROWF("Unable to send the freshly created token: %s");
     }
   }

diff --git a/examples/gras/p2p/can/can.c b/examples/gras/p2p/can/can.c
index 82379e4..5c4cb0d 100644 (file)
--- a/examples/gras/p2p/can/can.c
+++ b/examples/gras/p2p/can/can.c
@@ -53,16 +53,17 @@ static void register_messages()
 static void forward_get_suc(get_suc_t msg, char host[1024], int port)
 {
   gras_socket_t temp_sock = NULL;
 static void forward_get_suc(get_suc_t msg, char host[1024], int port)
 {
   gras_socket_t temp_sock = NULL;

-  xbt_ex_t e;                   // the error variable used in TRY.. CATCH tokens.

   //XBT_INFO("Transmiting message to %s:%d",host,port);
   TRY {
     temp_sock = gras_socket_client(host, port);
   //XBT_INFO("Transmiting message to %s:%d",host,port);
   TRY {
     temp_sock = gras_socket_client(host, port);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to connect!: %s");
   }
   TRY {
     gras_msg_send(temp_sock, "can_get_suc", &msg);
     RETHROWF("Unable to connect!: %s");
   }
   TRY {
     gras_msg_send(temp_sock, "can_get_suc", &msg);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to send!: %s");
   }
   XBT_INFO("Forwarding a get_successor message to %s for (%d;%d)", host,
     RETHROWF("Unable to send!: %s");
   }
   XBT_INFO("Forwarding a get_successor message to %s for (%d;%d)", host,


@@ -179,7 +180,7 @@ static int node_get_suc_handler(gras_msg_cb_ctx_t ctx, void *payload_data)
       TRY {
         temp_sock = gras_socket_client(incoming->host, incoming->port);
       }
       TRY {
         temp_sock = gras_socket_client(incoming->host, incoming->port);
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         RETHROWF
             ("Unable to connect to the node wich has requested for an area!: %s");
       }
         RETHROWF
             ("Unable to connect to the node wich has requested for an area!: %s");
       }


@@ -187,7 +188,7 @@ static int node_get_suc_handler(gras_msg_cb_ctx_t ctx, void *payload_data)
         gras_msg_send(temp_sock, "can_rep_suc", &outgoing);
         XBT_INFO("Environment informations sent!");
       }
         gras_msg_send(temp_sock, "can_rep_suc", &outgoing);
         XBT_INFO("Environment informations sent!");
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         RETHROWF("%s:Timeout sending environment informations to %s: %s",
                  globals->host, gras_socket_peer_name(expeditor));
       }
         RETHROWF("%s:Timeout sending environment informations to %s: %s",
                  globals->host, gras_socket_peer_name(expeditor));
       }


@@ -252,7 +253,7 @@ int node(int argc, char **argv)
     TRY {
       temp_sock = gras_socket_client(argv[4], atoi(argv[5]));
     }
     TRY {
       temp_sock = gras_socket_client(argv[4], atoi(argv[5]));
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to connect known host to request for an area!: %s");
     }
 
       RETHROWF("Unable to connect known host to request for an area!: %s");
     }
 


@@ -264,7 +265,7 @@ int node(int argc, char **argv)
     TRY {                       // asking.
       gras_msg_send(temp_sock, "can_get_suc", &get_suc_msg);
     }
     TRY {                       // asking.
       gras_msg_send(temp_sock, "can_get_suc", &get_suc_msg);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       gras_socket_close(temp_sock);
       RETHROWF("Unable to contact known host to get an area!: %s");
     }
       gras_socket_close(temp_sock);
       RETHROWF("Unable to contact known host to get an area!: %s");
     }


@@ -276,7 +277,7 @@ int node(int argc, char **argv)
       XBT_INFO("Waiting for reply!");
       gras_msg_wait(6000, "can_rep_suc", &temp_sock2, &rep_suc_msg);
     }
       XBT_INFO("Waiting for reply!");
       gras_msg_wait(6000, "can_rep_suc", &temp_sock2, &rep_suc_msg);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("%s: Error waiting for an area:%s", globals->host);
     }
 
       RETHROWF("%s: Error waiting for an area:%s", globals->host);
     }
 

diff --git a/examples/gras/p2p/can/can_tests.c b/examples/gras/p2p/can/can_tests.c
index 89104f3..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;
 {
   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.
   //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,7 +34,8 @@ 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]));
 
   TRY {                         // contacting the bad guy that will launch the War.
     temp_sock = gras_socket_client(gras_os_myname(), atoi(argv[1]));

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to connect known host so as to declare WAR!: %s");
   }
 
     RETHROWF("Unable to connect known host so as to declare WAR!: %s");
   }
 


@@ -48,7 +48,8 @@ int start_war(int argc, char **argv)
 
   TRY {
     gras_msg_send(temp_sock, "can_nuke", &nuke_msg);
 
   TRY {
     gras_msg_send(temp_sock, "can_nuke", &nuke_msg);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     gras_socket_close(temp_sock);
     RETHROWF
         ("Unable to contact known host so as to declare WAR!!!!!!!!!!!!!!!!!!!!!: %s");
     gras_socket_close(temp_sock);
     RETHROWF
         ("Unable to contact known host so as to declare WAR!!!!!!!!!!!!!!!!!!!!!: %s");


@@ -63,7 +64,6 @@ 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;
 {
   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) {
 
   if (xId >= globals->x1 && xId <= globals->x2 && yId >= globals->y1
       && yId <= globals->y2) {


@@ -95,14 +95,14 @@ static int send_nuke(nuke_t * msg, int xId, int yId)
     TRY {                       // sending the nuke.
       temp_sock = gras_socket_client(host, port);
     }
     TRY {                       // sending the nuke.
       temp_sock = gras_socket_client(host, port);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to connect the nuke!: %s");
     }
     //XBT_INFO("%s ON %s %d %d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",globals->host,host,xId,yId);
     TRY {
       gras_msg_send(temp_sock, "can_nuke", msg);
     }
       RETHROWF("Unable to connect the nuke!: %s");
     }
     //XBT_INFO("%s ON %s %d %d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",globals->host,host,xId,yId);
     TRY {
       gras_msg_send(temp_sock, "can_nuke", msg);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to send the nuke!: %s");
     }
     gras_socket_close(temp_sock);
       RETHROWF("Unable to send the nuke!: %s");
     }
     gras_socket_close(temp_sock);


@@ -190,13 +190,13 @@ static int node_nuke_handler(gras_msg_cb_ctx_t ctx, void *payload_data)
     TRY {
       temp_sock = gras_socket_client(host, port);
     }
     TRY {
       temp_sock = gras_socket_client(host, port);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to connect the nuke!: %s");
     }
     TRY {
       gras_msg_send(temp_sock, "can_nuke", incoming);
     }
       RETHROWF("Unable to connect the nuke!: %s");
     }
     TRY {
       gras_msg_send(temp_sock, "can_nuke", incoming);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to send the nuke!: %s");
     }
     XBT_INFO("Nuke re-aimed by %s to %s for (%d;%d)", globals->host, host,
       RETHROWF("Unable to send the nuke!: %s");
     }
     XBT_INFO("Nuke re-aimed by %s to %s for (%d;%d)", globals->host, host,

diff --git a/examples/gras/p2p/chord/chord.c b/examples/gras/p2p/chord/chord.c
index f72bef8..7060096 100644 (file)
--- a/examples/gras/p2p/chord/chord.c
+++ b/examples/gras/p2p/chord/chord.c
@@ -113,7 +113,6 @@ static int node_cb_get_suc_handler(gras_msg_cb_ctx_t ctx,
                                    void *payload_data)
 {
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);
                                    void *payload_data)
 {
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);

-  xbt_ex_t e;

   get_suc_t incoming = *(get_suc_t *) payload_data;
   rep_suc_t outgoing;
   node_data_t *globals = (node_data_t *) gras_userdata_get();
   get_suc_t incoming = *(get_suc_t *) payload_data;
   rep_suc_t outgoing;
   node_data_t *globals = (node_data_t *) gras_userdata_get();


@@ -141,13 +140,13 @@ static int node_cb_get_suc_handler(gras_msg_cb_ctx_t ctx,
         temp_sock = gras_socket_client(globals->finger[contact].host,
                                        globals->finger[contact].port);
       }
         temp_sock = gras_socket_client(globals->finger[contact].host,
                                        globals->finger[contact].port);
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         RETHROWF("Unable to connect!: %s");
       }
       TRY {
         gras_msg_send(temp_sock, "chord_get_suc", &asking);
       }
         RETHROWF("Unable to connect!: %s");
       }
       TRY {
         gras_msg_send(temp_sock, "chord_get_suc", &asking);
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         RETHROWF("Unable to ask!: %s");
       }
       gras_msg_wait(10., "chord_rep_suc", &temp_sock, &outgoing);
         RETHROWF("Unable to ask!: %s");
       }
       gras_msg_wait(10., "chord_rep_suc", &temp_sock, &outgoing);


@@ -158,7 +157,7 @@ static int node_cb_get_suc_handler(gras_msg_cb_ctx_t ctx,
     gras_msg_send(expeditor, "chord_rep_suc", &outgoing);
     XBT_INFO("Successor information sent!");
   }
     gras_msg_send(expeditor, "chord_rep_suc", &outgoing);
     XBT_INFO("Successor information sent!");
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("%s:Timeout sending successor information to %s: %s",
              globals->host, gras_socket_peer_name(expeditor));
   }
     RETHROWF("%s:Timeout sending successor information to %s: %s",
              globals->host, gras_socket_peer_name(expeditor));
   }


@@ -201,7 +200,6 @@ static int node_cb_notify_handler(gras_msg_cb_ctx_t ctx,
 static void fix_fingers()
 {
   get_suc_t get_suc_msg;
 static void fix_fingers()
 {
   get_suc_t get_suc_msg;

-  xbt_ex_t e;

   gras_socket_t temp_sock = NULL;
   gras_socket_t temp_sock2 = NULL;
   rep_suc_t rep_suc_msg;
   gras_socket_t temp_sock = NULL;
   gras_socket_t temp_sock2 = NULL;
   rep_suc_t rep_suc_msg;


@@ -209,14 +207,16 @@ static void fix_fingers()
 
   TRY {
     temp_sock = gras_socket_client(globals->host, globals->port);
 
   TRY {
     temp_sock = gras_socket_client(globals->host, globals->port);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to contact known host: %s");
   }
 
   get_suc_msg.id = globals->id;
   TRY {
     gras_msg_send(temp_sock, "chord_get_suc", &get_suc_msg);
     RETHROWF("Unable to contact known host: %s");
   }
 
   get_suc_msg.id = globals->id;
   TRY {
     gras_msg_send(temp_sock, "chord_get_suc", &get_suc_msg);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     gras_socket_close(temp_sock);
     RETHROWF("Unable to contact known host to get successor!: %s");
   }
     gras_socket_close(temp_sock);
     RETHROWF("Unable to contact known host to get successor!: %s");
   }


@@ -224,7 +224,8 @@ static void fix_fingers()
   TRY {
     XBT_INFO("Waiting for reply!");
     gras_msg_wait(6000, "chord_rep_suc", &temp_sock2, &rep_suc_msg);
   TRY {
     XBT_INFO("Waiting for reply!");
     gras_msg_wait(6000, "chord_rep_suc", &temp_sock2, &rep_suc_msg);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("%s: Error waiting for successor:%s", globals->host);
   }
   globals->finger[0].id = rep_suc_msg.id;
     RETHROWF("%s: Error waiting for successor:%s", globals->host);
   }
   globals->finger[0].id = rep_suc_msg.id;


@@ -337,7 +338,7 @@ int node(int argc, char **argv)
     TRY {
       temp_sock = gras_socket_client(other_host, other_port);
     }
     TRY {
       temp_sock = gras_socket_client(other_host, other_port);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to contact known host: %s");
     }
 
       RETHROWF("Unable to contact known host: %s");
     }
 


@@ -345,7 +346,7 @@ int node(int argc, char **argv)
     TRY {
       gras_msg_send(temp_sock, "chord_get_suc", &get_suc_msg);
     }
     TRY {
       gras_msg_send(temp_sock, "chord_get_suc", &get_suc_msg);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       gras_socket_close(temp_sock);
       RETHROWF("Unable to contact known host to get successor!: %s");
     }
       gras_socket_close(temp_sock);
       RETHROWF("Unable to contact known host to get successor!: %s");
     }


@@ -354,7 +355,7 @@ int node(int argc, char **argv)
       XBT_INFO("Waiting for reply!");
       gras_msg_wait(10., "chord_rep_suc", &temp_sock2, &rep_suc_msg);
     }
       XBT_INFO("Waiting for reply!");
       gras_msg_wait(10., "chord_rep_suc", &temp_sock2, &rep_suc_msg);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("%s: Error waiting for successor:%s", globals->host);
     }
     globals->finger[0].id = rep_suc_msg.id;
       RETHROWF("%s: Error waiting for successor:%s", globals->host);
     }
     globals->finger[0].id = rep_suc_msg.id;


@@ -367,7 +368,7 @@ int node(int argc, char **argv)
       temp_sock = gras_socket_client(globals->finger[0].host,
                                      globals->finger[0].port);
     }
       temp_sock = gras_socket_client(globals->finger[0].host,
                                      globals->finger[0].port);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to contact successor: %s");
     }
 
       RETHROWF("Unable to contact successor: %s");
     }
 


@@ -377,7 +378,7 @@ int node(int argc, char **argv)
     TRY {
       gras_msg_send(temp_sock, "chord_notify", &notify_msg);
     }
     TRY {
       gras_msg_send(temp_sock, "chord_notify", &notify_msg);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       RETHROWF("Unable to notify successor! %s");
     }
   }
       RETHROWF("Unable to notify successor! %s");
     }
   }

diff --git a/examples/gras/ping/ping_client.c b/examples/gras/ping/ping_client.c
index 1b74e70..e362b44 100644 (file)
--- a/examples/gras/ping/ping_client.c
+++ b/examples/gras/ping/ping_client.c
@@ -62,7 +62,7 @@ int client(int argc, char *argv[])
   TRY {
     gras_msg_send(toserver, "ping", &ping);
   }
   TRY {
     gras_msg_send(toserver, "ping", &ping);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(toserver);
     RETHROWF("Failed to send PING to server: %s");
   }
     gras_socket_close(toserver);
     RETHROWF("Failed to send PING to server: %s");
   }


@@ -73,7 +73,7 @@ int client(int argc, char *argv[])
   TRY {
     gras_msg_wait(6000, "pong", &from, &pong);
   }
   TRY {
     gras_msg_wait(6000, "pong", &from, &pong);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(toserver);
     RETHROWF("Why can't I get my PONG message like everyone else: %s");
   }
     gras_socket_close(toserver);
     RETHROWF("Why can't I get my PONG message like everyone else: %s");
   }

diff --git a/examples/gras/ping/ping_server.c b/examples/gras/ping/ping_server.c
index 885b4e5..4167d41 100644 (file)
--- a/examples/gras/ping/ping_server.c
+++ b/examples/gras/ping/ping_server.c
@@ -19,8 +19,6 @@ typedef struct {
 
 static int server_cb_ping_handler(gras_msg_cb_ctx_t ctx, void *payload)
 {
 
 static int server_cb_ping_handler(gras_msg_cb_ctx_t ctx, void *payload)
 {

-
-  xbt_ex_t e;

   /* 1. Get the payload into the msg variable, and retrieve my caller */
   int msg = *(int *) payload;
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);
   /* 1. Get the payload into the msg variable, and retrieve my caller */
   int msg = *(int *) payload;
   gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);


@@ -43,7 +41,8 @@ static int server_cb_ping_handler(gras_msg_cb_ctx_t ctx, void *payload)
     gras_msg_send(expeditor, "pong", &msg);
 
     /* 6. Deal with errors: add some details to the exception */
     gras_msg_send(expeditor, "pong", &msg);
 
     /* 6. Deal with errors: add some details to the exception */

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     gras_socket_close(globals->sock);
     RETHROWF("Unable answer with PONG: %s");
   }
     gras_socket_close(globals->sock);
     RETHROWF("Unable answer with PONG: %s");
   }

diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c
index dbc87c6..27b03d1 100644 (file)
--- a/examples/gras/pmm/pmm.c
+++ b/examples/gras/pmm/pmm.c
@@ -240,8 +240,6 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
   s_pmm_assignment_t assignment = *(s_pmm_assignment_t *) payload;
   gras_socket_t master = gras_msg_cb_ctx_from(ctx);
 
   s_pmm_assignment_t assignment = *(s_pmm_assignment_t *) payload;
   gras_socket_t master = gras_msg_cb_ctx_from(ctx);
 

-  xbt_ex_t e;
-

   int step, l;
   xbt_matrix_t bA = xbt_matrix_new(submatrix_size, submatrix_size,
                                    sizeof(double), NULL);
   int step, l;
   xbt_matrix_t bA = xbt_matrix_new(submatrix_size, submatrix_size,
                                    sizeof(double), NULL);


@@ -311,7 +309,7 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
         xbt_matrix_free(bB);
         gras_msg_wait(600, "dataB", &from, &bB);
       }
         xbt_matrix_free(bB);
         gras_msg_wait(600, "dataB", &from, &bB);
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         RETHROWF("Can't get a data message from line : %s");
       }
       XBT_VERB("LINE: step(%d) <> Myline(%d). Receive data from %s", step,
         RETHROWF("Can't get a data message from line : %s");
       }
       XBT_VERB("LINE: step(%d) <> Myline(%d). Receive data from %s", step,


@@ -334,7 +332,7 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
         xbt_matrix_free(bA);
         gras_msg_wait(1200, "dataA", &from, &bA);
       }
         xbt_matrix_free(bA);
         gras_msg_wait(1200, "dataA", &from, &bA);
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         RETHROWF("Can't get a data message from row : %s");
       }
       XBT_VERB("ROW: step(%d)<>myrow(%d). Receive data from %s", step, myrow,
         RETHROWF("Can't get a data message from row : %s");
       }
       XBT_VERB("ROW: step(%d)<>myrow(%d). Receive data from %s", step, myrow,


@@ -352,7 +350,7 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
   TRY {
     gras_msg_send(master, "result", &result);
   }
   TRY {
     gras_msg_send(master, "result", &result);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("Failed to send answer to server: %s");
   }
   XBT_VERB(">>>>>>>> Result sent to %s:%d <<<<<<<<",
     RETHROWF("Failed to send answer to server: %s");
   }
   XBT_VERB(">>>>>>>> Result sent to %s:%d <<<<<<<<",

diff --git a/examples/gras/replay/replay.c b/examples/gras/replay/replay.c
index ed04167..dbe3c90 100644 (file)
--- a/examples/gras/replay/replay.c
+++ b/examples/gras/replay/replay.c
@@ -54,8 +54,6 @@ int master(int argc, char *argv[])
   xbt_workload_sort_who_date(cmds);
   unsigned int cursor;
   xbt_workload_elm_t cmd;
   xbt_workload_sort_who_date(cmds);
   unsigned int cursor;
   xbt_workload_elm_t cmd;

-
-  xbt_ex_t e;

   xbt_dict_cursor_t dict_cursor;
 
   xbt_dict_t pals_int = xbt_dict_new();
   xbt_dict_cursor_t dict_cursor;
 
   xbt_dict_t pals_int = xbt_dict_new();


@@ -74,7 +72,7 @@ int master(int argc, char *argv[])
     TRY {
       gras_msg_handle(20);
     }
     TRY {
       gras_msg_handle(20);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       xbt_dynar_foreach(peers, cursor, peer) {
         xbt_dict_remove(pals_int, peer->name);
       }
       xbt_dynar_foreach(peers, cursor, peer) {
         xbt_dict_remove(pals_int, peer->name);
       }


@@ -159,7 +157,6 @@ static int worker_commands_cb(gras_msg_cb_ctx_t ctx, void *payload)
 
 static void do_command(int rank, void *c)
 {
 
 static void do_command(int rank, void *c)
 {

-  xbt_ex_t e;

   xbt_workload_elm_t cmd = *(xbt_workload_elm_t *) c;
   xbt_workload_data_chunk_t chunk;
 
   xbt_workload_elm_t cmd = *(xbt_workload_elm_t *) c;
   xbt_workload_data_chunk_t chunk;
 


@@ -176,7 +173,7 @@ static void do_command(int rank, void *c)
     TRY {
       gras_msg_wait(1000000, "chunk", NULL, &chunk);
     }
     TRY {
       gras_msg_wait(1000000, "chunk", NULL, &chunk);
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       SIMIX_display_process_status();
       RETHROWF("Exception while waiting for %f bytes from %s: %s",
                cmd->d_arg, cmd->str_arg);
       SIMIX_display_process_status();
       RETHROWF("Exception while waiting for %f bytes from %s: %s",
                cmd->d_arg, cmd->str_arg);

diff --git a/examples/gras/rpc/rpc.c b/examples/gras/rpc/rpc.c
index f686f20..fe0c62b 100644 (file)
--- a/examples/gras/rpc/rpc.c
+++ b/examples/gras/rpc/rpc.c
@@ -97,7 +97,7 @@ int client(int argc, char *argv[])
     toserver = gras_socket_client(host, port);
     toforwarder = gras_socket_client(argv[3], atoi(argv[4]));
   }
     toserver = gras_socket_client(host, port);
     toforwarder = gras_socket_client(argv[3], atoi(argv[4]));
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to connect to the server: %s");
   }
   XBT_INFO("Connected to %s:%d.", host, port);
     RETHROWF("Unable to connect to the server: %s");
   }
   XBT_INFO("Connected to %s:%d.", host, port);


@@ -119,7 +119,7 @@ int client(int argc, char *argv[])
     exception_catching();
     gras_msg_rpccall(toserver, 6000.0, "plain ping", &ping, &pong);
   }
     exception_catching();
     gras_msg_rpccall(toserver, 6000.0, "plain ping", &ping, &pong);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(toserver);
     RETHROWF("Failed to execute a PING rpc on the server: %s");
   }
     gras_socket_close(toserver);
     RETHROWF("Failed to execute a PING rpc on the server: %s");
   }

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index eeabf72..9364c2e 100644 (file)
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -176,7 +176,7 @@ void amok_bw_test(gras_socket_t peer,
   TRY {
     gras_msg_rpccall(peer, 15, "BW handshake", &request, &request_ack);
   }
   TRY {
     gras_msg_rpccall(peer, 15, "BW handshake", &request, &request_ack);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("Error encountered while sending the BW request: %s");
   }
   measIn = gras_socket_meas_accept(measMasterIn);
     RETHROWF("Error encountered while sending the BW request: %s");
   }
   measIn = gras_socket_meas_accept(measMasterIn);


@@ -186,7 +186,7 @@ void amok_bw_test(gras_socket_t peer,
                                      request_ack->peer.port,
                                      request->buf_size, 1);
   }
                                      request_ack->peer.port,
                                      request->buf_size, 1);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF
         ("Error encountered while opening the measurement socket to %s:%d for BW test: %s",
          gras_socket_peer_name(peer), request_ack->peer.port);
     RETHROWF
         ("Error encountered while opening the measurement socket to %s:%d for BW test: %s",
          gras_socket_peer_name(peer), request_ack->peer.port);


@@ -244,7 +244,8 @@ void amok_bw_test(gras_socket_t peer,
                             request->msg_amount);
       XBT_DEBUG("Data sent. Wait ACK");
       gras_socket_meas_recv(measIn, 120, 1, 1);
                             request->msg_amount);
       XBT_DEBUG("Data sent. Wait ACK");
       gras_socket_meas_recv(measIn, 120, 1, 1);

-    } CATCH(e) {
+    }
+    CATCH_ANONYMOUS {

       gras_socket_close(measOut);
       gras_socket_close(measMasterIn);
       gras_socket_close(measIn);
       gras_socket_close(measOut);
       gras_socket_close(measMasterIn);
       gras_socket_close(measIn);


@@ -328,7 +329,7 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
   TRY {
     gras_msg_rpcreturn(60, ctx, &answer);
   }
   TRY {
     gras_msg_rpcreturn(60, ctx, &answer);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(measMasterIn);
     /* FIXME: tell error to remote */
     RETHROWF("Error encountered while sending the answer: %s");
     gras_socket_close(measMasterIn);
     /* FIXME: tell error to remote */
     RETHROWF("Error encountered while sending the answer: %s");


@@ -341,7 +342,7 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
                                      request->peer.port,
                                      request->buf_size, 1);
   }
                                      request->peer.port,
                                      request->buf_size, 1);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF
         ("Error encountered while opening a measurement socket back to %s:%d : %s",
          gras_socket_peer_name(expeditor), request->peer.port);
     RETHROWF
         ("Error encountered while opening a measurement socket back to %s:%d : %s",
          gras_socket_peer_name(expeditor), request->peer.port);


@@ -355,7 +356,7 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
          answer->buf_size, answer->msg_size, answer->msg_amount,
          answer->peer.port);
   }
          answer->buf_size, answer->msg_size, answer->msg_amount,
          answer->peer.port);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(measMasterIn);
     gras_socket_close(measIn);
     gras_socket_close(measOut);
     gras_socket_close(measMasterIn);
     gras_socket_close(measIn);
     gras_socket_close(measOut);


@@ -376,7 +377,8 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
       gras_socket_meas_recv(measIn, 120, request->msg_size,
                             request->msg_amount);
       gras_socket_meas_send(measOut, 120, 1, 1);
       gras_socket_meas_recv(measIn, 120, request->msg_size,
                             request->msg_amount);
       gras_socket_meas_send(measOut, 120, 1, 1);

-    } CATCH(e) {
+    }
+    CATCH_ANONYMOUS {

       gras_socket_close(measMasterIn);
       gras_socket_close(measIn);
       gras_socket_close(measOut);
       gras_socket_close(measMasterIn);
       gras_socket_close(measIn);
       gras_socket_close(measOut);

diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c
index 9b94199..78e022e 100644 (file)
--- a/src/amok/Bandwidth/saturate.c
+++ b/src/amok/Bandwidth/saturate.c
@@ -294,7 +294,7 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload)
     meas = gras_socket_meas_accept(measMaster);
     XBT_DEBUG("saturation handshake answered");
   }
     meas = gras_socket_meas_accept(measMaster);
     XBT_DEBUG("saturation handshake answered");
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     gras_socket_close(measMaster);
     RETHROWF("Error during saturation handshake: %s");
   }
     gras_socket_close(measMaster);
     RETHROWF("Error during saturation handshake: %s");
   }


@@ -330,16 +330,14 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload)
 void amok_bw_saturate_stop(const char *from_name, unsigned int from_port,
                            /*out */ double *time, double *bw)
 {
 void amok_bw_saturate_stop(const char *from_name, unsigned int from_port,
                            /*out */ double *time, double *bw)
 {

-  xbt_ex_t e;
-

   gras_socket_t sock = gras_socket_client(from_name, from_port);
   bw_res_t answer;
   XBT_VERB("Ask %s:%d to stop the saturation", from_name, from_port);
   TRY {
     gras_msg_rpccall(sock, 60, "amok_bw_sat stop", NULL, &answer);
   gras_socket_t sock = gras_socket_client(from_name, from_port);
   bw_res_t answer;
   XBT_VERB("Ask %s:%d to stop the saturation", from_name, from_port);
   TRY {
     gras_msg_rpccall(sock, 60, "amok_bw_sat stop", NULL, &answer);

-  } CATCH(e) {
-    RETHROWF("Cannot ask %s:%d to stop saturation: %s", from_name,
-             from_port);
+  }
+  CATCH_ANONYMOUS {
+    RETHROWF("Cannot ask %s:%d to stop saturation: %s", from_name, from_port);

   }
   gras_socket_close(sock);
   if (time)
   }
   gras_socket_close(sock);
   if (time)

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index 8069511..5834d34 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -385,7 +385,6 @@ gras_datadesc_memcpy_rec(gras_cbps_t state,
  */
 int gras_datadesc_memcpy(gras_datadesc_type_t type, void *src, void *dst)
 {
  */
 int gras_datadesc_memcpy(gras_datadesc_type_t type, void *src, void *dst)
 {

-  xbt_ex_t e;

   static gras_cbps_t state = NULL;
   static xbt_dict_t refs = NULL;        /* all references already sent */
   int size = 0;
   static gras_cbps_t state = NULL;
   static xbt_dict_t refs = NULL;        /* all references already sent */
   int size = 0;


@@ -406,7 +405,8 @@ int gras_datadesc_memcpy(gras_datadesc_type_t type, void *src, void *dst)
   } TRY_CLEANUP {
     xbt_dict_reset(refs);
     gras_cbps_reset(state);
   } TRY_CLEANUP {
     xbt_dict_reset(refs);
     gras_cbps_reset(state);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROW;
   }
   return size;
     RETHROW;
   }
   return size;


@@ -630,8 +630,6 @@ gras_datadesc_send_rec(gras_socket_t sock,
 void gras_datadesc_send(gras_socket_t sock,
                         gras_datadesc_type_t type, void *src)
 {
 void gras_datadesc_send(gras_socket_t sock,
                         gras_datadesc_type_t type, void *src)
 {

-
-  xbt_ex_t e;

   static gras_cbps_t state = NULL;
   static xbt_dict_t refs = NULL;        /* all references already sent */
 
   static gras_cbps_t state = NULL;
   static xbt_dict_t refs = NULL;        /* all references already sent */
 


@@ -648,7 +646,8 @@ void gras_datadesc_send(gras_socket_t sock,
   } TRY_CLEANUP {
     xbt_dict_reset(refs);
     gras_cbps_reset(state);
   } TRY_CLEANUP {
     xbt_dict_reset(refs);
     gras_cbps_reset(state);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROW;
   }
 }
     RETHROW;
   }
 }


@@ -970,8 +969,6 @@ void
 gras_datadesc_recv(gras_socket_t sock,
                    gras_datadesc_type_t type, int r_arch, void *dst)
 {
 gras_datadesc_recv(gras_socket_t sock,
                    gras_datadesc_type_t type, int r_arch, void *dst)
 {

-
-  xbt_ex_t e;

   static gras_cbps_t state = NULL;      /* callback persistent state */
   static xbt_dict_t refs = NULL;        /* all references already sent */
 
   static gras_cbps_t state = NULL;      /* callback persistent state */
   static xbt_dict_t refs = NULL;        /* all references already sent */
 


@@ -987,7 +984,8 @@ gras_datadesc_recv(gras_socket_t sock,
   } TRY_CLEANUP {
     xbt_dict_reset(refs);
     gras_cbps_reset(state);
   } TRY_CLEANUP {
     xbt_dict_reset(refs);
     gras_cbps_reset(state);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROW;
   }
 }
     RETHROW;
   }
 }

diff --git a/src/gras/Msg/rl_msg.c b/src/gras/Msg/rl_msg.c
index 5d5b48d..37b6fd1 100644 (file)
--- a/src/gras/Msg/rl_msg.c
+++ b/src/gras/Msg/rl_msg.c
@@ -117,7 +117,7 @@ void gras_msg_recv(gras_socket_t sock, gras_msg_t msg)
     gras_trp_recv(sock, &c_kind, 1);
     msg->kind = (e_gras_msg_kind_t) c_kind;
   }
     gras_trp_recv(sock, &c_kind, 1);
     msg->kind = (e_gras_msg_kind_t) c_kind;
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF
         ("Exception caught while trying to get the message header: %s");
   }
     RETHROWF
         ("Exception caught while trying to get the message header: %s");
   }

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index 2036788..7c3c4e9 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -187,8 +187,6 @@ gras_socket_t
 gras_socket_server_ext(unsigned short port,
                        unsigned long int buf_size, int measurement)
 {
 gras_socket_server_ext(unsigned short port,
                        unsigned long int buf_size, int measurement)
 {

-
-  xbt_ex_t e;

   gras_trp_plugin_t trp;
   gras_socket_t sock;
 
   gras_trp_plugin_t trp;
   gras_socket_t sock;
 


@@ -209,8 +207,8 @@ gras_socket_server_ext(unsigned short port,
     XBT_DEBUG("in=%c out=%c accept=%c",
            sock->incoming ? 'y' : 'n',
            sock->outgoing ? 'y' : 'n', sock->accepting ? 'y' : 'n');
     XBT_DEBUG("in=%c out=%c accept=%c",
            sock->incoming ? 'y' : 'n',
            sock->outgoing ? 'y' : 'n', sock->accepting ? 'y' : 'n');

-  } CATCH(e) {
-
+  }
+  CATCH_ANONYMOUS {

     free(sock);
     RETHROW;
   }
     free(sock);
     RETHROW;
   }


@@ -274,8 +272,6 @@ gras_socket_client_ext(const char *host,
                        unsigned short port,
                        unsigned long int buf_size, int measurement)
 {
                        unsigned short port,
                        unsigned long int buf_size, int measurement)
 {

-
-  xbt_ex_t e;

   gras_trp_plugin_t trp;
   gras_socket_t sock;
 
   gras_trp_plugin_t trp;
   gras_socket_t sock;
 


@@ -295,7 +291,8 @@ gras_socket_client_ext(const char *host,
     XBT_DEBUG("in=%c out=%c accept=%c",
            sock->incoming ? 'y' : 'n',
            sock->outgoing ? 'y' : 'n', sock->accepting ? 'y' : 'n');
     XBT_DEBUG("in=%c out=%c accept=%c",
            sock->incoming ? 'y' : 'n',
            sock->outgoing ? 'y' : 'n', sock->accepting ? 'y' : 'n');

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     free(sock);
     RETHROW;
   }
     free(sock);
     RETHROW;
   }

diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c
index f560472..de2085b 100644 (file)
--- a/src/gras/Virtu/process.c
+++ b/src/gras/Virtu/process.c
@@ -89,7 +89,6 @@ void *gras_libdata_by_name_from_procdata(const char *name,
                                          gras_procdata_t * pd)
 {
   void *res = NULL;
                                          gras_procdata_t * pd)
 {
   void *res = NULL;

-  xbt_ex_t e;

   if (xbt_set_length(pd->libdata) <
       xbt_dynar_length(_gras_procdata_fabrics)) {
     /* Damn, some new modules were added since procdata_init(). Amok? */
   if (xbt_set_length(pd->libdata) <
       xbt_dynar_length(_gras_procdata_fabrics)) {
     /* Damn, some new modules were added since procdata_init(). Amok? */


@@ -99,7 +98,7 @@ void *gras_libdata_by_name_from_procdata(const char *name,
   TRY {
     res = xbt_set_get_by_name(pd->libdata, name);
   }
   TRY {
     res = xbt_set_get_by_name(pd->libdata, name);
   }

-  CATCH(e) {
+  CATCH_ANONYMOUS {

     RETHROWF("Cannot retrieve the libdata associated to %s: %s", name);
   }
   return res;
     RETHROWF("Cannot retrieve the libdata associated to %s: %s", name);
   }
   return res;

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 4aa81d7..b0e9ef8 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -719,7 +719,7 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options)
                name);
       }
     }
                name);
       }
     }

-    CATCH(e) {
+    CATCH_ANONYMOUS {

       free(optionlist_cpy);
       RETHROW;
     }
       free(optionlist_cpy);
       RETHROW;
     }

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index a11b2c9..f196c66 100644 (file)
--- a/src/xbt/dict_multi.c
+++ b/src/xbt/dict_multi.c
@@ -85,7 +85,6 @@ xbt_multidict_set(xbt_dict_t mdict,
 {
   xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int), NULL);
   unsigned long i;
 {
   xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int), NULL);
   unsigned long i;

-  xbt_ex_t e;

 
   for (i = 0; i < xbt_dynar_length(keys); i++) {
     char *thiskey = xbt_dynar_get_as(keys, i, char *);
 
   for (i = 0; i < xbt_dynar_length(keys); i++) {
     char *thiskey = xbt_dynar_get_as(keys, i, char *);


@@ -98,7 +97,8 @@ xbt_multidict_set(xbt_dict_t mdict,
     xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
   } TRY_CLEANUP {
     xbt_dynar_free(&lens);
     xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
   } TRY_CLEANUP {
     xbt_dynar_free(&lens);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROW;
   }
 }
     RETHROW;
   }
 }


@@ -221,8 +221,6 @@ xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
 
 void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
 {
 
 void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
 {

-
-  xbt_ex_t e;

   xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int), NULL);
   unsigned long i;
 
   xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int), NULL);
   unsigned long i;
 


@@ -236,7 +234,8 @@ void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
     xbt_multidict_remove_ext(mdict, keys, lens);
   } TRY_CLEANUP {
     xbt_dynar_free(&lens);
     xbt_multidict_remove_ext(mdict, keys, lens);
   } TRY_CLEANUP {
     xbt_dynar_free(&lens);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROW;
   }
 }
     RETHROW;
   }
 }

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 5087b0c..3212457 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -266,7 +266,7 @@ XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow")
       n++;
       THROWF(unknown_error, 0, "something");
     }
       n++;
       THROWF(unknown_error, 0, "something");
     }

-    CATCH(ex) {
+    CATCH_ANONYMOUS {

       if (n != 6)
         xbt_test_fail("M3: n=%d (!= 6)", n);
       n++;
       if (n != 6)
         xbt_test_fail("M3: n=%d (!= 6)", n);
       n++;


@@ -397,7 +397,7 @@ static void bad_example(void)
     if (cp1 != NULL)
       free(cp1);
   }
     if (cp1 != NULL)
       free(cp1);
   }

-  CATCH(ex) {
+  CATCH_ANONYMOUS {

     printf("cp3=%s", cp3);
     RETHROW;
   }
     printf("cp3=%s", cp3);
     RETHROW;
   }


@@ -411,7 +411,6 @@ typedef struct {
 static void good_example(void)
 {
   global_context_t *global_context = malloc(sizeof(global_context_t));
 static void good_example(void)
 {
   global_context_t *global_context = malloc(sizeof(global_context_t));

-  xbt_ex_t ex;

 
   /* GOOD_EXAMPLE */
   {                             /*01 */
 
   /* GOOD_EXAMPLE */
   {                             /*01 */


@@ -434,7 +433,7 @@ static void good_example(void)
         free(cp2);
       /*05 cp1 was given away */
     }
         free(cp2);
       /*05 cp1 was given away */
     }

-    CATCH(ex) {
+    CATCH_ANONYMOUS {

       /*05 global context untouched */
       RETHROW;
     }
       /*05 global context untouched */
       RETHROW;
     }

diff --git a/src/xbt/xbt_queue.c b/src/xbt/xbt_queue.c
index ad6027b..7a38199 100644 (file)
--- a/src/xbt/xbt_queue.c
+++ b/src/xbt/xbt_queue.c
@@ -159,7 +159,6 @@ void xbt_queue_shift(xbt_queue_t queue, void *const dst)
 void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay)
 {
   double begin = xbt_time();
 void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay)
 {
   double begin = xbt_time();

-  xbt_ex_t e;

 
   xbt_mutex_acquire(queue->mutex);
 
 
   xbt_mutex_acquire(queue->mutex);
 


@@ -183,7 +182,7 @@ void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay)
         xbt_cond_timedwait(queue->not_full, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
         xbt_cond_timedwait(queue->not_full, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }


@@ -204,7 +203,6 @@ void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay)
 void xbt_queue_pop_timed(xbt_queue_t queue, void *const dst, double delay)
 {
   double begin = xbt_time();
 void xbt_queue_pop_timed(xbt_queue_t queue, void *const dst, double delay)
 {
   double begin = xbt_time();

-  xbt_ex_t e;

 
   xbt_mutex_acquire(queue->mutex);
 
 
   xbt_mutex_acquire(queue->mutex);
 


@@ -221,7 +219,7 @@ void xbt_queue_pop_timed(xbt_queue_t queue, void *const dst, double delay)
         xbt_cond_timedwait(queue->not_empty, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
         xbt_cond_timedwait(queue->not_empty, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }


@@ -241,7 +239,6 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,
                              double delay)
 {
   double begin = xbt_time();
                              double delay)
 {
   double begin = xbt_time();

-  xbt_ex_t e;

 
   xbt_mutex_acquire(queue->mutex);
 
 
   xbt_mutex_acquire(queue->mutex);
 


@@ -265,7 +262,7 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,
         xbt_cond_timedwait(queue->not_full, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
         xbt_cond_timedwait(queue->not_full, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }


@@ -287,7 +284,6 @@ void xbt_queue_shift_timed(xbt_queue_t queue, void *const dst,
                            double delay)
 {
   double begin = xbt_time();
                            double delay)
 {
   double begin = xbt_time();

-  xbt_ex_t e;

 
   xbt_mutex_acquire(queue->mutex);
 
 
   xbt_mutex_acquire(queue->mutex);
 


@@ -304,7 +300,7 @@ void xbt_queue_shift_timed(xbt_queue_t queue, void *const dst,
         xbt_cond_timedwait(queue->not_empty, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
         xbt_cond_timedwait(queue->not_empty, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }

-      CATCH(e) {
+      CATCH_ANONYMOUS {

         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }

diff --git a/teshsuite/gras/msg_handle/msg_handle.c b/teshsuite/gras/msg_handle/msg_handle.c
index 2ded662..158fd33 100644 (file)
--- a/teshsuite/gras/msg_handle/msg_handle.c
+++ b/teshsuite/gras/msg_handle/msg_handle.c
@@ -46,13 +46,15 @@ int server(int argc, char *argv[])
   XBT_INFO("Launch server (port=%d)", myport);
   TRY {
     me = gras_socket_server(myport);
   XBT_INFO("Launch server (port=%d)", myport);
   TRY {
     me = gras_socket_server(myport);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to establish a server socket: %s");
   }
   gras_os_sleep(1);             /* Wait for pal to startup */
   TRY {
     pal = gras_socket_client_from_string(palstr);
     RETHROWF("Unable to establish a server socket: %s");
   }
   gras_os_sleep(1);             /* Wait for pal to startup */
   TRY {
     pal = gras_socket_client_from_string(palstr);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to establish a socket to %s: %s", palstr);
   }
   XBT_INFO("Initialization done.");
     RETHROWF("Unable to establish a socket to %s: %s", palstr);
   }
   XBT_INFO("Initialization done.");


@@ -116,7 +118,6 @@ int client(int argc, char *argv[])
   gras_socket_t me = NULL, pal = NULL;
   int myport;
   char *palstr;
   gras_socket_t me = NULL, pal = NULL;
   int myport;
   char *palstr;

-  xbt_ex_t e;

 
   gras_init(&argc, argv);
   xbt_assert(argc == 3, "Usage: client <myport> <server>");
 
   gras_init(&argc, argv);
   xbt_assert(argc == 3, "Usage: client <myport> <server>");


@@ -129,13 +130,15 @@ int client(int argc, char *argv[])
   XBT_INFO("Launch client (port=%d)", myport);
   TRY {
     me = gras_socket_server(myport);
   XBT_INFO("Launch client (port=%d)", myport);
   TRY {
     me = gras_socket_server(myport);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to establish a server socket: %s");
   }
   gras_os_sleep(1);             /* Wait for pal to startup */
   TRY {
     pal = gras_socket_client_from_string(palstr);
     RETHROWF("Unable to establish a server socket: %s");
   }
   gras_os_sleep(1);             /* Wait for pal to startup */
   TRY {
     pal = gras_socket_client_from_string(palstr);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("Unable to establish a socket to %s: %s", palstr);
   }
   XBT_INFO("Initialization done.");
     RETHROWF("Unable to establish a socket to %s: %s", palstr);
   }
   XBT_INFO("Initialization done.");


@@ -143,7 +146,8 @@ int client(int argc, char *argv[])
   /* Launch handle(-1). Lock until message from server expected */
   TRY {
     gras_msg_handle(-1);
   /* Launch handle(-1). Lock until message from server expected */
   TRY {
     gras_msg_handle(-1);

-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {

     RETHROWF("No exception expected during handle(-1), but got %s");
   }
   XBT_INFO("gras_msg_handle(-1) works as expected (locked)");
     RETHROWF("No exception expected during handle(-1), but got %s");
   }
   XBT_INFO("gras_msg_handle(-1) works as expected (locked)");