X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc01c6a871dbbfd0cc84e26eb9f94aeb539e613e..bdfe4f8674f98efbf2d67ad854ef83a1d5f855ed:/examples/msg/mc/bugged3.c diff --git a/examples/msg/mc/bugged3.c b/examples/msg/mc/bugged3.c index 5853337d46..91d00c1e37 100644 --- a/examples/msg/mc/bugged3.c +++ b/examples/msg/mc/bugged3.c @@ -1,3 +1,10 @@ +/* Copyright (c) 2010-2012. 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 */ @@ -8,7 +15,7 @@ /******************************************************************************/ #include -#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3, "this example"); @@ -17,7 +24,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,11 +34,11 @@ 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; } @@ -39,12 +46,12 @@ int client(int argc, char *argv[]) { msg_comm_t comm; char *mbox; - m_task_t task1 = + msg_task_t task1 = MSG_task_create("task", 0, 10000, (void *) atol(argv[1])); mbox = bprintf("mymailbox%s", argv[1]); - INFO1("Send %d!", atoi(argv[1])); + XBT_INFO("Send %d!", atoi(argv[1])); comm = MSG_task_isend(task1, mbox); MSG_comm_wait(comm, -1); @@ -55,7 +62,7 @@ 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");