X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/281f8c29e177852dcb1591fc31e363e1176857c8..1c344d71e53430eca582bdcd56655ba9f078e901:/examples/msg/tracing/ms.c diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c index d9a713f13d..697a814ced 100644 --- a/examples/msg/tracing/ms.c +++ b/examples/msg/tracing/ms.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012. The SimGrid Team. +/* Copyright (c) 2010-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -20,7 +20,7 @@ */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ @@ -32,13 +32,13 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, int master(int argc, char *argv[]); int slave(int argc, char *argv[]); -/** Emitter function */ +/** sender function */ int master(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long slaves_count = atol(argv[4]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s"); //setting the variable "is_master" (previously declared) to value 1 TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_master", 1); @@ -88,7 +88,7 @@ int slave(int argc, char *argv[]) //to the variable "task_computation" TRACE_host_variable_add(MSG_host_get_name(MSG_host_self()), "task_computation", - MSG_task_get_compute_duration(task)); + MSG_task_get_flops_amount(task)); MSG_task_execute(task); MSG_task_destroy(task); task = NULL;