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
This seems to be useless since ... a long time, now (and it breaks on macos)
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
68e296f
..
2ef29f3
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-6,10
+6,6
@@
#include <stdlib.h>
#include "src/portable.h"
#include <stdlib.h>
#include "src/portable.h"
-#ifdef HAVE_SYS_PTRACE_H
-# include <sys/types.h>
-# include <sys/ptrace.h>
-#endif
#include "src/surf/surf_interface.hpp"
#include "src/surf/storage_interface.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/surf/storage_interface.hpp"
@@
-22,26
+18,23
@@
#include "src/mc/mc_replay.h"
#include "simgrid/sg_config.h"
#include "src/mc/mc_replay.h"
#include "simgrid/sg_config.h"
-#if
def
HAVE_MC
+#if HAVE_MC
#include "src/mc/mc_private.h"
#include "src/mc/mc_protocol.h"
#include "src/mc/mc_client.h"
#include "src/mc/mc_private.h"
#include "src/mc/mc_protocol.h"
#include "src/mc/mc_client.h"
-#endif
-#ifdef HAVE_MC
#include <stdlib.h>
#include "src/mc/mc_protocol.h"
#endif
#include "src/mc/mc_record.h"
#include <stdlib.h>
#include "src/mc/mc_protocol.h"
#endif
#include "src/mc/mc_record.h"
-#if
def
HAVE_SMPI
+#if HAVE_SMPI
#include "src/smpi/private.h"
#endif
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
#include "src/smpi/private.h"
#endif
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
- "Logging specific to SIMIX (kernel)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)");
smx_global_t simix_global = NULL;
static xbt_heap_t simix_timers = NULL;
smx_global_t simix_global = NULL;
static xbt_heap_t simix_timers = NULL;
@@
-63,7
+56,7
@@
static void SIMIX_synchro_mallocator_reset_f(void* synchro);
#include <signal.h>
int _sg_do_verbose_exit = 1;
#include <signal.h>
int _sg_do_verbose_exit = 1;
-static void
_XBT_CALL
inthandler(int ignored)
+static void inthandler(int ignored)
{
if ( _sg_do_verbose_exit ) {
XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option 'verbose-exit').");
{
if ( _sg_do_verbose_exit ) {
XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option 'verbose-exit').");
@@
-75,8
+68,8
@@
static void _XBT_CALL inthandler(int ignored)
exit(1);
}
exit(1);
}
-#ifndef WIN32
-static void
_XBT_CALL
segvhandler(int signum, siginfo_t *siginfo, void *context)
+#ifndef
_
WIN32
+static void segvhandler(int signum, siginfo_t *siginfo, void *context)
{
if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) {
fprintf(stderr,
{
if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) {
fprintf(stderr,
@@
-95,17
+88,17
@@
static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context)
}
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
}
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
-#if
def
HAVE_SMPI
+#if HAVE_SMPI
if (smpi_enabled() && !smpi_privatize_global_variables) {
if (smpi_enabled() && !smpi_privatize_global_variables) {
-#if
def
HAVE_PRIVATIZATION
+#if HAVE_PRIVATIZATION
fprintf(stderr,
"Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n");
#else
fprintf(stderr,
"Sadly, your system does not support --cfg=smpi/privatize_global_variables:yes (yet).\n");
fprintf(stderr,
"Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n");
#else
fprintf(stderr,
"Sadly, your system does not support --cfg=smpi/privatize_global_variables:yes (yet).\n");
-#endif
+#endif
/* HAVE_PRIVATIZATION */
}
}
-#endif
+#endif
/* HAVE_SMPI */
}
raise(signum);
}
}
raise(signum);
}
@@
-124,8
+117,7
@@
static void install_segvhandler(void)
stack.ss_flags = 0;
if (sigaltstack(&stack, &old_stack) == -1) {
stack.ss_flags = 0;
if (sigaltstack(&stack, &old_stack) == -1) {
- XBT_WARN("Failed to register alternate signal stack: %s",
- strerror(errno));
+ XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno));
return;
}
if (!(old_stack.ss_flags & SS_DISABLE)) {
return;
}
if (!(old_stack.ss_flags & SS_DISABLE)) {
@@
-140,8
+132,7
@@
static void install_segvhandler(void)
sigemptyset(&action.sa_mask);
if (sigaction(SIGSEGV, &action, &old_action) == -1) {
sigemptyset(&action.sa_mask);
if (sigaction(SIGSEGV, &action, &old_action) == -1) {
- XBT_WARN("Failed to register signal handler for SIGSEGV: %s",
- strerror(errno));
+ XBT_WARN("Failed to register signal handler for SIGSEGV: %s", strerror(errno));
return;
}
if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) {
return;
}
if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) {
@@
-152,7
+143,7
@@
static void install_segvhandler(void)
}
}
}
}
-#endif
+#endif
/* _WIN32 */
/********************************* SIMIX **************************************/
double SIMIX_timer_next(void)
/********************************* SIMIX **************************************/
double SIMIX_timer_next(void)
@@
-198,7
+189,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
def
HAVE_MC
+#if HAVE_MC
_sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL;
#endif
_sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL;
#endif
@@
-244,7
+235,7
@@
void SIMIX_global_init(int *argc, char **argv)
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT, inthandler);
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT, inthandler);
-#ifndef WIN32
+#ifndef
_
WIN32
install_segvhandler();
#endif
/* register a function to be called by SURF after the environment creation */
install_segvhandler();
#endif
/* register a function to be called by SURF after the environment creation */
@@
-263,18
+254,16
@@
void SIMIX_global_init(int *argc, char **argv)
SIMIX_storage_create_(s);
});
SIMIX_storage_create_(s);
});
-
+ SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy);
}
if (!simix_timers) {
simix_timers = xbt_heap_new(8, &free);
}
}
if (!simix_timers) {
simix_timers = xbt_heap_new(8, &free);
}
- SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy);
-
if (sg_cfg_get_boolean("clean_atexit"))
atexit(SIMIX_clean);
if (sg_cfg_get_boolean("clean_atexit"))
atexit(SIMIX_clean);
-#if
def
HAVE_MC
+#if HAVE_MC
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
MC_client_init();
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
MC_client_init();