X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7c05078f9a89dba063df2fc7edea55ae1d6a3ed..1e70e8878e6a54c9d58bc662b00865db70a38b4f:/src/mc/mc_request.c diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c index f6a70ad635..9a5f74aa40 100644 --- a/src/mc/mc_request.c +++ b/src/mc/mc_request.c @@ -1,4 +1,9 @@ -#include "private.h" +/* Copyright (c) 2008-2012 Da 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 "mc_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc, "Logging specific to MC (request)"); @@ -191,12 +196,12 @@ char *MC_request_to_string(smx_simcall_t req, int value) act = req->comm_wait.comm; if(value == -1){ type = xbt_strdup("WaitTimeout"); - p = pointer_to_string(act); - args = bprintf("comm=%p", p); + p = pointer_to_string(act); + args = bprintf("comm=%p", p); }else{ type = xbt_strdup("Wait"); - p = pointer_to_string(act); - args = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p, + p = pointer_to_string(act); + args = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p, act->comm.src_proc ? act->comm.src_proc->pid : 0, act->comm.src_proc ? act->comm.src_proc->name : "", act->comm.dst_proc ? act->comm.dst_proc->pid : 0, @@ -207,11 +212,11 @@ char *MC_request_to_string(smx_simcall_t req, int value) act = req->comm_test.comm; if(act->comm.src_proc == NULL || act->comm.dst_proc == NULL){ type = xbt_strdup("Test FALSE"); - p = pointer_to_string(act); + p = pointer_to_string(act); args = bprintf("comm=%s", p); }else{ type = xbt_strdup("Test TRUE"); - p = pointer_to_string(act); + p = pointer_to_string(act); args = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p, act->comm.src_proc->pid, act->comm.src_proc->name, act->comm.dst_proc->pid, act->comm.dst_proc->name);