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
New function: xbt::Path() gets the CWD
[simgrid.git]
/
src
/
xbt
/
xbt_main.cpp
diff --git
a/src/xbt/xbt_main.cpp
b/src/xbt/xbt_main.cpp
index
496cc47
..
5cb3298
100644
(file)
--- a/
src/xbt/xbt_main.cpp
+++ b/
src/xbt/xbt_main.cpp
@@
-1,35
+1,31
@@
/* module handling */
/* module handling */
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2018. 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. */
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
/* 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. */
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
-#include <math.h>
-#include "xbt/misc.h"
-#include "simgrid_config.h"
-#include "xbt/sysdep.h"
+#include "simgrid/config.h"
+#include "simgrid/sg_config.hpp"
+#include "src/internal_config.h"
+#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
+#include "xbt/config.hpp"
+#include "xbt/dynar.h"
#include "xbt/log.h"
#include "xbt/log.hpp"
#include "xbt/log.h"
#include "xbt/log.hpp"
-#include "xbt/dynar.h"
-#include "xbt/config.h"
-
-#include "xbt/module.h" /* this module */
-
-#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
-
-#include "simgrid/sg_config.h"
+#include "xbt/misc.h"
+#include "xbt/module.h" /* this module */
+#include "xbt/sysdep.h"
-#include
"src/internal_config.h"
-#include <
stdio.h
>
+#include
<cmath>
+#include <
cstdio
>
#ifdef _WIN32
#ifdef _WIN32
-#
include <signal.h
> /* To silence MSVC on abort() */
+#
include <csignal
> /* To silence MSVC on abort() */
#endif
#if HAVE_UNISTD_H
#endif
#if HAVE_UNISTD_H
-#
include <unistd.h>
+# include <unistd.h>
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
@@
-40,7
+36,7
@@
char *xbt_binary_name = NULL; /* Name of the system process containing us (man
xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
int xbt_initialized = 0;
xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
int xbt_initialized = 0;
-
int _sg_do_clean_atexit = 1
;
+
bool _sg_do_clean_atexit = true
;
int xbt_pagesize;
int xbt_pagebits = 0;
int xbt_pagesize;
int xbt_pagebits = 0;
@@
-48,8
+44,8
@@
int xbt_pagebits = 0;
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
*/
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
*/
-static void xbt_preinit(
void) _XBT_GNUC
_CONSTRUCTOR(200);
-static void xbt_postexit(
void
);
+static void xbt_preinit(
) XBT_ATTRIB
_CONSTRUCTOR(200);
+static void xbt_postexit();
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-76,7
+72,8
@@
static BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserv
#endif
#endif
-static void xbt_preinit(void) {
+static void xbt_preinit()
+{
unsigned int seed = 2147483647;
#ifdef _WIN32
SYSTEM_INFO si;
unsigned int seed = 2147483647;
#ifdef _WIN32
SYSTEM_INFO si;
@@
-85,7
+82,7
@@
static void xbt_preinit(void) {
#elif HAVE_SYSCONF
xbt_pagesize = sysconf(_SC_PAGESIZE);
#else
#elif HAVE_SYSCONF
xbt_pagesize = sysconf(_SC_PAGESIZE);
#else
-
#
error Cannot get page size.
+
#
error Cannot get page size.
#endif
xbt_pagebits = log2(xbt_pagesize);
#endif
xbt_pagebits = log2(xbt_pagesize);
@@
-97,7
+94,7
@@
static void xbt_preinit(void) {
xbt_log_preinit();
xbt_os_thread_mod_preinit();
xbt_dict_preinit();
xbt_log_preinit();
xbt_os_thread_mod_preinit();
xbt_dict_preinit();
-
+
srand(seed);
#ifndef _WIN32
srand48(seed);
srand(seed);
#ifndef _WIN32
srand48(seed);
@@
-105,16
+102,16
@@
static void xbt_preinit(void) {
atexit(xbt_postexit);
}
atexit(xbt_postexit);
}
-static void xbt_postexit(
void
)
+static void xbt_postexit()
{
{
- if(!_sg_do_clean_atexit) return;
+ if (not _sg_do_clean_atexit)
+ return;
xbt_initialized--;
xbt_dict_postexit();
xbt_os_thread_mod_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
xbt_initialized--;
xbt_dict_postexit();
xbt_os_thread_mod_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
- free(xbt_binary_name);
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
mmalloc_postexit();
#endif
}
mmalloc_postexit();
#endif
}
@@
-122,45
+119,45
@@
static void xbt_postexit(void)
/** @brief Initialize the xbt mechanisms. */
void xbt_init(int *argc, char **argv)
{
/** @brief Initialize the xbt mechanisms. */
void xbt_init(int *argc, char **argv)
{
- simgrid::xbt::install
ExceptionH
andler();
+ simgrid::xbt::install
_exception_h
andler();
- if (xbt_initialized++) {
- XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);
+ xbt_initialized++;
+ if (xbt_initialized > 1) {
+ XBT_DEBUG("XBT has been initialized %d times.", xbt_initialized);
return;
}
return;
}
- xbt_binary_name =
xbt_strdup(argv[0])
;
- xbt_cmdline
= xbt_dynar_new(sizeof(char*),
NULL);
- for (int i
=0;i<*argc;
i++)
+ xbt_binary_name =
argv[0]
;
+ xbt_cmdline
= xbt_dynar_new(sizeof(char*),
NULL);
+ for (int i
= 0; i < *argc;
i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
xbt_dynar_push(xbt_cmdline,&(argv[i]));
-
+
xbt_log_init(argc, argv);
}
/* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
xbt_log_init(argc, argv);
}
/* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
-/** @brief like free, but you can be sure that it is a function */
+/** @brief like
xbt_
free, but you can be sure that it is a function */
void xbt_free_f(void *p)
{
void xbt_free_f(void *p)
{
- free(p);
+
xbt_
free(p);
}
/** @brief should be given a pointer to pointer, and frees the second one */
void xbt_free_ref(void *d)
{
}
/** @brief should be given a pointer to pointer, and frees the second one */
void xbt_free_ref(void *d)
{
-
free(*(void **)
d);
+
xbt_free(*(void**)
d);
}
/** @brief Kill the program in silence */
}
/** @brief Kill the program in silence */
-void xbt_abort(
void
)
+void xbt_abort()
{
#ifdef COVERAGE
/* Call __gcov_flush on abort when compiling with coverage options. */
{
#ifdef COVERAGE
/* Call __gcov_flush on abort when compiling with coverage options. */
- extern void __gcov_flush(
void
);
+ extern void __gcov_flush();
__gcov_flush();
#endif
#ifdef _WIN32
__gcov_flush();
#endif
#ifdef _WIN32
- /* It was said *in silence*. We don't want to see the error message printed
- * by the Microsoft's implementation of abort(). */
+ /* We said *in silence*. We don't want to see the error message printed by Microsoft's implementation of abort(). */
raise(SIGABRT);
signal(SIGABRT, SIG_DFL);
raise(SIGABRT);
raise(SIGABRT);
signal(SIGABRT, SIG_DFL);
raise(SIGABRT);