greatly reduce the amount of atoi in our codebase

[simgrid.git] / examples / msg / mc / bugged3.c

diff --git a/examples/msg/mc/bugged3.c b/examples/msg/mc/bugged3.c
index 5853337d465b19c4177ce199c3d8cdef23e78a28..e43e802d9309d52ac696b0b0621803bc52cbfcc2 100644 (file)
--- a/examples/msg/mc/bugged3.c
+++ b/examples/msg/mc/bugged3.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2010-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 /**************** Shared buffer between asynchronous receives *****************/
 /* Server process assumes that the data from the second communication comm2   */
 /* will overwrite the one from the first communication, because of the order  */
@@ -7,8 +13,8 @@
 /* same buffer for reception (task1).                                         */
 /******************************************************************************/
 
-#include <msg/msg.h>
-#include <mc/modelchecker.h>
+#include <simgrid/msg.h>
+#include <simgrid/modelchecker.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3, "this example");
 
@@ -17,7 +23,7 @@ int client(int argc, char *argv[]);
 
 int server(int argc, char *argv[])
 {
-  m_task_t task1;
+  msg_task_t task1;
   long val1;
   msg_comm_t comm1, comm2;
 
@@ -27,25 +33,23 @@ int server(int argc, char *argv[])
   MSG_comm_wait(comm2, -1);
 
   val1 = (long) MSG_task_get_data(task1);
-  INFO1("Received %lu", val1);
+  XBT_INFO("Received %lu", val1);
 
   MC_assert(val1 == 2);
 
-  INFO0("OK");
+  XBT_INFO("OK");
   return 0;
 }
 
 int client(int argc, char *argv[])
 {
-  msg_comm_t comm;
-  char *mbox;
-  m_task_t task1 =
-      MSG_task_create("task", 0, 10000, (void *) atol(argv[1]));
+  int ID = xbt_str_parse_int(argv[1], "Arg 1 is not a numerical ID: %s");
+  msg_task_t task1 = MSG_task_create("task", 0, 10000, (void *) ID);
 
-  mbox = bprintf("mymailbox%s", argv[1]);
+  char *mbox = bprintf("mymailbox%s", argv[1]);
 
-  INFO1("Send %d!", atoi(argv[1]));
-  comm = MSG_task_isend(task1, mbox);
+  XBT_INFO("Send %d!", ID);
+  msg_comm_t comm = MSG_task_isend(task1, mbox);
   MSG_comm_wait(comm, -1);
 
   xbt_free(mbox);
@@ -55,14 +59,12 @@ int client(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
 
   MSG_create_environment("platform.xml");
 
   MSG_function_register("server", server);
-
   MSG_function_register("client", client);
-
   MSG_launch_application("deploy_bugged3.xml");
 
   MSG_main();