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
kill windows backtraces. They were x86 only
[simgrid.git]
/
src
/
xbt
/
ex.c
diff --git
a/src/xbt/ex.c
b/src/xbt/ex.c
index
680b110
..
7db2ce5
100644
(file)
--- a/
src/xbt/ex.c
+++ b/
src/xbt/ex.c
@@
-61,7
+61,7
@@
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
-#if defined(_
XBT_
WIN32) && defined(_M_IX86) && !defined(__GNUC__)
+#if defined(_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
#endif
# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
#endif
@@
-99,11
+99,8
@@
void xbt_backtrace_display(xbt_ex_t * e)
if (e->used == 0) {
fprintf(stderr, "(backtrace not set)\n");
} else {
if (e->used == 0) {
fprintf(stderr, "(backtrace not set)\n");
} else {
- int i;
-
- fprintf(stderr, "Backtrace (displayed in process %s):\n",
- SIMIX_process_self_get_name());
- for (i = 1; i < e->used; i++) /* no need to display "xbt_backtrace_display" */
+ fprintf(stderr, "Backtrace (displayed in process %s):\n", SIMIX_process_self_get_name());
+ for (int i = 1; i < e->used; i++) /* no need to display "xbt_backtrace_display" */
fprintf(stderr, "---> %s\n", e->bt_strings[i] + 4);
}
fprintf(stderr, "---> %s\n", e->bt_strings[i] + 4);
}
@@
-111,7
+108,6
@@
void xbt_backtrace_display(xbt_ex_t * e)
e->msg = NULL;
xbt_ex_free(*e);
#else
e->msg = NULL;
xbt_ex_free(*e);
#else
-
XBT_ERROR("No backtrace on this arch");
#endif
}
XBT_ERROR("No backtrace on this arch");
#endif
}
@@
-126,8
+122,6
@@
void xbt_backtrace_display_current(void)
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
# include "src/xbt/backtrace_linux.c"
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
# include "src/xbt/backtrace_linux.c"
-#elif (defined(_XBT_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
@@
-192,13
+186,9
@@
void xbt_ex_display(xbt_ex_t * e)
} else
#endif
} else
#endif
- {
- fprintf(stderr,
- "\n"
- "** In %s() at %s:%d\n"
- "** (no backtrace available)\n",
- e->func, e->file, e->line);
- }
+ fprintf(stderr, "\n"
+ "** In %s() at %s:%d\n"
+ "** (no backtrace available)\n", e->func, e->file, e->line);
}
}
@@
-216,16
+206,13
@@
XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_defa
void xbt_ex_free(xbt_ex_t e)
{
void xbt_ex_free(xbt_ex_t e)
{
- int i;
-
free(e.msg);
if (e.bt_strings) {
free(e.msg);
if (e.bt_strings) {
- for (i = 0; i < e.used; i++)
+ for (i
nt i
= 0; i < e.used; i++)
free(e.bt_strings[i]);
free(e.bt_strings);
}
free(e.bt_strings[i]);
free(e.bt_strings);
}
- /* memset(e,0,sizeof(xbt_ex_t)); */
}
/** \brief returns a short name for the given exception category */
}
/** \brief returns a short name for the given exception category */