From 3ee43d9b0acdf2f76f4525beca51dccef14f7319 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 23 Nov 2012 00:04:19 +0100 Subject: [PATCH 1/1] comments, debugs and other minor glitches --- src/simix/smx_global.c | 2 -- src/simix/smx_private.h | 1 + src/simix/smx_process.c | 2 +- src/simix/smx_smurf.c | 1 + teshsuite/xbt/parallel_log_crashtest.tesh | 2 -- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 728da6ffa5..3315b5108a 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -92,7 +92,6 @@ void SIMIX_global_init(int *argc, char **argv) __xbt_running_ctx_fetch = SIMIX_process_get_running_context; __xbt_ex_terminate = SIMIX_process_exception_terminate; - /* Initialize the SIMIX network module */ SIMIX_network_init(); /* Prepare to display some more info when dying on Ctrl-C pressing */ @@ -107,7 +106,6 @@ void SIMIX_global_init(int *argc, char **argv) simix_timers = xbt_heap_new(8, &free); } - XBT_DEBUG("ADD SIMIX LEVELS"); SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy); atexit(SIMIX_clean); diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 59f4342d85..9cbceaa018 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -313,6 +313,7 @@ static XBT_INLINE smx_context_t SIMIX_context_self(void) return simix_global->context_factory->self(); } + xbt_die("simix is not initialized, please call MSG_init first"); return NULL; } diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index 657c8170c9..e9418a4082 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -214,7 +214,7 @@ void SIMIX_process_create(smx_process_t *process, *process = NULL; smx_host_t host = SIMIX_host_get_by_name(hostname); - XBT_DEBUG("Start process %s on host %s", name, hostname); + XBT_DEBUG("Start process %s on host '%s'", name, hostname); if (!SIMIX_host_get_state(host)) { XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c index c049f29ea9..67dc28852e 100644 --- a/src/simix/smx_smurf.c +++ b/src/simix/smx_smurf.c @@ -25,6 +25,7 @@ void SIMIX_simcall_push(smx_process_t self) SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { + XBT_DEBUG("I'm the maestro, execute the simcall directly"); SIMIX_simcall_pre(&self->simcall, 0); } } diff --git a/teshsuite/xbt/parallel_log_crashtest.tesh b/teshsuite/xbt/parallel_log_crashtest.tesh index 0f18b71d59..cb7605e3d4 100644 --- a/teshsuite/xbt/parallel_log_crashtest.tesh +++ b/teshsuite/xbt/parallel_log_crashtest.tesh @@ -1,7 +1,6 @@ ! timeout 20 p Try to crash the log mecanism by using it in parallel with a lot of threads -! setenv GRAS_NO_WARN_EXPERIMENTAL=1 $ xbt/parallel_log_crashtest "--log=root.fmt:%m%n" > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) @@ -9804,4 +9803,3 @@ $ xbt/parallel_log_crashtest "--log=root.fmt:%m%n" > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) -> Exiting GRAS -- 2.20.1