X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed9b07e5c0c7eb6d4d38b0fe5aaea80d6996a8a7..102eee116018d7c6e9f4b9301421b137272d84fb:/examples/msg/semaphores/synchro.c diff --git a/examples/msg/semaphores/synchro.c b/examples/msg/semaphores/synchro.c index 01dcd02834..9d4e0a9df8 100644 --- a/examples/msg/semaphores/synchro.c +++ b/examples/msg/semaphores/synchro.c @@ -1,31 +1,25 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-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 #include "simgrid/msg.h" -#include "xbt/log.h" -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_semaphore_example, - "Messages specific for this msg example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_semaphore_example, "Messages specific for this msg example"); msg_sem_t sem; static int peer(int argc, char* argv[]){ - int i = 0; - while(i < argc) { - double wait_time = atof(argv[i++]); + double wait_time = xbt_str_parse_double(argv[i++],"Invalid wait time: %s"); MSG_process_sleep(wait_time); XBT_INFO("Trying to acquire %d", i); MSG_sem_acquire(sem); XBT_INFO("Acquired %d", i); - wait_time = atof(argv[i++]); + wait_time = xbt_str_parse_double(argv[i++], "Invalid wait time: %s"); MSG_process_sleep(wait_time); XBT_INFO("Releasing %d", i); MSG_sem_release(sem); @@ -37,11 +31,11 @@ static int peer(int argc, char* argv[]){ return 0; } -int main(int argc, char* argv[]) { - +int main(int argc, char* argv[]) +{ MSG_init(&argc, argv); MSG_create_environment(argv[1]); - + xbt_dynar_t hosts = MSG_hosts_as_dynar(); msg_host_t h = xbt_dynar_get_as(hosts,0,msg_host_t); @@ -69,14 +63,11 @@ int main(int argc, char* argv[]) { bobTimes[nbBob++] = xbt_strdup("0"); bobTimes[nbBob++] = xbt_strdup("5"); bobTimes[nbBob++] = NULL; - - MSG_process_create_with_arguments(xbt_strdup("Alice"), peer, NULL, - h, 8, aliceTimes); - MSG_process_create_with_arguments(xbt_strdup("Bob"), peer, NULL, - h, 8, bobTimes); + MSG_process_create_with_arguments(xbt_strdup("Alice"), peer, NULL, h, 8, aliceTimes); + MSG_process_create_with_arguments(xbt_strdup("Bob"), peer, NULL, h, 8, bobTimes); msg_error_t res = MSG_main(); - printf("Finished\n"); + XBT_INFO("Finished\n"); return (res != MSG_OK); }