ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vppinfra: fix spinlock and rwlock tests

Browse Source 
Type: fix

Change-Id: I67b72b5ad03b972198c27bc0d927867f41b0e20b
Signed-off-by: Florin Coras <fcoras@cisco.com>
This commit is contained in:
Florin Coras
2019-08-01 10:54:06 -07:00
committed by Florin Coras
parent 3b9374fa57
commit 4f9446444d
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vppinfra/CMakeLists.txt
View File

@@ -255,7 +255,7 @@ if(VPP_BUILD_VPPINFRA_TESTS)
)
add_vpp_executable(test_${test}
SOURCES test_${test}.c
LINK_LIBRARIES vppinfra
LINK_LIBRARIES vppinfra pthread
)
endforeach()

18
src/vppinfra/test_rwlock.c
View File

@@ -110,12 +110,12 @@ test_rwlock (rwlock_test_main_t * rtm, f64 * elapse_time)
for (uword t_num = 0; t_num < rtm->threads_per_core; t_num++)
{
uword t_index = cores_set * rtm->threads_per_core + t_num;
if (error = pthread_create (&pthread[t_index], NULL,
&read_shared_counter, rtm))
if ((error = pthread_create (&pthread[t_index], NULL,
&read_shared_counter, rtm)))
clib_unix_warning ("pthread_create failed with %d", error);
if (error = pthread_setaffinity_np (pthread[t_index],
sizeof (cpu_set_t), &cpuset))
if ((error = pthread_setaffinity_np (pthread[t_index],
sizeof (cpu_set_t), &cpuset)))
clib_unix_warning ("pthread_set_affinity_np failed with %d",
error);
}
@@ -138,12 +138,12 @@ test_rwlock (rwlock_test_main_t * rtm, f64 * elapse_time)
for (uword t_num = 0; t_num < rtm->threads_per_core; t_num++)
{
uword t_index = cores_set * rtm->threads_per_core + t_num;
if (error = pthread_create (&pthread[t_index], NULL,
&write_shared_counter, rtm))
if ((error = pthread_create (&pthread[t_index], NULL,
&write_shared_counter, rtm)))
clib_unix_warning ("pthread_create failed with %d", error);
if (error = pthread_setaffinity_np (pthread[t_index],
sizeof (cpu_set_t), &cpuset))
if ((error = pthread_setaffinity_np (pthread[t_index],
sizeof (cpu_set_t), &cpuset)))
clib_unix_warning ("pthread_set_affinity_np failed with %d",
error);
}
@@ -157,7 +157,7 @@ test_rwlock (rwlock_test_main_t * rtm, f64 * elapse_time)
for (uword thread_num = 0; thread_num < total_threads; thread_num++)
{
f64 *time;
if (error = pthread_join (pthread[thread_num], (void *) &time))
if ((error = pthread_join (pthread[thread_num], (void *) &time)))
clib_unix_warning ("pthread_join failed with %d", error);
*elapse_time += *time;
vec_free (time);

10
src/vppinfra/test_spinlock.c
View File

@@ -84,12 +84,12 @@ test_spinlock (spinlock_test_main_t * stm, f64 * elapse_time)
for (uword t_num = 0; t_num < stm->threads_per_core; t_num++)
{
uword t_index = cores_set * stm->threads_per_core + t_num;
if (error = pthread_create (&pthread[t_index], NULL,
&inc_shared_counter, stm))
if ((error = pthread_create (&pthread[t_index], NULL,
&inc_shared_counter, stm)))
clib_unix_warning ("pthread_create failed with %d", error);
if (error = pthread_setaffinity_np (pthread[t_index],
sizeof (cpu_set_t), &cpuset))
if ((error = pthread_setaffinity_np (pthread[t_index],
sizeof (cpu_set_t), &cpuset)))
clib_unix_warning ("pthread_setaffinity_np failed with %d",
error);
}
@@ -103,7 +103,7 @@ test_spinlock (spinlock_test_main_t * stm, f64 * elapse_time)
for (uword thread_num = 0; thread_num < num_threads; thread_num++)
{
f64 *time;
if (error = pthread_join (pthread[thread_num], (void *) &time))
if ((error = pthread_join (pthread[thread_num], (void *) &time)))
clib_unix_warning ("pthread_join failed with %d", error);
*elapse_time += *time;
vec_free (time);