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
Same thing. But working, this time.
[simgrid.git]
/
src
/
xbt
/
ex.c
diff --git
a/src/xbt/ex.c
b/src/xbt/ex.c
index
97a9c33
..
37f1768
100644
(file)
--- a/
src/xbt/ex.c
+++ b/
src/xbt/ex.c
@@
-45,7
+45,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "src/
portable
.h" /* execinfo when available */
+#include "src/
internal_config
.h" /* execinfo when available */
#include "xbt/ex.h"
#include "xbt/str.h"
#include "xbt/synchro_core.h"
#include "xbt/ex.h"
#include "xbt/str.h"
#include "xbt/synchro_core.h"
@@
-57,7
+57,7
@@
#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
#undef HAVE_BACKTRACE
#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
#undef HAVE_BACKTRACE
-#if
defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN)
&& defined(ADDR2LINE)
+#if
HAVE_EXECINFO_H && HAVE_POPEN
&& defined(ADDR2LINE)
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
@@
-65,7
+65,6
@@
# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
#endif
# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
#endif
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mecanism");
XBT_EXPORT_NO_IMPORT(const xbt_running_ctx_t) __xbt_ex_ctx_initializer = XBT_RUNNING_CTX_INITIALIZER;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mecanism");
XBT_EXPORT_NO_IMPORT(const xbt_running_ctx_t) __xbt_ex_ctx_initializer = XBT_RUNNING_CTX_INITIALIZER;
@@
-120,10
+119,8
@@
void xbt_backtrace_display_current(void)
xbt_backtrace_display(&e);
}
xbt_backtrace_display(&e);
}
-#if
defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN)
&& defined(ADDR2LINE)
+#if
HAVE_EXECINFO_H && HAVE_POPEN
&& defined(ADDR2LINE)
# include "src/xbt/backtrace_linux.c"
# include "src/xbt/backtrace_linux.c"
-#elif (defined(_WIN32) && defined (_M_IX86)) && !defined(__GNUC__)
-# include "src/xbt/backtrace_windows.c"
#else
# include "src/xbt/backtrace_dummy.c"
#endif
#else
# include "src/xbt/backtrace_dummy.c"
#endif
@@
-135,12
+132,10
@@
void xbt_ex_display(xbt_ex_t * e)
if (e->pid != xbt_getpid())
thrower = bprintf(" on process %d",e->pid);
if (e->pid != xbt_getpid())
thrower = bprintf(" on process %d",e->pid);
- fprintf(stderr,
- "** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
+ fprintf(stderr, "** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
"** %s\n"
"** Thrown by %s()%s\n",
"** %s\n"
"** Thrown by %s()%s\n",
- xbt_binary_name, xbt_getpid(),
- xbt_ex_catname(e->category), e->value, e->msg,
+ xbt_binary_name, xbt_getpid(), xbt_ex_catname(e->category), e->value, e->msg,
e->procname, thrower ? thrower : " in this process");
XBT_CRITICAL("%s", e->msg);
xbt_free(thrower);
e->procname, thrower ? thrower : " in this process");
XBT_CRITICAL("%s", e->msg);
xbt_free(thrower);
@@
-185,7
+180,6
@@
void xbt_ex_display(xbt_ex_t * e)
fprintf(stderr, "%s\n", e->bt_strings[i]);
}
}
fprintf(stderr, "%s\n", e->bt_strings[i]);
}
}
-
} else
#endif
fprintf(stderr, "\n"
} else
#endif
fprintf(stderr, "\n"
@@
-193,7
+187,6
@@
void xbt_ex_display(xbt_ex_t * e)
"** (no backtrace available)\n", e->func, e->file, e->line);
}
"** (no backtrace available)\n", e->func, e->file, e->line);
}
-
/* default __ex_terminate callback function */
void __xbt_ex_terminate_default(xbt_ex_t * e)
{
/* default __ex_terminate callback function */
void __xbt_ex_terminate_default(xbt_ex_t * e)
{
@@
-205,7
+198,6
@@
void __xbt_ex_terminate_default(xbt_ex_t * e)
XBT_EXPORT_NO_IMPORT(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch = &__xbt_ex_ctx_default;
XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
XBT_EXPORT_NO_IMPORT(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch = &__xbt_ex_ctx_default;
XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
-
void xbt_ex_free(xbt_ex_t e)
{
free(e.msg);
void xbt_ex_free(xbt_ex_t e)
{
free(e.msg);
@@
-249,12
+241,10
@@
const char *xbt_ex_catname(xbt_errcat_t cat)
return "io error";
case vm_error:
return "vm error";
return "io error";
case vm_error:
return "vm error";
-
}
return "INVALID ERROR";
}
}
return "INVALID ERROR";
}
-
#ifdef SIMGRID_TEST
#include <stdio.h>
#include "xbt/ex.h"
#ifdef SIMGRID_TEST
#include <stdio.h>
#include "xbt/ex.h"
@@
-277,8
+267,7
@@
XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow")
xbt_test_fail("M2: n=%d (!= 2)", n);
n++;
THROWF(unknown_error, 0, "something");
xbt_test_fail("M2: n=%d (!= 2)", n);
n++;
THROWF(unknown_error, 0, "something");
- }
- CATCH(ex) {
+ } CATCH(ex) {
if (n != 3)
xbt_test_fail("M3: n=%d (!= 3)", n);
n++;
if (n != 3)
xbt_test_fail("M3: n=%d (!= 3)", n);
n++;
@@
-290,8
+279,7
@@
XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow")
xbt_test_fail("M2: n=%d (!= 5)", n);
n++;
THROWF(unknown_error, 0, "something");
xbt_test_fail("M2: n=%d (!= 5)", n);
n++;
THROWF(unknown_error, 0, "something");
- }
- CATCH_ANONYMOUS {
+ } CATCH_ANONYMOUS {
if (n != 6)
xbt_test_fail("M3: n=%d (!= 6)", n);
n++;
if (n != 6)
xbt_test_fail("M3: n=%d (!= 6)", n);
n++;
@@
-299,8
+287,7
@@
XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow")
n++;
}
xbt_test_fail("MX: n=%d (shouldn't reach this point)", n);
n++;
}
xbt_test_fail("MX: n=%d (shouldn't reach this point)", n);
- }
- CATCH(ex) {
+ } CATCH(ex) {
if (n != 7)
xbt_test_fail("M4: n=%d (!= 7)", n);
n++;
if (n != 7)
xbt_test_fail("M4: n=%d (!= 7)", n);
n++;
@@
-316,8
+303,7
@@
XBT_TEST_UNIT("value", test_value, "exception value passing")
TRY {
THROWF(unknown_error, 2, "toto");
TRY {
THROWF(unknown_error, 2, "toto");
- }
- CATCH(ex) {
+ } CATCH(ex) {
xbt_test_add("exception value passing");
if (ex.category != unknown_error)
xbt_test_fail("category=%d (!= 1)", (int)ex.category);
xbt_test_add("exception value passing");
if (ex.category != unknown_error)
xbt_test_fail("category=%d (!= 1)", (int)ex.category);
@@
-342,8
+328,7
@@
XBT_TEST_UNIT("variables", test_variables, "variable value preservation")
r2 = 5678;
v2 = 5678;
THROWF(unknown_error, 0, "toto");
r2 = 5678;
v2 = 5678;
THROWF(unknown_error, 0, "toto");
- }
- CATCH(ex) {
+ } CATCH(ex) {
xbt_test_add("variable preservation");
if (r1 != 1234)
xbt_test_fail("r1=%d (!= 1234)", r1);
xbt_test_add("variable preservation");
if (r1 != 1234)
xbt_test_fail("r1=%d (!= 1234)", r1);
@@
-374,8
+359,7
@@
XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling")
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
c = 1;
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
c = 1;
- }
- CATCH(ex) {
+ } CATCH(ex) {
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg, "blah")))
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg, "blah")))
@@
-386,7
+370,6
@@
XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling")
xbt_test_fail("xbt_ex_free not executed");
}
xbt_test_fail("xbt_ex_free not executed");
}
-
/*
* The following is the example included in the documentation. It's a good
* idea to check its syntax even if we don't try to run it.
/*
* The following is the example included in the documentation. It's a good
* idea to check its syntax even if we don't try to run it.