This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/refactor_bundle_cache
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/refactor_bundle_cache
by this push:
new 5233dabb Replace CELIX_EI_IMPL0 by CELIX_EI_IMPL.
5233dabb is described below
commit 5233dabb98df2127f577566ec81e011ba1daeb98
Author: PengZheng <[email protected]>
AuthorDate: Tue Feb 21 22:04:05 2023 +0800
Replace CELIX_EI_IMPL0 by CELIX_EI_IMPL.
---
libs/error_injector/api/celix_error_injector.h | 34 ----------------------
.../celix_properties/src/celix_properties_ei.cc | 2 +-
.../celix_utils/src/celix_utils_ei.cc | 2 +-
libs/error_injector/malloc/src/malloc_ei.cc | 6 ++--
4 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/libs/error_injector/api/celix_error_injector.h
b/libs/error_injector/api/celix_error_injector.h
index 7d276511..a0055b32 100644
--- a/libs/error_injector/api/celix_error_injector.h
+++ b/libs/error_injector/api/celix_error_injector.h
@@ -60,40 +60,6 @@ void celix_ei_expect_##name(void *caller, unsigned int
level, ret_type ret, size
name ## _ordinal = (ordinal);
\
}
-
-#define CELIX_EI_IMPL0(name)
\
-do {
\
- void *addr = CELIX_EI_UNKNOWN_CALLER;
\
- if(name##_caller) {
\
- if(name ## _caller != CELIX_EI_UNKNOWN_CALLER) {
\
- /* we can not use CELIX_EI_GET_CALLER(addr, name ## _caller_level)
*/ \
- switch(name ## _caller_level) {
\
- case 0:
\
- CELIX_EI_GET_CALLER(addr, 0);
\
- break;
\
- case 1:
\
- CELIX_EI_GET_CALLER(addr, 1);
\
- break;
\
- case 2:
\
- CELIX_EI_GET_CALLER(addr, 2);
\
- break;
\
- case 3:
\
- CELIX_EI_GET_CALLER(addr, 3);
\
- break;
\
- case 4:
\
- CELIX_EI_GET_CALLER(addr, 4);
\
- break;
\
- default:
\
- assert(0);
\
- }
\
- }
\
- if(name ## _caller == addr) {
\
- if(__atomic_fetch_sub(&(name ## _ordinal), 1, __ATOMIC_RELAXED) ==
1 && name ## _ret == 0) \
- return name ## _ret;
\
- }
\
- }
\
-} while(0)
-
#define CELIX_EI_IMPL(name)
\
do {
\
void *addr = CELIX_EI_UNKNOWN_CALLER;
\
diff --git a/libs/error_injector/celix_properties/src/celix_properties_ei.cc
b/libs/error_injector/celix_properties/src/celix_properties_ei.cc
index a9f973e2..cd5129a6 100644
--- a/libs/error_injector/celix_properties/src/celix_properties_ei.cc
+++ b/libs/error_injector/celix_properties/src/celix_properties_ei.cc
@@ -23,7 +23,7 @@ extern "C" {
void *__real_celix_properties_create(void);
CELIX_EI_DEFINE(celix_properties_create, celix_properties_t*)
void *__wrap_celix_properties_create(void) {
- CELIX_EI_IMPL0(celix_properties_create);
+ CELIX_EI_IMPL(celix_properties_create);
return __real_celix_properties_create();
}
}
\ No newline at end of file
diff --git a/libs/error_injector/celix_utils/src/celix_utils_ei.cc
b/libs/error_injector/celix_utils/src/celix_utils_ei.cc
index 7c09b97e..85645667 100644
--- a/libs/error_injector/celix_utils/src/celix_utils_ei.cc
+++ b/libs/error_injector/celix_utils/src/celix_utils_ei.cc
@@ -25,7 +25,7 @@ extern "C" {
char* __real_celix_utils_strdup(const char *);
CELIX_EI_DEFINE(celix_utils_strdup, char*)
char* __wrap_celix_utils_strdup(const char* str) {
- CELIX_EI_IMPL0(celix_utils_strdup);
+ CELIX_EI_IMPL(celix_utils_strdup);
return __real_celix_utils_strdup(str);
}
diff --git a/libs/error_injector/malloc/src/malloc_ei.cc
b/libs/error_injector/malloc/src/malloc_ei.cc
index 5d222284..7d932e59 100644
--- a/libs/error_injector/malloc/src/malloc_ei.cc
+++ b/libs/error_injector/malloc/src/malloc_ei.cc
@@ -23,21 +23,21 @@ extern "C" {
void *__real_malloc(size_t);
CELIX_EI_DEFINE(malloc, void *)
void *__wrap_malloc(size_t size) {
- CELIX_EI_IMPL0(malloc);
+ CELIX_EI_IMPL(malloc);
return __real_malloc(size);
}
void *__real_realloc(void *__ptr, size_t __size);
CELIX_EI_DEFINE(realloc, void *)
void *__wrap_realloc(void *__ptr, size_t __size) {
- CELIX_EI_IMPL0(realloc);
+ CELIX_EI_IMPL(realloc);
return __real_realloc(__ptr, __size);
}
void *__real_calloc (size_t __nmemb, size_t __size);
CELIX_EI_DEFINE(calloc, void *)
void *__wrap_calloc (size_t __nmemb, size_t __size) {
- CELIX_EI_IMPL0(calloc);
+ CELIX_EI_IMPL(calloc);
return __real_calloc(__nmemb, __size);
}
}
\ No newline at end of file
