-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example");
-int server(int argc, char *argv[]);
-int client(int argc, char *argv[]);
-
-int server(int argc, char *argv[])
+static int server(int argc, char *argv[])
{
msg_task_t task1 = NULL;
msg_task_t task2 = NULL;
long val1, val2;
MSG_task_receive(&task1, "mymailbox");
- val1 = (long) MSG_task_get_data(task1);
+ val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
MSG_task_destroy(task1);
task1 = NULL;
XBT_INFO("Received %lu", val1);
MSG_task_receive(&task2, "mymailbox");
- val2 = (long) MSG_task_get_data(task2);
+ val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
MSG_task_destroy(task2);
task2 = NULL;
XBT_INFO("Received %lu", val2);
- MC_assert(min(val1, val2) == 1);
+ MC_assert(MIN(val1, val2) == 1);
MSG_task_receive(&task1, "mymailbox");
- val1 = (long) MSG_task_get_data(task1);
+ val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
MSG_task_destroy(task1);
XBT_INFO("Received %lu", val1);
MSG_task_receive(&task2, "mymailbox");
- val2 = (long) MSG_task_get_data(task2);
+ val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
MSG_task_destroy(task2);
XBT_INFO("Received %lu", val2);
return 0;
}
-int client(int argc, char *argv[])
+static int client(int argc, char *argv[])
{
- msg_task_t task1 =
- MSG_task_create("task", 0, 10000, (void *) atol(argv[1]));
- msg_task_t task2 =
- MSG_task_create("task", 0, 10000, (void *) atol(argv[1]));
+ msg_task_t task1 = MSG_task_create(argv[1], 0, 10000, NULL);
+ msg_task_t task2 = MSG_task_create(argv[1], 0, 10000, NULL);
- XBT_INFO("Send %d!", atoi(argv[1]));
+ XBT_INFO("Send %s", argv[1]);
MSG_task_send(task1, "mymailbox");
- XBT_INFO("Send %d!", atoi(argv[1]));
+ XBT_INFO("Send %s", argv[1]);
MSG_task_send(task2, "mymailbox");
return 0;
MSG_create_environment("platform.xml");
MSG_function_register("server", server);
-
MSG_function_register("client", client);
-
MSG_launch_application("deploy_bugged2.xml");
MSG_main();
-
return 0;
}