diff options
Diffstat (limited to 'examples/performance-thread/common')
7 files changed, 8 insertions, 21 deletions
diff --git a/examples/performance-thread/common/lthread.c b/examples/performance-thread/common/lthread.c index 8fbff737..062275a4 100644 --- a/examples/performance-thread/common/lthread.c +++ b/examples/performance-thread/common/lthread.c @@ -143,7 +143,7 @@ struct lthread_stack *_stack_alloc(void) struct lthread_stack *s; s = _lthread_objcache_alloc((THIS_SCHED)->stack_cache); - LTHREAD_ASSERT(s != NULL); + RTE_ASSERT(s != NULL); s->root_sched = THIS_SCHED; s->stack_size = LTHREAD_MAX_STACK_SIZE; diff --git a/examples/performance-thread/common/lthread_int.h b/examples/performance-thread/common/lthread_int.h index c8357f4a..b858b55e 100644 --- a/examples/performance-thread/common/lthread_int.h +++ b/examples/performance-thread/common/lthread_int.h @@ -197,16 +197,4 @@ struct lthread { uint64_t diag_ref; /* ref to user diag data */ } __rte_cache_aligned; -/* - * Assert - */ -#if LTHREAD_DIAG -#define LTHREAD_ASSERT(expr) do { \ - if (!(expr)) \ - rte_panic("line%d\tassert \"" #expr "\" failed\n", __LINE__);\ -} while (0) -#else -#define LTHREAD_ASSERT(expr) do {} while (0) -#endif - #endif /* LTHREAD_INT_H */ diff --git a/examples/performance-thread/common/lthread_mutex.c b/examples/performance-thread/common/lthread_mutex.c index af8b82d2..c1bc6271 100644 --- a/examples/performance-thread/common/lthread_mutex.c +++ b/examples/performance-thread/common/lthread_mutex.c @@ -170,7 +170,6 @@ int lthread_mutex_lock(struct lthread_mutex *m) _suspend(); /* resumed, must loop and compete for the lock again */ } - LTHREAD_ASSERT(0); return 0; } @@ -231,7 +230,7 @@ int lthread_mutex_unlock(struct lthread_mutex *m) if (unblocked != NULL) { rte_atomic64_dec(&m->count); DIAG_EVENT(m, LT_DIAG_MUTEX_UNLOCKED, m, unblocked); - LTHREAD_ASSERT(unblocked->sched != NULL); + RTE_ASSERT(unblocked->sched != NULL); _ready_queue_insert((struct lthread_sched *) unblocked->sched, unblocked); break; diff --git a/examples/performance-thread/common/lthread_pool.h b/examples/performance-thread/common/lthread_pool.h index a5f32515..27680eab 100644 --- a/examples/performance-thread/common/lthread_pool.h +++ b/examples/performance-thread/common/lthread_pool.h @@ -138,14 +138,14 @@ _qnode_pool_create(const char *name, int prealloc_size) { RTE_CACHE_LINE_SIZE, rte_socket_id()); - LTHREAD_ASSERT(p); + RTE_ASSERT(p); p->stub = rte_malloc_socket(NULL, sizeof(struct qnode), RTE_CACHE_LINE_SIZE, rte_socket_id()); - LTHREAD_ASSERT(p->stub); + RTE_ASSERT(p->stub); if (name != NULL) strncpy(p->name, name, LT_MAX_NAME_SIZE); diff --git a/examples/performance-thread/common/lthread_queue.h b/examples/performance-thread/common/lthread_queue.h index 0c395167..2c55fcec 100644 --- a/examples/performance-thread/common/lthread_queue.h +++ b/examples/performance-thread/common/lthread_queue.h @@ -129,7 +129,7 @@ _lthread_queue_create(const char *name) /* allocated stub node */ stub = _qnode_alloc(); - LTHREAD_ASSERT(stub); + RTE_ASSERT(stub); if (name != NULL) strncpy(new_queue->name, name, sizeof(new_queue->name)); diff --git a/examples/performance-thread/common/lthread_sched.c b/examples/performance-thread/common/lthread_sched.c index 7c40bc05..c64c21ff 100644 --- a/examples/performance-thread/common/lthread_sched.c +++ b/examples/performance-thread/common/lthread_sched.c @@ -268,7 +268,7 @@ struct lthread_sched *_lthread_sched_create(size_t stack_size) struct lthread_sched *new_sched; unsigned lcoreid = rte_lcore_id(); - LTHREAD_ASSERT(stack_size <= LTHREAD_MAX_STACK_SIZE); + RTE_ASSERT(stack_size <= LTHREAD_MAX_STACK_SIZE); if (stack_size == 0) stack_size = LTHREAD_MAX_STACK_SIZE; diff --git a/examples/performance-thread/common/lthread_tls.c b/examples/performance-thread/common/lthread_tls.c index 43cda4ff..6876f831 100644 --- a/examples/performance-thread/common/lthread_tls.c +++ b/examples/performance-thread/common/lthread_tls.c @@ -94,7 +94,7 @@ void _lthread_key_pool_init(void) pool = rte_ring_create(name, LTHREAD_MAX_KEYS, 0, 0); - LTHREAD_ASSERT(pool); + RTE_ASSERT(pool); int i; @@ -240,7 +240,7 @@ void _lthread_tls_alloc(struct lthread *lt) tls = _lthread_objcache_alloc((THIS_SCHED)->tls_cache); - LTHREAD_ASSERT(tls != NULL); + RTE_ASSERT(tls != NULL); tls->root_sched = (THIS_SCHED); lt->tls = tls; |