From c037b350be91c83c14b36d096820e2bf8494bf1f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 2 May 2016 14:58:44 +0200 Subject: [PATCH] simix: inline a function --- src/simix/smx_global.cpp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index e93da3a3ff..856ccc8c49 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -4,6 +4,7 @@ /* 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 /* Signal handling */ #include #include "src/internal_config.h" @@ -52,8 +53,6 @@ static void* SIMIX_synchro_mallocator_new_f(void); static void SIMIX_synchro_mallocator_free_f(void* synchro); static void SIMIX_synchro_mallocator_reset_f(void* synchro); -/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ -#include int _sg_do_verbose_exit = 1; static void inthandler(int ignored) @@ -144,8 +143,8 @@ static void install_segvhandler(void) } #endif /* _WIN32 */ -/********************************* SIMIX **************************************/ +/********************************* SIMIX **************************************/ double SIMIX_timer_next(void) { return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0; @@ -156,12 +155,6 @@ static void kill_process(smx_process_t process) SIMIX_process_kill(process, NULL); } -static void SIMIX_storage_create_(smx_storage_t storage) -{ - const char* key = xbt_dict_get_elm_key(storage); - SIMIX_storage_create(key, storage, NULL); -} - static std::function maestro_code; namespace simgrid { @@ -242,12 +235,13 @@ void SIMIX_global_init(int *argc, char **argv) SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy); simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) { - const char* id = storage->getName(); - // TODO, create sg_storage_by_name - sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, id); - xbt_assert(s != NULL, "Storage not found for name %s", id); - SIMIX_storage_create_(s); - }); + const char* name = storage->getName(); + // TODO, create sg_storage_by_name + sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name); + xbt_assert(s != NULL, "Storage not found for name %s", name); + + SIMIX_storage_create(name, s, NULL); + }); SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy); } -- 2.20.1