d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: resolve name collision on Windows

Browse Source 
Add prefix to resolve name collision on Windows.

Signed-off-by: Jie Zhou <jizh@linux.microsoft.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
This commit is contained in:
Jie Zhou 2022-01-25 21:10:41 -08:00 committed by Thomas Monjalon
parent a089d32033
commit f684672947
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/test/test_hash_perf.c
View File

@ -30,10 +30,10 @@
#define BURST_SIZE 16
enum operations {
ADD = 0,
LOOKUP,
LOOKUP_MULTI,
DELETE,
OP_ADD = 0,
OP_LOOKUP,
OP_LOOKUP_MULTI,
OP_DELETE,
NUM_OPERATIONS
};
@ -308,7 +308,7 @@ timed_adds(unsigned int with_hash, unsigned int with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
cycles[table_index][ADD][with_hash][with_data] = time_taken/keys_to_add;
cycles[table_index][OP_ADD][with_hash][with_data] = time_taken/keys_to_add;
return 0;
}
@ -385,7 +385,7 @@ timed_lookups(unsigned int with_hash, unsigned int with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
cycles[table_index][LOOKUP][with_hash][with_data] = time_taken/num_lookups;
cycles[table_index][OP_LOOKUP][with_hash][with_data] = time_taken/num_lookups;
return 0;
}
@ -511,7 +511,7 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
cycles[table_index][LOOKUP_MULTI][with_hash][with_data] =
cycles[table_index][OP_LOOKUP_MULTI][with_hash][with_data] =
time_taken/num_lookups;
return 0;
@ -550,7 +550,7 @@ timed_deletes(unsigned int with_hash, unsigned int with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
cycles[table_index][DELETE][with_hash][with_data] = time_taken/keys_to_add;
cycles[table_index][OP_DELETE][with_hash][with_data] = time_taken/keys_to_add;
return 0;
}

30
app/test/test_lcores.c
View File

@ -12,7 +12,7 @@
#include "test.h"
struct thread_context {
enum { INIT, ERROR, DONE } state;
enum { Thread_INIT, Thread_ERROR, Thread_DONE } state;
bool lcore_id_any;
pthread_t id;
unsigned int *registered_count;
@ -26,7 +26,7 @@ static void *thread_loop(void *arg)
lcore_id = rte_lcore_id();
if (lcore_id != LCORE_ID_ANY) {
printf("Error: incorrect lcore id for new thread %u\n", lcore_id);
t->state = ERROR;
t->state = Thread_ERROR;
}
if (rte_thread_register() < 0)
printf("Warning: could not register new thread (this might be expected during this test), reason %s\n",
@ -36,7 +36,7 @@ static void *thread_loop(void *arg)
(!t->lcore_id_any && lcore_id == LCORE_ID_ANY)) {
printf("Error: could not register new thread, got %u while %sexpecting %u\n",
lcore_id, t->lcore_id_any ? "" : "not ", LCORE_ID_ANY);
t->state = ERROR;
t->state = Thread_ERROR;
}
/* Report register happened to the control thread. */
__atomic_add_fetch(t->registered_count, 1, __ATOMIC_RELEASE);
@ -49,11 +49,11 @@ static void *thread_loop(void *arg)
if (lcore_id != LCORE_ID_ANY) {
printf("Error: could not unregister new thread, %u still assigned\n",
lcore_id);
t->state = ERROR;
t->state = Thread_ERROR;
}
if (t->state != ERROR)
t->state = DONE;
if (t->state != Thread_ERROR)
t->state = Thread_DONE;
return NULL;
}
@ -74,7 +74,7 @@ test_non_eal_lcores(unsigned int eal_threads_count)
/* Try to create as many threads as possible. */
for (i = 0; i < RTE_MAX_LCORE - eal_threads_count; i++) {
t = &thread_contexts[i];
t->state = INIT;
t->state = Thread_INIT;
t->registered_count = &registered_count;
t->lcore_id_any = false;
if (pthread_create(&t->id, NULL, thread_loop, t) != 0)
@ -93,7 +93,7 @@ test_non_eal_lcores(unsigned int eal_threads_count)
if (eal_threads_count + non_eal_threads_count < RTE_MAX_LCORE)
goto skip_lcore_any;
t = &thread_contexts[non_eal_threads_count];
t->state = INIT;
t->state = Thread_INIT;
t->registered_count = &registered_count;
t->lcore_id_any = true;
if (pthread_create(&t->id, NULL, thread_loop, t) == 0) {
@ -111,7 +111,7 @@ skip_lcore_any:
for (i = 0; i < non_eal_threads_count; i++) {
t = &thread_contexts[i];
pthread_join(t->id, NULL);
if (t->state != DONE)
if (t->state != Thread_DONE)
ret = -1;
}
@ -259,7 +259,7 @@ test_non_eal_lcores_callback(unsigned int eal_threads_count)
}
/* First thread that expects a valid lcore id. */
t = &thread_contexts[0];
t->state = INIT;
t->state = Thread_INIT;
t->registered_count = &registered_count;
t->lcore_id_any = false;
if (pthread_create(&t->id, NULL, thread_loop, t) != 0)
@ -282,7 +282,7 @@ test_non_eal_lcores_callback(unsigned int eal_threads_count)
}
/* Second thread, that expects LCORE_ID_ANY because of init refusal. */
t = &thread_contexts[1];
t->state = INIT;
t->state = Thread_INIT;
t->registered_count = &registered_count;
t->lcore_id_any = true;
if (pthread_create(&t->id, NULL, thread_loop, t) != 0)
@ -310,7 +310,7 @@ test_non_eal_lcores_callback(unsigned int eal_threads_count)
for (i = 0; i < non_eal_threads_count; i++) {
t = &thread_contexts[i];
pthread_join(t->id, NULL);
if (t->state != DONE)
if (t->state != Thread_DONE)
ret = -1;
}
if (ret < 0)
@ -347,7 +347,7 @@ static void *ctrl_thread_loop(void *arg)
printf("Control thread running successfully\n");
/* Set the thread state to DONE */
t->state = DONE;
t->state = Thread_DONE;
return NULL;
}
@ -360,7 +360,7 @@ test_ctrl_thread(void)
/* Create one control thread */
t = &ctrl_thread_context;
t->state = INIT;
t->state = Thread_INIT;
if (rte_ctrl_thread_create(&t->id, "test_ctrl_threads",
NULL, ctrl_thread_loop, t) != 0)
return -1;
@ -372,7 +372,7 @@ test_ctrl_thread(void)
pthread_join(t->id, NULL);
/* Check if the control thread set the correct state */
if (t->state != DONE)
if (t->state != Thread_DONE)
return -1;
return 0;