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
Continue documenting my changes
[simgrid.git]
/
include
/
xbt
/
ex.h
diff --git
a/include/xbt/ex.h
b/include/xbt/ex.h
index
269556b
..
3d72283
100644
(file)
--- a/
include/xbt/ex.h
+++ b/
include/xbt/ex.h
@@
-14,33
+14,32
@@
#ifndef __XBT_EX_H__
#define __XBT_EX_H__
#ifndef __XBT_EX_H__
#define __XBT_EX_H__
-#include <xbt/sysdep.h>
-#include <xbt/misc.h>
+#include "xbt/sysdep.h"
+#include "xbt/misc.h"
+#include "xbt/virtu.h"
/* do not include execinfo.h directly since it's not always available.
Instead, copy the parts we need (and fake when it's not there) */
/* do not include execinfo.h directly since it's not always available.
Instead, copy the parts we need (and fake when it's not there) */
-extern int backtrace (void **__array, int __size);
-
-/* required ISO-C standard facilities */
-#include <errno.h>
-#include <stdio.h>
+XBT_PUBLIC(int) backtrace (void **__array, int __size);
/*-*-* Emergency debuging: define this when the exceptions get crazy *-*-*/
#undef __EX_MAYDAY
#ifdef __EX_MAYDAY
/*-*-* Emergency debuging: define this when the exceptions get crazy *-*-*/
#undef __EX_MAYDAY
#ifdef __EX_MAYDAY
-int gras_os_getpid(void);
+# include <stdio.h>
+#include <errno.h>
+
# define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \
# define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \
-
gras_os_getpid
(),__FILE__,__LINE__, \
+
(*xbt_getpid)
(),__FILE__,__LINE__, \
(m)->jb \
),
# define MAYDAY_RESTORE(m) printf("%d %s:%d restore %p\n", \
(m)->jb \
),
# define MAYDAY_RESTORE(m) printf("%d %s:%d restore %p\n", \
-
gras_os_getpid
(),__FILE__,__LINE__, \
+
(*xbt_getpid)
(),__FILE__,__LINE__, \
(m)->jb \
),
# define MAYDAY_CATCH(e) printf("%d %s:%d Catched '%s'\n", \
(m)->jb \
),
# define MAYDAY_CATCH(e) printf("%d %s:%d Catched '%s'\n", \
-
gras_os_getpid
(),__FILE__,__LINE__, \
+
(*xbt_getpid)
(),__FILE__,__LINE__, \
e.msg \
),
#else
e.msg \
),
#else
@@
-51,12
+50,7
@@
int gras_os_getpid(void);
/*-*-* end of debugging stuff *-*-*/
/*-*-* end of debugging stuff *-*-*/
-
-/* the machine context */
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) | defined(__TOS_WIN__)
-#include "xbt/win32_context.h"
-
-#elif defined(__EX_MCTX_MCSC__)
+#if defined(__EX_MCTX_MCSC__)
#include <ucontext.h> /* POSIX.1 ucontext(3) */
#define __ex_mctx_struct ucontext_t uc;
#define __ex_mctx_save(mctx) (getcontext(&(mctx)->uc) == 0)
#include <ucontext.h> /* POSIX.1 ucontext(3) */
#define __ex_mctx_struct ucontext_t uc;
#define __ex_mctx_save(mctx) (getcontext(&(mctx)->uc) == 0)
@@
-234,9
+228,6
@@
typedef struct { __ex_mctx_struct } __ex_mctx_t;
* @{
*/
* @{
*/
-/* we need this symbol here, even if it breaks a bit the module separation */
-long int gras_os_getpid(void);
-
/** @brief different kind of errors */
typedef enum {
unknown_error=0, /**< unknown error */
/** @brief different kind of errors */
typedef enum {
unknown_error=0, /**< unknown error */
@@
-247,10
+238,11
@@
typedef enum {
system_error, /**< a syscall did fail */
network_error, /**< error while sending/receiving data */
timeout_error, /**< not quick enough, dude */
system_error, /**< a syscall did fail */
network_error, /**< error while sending/receiving data */
timeout_error, /**< not quick enough, dude */
- thread_error /**< error while [un]locking */
+ thread_error, /**< error while [un]locking */
+ host_error /**< host failed */
} xbt_errcat_t;
} xbt_errcat_t;
-
const char *
xbt_ex_catname(xbt_errcat_t cat);
+
XBT_PUBLIC(const char *)
xbt_ex_catname(xbt_errcat_t cat);
/** @brief Structure describing an exception */
typedef struct {
/** @brief Structure describing an exception */
typedef struct {
@@
-262,7
+254,7
@@
typedef struct {
char *host; /**< NULL locally thrown exceptions; full hostname if remote ones */
/* FIXME: host should be hostname:port[#thread] */
char *procname; /**< Name of the process who thrown this */
char *host; /**< NULL locally thrown exceptions; full hostname if remote ones */
/* FIXME: host should be hostname:port[#thread] */
char *procname; /**< Name of the process who thrown this */
-
long int pid;
/**< PID of the process who thrown this */
+
int pid;
/**< PID of the process who thrown this */
char *file; /**< Thrown point */
int line; /**< Thrown point */
char *func; /**< Thrown point */
char *file; /**< Thrown point */
int line; /**< Thrown point */
char *func; /**< Thrown point */
@@
-314,12
+306,12
@@
typedef struct {
/* the exception context */
typedef ex_ctx_t *(*ex_ctx_cb_t)(void);
/* the exception context */
typedef ex_ctx_t *(*ex_ctx_cb_t)(void);
-extern
ex_ctx_cb_t
__xbt_ex_ctx;
+extern
XBT_PUBLIC_DATA(ex_ctx_cb_t)
__xbt_ex_ctx;
extern ex_ctx_t *__xbt_ex_ctx_default(void);
/* the termination handler */
typedef void (*ex_term_cb_t)(xbt_ex_t *);
extern ex_ctx_t *__xbt_ex_ctx_default(void);
/* the termination handler */
typedef void (*ex_term_cb_t)(xbt_ex_t *);
-extern
ex_term_cb_t
__xbt_ex_terminate;
+extern
XBT_PUBLIC_DATA(ex_term_cb_t)
__xbt_ex_terminate;
extern void __xbt_ex_terminate_default(xbt_ex_t *e);
/** @brief Introduce a block where exception may be dealed with
extern void __xbt_ex_terminate_default(xbt_ex_t *e);
/** @brief Introduce a block where exception may be dealed with
@@
-416,7
+408,7
@@
extern void __xbt_ex_terminate_default(xbt_ex_t *e);
__xbt_ex_ctx()->ctx_ex.remote = 0; \
__xbt_ex_ctx()->ctx_ex.host = (char*)NULL; \
__xbt_ex_ctx()->ctx_ex.procname = (char*)xbt_procname(); \
__xbt_ex_ctx()->ctx_ex.remote = 0; \
__xbt_ex_ctx()->ctx_ex.host = (char*)NULL; \
__xbt_ex_ctx()->ctx_ex.procname = (char*)xbt_procname(); \
- __xbt_ex_ctx()->ctx_ex.pid =
gras_os_getpid();
\
+ __xbt_ex_ctx()->ctx_ex.pid =
(*xbt_getpid)();
\
__xbt_ex_ctx()->ctx_ex.file = (char*)__FILE__; \
__xbt_ex_ctx()->ctx_ex.line = __LINE__; \
__xbt_ex_ctx()->ctx_ex.func = (char*)_XBT_FUNCTION; \
__xbt_ex_ctx()->ctx_ex.file = (char*)__FILE__; \
__xbt_ex_ctx()->ctx_ex.line = __LINE__; \
__xbt_ex_ctx()->ctx_ex.func = (char*)_XBT_FUNCTION; \
@@
-510,10
+502,10
@@
extern void __xbt_ex_terminate_default(xbt_ex_t *e);
#define RETHROW5(msg,a,b,c,d,e) _XBT_PRE_RETHROW msg,a,b,c,d,e, _XBT_POST_RETHROW
/** @brief Exception destructor */
#define RETHROW5(msg,a,b,c,d,e) _XBT_PRE_RETHROW msg,a,b,c,d,e, _XBT_POST_RETHROW
/** @brief Exception destructor */
-
void
xbt_ex_free(xbt_ex_t e);
+
XBT_PUBLIC(void)
xbt_ex_free(xbt_ex_t e);
-
void
xbt_ex_display(xbt_ex_t *e);
-
void
xbt_backtrace_display(void);
+
XBT_PUBLIC(void)
xbt_ex_display(xbt_ex_t *e);
+
XBT_PUBLIC(void)
xbt_backtrace_display(void);
/** @} */
#endif /* __XBT_EX_H__ */
/** @} */
#endif /* __XBT_EX_H__ */