X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8eb62b207b566949a0d9ce649a7b21e226b9168..e47e02e59a4fb6c51d6b7d9cc8a3732cc73dc0ae:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index e1fbbdfff0..b777616792 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -179,13 +179,9 @@ void SIMIX_global_init(int *argc, char **argv) simgrid::mc::Client::initialize(); #endif - if (not simix_global) { + if (simix_global == nullptr) { simix_global = std::unique_ptr(new simgrid::simix::Global()); simix_global->maestro_process = nullptr; - simix_global->create_process_function = &SIMIX_process_create; - simix_global->kill_process_function = &kill_process; - simix_global->cleanup_process_function = &SIMIX_process_cleanup; - simix_global->mutex = xbt_os_mutex_init(); surf_init(argc, argv); /* Initialize SURF structures */ SIMIX_context_mod_init(); @@ -267,8 +263,6 @@ void SIMIX_clean() simix_global->process_to_destroy.clear(); simix_global->process_list.clear(); - xbt_os_mutex_destroy(simix_global->mutex); - simix_global->mutex = nullptr; #if SIMGRID_HAVE_MC xbt_dynar_free(&simix_global->actors_vector); xbt_dynar_free(&simix_global->dead_actors_vector); @@ -506,13 +500,6 @@ void SIMIX_run() SIMIX_wake_processes(); } while (again); - /* Autorestart all process */ - for (auto const& host : host_that_restart) { - XBT_INFO("Restart processes on host %s", host->get_cname()); - SIMIX_host_autorestart(host); - } - host_that_restart.clear(); - /* Clean processes to destroy */ SIMIX_process_empty_trash(); @@ -570,45 +557,6 @@ double SIMIX_timer_get_date(smx_timer_t timer) { return timer ? timer->getDate() : 0; } -/** - * @brief Registers a function to create a process. - * - * This function registers a function to be called - * when a new process is created. The function has - * to call SIMIX_process_create(). - * @param function create process function - */ -void SIMIX_function_register_process_create(smx_creation_func_t function) -{ - simix_global->create_process_function = function; -} - -/** - * @brief Registers a function to kill a process. - * - * This function registers a function to be called when a process is killed. The function has to call the - * SIMIX_process_kill(). - * - * @param function Kill process function - */ -void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function) -{ - simix_global->kill_process_function = function; -} - -/** - * @brief Registers a function to cleanup a process. - * - * This function registers a user function to be called when a process ends properly. - * - * @param function cleanup process function - */ -void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function) -{ - simix_global->cleanup_process_function = function; -} - - void SIMIX_display_process_status() { int nbprocess = simix_global->process_list.size();