A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reduce the amount of includes
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
dd1e268
..
4c7bc53
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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. */
/* 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. */
@@
-13,31
+12,31
@@
#include <xbt/functional.hpp>
#include <xbt/functional.hpp>
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/surf/storage_interface.hpp"
#include "src/surf/xml/platf.hpp"
#include "smx_private.h"
#include "src/surf/surf_interface.hpp"
#include "src/surf/storage_interface.hpp"
#include "src/surf/xml/platf.hpp"
#include "smx_private.h"
-#include "xbt/str.h"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "simgrid/sg_config.h"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "simgrid/sg_config.h"
+#include "src/smpi/smpi_process.hpp"
+
#include "src/kernel/activity/SynchroExec.hpp"
#include "src/kernel/activity/SynchroComm.hpp"
#include "src/kernel/activity/SynchroSleep.hpp"
#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/kernel/activity/SynchroExec.hpp"
#include "src/kernel/activity/SynchroComm.hpp"
#include "src/kernel/activity/SynchroSleep.hpp"
#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
#include "src/mc/mc_private.h"
#include "src/mc/mc_private.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
-
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
#include <stdlib.h>
#include <stdlib.h>
-#include "src/mc/mc_protocol.h"
#endif
#include "src/mc/mc_record.h"
#endif
#include "src/mc/mc_record.h"
@@
-93,18
+92,14
@@
static void segvhandler(int signum, siginfo_t *siginfo, void *context)
"Minimal Working Example (MWE) reproducing your problem and a full backtrace\n"
"of the fault captured with gdb or valgrind.\n",
smx_context_stack_size / 1024);
"Minimal Working Example (MWE) reproducing your problem and a full backtrace\n"
"of the fault captured with gdb or valgrind.\n",
smx_context_stack_size / 1024);
- if (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
- fprintf(stderr, "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n",
- siginfo->si_signo, siginfo->si_errno, siginfo->si_code, siginfo->si_addr);
- }
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
- if (smpi_enabled() &&
!smpi_privatize_global_variables
) {
+ if (smpi_enabled() &&
smpi_privatize_global_variables == SMPI_PRIVATIZE_NONE
) {
#if HAVE_PRIVATIZATION
#if HAVE_PRIVATIZATION
- fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatiz
e-global-variables
:yes.\n");
+ fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatiz
ation
:yes.\n");
#else
#else
- fprintf(stderr, "Sadly, your system does not support --cfg=smpi/privatiz
e-global-variables
:yes (yet).\n");
+ fprintf(stderr, "Sadly, your system does not support --cfg=smpi/privatiz
ation
:yes (yet).\n");
#endif /* HAVE_PRIVATIZATION */
}
#endif /* HAVE_SMPI */
#endif /* HAVE_PRIVATIZATION */
}
#endif /* HAVE_SMPI */
@@
-120,7
+115,8
@@
char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */
*/
static void install_segvhandler()
{
*/
static void install_segvhandler()
{
- stack_t stack, old_stack;
+ stack_t stack;
+ stack_t old_stack;
stack.ss_sp = sigsegv_stack;
stack.ss_size = sizeof sigsegv_stack;
stack.ss_flags = 0;
stack.ss_sp = sigsegv_stack;
stack.ss_size = sizeof sigsegv_stack;
stack.ss_flags = 0;
@@
-135,7
+131,8
@@
static void install_segvhandler()
sigaltstack(&old_stack, nullptr);
}
sigaltstack(&old_stack, nullptr);
}
- struct sigaction action, old_action;
+ struct sigaction action;
+ struct sigaction old_action;
action.sa_sigaction = &segvhandler;
action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
sigemptyset(&action.sa_mask);
action.sa_sigaction = &segvhandler;
action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
sigemptyset(&action.sa_mask);
@@
-196,7
+193,7
@@
void SIMIX_set_maestro(void (*code)(void*), void* data)
*/
void SIMIX_global_init(int *argc, char **argv)
{
*/
void SIMIX_global_init(int *argc, char **argv)
{
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
simgrid::mc::Client::initialize();
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
simgrid::mc::Client::initialize();
@@
-208,7
+205,6
@@
void SIMIX_global_init(int *argc, char **argv)
simgrid::simix::ActorImpl proc;
simix_global->process_to_run = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
simgrid::simix::ActorImpl proc;
simix_global->process_to_run = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
- simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup));
simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
simix_global->maestro_process = nullptr;
simix_global->create_process_function = &SIMIX_process_create;
simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
simix_global->maestro_process = nullptr;
simix_global->create_process_function = &SIMIX_process_create;
@@
-231,13
+227,14
@@
void SIMIX_global_init(int *argc, char **argv)
#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
- simgrid::s
urf::on_postparse
.connect(SIMIX_post_create_environment);
+ simgrid::s
4u::onPlatformCreated
.connect(SIMIX_post_create_environment);
simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
- host.extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
+ if (host.extension<simgrid::simix::Host>() == nullptr) // another callback to the same signal may have created it
+ host.extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
});
simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) {
});
simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) {
- const char* name = storage->
getN
ame();
+ const char* name = storage->
cn
ame();
// TODO, create sg_storage_by_name
sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name);
xbt_assert(s != nullptr, "Storage not found for name %s", name);
// TODO, create sg_storage_by_name
sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name);
xbt_assert(s != nullptr, "Storage not found for name %s", name);
@@
-273,7
+270,7
@@
void SIMIX_clean()
#if HAVE_SMPI
if (SIMIX_process_count()>0){
#if HAVE_SMPI
if (SIMIX_process_count()>0){
- if(smpi_process
_
initialized()){
+ if(smpi_process
()->
initialized()){
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
}else{
XBT_WARN("Process called exit when leaving - Skipping cleanups");
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
}else{
XBT_WARN("Process called exit when leaving - Skipping cleanups");
@@
-302,12
+299,14
@@
void SIMIX_clean()
xbt_dynar_free(&simix_global->process_to_run);
xbt_dynar_free(&simix_global->process_that_ran);
xbt_swag_free(simix_global->process_to_destroy);
xbt_dynar_free(&simix_global->process_to_run);
xbt_dynar_free(&simix_global->process_that_ran);
xbt_swag_free(simix_global->process_to_destroy);
- xbt_swag_free(simix_global->process_list);
- simix_global->process_list = nullptr;
+ simix_global->process_list.clear();
simix_global->process_to_destroy = nullptr;
xbt_os_mutex_destroy(simix_global->mutex);
simix_global->mutex = nullptr;
simix_global->process_to_destroy = nullptr;
xbt_os_mutex_destroy(simix_global->mutex);
simix_global->mutex = nullptr;
+#if SIMGRID_HAVE_MC
+ xbt_dynar_free(&simix_global->actors_vector);
+#endif
/* Let's free maestro now */
delete simix_global->maestro_process->context;
/* Let's free maestro now */
delete simix_global->maestro_process->context;
@@
-321,7
+320,6
@@
void SIMIX_clean()
surf_exit();
simix_global = nullptr;
surf_exit();
simix_global = nullptr;
- return;
}
}
@@
-433,7
+431,6
@@
void SIMIX_run()
}
double time = 0;
}
double time = 0;
- smx_actor_t process;
do {
XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run));
do {
XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run));
@@
-505,6
+502,7
@@
void SIMIX_run()
*/
unsigned int iter;
*/
unsigned int iter;
+ smx_actor_t process;
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
if (process->simcall.call != SIMCALL_NONE) {
SIMIX_simcall_handle(&process->simcall, 0);
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
if (process->simcall.call != SIMCALL_NONE) {
SIMIX_simcall_handle(&process->simcall, 0);
@@
-516,10
+514,16
@@
void SIMIX_run()
SIMIX_wake_processes();
} while (SIMIX_execute_tasks());
SIMIX_wake_processes();
} while (SIMIX_execute_tasks());
+ /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */
+ if (simix_global->process_list.size() == simix_global->daemons.size())
+ for (const auto& dmon : simix_global->daemons) {
+ XBT_DEBUG("Kill %s", dmon->cname());
+ SIMIX_process_kill(dmon, simix_global->maestro_process);
+ }
}
time = SIMIX_timer_next();
}
time = SIMIX_timer_next();
- if (time > -1.0 ||
xbt_swag_size(simix_global->process_list) != 0
) {
+ if (time > -1.0 ||
simix_global->process_list.empty() == false
) {
XBT_DEBUG("Calling surf_solve");
time = surf_solve(time);
XBT_DEBUG("Moving time ahead : %g", time);
XBT_DEBUG("Calling surf_solve");
time = surf_solve(time);
XBT_DEBUG("Moving time ahead : %g", time);
@@
-548,15
+552,17
@@
void SIMIX_run()
/* Clean processes to destroy */
SIMIX_process_empty_trash();
/* Clean processes to destroy */
SIMIX_process_empty_trash();
- XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run));
+ XBT_DEBUG("### time %f, #processes %zu, #to_run %lu", time, simix_global->process_list.size(),
+ xbt_dynar_length(simix_global->process_to_run));
+
if (xbt_dynar_is_empty(simix_global->process_to_run) &&
if (xbt_dynar_is_empty(simix_global->process_to_run) &&
-
xbt_swag_size(simix_global->process_list) != 0
)
+
!simix_global->process_list.empty()
)
simgrid::simix::onDeadlock();
} while (time > -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
simgrid::simix::onDeadlock();
} while (time > -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
- if (
xbt_swag_size(simix_global->process_list
) != 0) {
+ if (
simix_global->process_list.size(
) != 0) {
TRACE_end();
TRACE_end();
@@
-564,6
+570,7
@@
void SIMIX_run()
SIMIX_display_process_status();
xbt_abort();
}
SIMIX_display_process_status();
xbt_abort();
}
+ simgrid::s4u::onSimulationEnd();
}
/**
}
/**
@@
-571,7
+578,7
@@
void SIMIX_run()
*
* Set the date to execute the function on the surf.
* \param date Date to execute function
*
* Set the date to execute the function on the surf.
* \param date Date to execute function
- * \param
function
Function to be executed
+ * \param
callback
Function to be executed
* \param arg Parameters of the function
*
*/
* \param arg Parameters of the function
*
*/
@@
-640,17
+647,13
@@
void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function)
void SIMIX_display_process_status()
{
void SIMIX_display_process_status()
{
- if (simix_global->process_list == nullptr) {
- return;
- }
-
- smx_actor_t process = nullptr;
- int nbprocess = xbt_swag_size(simix_global->process_list);
+ int nbprocess = simix_global->process_list.size();
XBT_INFO("%d processes are still running, waiting for something.", nbprocess);
/* List the process and their state */
XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
XBT_INFO("%d processes are still running, waiting for something.", nbprocess);
/* List the process and their state */
XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
- xbt_swag_foreach(process, simix_global->process_list) {
+ for (auto kv : simix_global->process_list) {
+ smx_actor_t process = kv.second;
if (process->waiting_synchro) {
if (process->waiting_synchro) {
@@
-693,15
+696,8
@@
void SIMIX_display_process_status()
}
}
}
}
-xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char *name){
- return SIMIX_asr_get_properties(name);
-}
-xbt_dict_t SIMIX_asr_get_properties(const char *name)
-{
- return static_cast<xbt_dict_t>(xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL));
-}
-
int SIMIX_is_maestro()
{
int SIMIX_is_maestro()
{
- return simix_global==nullptr /*SimDag*/|| SIMIX_process_self() == simix_global->maestro_process;
+ smx_actor_t self = SIMIX_process_self();
+ return simix_global == nullptr /*SimDag*/ || self == nullptr || self == simix_global->maestro_process;
}
}