#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
-MSG_error_t test_all(const char *platform_file);
+msg_error_t test_all(const char *platform_file);
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
-typedef enum {
- PORT_22 = 0,
- MAX_CHANNEL
-} channel_t;
-
/** Emitter function */
int master(int argc, char *argv[])
{
int slaves_count = 0;
- m_host_t *slaves = NULL;
- m_task_t *todo = NULL;
+ msg_host_t *slaves = NULL;
+ msg_task_t *todo = NULL;
int number_of_tasks = 0;
double task_comp_size = 0;
double task_comm_size = 0;
{ /* Task creation */
char sprintf_buffer[64];
- todo = xbt_new0(m_task_t, number_of_tasks);
+ todo = xbt_new0(msg_task_t, number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
sprintf(sprintf_buffer, "Task_%d", i);
{ /* Process organisation */
slaves_count = argc - 4;
- slaves = xbt_new0(m_host_t, slaves_count);
+ slaves = xbt_new0(msg_host_t, slaves_count);
for (i = 4; i < argc; i++) {
slaves[i - 4] = MSG_get_host_by_name(argv[i]);
XBT_INFO("Got %d slave(s) :", slaves_count);
for (i = 0; i < slaves_count; i++)
- XBT_INFO("\t %s", slaves[i]->name);
+ XBT_INFO("\t %s", MSG_host_get_name(slaves[i]));
XBT_INFO("Got %d task to process :", number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
XBT_INFO("Sending \"%s\" to \"%s\"",
- todo[i]->name, slaves[i % slaves_count]->name);
+ todo[i]->name, MSG_host_get_name(slaves[i % slaves_count]));
if (MSG_host_self() == slaves[i % slaves_count]) {
XBT_INFO("Hey ! It's me ! :)");
}
- MSG_task_put(todo[i], slaves[i % slaves_count], PORT_22);
+ MSG_task_send(todo[i], MSG_host_get_name(slaves[i % slaves_count]));
XBT_INFO("Send completed");
}
XBT_INFO
("All tasks have been dispatched. Let's tell everybody the computation is over.");
for (i = 0; i < slaves_count; i++)
- MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE),
- slaves[i], PORT_22);
+ MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE),
+ MSG_host_get_name(slaves[i]));
XBT_INFO("Goodbye now!");
free(slaves);
{
XBT_INFO("I'm a slave");
while (1) {
- m_task_t task = NULL;
+ msg_task_t task = NULL;
int a;
- a = MSG_task_get(&(task), PORT_22);
+ a = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
XBT_INFO("Received \"%s\" ", MSG_task_get_name(task));
if (MSG_task_get_data(task) == FINALIZE) {
} else {
XBT_INFO("Hey ?! What's up ? ");
xbt_die("Unexpected behavior");
- }
+ }
}
XBT_INFO("I'm done. See you!");
return 0;
/** Bypass deployment **/
static int bypass_deployment(void)
{
- int nb_host,i;
- static int AX_ptr;
- static int surfxml_bufferstack_size = 2048;
- static int surfxml_buffer_stack_stack_ptr = 0;
- static int surfxml_buffer_stack_stack[1024];
- /* allocating memory to the buffer, I think 2MB should be enough */
- surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- nb_host = MSG_get_host_number();
-
- /* <platform> */
- SURFXML_BUFFER_SET(platform_version, "3");
- SURFXML_START_TAG(platform);
- XBT_DEBUG("<platform version=\"3\">");
-
- XBT_DEBUG(" <process host=\"c-0.me\" function=\"master\">");
- SURFXML_BUFFER_SET(process_host, "c-0.me");
- SURFXML_BUFFER_SET(process_function, "master");
- SURFXML_BUFFER_SET(process_start_time, "-1.0");
- SURFXML_BUFFER_SET(process_kill_time, "-1.0");
- SURFXML_START_TAG(process);
-
- XBT_DEBUG(" <argument value=\"%s\"/>",bprintf("%d",nb_host-1));
- SURFXML_BUFFER_SET(argument_value, bprintf("%d",nb_host-1));
- SURFXML_START_TAG(argument);
- SURFXML_END_TAG(argument);
-
- XBT_DEBUG(" <argument value=\"5000000\"/>");
- SURFXML_BUFFER_SET(argument_value, "5000000");
- SURFXML_START_TAG(argument);
- SURFXML_END_TAG(argument);
-
- XBT_DEBUG(" <argument value=\"100000\"/>");
- SURFXML_BUFFER_SET(argument_value, "100000");
- SURFXML_START_TAG(argument);
- SURFXML_END_TAG(argument);
-
- for(i=1 ; i<nb_host ; i++)
- {
- XBT_DEBUG(" <argument value=\"%s.me\"/>",bprintf("c-%d",i));
- SURFXML_BUFFER_SET(argument_value, bprintf("c-%d.me",i));
- SURFXML_START_TAG(argument);
- SURFXML_END_TAG(argument);
- }
- XBT_DEBUG(" </process>");
- SURFXML_END_TAG(process);
-
- for(i=1 ; i<nb_host ; i++)
- {
- XBT_DEBUG(" <process host=\"%s.me\" function=\"slave\"/>",bprintf("c-%d",i));
- SURFXML_BUFFER_SET(process_host, bprintf("c-%d.me",i));
- SURFXML_BUFFER_SET(process_function, "slave");
- SURFXML_BUFFER_SET(process_start_time, "-1.0");
- SURFXML_BUFFER_SET(process_kill_time, "-1.0");
- SURFXML_START_TAG(process);
- SURFXML_END_TAG(process);
- }
-
- XBT_DEBUG("</platform>");
- SURFXML_END_TAG(platform);
-
- free(surfxml_bufferstack);
- return 0;
+ int nb_host,i;
+ static int AX_ptr;
+ static int surfxml_bufferstack_size = 2048;
+ static int surfxml_buffer_stack_stack_ptr = 0;
+ static int surfxml_buffer_stack_stack[1024];
+ xbt_dynar_t hosts = MSG_hosts_as_dynar();
+ /* allocating memory to the buffer, I think 2MB should be enough */
+ surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
+
+ nb_host = xbt_dynar_length(hosts);
+ xbt_dynar_free(&hosts);
+
+ /* <platform> */
+ SURFXML_BUFFER_SET(platform_version, "3");
+ SURFXML_START_TAG(platform);
+ XBT_DEBUG("<platform version=\"3\">");
+
+ XBT_DEBUG(" <process host=\"c-0.me\" function=\"master\">");
+ SURFXML_BUFFER_SET(process_host, "c-0.me");
+ SURFXML_BUFFER_SET(process_function, "master");
+ SURFXML_BUFFER_SET(process_start___time, "-1.0");
+ SURFXML_BUFFER_SET(process_kill___time, "-1.0");
+ SURFXML_START_TAG(process);
+
+ XBT_DEBUG(" <argument value=\"%s\"/>",bprintf("%d",nb_host-1));
+ SURFXML_BUFFER_SET(argument_value, bprintf("%d",nb_host-1));
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
+
+ XBT_DEBUG(" <argument value=\"5000000\"/>");
+ SURFXML_BUFFER_SET(argument_value, "5000000");
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
+
+ XBT_DEBUG(" <argument value=\"100000\"/>");
+ SURFXML_BUFFER_SET(argument_value, "100000");
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
+
+ for(i=1 ; i<nb_host ; i++)
+ {
+ XBT_DEBUG(" <argument value=\"%s.me\"/>",bprintf("c-%d",i));
+ SURFXML_BUFFER_SET(argument_value, bprintf("c-%d.me",i));
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
+ }
+ XBT_DEBUG(" </process>");
+ SURFXML_END_TAG(process);
+
+ for(i=1 ; i<nb_host ; i++)
+ {
+ XBT_DEBUG(" <process host=\"%s.me\" function=\"slave\"/>",bprintf("c-%d",i));
+ SURFXML_BUFFER_SET(process_host, bprintf("c-%d.me",i));
+ SURFXML_BUFFER_SET(process_function, "slave");
+ SURFXML_BUFFER_SET(process_start___time, "-1.0");
+ SURFXML_BUFFER_SET(process_kill___time, "-1.0");
+ SURFXML_START_TAG(process);
+ SURFXML_END_TAG(process);
+ }
+
+ XBT_DEBUG("</platform>");
+ SURFXML_END_TAG(platform);
+
+ free(surfxml_bufferstack);
+ return 0;
}
/** Test function */
-MSG_error_t test_all(const char *platform_file)
+msg_error_t test_all(const char *platform_file)
{
- MSG_error_t res = MSG_OK;
- MSG_set_channel_number(MAX_CHANNEL);
- MSG_create_environment(platform_file);
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- surf_parse = bypass_deployment;
- MSG_launch_application(NULL);
-
- res = MSG_main();
-
- XBT_INFO("Simulation time %g", MSG_get_clock());
- return res;
+ msg_error_t res = MSG_OK;
+ MSG_create_environment(platform_file);
+ MSG_function_register("master", master);
+ MSG_function_register("slave", slave);
+ surf_parse = bypass_deployment;
+ MSG_launch_application(NULL);
+
+ res = MSG_main();
+
+ XBT_INFO("Simulation time %g", MSG_get_clock());
+ return res;
} /* end_of_test_all */
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
- MSG_global_init(&argc, argv);
- res = test_all(argv[1]);
- MSG_clean();
+ MSG_init(&argc, argv);
+ res = test_all(argv[1]);
- if (res == MSG_OK)
- return 0;
- else
- return 1;
+ if (res == MSG_OK)
+ return 0;
+ else
+ return 1;
} /* end_of_main */
