Merge back master branch

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

diff --git a/examples/gras/replay/replay.c b/examples/gras/replay/replay.c
index f915360..6a79238 100644 (file)
--- a/examples/gras/replay/replay.c
+++ b/examples/gras/replay/replay.c
@@ -46,7 +46,7 @@ int master(int argc, char *argv[])
   declare_msg();
 
 
-  xbt_assert0(argc == 3, "usage: replay_master tracefile port");
+  xbt_assert(argc == 3, "usage: replay_master tracefile port");
   gras_socket_server(atoi(argv[2]));    /* open my master socket, even if I don't use it */
   xbt_dynar_t peers = amok_pm_group_new("replay");      /* group of slaves */
   xbt_peer_t peer;
@@ -178,7 +178,7 @@ static void do_command(int rank, void *c)
     }
     CATCH(e) {
       SIMIX_display_process_status();
-      RETHROW2("Exception while waiting for %f bytes from %s: %s",
+      RETHROWF("Exception while waiting for %f bytes from %s: %s",
                cmd->d_arg, cmd->str_arg);
     }
     xbt_workload_data_chunk_free(chunk);