diff options
| author | Mike Holmes <mike.holmes@linaro.org> | 2015-02-03 06:35:26 -0500 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-02-03 17:31:10 +0300 |
| commit | de37ffa4c410569db9e2921328eb8b8194134c46 (patch) | |
| tree | 105834cd9cbf1f8c55a890cd64471ea7d8575eeb /platform | |
| parent | 04a00b80e1a8a4bdbab5adf8612a01162ba0ad8f (diff) | |
api: abort: use globaly stored abort function
Use the abort function stored in the global data structure.
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
Reviewed-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linux-generic/include/odp_debug_internal.h | 4 | ||||
| -rw-r--r-- | platform/linux-generic/include/odp_internal.h | 1 | ||||
| -rw-r--r-- | platform/linux-generic/odp_init.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h index 20b6fcc..2b643eb 100644 --- a/platform/linux-generic/include/odp_debug_internal.h +++ b/platform/linux-generic/include/odp_debug_internal.h @@ -54,7 +54,7 @@ extern "C" { #define ODP_ASSERT(cond, msg) \ do { if ((ODP_DEBUG == 1) && (!(cond))) { \ ODP_ERR("%s\n", msg); \ - odp_override_abort(); } \ + odp_global_data.abort_fn(); } \ } while (0) /** @@ -86,7 +86,7 @@ extern "C" { #define ODP_ABORT(fmt, ...) \ do { \ ODP_LOG(ODP_LOG_ABORT, fmt, ##__VA_ARGS__); \ - odp_override_abort(); \ + odp_global_data.abort_fn(); \ } while (0) /** diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 608aafd..9a6e29d 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -22,6 +22,7 @@ extern "C" { struct odp_global_data { odp_log_func_t log_fn; + odp_abort_func_t abort_fn; } odp_global_data; int odp_system_info_init(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 6db05b3..e91e910 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -14,6 +14,7 @@ int odp_init_global(odp_init_t *params ODP_UNUSED, odp_platform_init_t *platform_params ODP_UNUSED) { odp_global_data.log_fn = odp_override_log; + odp_global_data.abort_fn = odp_override_abort; if (params != NULL) { if (params->log_fn != NULL) |