X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/743c2c7fedb05cdd99b35368f15483dfb33790ee..e2d280829e07d8b5e96c96bd4b2fd815e8311102:/examples/msg/mc/bugged2_liveness.c?ds=sidebyside diff --git a/examples/msg/mc/bugged2_liveness.c b/examples/msg/mc/bugged2_liveness.c index da785bb23f..5a6d2d23fc 100644 --- a/examples/msg/mc/bugged2_liveness.c +++ b/examples/msg/mc/bugged2_liveness.c @@ -1,5 +1,4 @@ -/* Copyright (c) 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2012-2018. 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. */ @@ -10,10 +9,8 @@ /* LTL property checked : !(GFcs) */ /******************************************************************************/ -#include "simgrid/msg.h" -#include "mc/mc.h" -#include "xbt/automaton.h" -#include "bugged2_liveness.h" +#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3, "my log messages"); @@ -29,12 +26,12 @@ static int coordinator(int argc, char *argv[]) const char *kind = MSG_task_get_name(task); //is it a request or a release? if (!strcmp(kind, "request")) { // that's a request char *req = MSG_task_get_data(task); - if (CS_used) { + if (CS_used) { XBT_INFO("CS already used."); msg_task_t answer = MSG_task_create("not grant", 0, 1000, NULL); MSG_task_send(answer, req); - } else { // can serve it immediatly - XBT_INFO("CS idle. Grant immediatly"); + } else { // can serve it immediately + XBT_INFO("CS idle. Grant immediately"); msg_task_t answer = MSG_task_create("grant", 0, 1000, NULL); MSG_task_send(answer, req); CS_used = 1; @@ -54,7 +51,6 @@ static int client(int argc, char *argv[]) { int my_pid = MSG_process_get_PID(MSG_process_self()); char *my_mailbox = xbt_strdup(argv[1]); - const char* kind; while(1){ XBT_INFO("Client (%s) asks the request", my_mailbox); @@ -63,7 +59,7 @@ static int client(int argc, char *argv[]) msg_task_t answer = NULL; MSG_task_receive(&answer, my_mailbox); - kind = MSG_task_get_name(answer); + const char* kind = MSG_task_get_name(answer); if (!strcmp(kind, "grant")) { XBT_INFO("Client (%s) got the answer (grant). Sleep a bit and release it", my_mailbox);