X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5032998904d77b72c4dc7658a3d29b90341e6b46..24a475be5e6be07d3585b68beef940d6b7a44133:/src/mc/mc_request.c diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c index 27e1d3f342..5b7ce40864 100644 --- a/src/mc/mc_request.c +++ b/src/mc/mc_request.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2013. 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. */ @@ -274,9 +275,9 @@ char *MC_request_to_string(smx_simcall_t req, int value) } if(args != NULL){ - str = bprintf("[(%lu)%s (%s)] %s(%d) (%s)", req->issuer->pid , MSG_host_get_name(req->issuer->smx_host), req->issuer->name, type, req->call, args); + str = bprintf("[(%lu)%s (%s)] %s(%s) (%d)", req->issuer->pid , MSG_host_get_name(req->issuer->smx_host), req->issuer->name, type, args, req->call); }else{ - str = bprintf("[(%lu)%s (%s)] %s(%d) ", req->issuer->pid , MSG_host_get_name(req->issuer->smx_host), req->issuer->name, type, req->call); + str = bprintf("[(%lu)%s (%s)] %s (%d) ", req->issuer->pid , MSG_host_get_name(req->issuer->smx_host), req->issuer->name, type, req->call); } xbt_free(args); @@ -461,17 +462,10 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value){ break; case SIMCALL_MC_RANDOM: - if(value == 0){ - if(req->issuer->smx_host) - label = bprintf("[(%lu)%s] MC_RANDOM (0)", req->issuer->pid, MSG_host_get_name(req->issuer->smx_host)); - else - label = bprintf("[(%lu)] MC_RANDOM (0)", req->issuer->pid); - }else{ - if(req->issuer->smx_host) - label = bprintf("[(%lu)%s] MC_RANDOM (1)", req->issuer->pid, MSG_host_get_name(req->issuer->smx_host)); - else - label = bprintf("[(%lu)] MC_RANDOM (1)", req->issuer->pid); - } + if(req->issuer->smx_host) + label = bprintf("[(%lu)%s] MC_RANDOM (%d)", req->issuer->pid, MSG_host_get_name(req->issuer->smx_host), value); + else + label = bprintf("[(%lu)] MC_RANDOM (%d)", req->issuer->pid, value); break; case SIMCALL_MC_SNAPSHOT: