X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63ea7e30d56956923efa25dd65b713cc944e236f..8ea0509fd99dd8601f629a14935f29241914446d:/examples/msg/masterslave/masterslave_bypass.c diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c index 2a446232d0..ecdf4cd9c3 100644 --- a/examples/msg/masterslave/masterslave_bypass.c +++ b/examples/msg/masterslave/masterslave_bypass.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-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. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ /* Create a log channel to have nice outputs. */ @@ -18,7 +18,8 @@ static int surf_parse_bypass_platform(void) { static int AX_ptr = 0; static int surfxml_bufferstack_size = 2048; - + static int surfxml_buffer_stack_stack_ptr = 0; + static int surfxml_buffer_stack_stack[1024]; /* allocating memory for the buffer, I think 2kB should be enough */ surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); @@ -28,18 +29,18 @@ static int surf_parse_bypass_platform(void) XBT_DEBUG(""); SURFXML_BUFFER_SET(AS_id, "AS0"); - SURFXML_BUFFER_SET(AS_coordinates, ""); - SURFXML_BUFFER_SET(AS_routing, "Full"); + A_surfxml_AS_routing = A_surfxml_AS_routing_Full; SURFXML_START_TAG(AS); XBT_DEBUG(""); SURFXML_BUFFER_SET(host_id, "host A"); SURFXML_BUFFER_SET(host_power, "100000000.00"); + SURFXML_BUFFER_SET(host_pstate, "0"); SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); + SURFXML_BUFFER_SET(host_availability___file, ""); SURFXML_BUFFER_SET(host_core, "1"); A_surfxml_host_state = A_surfxml_host_state_ON; - SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_state___file, ""); SURFXML_BUFFER_SET(host_coordinates, ""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); @@ -47,11 +48,12 @@ static int surf_parse_bypass_platform(void) XBT_DEBUG(""); SURFXML_BUFFER_SET(host_id, "host B"); SURFXML_BUFFER_SET(host_power, "100000000.00"); + SURFXML_BUFFER_SET(host_pstate, "0"); SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); + SURFXML_BUFFER_SET(host_availability___file, ""); SURFXML_BUFFER_SET(host_core, "1"); A_surfxml_host_state = A_surfxml_host_state_ON; - SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_state___file, ""); SURFXML_BUFFER_SET(host_coordinates, ""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); @@ -59,12 +61,12 @@ static int surf_parse_bypass_platform(void) XBT_DEBUG(""); SURFXML_BUFFER_SET(link_id, "LinkA"); SURFXML_BUFFER_SET(link_bandwidth, "10000000.0"); - SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_bandwidth___file, ""); SURFXML_BUFFER_SET(link_latency, "0.2"); - SURFXML_BUFFER_SET(link_latency_file, ""); + SURFXML_BUFFER_SET(link_latency___file, ""); A_surfxml_link_state = A_surfxml_link_state_ON; - SURFXML_BUFFER_SET(link_state_file, ""); - A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + SURFXML_BUFFER_SET(link_state___file, ""); + A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_SHARED; SURFXML_START_TAG(link); SURFXML_END_TAG(link); @@ -73,11 +75,11 @@ static int surf_parse_bypass_platform(void) SURFXML_BUFFER_SET(route_dst, "host B"); A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES; SURFXML_START_TAG(route); - XBT_DEBUG(" "); - SURFXML_BUFFER_SET(link_ctn_id, "LinkA"); - A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; - SURFXML_START_TAG(link_ctn); - SURFXML_END_TAG(link_ctn); + XBT_DEBUG(" "); + SURFXML_BUFFER_SET(link___ctn_id, "LinkA"); + A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_NONE; + SURFXML_START_TAG(link___ctn); + SURFXML_END_TAG(link___ctn); XBT_DEBUG(""); SURFXML_END_TAG(route); @@ -107,8 +109,8 @@ static int surf_parse_bypass_application(void) /* */ SURFXML_BUFFER_SET(process_host, "host A"); SURFXML_BUFFER_SET(process_function, "master"); - SURFXML_BUFFER_SET(process_start_time, "-1.0"); - SURFXML_BUFFER_SET(process_kill_time, "-1.0"); + SURFXML_BUFFER_SET(process_start___time, "-1.0"); + SURFXML_BUFFER_SET(process_kill___time, "-1.0"); SURFXML_START_TAG(process); /* */ @@ -137,8 +139,8 @@ static int surf_parse_bypass_application(void) /* */ SURFXML_BUFFER_SET(process_host, "host B"); SURFXML_BUFFER_SET(process_function, "slave"); - SURFXML_BUFFER_SET(process_start_time, "-1.0"); - SURFXML_BUFFER_SET(process_kill_time, "-1.0"); + SURFXML_BUFFER_SET(process_start___time, "-1.0"); + SURFXML_BUFFER_SET(process_kill___time, "-1.0"); SURFXML_START_TAG(process); SURFXML_END_TAG(process); @@ -151,36 +153,31 @@ static int surf_parse_bypass_application(void) int master(int argc, char *argv[]); int slave(int argc, char *argv[]); -MSG_error_t test_all(void); - -typedef enum { - PORT_22 = 0, - MAX_CHANNEL -} channel_t; +msg_error_t test_all(void); /** 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; int i; - int read; + XBT_ATTRIB_UNUSED int read; read = sscanf(argv[1], "%d", &number_of_tasks); - xbt_assert1(read, "Invalid argument %s\n", argv[1]); + xbt_assert(read, "Invalid argument %s\n", argv[1]); read = sscanf(argv[2], "%lg", &task_comp_size); - xbt_assert1(read, "Invalid argument %s\n", argv[2]); + xbt_assert(read, "Invalid argument %s\n", argv[2]); read = sscanf(argv[3], "%lg", &task_comm_size); - xbt_assert1(read, "Invalid argument %s\n", argv[3]); + xbt_assert(read, "Invalid argument %s\n", argv[3]); { /* 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); @@ -190,14 +187,14 @@ int master(int argc, char *argv[]) } } - { /* Process organisation */ + { /* Process organization */ 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]); + slaves[i - 4] = MSG_host_by_name(argv[i]); if (slaves[i - 4] == NULL) { - XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]); + XBT_INFO("Unknown host %s. Stopping Now!", argv[i]); abort(); } } @@ -205,7 +202,7 @@ int master(int argc, char *argv[]) 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); @@ -214,19 +211,19 @@ int master(int argc, char *argv[]) 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); @@ -239,21 +236,21 @@ int slave(int argc, char *argv[]) { 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)); + XBT_INFO("Received \"%s\"" , MSG_task_get_name(task)); if (MSG_task_get_data(task) == FINALIZE) { MSG_task_destroy(task); break; } - XBT_INFO("Processing \"%s\" ", MSG_task_get_name(task)); + XBT_INFO("Processing \"%s\"", MSG_task_get_name(task)); MSG_task_execute(task); - XBT_INFO("\"%s\" done ", MSG_task_get_name(task)); + XBT_INFO("\"%s\" done", MSG_task_get_name(task)); MSG_task_destroy(task); } else { - XBT_INFO("Hey ?! What's up ? "); + XBT_INFO("Hey ?! What's up ?"); xbt_die( "Unexpected behavior"); } } @@ -262,12 +259,11 @@ int slave(int argc, char *argv[]) } /* end_of_slave */ /** Test function */ -MSG_error_t test_all(void) +msg_error_t test_all(void) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; /* Simulation setting */ - MSG_set_channel_number(MAX_CHANNEL); surf_parse = surf_parse_bypass_platform; MSG_create_environment(NULL); @@ -286,14 +282,10 @@ MSG_error_t test_all(void) /** 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); + MSG_init(&argc, argv); res = test_all(); - MSG_clean(); - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}