From d32b7bd0e7f81e57a139a5bcd719d04d2825b1a4 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 23 Mar 2010 00:50:35 +0000 Subject: [PATCH 1/1] more verbose on error git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7305 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simix/smx_process.c | 4 ++-- tools/doxygen/xbt_log_extract_hierarchy.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index 677a3753ac..0b341d3bc6 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -176,7 +176,7 @@ void SIMIX_process_kill(smx_process_t process) SIMIX_context_stop(process->context); } else { - DEBUG4("%s(%p) here! killing %s(%p) %s", + DEBUG4("%s(%p) here! killing %s(%p)", simix_global->current_process->name,simix_global->current_process, process->name,process); @@ -466,7 +466,7 @@ void SIMIX_process_schedule(smx_process_t new_process) simix_global->current_process = new_process; /* schedule the context */ - SIMIX_context_resume(simix_global->maestro_process->context,new_process->context); + SIMIX_context_resume(new_process->context); DEBUG1("Resumed from scheduling context: '%s'", new_process->name); /* restore the current process to the previously saved process */ diff --git a/tools/doxygen/xbt_log_extract_hierarchy.pl b/tools/doxygen/xbt_log_extract_hierarchy.pl index 64d9a25c22..8d9e70cd84 100755 --- a/tools/doxygen/xbt_log_extract_hierarchy.pl +++ b/tools/doxygen/xbt_log_extract_hierarchy.pl @@ -87,7 +87,7 @@ sub parse_file { my ($name,$anc,$desc) = cleanup_ctn($1); # build the tree, checking for name conflict - die "ERROR: Category name conflict: $name used several times\n" + die "ERROR: Category name conflict: $name used several times (in $ancestor{$name} and $anc, last time in $filename)\n" if defined ($ancestor{$name}) && $ancestor{$name} ne $anc && defined ($desc{$name}) && $desc{$name} ne $desc; $ancestor{$name}=$anc; -- 2.20.1