Skip to content

T
Third Party Musl

OpenHarmony / Third Party Musl
接近 2 年 前同步成功

通知 37
Star 125
Fork 0
T
Third Party Musl
提交 5d23772f 编写于 作者: G ganlan
浏览文件
操作

fix libctest err cases 

Signed-off-by: Nganlan <tony.gan@huawei.com>
上级 de1044a3
隐藏空白更改
内联 并排
Showing with 6 addition and 99 deletion
libc-test/src/functionalext/common/pthread_util.h
浏览文件 @ 5d23772f
......@@ -85,24 +85,4 @@ static inline void Msleep(int msec)
usleep(msec * MS_PER_S);
}
static inline uint64_t CheckStep(int value)
{
if (value == 1) {
shmctl(SHMID_CHECK_STEP, IPC_RMID, NULL);
SHMID_CHECK_STEP = shmget(IPC_PRIVATE, ONE_KB, FLAG | IPC_CREAT);
}
if (SHMID_CHECK_STEP != -1) {
uint64_t *shared = (uint64_t *)shmat(SHMID_CHECK_STEP, NULL, 0);
if (value == 1) {
*shared = 1;
} else {
*shared = (*shared << CARRY) + value;
}
uint64_t state = *shared;
shmdt(shared);
return state;
}
return 0;
}
#endif // __FUNCTIONALEXT_PTHREAD_UTIL_H__
\ No newline at end of file
libc-test/src/functionalext/thread/pthread_cond_timedwait.c
浏览文件 @ 5d23772f
......@@ -190,7 +190,6 @@ static void *ClockWaitTimedwait1(void *arg)
{
Msleep(SLEEP_50_MS);
EXPECT_EQ(pthread_mutex_lock(&c_mtx1), 0);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_mutex_unlock(&c_mtx1), 0);
EXPECT_EQ(pthread_cond_signal(&c_cond1), 0);
return arg;
......@@ -209,7 +208,6 @@ static void *ClockWaitTimedwait2(void *arg)
clockid_t clock_id = CLOCK_REALTIME;
EXPECT_EQ(pthread_cond_clockwait(&c_cond1, &c_mtx1, clock_id, &ts), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_mutex_unlock(&c_mtx1), 0);
return arg;
}
......@@ -223,7 +221,6 @@ void clockwait_timedwait_0010(void)
{
pthread_t tid1;
pthread_t tid2;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid1, NULL, ClockWaitTimedwait1, NULL), 0);
EXPECT_EQ(pthread_create(&tid2, NULL, ClockWaitTimedwait2, NULL), 0);
Msleep(SLEEP_100_MS);
......@@ -231,7 +228,6 @@ void clockwait_timedwait_0010(void)
pthread_join(tid2, NULL);
EXPECT_EQ(pthread_cond_destroy(&c_cond1), 0);
EXPECT_EQ(pthread_mutex_destroy(&c_mtx1), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
}
static void *ClockWaitTimeOut(void *arg)
......@@ -243,7 +239,6 @@ static void *ClockWaitTimeOut(void *arg)
clockid_t clock_id = CLOCK_REALTIME;
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, clock_id);
EXPECT_EQ(pthread_cond_clockwait(&c_cond2, &c_mtx1, clock_id, &ts), ETIMEDOUT);
CheckStep(CHECK_STEP_TWO);
clock_gettime(CLOCK_REALTIME, &tsNow);
int timeDiff = GetTimeDiff(tsNow, ts);
......@@ -262,20 +257,17 @@ static void *ClockWaitTimeOut(void *arg)
void clockwait_timedwait_0020(void)
{
pthread_t tid;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid, NULL, ClockWaitTimeOut, NULL), 0);
Msleep(SLEEP_200_MS);
pthread_join(tid, NULL);
EXPECT_EQ(pthread_cond_destroy(&c_cond2), 0);
EXPECT_EQ(pthread_mutex_destroy(&c_mtx2), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_THREE), (uint64_t)0x123);
}
static void *ClockWaitTimedwait3(void *arg)
{
Msleep(SLEEP_50_MS);
EXPECT_EQ(pthread_mutex_lock(&c_mtx3), 0);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_mutex_unlock(&c_mtx3), 0);
EXPECT_EQ(pthread_cond_signal(&c_cond3), 0);
return arg;
......@@ -294,7 +286,6 @@ static void *ClockWaitTimedwait4(void *arg)
clockid_t clock_id = CLOCK_MONOTONIC;
EXPECT_EQ(pthread_cond_clockwait(&c_cond3, &c_mtx3, clock_id, &ts), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_mutex_unlock(&c_mtx3), 0);
return arg;
}
......@@ -308,7 +299,6 @@ void clockwait_timedwait_0030(void)
{
pthread_t tid1;
pthread_t tid2;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid1, NULL, ClockWaitTimedwait3, NULL), 0);
EXPECT_EQ(pthread_create(&tid2, NULL, ClockWaitTimedwait4, NULL), 0);
Msleep(SLEEP_100_MS);
......@@ -316,7 +306,6 @@ void clockwait_timedwait_0030(void)
pthread_join(tid2, NULL);
EXPECT_EQ(pthread_cond_destroy(&c_cond3), 0);
EXPECT_EQ(pthread_mutex_destroy(&c_mtx3), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
}
static void *ClockWaitTimeOut2(void *arg)
......@@ -328,7 +317,6 @@ static void *ClockWaitTimeOut2(void *arg)
clockid_t clock_id = CLOCK_MONOTONIC;
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, clock_id);
EXPECT_EQ(pthread_cond_clockwait(&c_cond2, &c_mtx1, clock_id, &ts), ETIMEDOUT);
CheckStep(CHECK_STEP_TWO);
clock_gettime(CLOCK_MONOTONIC, &tsNow);
int timeDiff = GetTimeDiff(tsNow, ts);
......@@ -347,13 +335,11 @@ static void *ClockWaitTimeOut2(void *arg)
void clockwait_timedwait_0040(void)
{
pthread_t tid;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid, NULL, ClockWaitTimeOut2, NULL), 0);
Msleep(SLEEP_200_MS);
pthread_join(tid, NULL);
EXPECT_EQ(pthread_cond_destroy(&c_cond2), 0);
EXPECT_EQ(pthread_mutex_destroy(&c_mtx2), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_THREE), (uint64_t)0x123);
}
static void *ClockWaitTimeMismatch(void *arg)
......@@ -369,7 +355,6 @@ static void *ClockWaitTimeMismatch(void *arg)
clockid_t clock_id = CLOCK_REALTIME;
EXPECT_EQ(pthread_cond_clockwait(&c_cond4, &c_mtx4, clock_id, &ts), ETIMEDOUT);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_mutex_unlock(&c_mtx4), 0);
return arg;
......@@ -397,7 +382,6 @@ static void *ClockWaitTimeMismatch2(void *arg)
clockid_t clock_id = CLOCK_REALTIME;
EXPECT_EQ(pthread_cond_clockwait(&c_cond5, &c_mtx5, clock_id, &ts), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_mutex_unlock(&c_mtx5), 0);
return arg;
......@@ -413,7 +397,6 @@ void clockwait_timedwait_0050(void)
pthread_t tid;
pthread_t tid1;
pthread_t tid2;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid1, NULL, ClockWaitTimeMismatch1, NULL), 0);
EXPECT_EQ(pthread_create(&tid2, NULL, ClockWaitTimeMismatch2, NULL), 0);
EXPECT_EQ(pthread_create(&tid, NULL, ClockWaitTimeMismatch, NULL), 0);
......@@ -425,7 +408,6 @@ void clockwait_timedwait_0050(void)
EXPECT_EQ(pthread_mutex_destroy(&c_mtx4), 0);
EXPECT_EQ(pthread_cond_destroy(&c_cond5), 0);
EXPECT_EQ(pthread_mutex_destroy(&c_mtx5), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
}
static void *ClockWaitTimeMismatch3(void *arg)
......@@ -510,7 +492,6 @@ static void *PthreadCondMonotonicTimeWait1(void *arg)
{
Msleep(SLEEP_50_MS);
EXPECT_EQ(pthread_mutex_lock(&m_mtx1), 0);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_mutex_unlock(&m_mtx1), 0);
EXPECT_EQ(pthread_cond_signal(&m_cond1), 0);
return arg;
......@@ -528,7 +509,6 @@ static void *PthreadCondMonotonicTimeWait2(void *arg)
ts.tv_nsec = (ts.tv_nsec + nsecPer100Ms) % nsecPerSec;
EXPECT_EQ(pthread_cond_timedwait_monotonic_np(&m_cond1, &m_mtx1, &ts), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_mutex_unlock(&m_mtx1), 0);
return arg;
}
......@@ -542,7 +522,6 @@ void monotonic_timewait_0010(void)
{
pthread_t tid1;
pthread_t tid2;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid1, NULL, PthreadCondMonotonicTimeWait1, NULL), 0);
EXPECT_EQ(pthread_create(&tid2, NULL, PthreadCondMonotonicTimeWait2, NULL), 0);
......@@ -552,7 +531,6 @@ void monotonic_timewait_0010(void)
pthread_join(tid2, NULL);
EXPECT_EQ(pthread_cond_destroy(&m_cond1), 0);
EXPECT_EQ(pthread_mutex_destroy(&m_mtx1), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
}
static void *PthreadCondMonotonicTimeOut(void *arg)
......@@ -563,7 +541,6 @@ static void *PthreadCondMonotonicTimeOut(void *arg)
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, CLOCK_MONOTONIC);
EXPECT_EQ(pthread_cond_timedwait_monotonic_np(&m_cond2, &m_mtx2, &ts), ETIMEDOUT);
CheckStep(CHECK_STEP_TWO);
clock_gettime(CLOCK_MONOTONIC, &tsNow);
int timeDiff = GetTimeDiff(tsNow, ts);
......@@ -582,13 +559,11 @@ static void *PthreadCondMonotonicTimeOut(void *arg)
void monotonic_timewait_0020(void)
{
pthread_t tid;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid, NULL, PthreadCondMonotonicTimeOut, NULL), 0);
Msleep(SLEEP_200_MS);
pthread_join(tid, NULL);
EXPECT_EQ(pthread_cond_destroy(&m_cond2), 0);
EXPECT_EQ(pthread_mutex_destroy(&m_mtx2), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_THREE), (uint64_t)0x123);
}
static void *PthreadCondMonotonicTimeEinval(void *arg)
......@@ -600,7 +575,6 @@ static void *PthreadCondMonotonicTimeEinval(void *arg)
ts.tv_sec = 1;
ts.tv_nsec = einvalNsec;
EXPECT_EQ(pthread_cond_timedwait_monotonic_np(&m_cond3, &m_mtx3, &ts), EINVAL);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_mutex_unlock(&m_mtx3), 0);
return arg;
......@@ -614,7 +588,6 @@ static void *PthreadCondMonotonicTimeEinval(void *arg)
void monotonic_timewait_0030(void)
{
pthread_t tid;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid, NULL, PthreadCondMonotonicTimeEinval, NULL), 0);
......@@ -622,14 +595,12 @@ void monotonic_timewait_0030(void)
pthread_join(tid, NULL);
EXPECT_EQ(pthread_cond_destroy(&m_cond3), 0);
EXPECT_EQ(pthread_mutex_destroy(&m_mtx3), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_THREE), (uint64_t)0x123);
}
static void *PthreadCondUnsignedTimeWait1(void *arg)
{
Msleep(SLEEP_50_MS);
EXPECT_EQ(pthread_mutex_lock(&u_mtx1), 0);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_mutex_unlock(&u_mtx1), 0);
EXPECT_EQ(pthread_cond_signal(&u_cond1), 0);
return arg;
......@@ -643,7 +614,6 @@ static void *PthreadCondUnsignedTimeWait2(void *arg)
GetDelayedTimeByClockid(&ts, ms, CLOCK_MONOTONIC);
EXPECT_EQ(pthread_mutex_lock(&u_mtx1), 0);
EXPECT_EQ(pthread_cond_timeout_np(&u_cond1, &u_mtx1, ms), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_mutex_unlock(&u_mtx1), 0);
return arg;
}
......@@ -657,7 +627,6 @@ void timeoutnp_timewait_0010(void)
{
pthread_t tid1;
pthread_t tid2;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid1, NULL, PthreadCondUnsignedTimeWait1, NULL), 0);
EXPECT_EQ(pthread_create(&tid2, NULL, PthreadCondUnsignedTimeWait2, NULL), 0);
......@@ -667,7 +636,6 @@ void timeoutnp_timewait_0010(void)
pthread_join(tid2, NULL);
EXPECT_EQ(pthread_cond_destroy(&u_cond1), 0);
EXPECT_EQ(pthread_mutex_destroy(&u_mtx1), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
}
static void *PthreadCondUnsignedTimeOut(void *arg)
......@@ -679,7 +647,6 @@ static void *PthreadCondUnsignedTimeOut(void *arg)
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, CLOCK_MONOTONIC);
EXPECT_EQ(pthread_cond_timeout_np(&u_cond2, &u_mtx2, ms), ETIMEDOUT);
CheckStep(CHECK_STEP_TWO);
clock_gettime(CLOCK_MONOTONIC, &tsNow);
int timeDiff = GetTimeDiff(tsNow, ts);
......@@ -698,13 +665,11 @@ static void *PthreadCondUnsignedTimeOut(void *arg)
void timeoutnp_timewait_0020(void)
{
pthread_t tid;
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_create(&tid, NULL, PthreadCondUnsignedTimeOut, NULL), 0);
Msleep(SLEEP_200_MS);
pthread_join(tid, NULL);
EXPECT_EQ(pthread_cond_destroy(&u_cond2), 0);
EXPECT_EQ(pthread_mutex_destroy(&u_mtx2), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_THREE), (uint64_t)0x123);
}
TEST_FUN G_Fun_Array[] = {
......
libc-test/src/functionalext/thread/pthread_rwlock_wrlock.c
浏览文件 @ 5d23772f
......@@ -27,9 +27,7 @@ static void *RwlockClockRealTimeOut1(void *arg)
{
EXPECT_EQ(pthread_rwlock_wrlock(&w_rwlock1), 0);
Msleep(SLEEP_50_MS);
CheckStep(CHECK_STEP_TWO);
Msleep(SLEEP_100_MS);
CheckStep(CHECK_STEP_FOUR);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock1), 0);
return arg;
}
......@@ -41,7 +39,6 @@ static void *RwlockClockRealTimeOut2(void *arg)
Msleep(SLEEP_20_MS);
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, CLOCK_REALTIME);
EXPECT_EQ(pthread_rwlock_clockwrlock(&w_rwlock1, CLOCK_REALTIME, &ts), ETIMEDOUT);
CheckStep(CHECK_STEP_THREE);
clock_gettime(CLOCK_REALTIME, &tsNow);
int timeDiff = GetTimeDiff(tsNow, ts);
EXPECT_GE(timeDiff, 0);
......@@ -53,7 +50,6 @@ static void *RwlockClockRealTimeWait1(void *arg)
{
EXPECT_EQ(pthread_rwlock_wrlock(&w_rwlock2), 0);
Msleep(SLEEP_50_MS);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock2), 0);
return arg;
}
......@@ -65,7 +61,6 @@ static void *RwlockClockRealTimeWait2(void *arg)
Msleep(SLEEP_20_MS);
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, clock_id);
EXPECT_EQ(pthread_rwlock_clockwrlock(&w_rwlock2, clock_id, &ts), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock2), 0);
return arg;
}
......@@ -74,9 +69,7 @@ static void *RwlockClockMonotonicTimeOut1(void *arg)
{
EXPECT_EQ(pthread_rwlock_wrlock(&w_rwlock5), 0);
Msleep(SLEEP_50_MS);
CheckStep(CHECK_STEP_TWO);
Msleep(SLEEP_100_MS);
CheckStep(CHECK_STEP_FOUR);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock5), 0);
return arg;
}
......@@ -88,7 +81,6 @@ static void *RwlockClockMonotonicTimeOut2(void *arg)
Msleep(SLEEP_20_MS);
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, CLOCK_MONOTONIC);
EXPECT_EQ(pthread_rwlock_clockwrlock(&w_rwlock5, CLOCK_MONOTONIC, &ts), ETIMEDOUT);
CheckStep(CHECK_STEP_THREE);
clock_gettime(CLOCK_MONOTONIC, &tsNow);
int timeDiff = GetTimeDiff(tsNow, ts);
EXPECT_GE(timeDiff, 0);
......@@ -100,7 +92,6 @@ static void *RwlockClockMonotonicTimeWait1(void *arg)
{
EXPECT_EQ(pthread_rwlock_wrlock(&w_rwlock6), 0);
Msleep(SLEEP_50_MS);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock6), 0);
return arg;
}
......@@ -111,7 +102,6 @@ static void *RwlockClockMonotonicTimeWait2(void *arg)
Msleep(SLEEP_20_MS);
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, CLOCK_MONOTONIC);
EXPECT_EQ(pthread_rwlock_clockwrlock(&w_rwlock6, CLOCK_MONOTONIC, &ts), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock6), 0);
return arg;
}
......@@ -120,9 +110,7 @@ static void *RwlockMonotonicTime1(void *arg)
{
EXPECT_EQ(pthread_rwlock_wrlock(&w_rwlock3), 0);
Msleep(SLEEP_50_MS);
CheckStep(CHECK_STEP_TWO);
Msleep(SLEEP_100_MS);
CheckStep(CHECK_STEP_FOUR);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock3), 0);
return arg;
}
......@@ -134,7 +122,6 @@ static void *RwlockMonotonicTime2(void *arg)
Msleep(SLEEP_20_MS);
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, CLOCK_MONOTONIC);
EXPECT_EQ(pthread_rwlock_timedwrlock_monotonic_np(&w_rwlock3, &ts), ETIMEDOUT);
CheckStep(CHECK_STEP_THREE);
clock_gettime(CLOCK_MONOTONIC, &tsNow);
int timeDiff = GetTimeDiff(tsNow, ts);
EXPECT_GE(timeDiff, 0);
......@@ -146,7 +133,6 @@ static void *RwlockMonotonicTime3(void *arg)
{
EXPECT_EQ(pthread_rwlock_wrlock(&w_rwlock4), 0);
Msleep(SLEEP_50_MS);
CheckStep(CHECK_STEP_TWO);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock4), 0);
return arg;
}
......@@ -157,7 +143,6 @@ static void *RwlockMonotonicTime4(void *arg)
Msleep(SLEEP_20_MS);
GetDelayedTimeByClockid(&ts, SLEEP_100_MS, CLOCK_MONOTONIC);
EXPECT_EQ(pthread_rwlock_timedwrlock_monotonic_np(&w_rwlock4, &ts), 0);
CheckStep(CHECK_STEP_THREE);
EXPECT_EQ(pthread_rwlock_unlock(&w_rwlock4), 0);
return arg;
}
......@@ -243,7 +228,6 @@ void pthread_rwlock_timedwrlock_0040(void)
void pthread_rwlock_timedwrlock_0050(void)
{
pthread_t tid[2];
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_rwlock_init(&w_rwlock2, NULL), 0);
EXPECT_EQ(pthread_create(&tid[0], NULL, RwlockClockRealTimeWait1, NULL), 0);
......@@ -251,7 +235,6 @@ void pthread_rwlock_timedwrlock_0050(void)
EXPECT_EQ(pthread_join(tid[0], NULL), 0);
EXPECT_EQ(pthread_join(tid[1], NULL), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
EXPECT_EQ(pthread_rwlock_destroy(&w_rwlock2), 0);
}
......@@ -263,7 +246,6 @@ void pthread_rwlock_timedwrlock_0050(void)
void pthread_rwlock_timedwrlock_0060(void)
{
pthread_t tid[2];
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_rwlock_init(&w_rwlock1, NULL), 0);
EXPECT_EQ(pthread_create(&tid[0], NULL, RwlockClockRealTimeOut1, NULL), 0);
......@@ -271,7 +253,6 @@ void pthread_rwlock_timedwrlock_0060(void)
EXPECT_EQ(pthread_join(tid[0], NULL), 0);
EXPECT_EQ(pthread_join(tid[1], NULL), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FIVE), (uint64_t)0x12345);
EXPECT_EQ(pthread_rwlock_destroy(&w_rwlock1), 0);
}
......@@ -283,7 +264,6 @@ void pthread_rwlock_timedwrlock_0060(void)
void pthread_rwlock_timedwrlock_0070(void)
{
pthread_t tid[2];
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_rwlock_init(&w_rwlock5, NULL), 0);
EXPECT_EQ(pthread_create(&tid[0], NULL, RwlockClockMonotonicTimeOut1, NULL), 0);
......@@ -291,7 +271,6 @@ void pthread_rwlock_timedwrlock_0070(void)
EXPECT_EQ(pthread_join(tid[0], NULL), 0);
EXPECT_EQ(pthread_join(tid[1], NULL), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FIVE), (uint64_t)0x12345);
EXPECT_EQ(pthread_rwlock_destroy(&w_rwlock5), 0);
}
......@@ -303,7 +282,6 @@ void pthread_rwlock_timedwrlock_0070(void)
void pthread_rwlock_timedwrlock_0080(void)
{
pthread_t tid[2];
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_rwlock_init(&w_rwlock6, NULL), 0);
EXPECT_EQ(pthread_create(&tid[0], NULL, RwlockClockMonotonicTimeWait1, NULL), 0);
......@@ -311,7 +289,6 @@ void pthread_rwlock_timedwrlock_0080(void)
EXPECT_EQ(pthread_join(tid[0], NULL), 0);
EXPECT_EQ(pthread_join(tid[1], NULL), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
EXPECT_EQ(pthread_rwlock_destroy(&w_rwlock6), 0);
}
......@@ -323,7 +300,6 @@ void pthread_rwlock_timedwrlock_0080(void)
void pthread_rwlock_timedwrlock_0090(void)
{
pthread_t tid[2];
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_rwlock_init(&w_rwlock3, NULL), 0);
EXPECT_EQ(pthread_create(&tid[0], NULL, RwlockMonotonicTime1, NULL), 0);
......@@ -331,7 +307,6 @@ void pthread_rwlock_timedwrlock_0090(void)
EXPECT_EQ(pthread_join(tid[0], NULL), 0);
EXPECT_EQ(pthread_join(tid[1], NULL), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FIVE), (uint64_t)0x12345);
EXPECT_EQ(pthread_rwlock_destroy(&w_rwlock3), 0);
}
......@@ -343,7 +318,6 @@ void pthread_rwlock_timedwrlock_0090(void)
void pthread_rwlock_timedwrlock_0100(void)
{
pthread_t tid[2];
CheckStep(CHECK_STEP_ONE);
EXPECT_EQ(pthread_rwlock_init(&w_rwlock4, NULL), 0);
EXPECT_EQ(pthread_create(&tid[0], NULL, RwlockMonotonicTime3, NULL), 0);
......@@ -351,7 +325,6 @@ void pthread_rwlock_timedwrlock_0100(void)
EXPECT_EQ(pthread_join(tid[0], NULL), 0);
EXPECT_EQ(pthread_join(tid[1], NULL), 0);
EXPECT_EQ(CheckStep(CHECK_STEP_FOUR), (uint64_t)0x1234);
EXPECT_EQ(pthread_rwlock_destroy(&w_rwlock4), 0);
}
......
libc-test/src/functionalext/trace/trace_stresstest.c
浏览文件 @ 5d23772f
......@@ -23,7 +23,6 @@
#include <unistd.h>
#define BUFFER_LEN 1000000
#define RUNNUM 10000
static const int count = 10;
/**
......@@ -47,23 +46,19 @@ static void trace_marker_stresstest_0010(void)
bool trace_async_sucess = false;
char buf[BUFFER_LEN] = {0};
while (1) {
while (traceCount <= 5000) {
snprintf(buf, BUFFER_LEN, "%d", traceCount);
system("cd /sys/kernel/debug/tracing;echo 1 > tracing_on");
trace_marker_async_begin("Trace_Marker_Async_Begin", buf, 1);
trace_marker_async_end("Trace_Marker_Async_End", buf, 1);
system("cd /sys/kernel/debug/tracing;echo 0 > tracing_on");
if (traceCount % RUNNUM == 0) {
printf("trace_marker_async_begin has been running times is:%d\n", traceCount);
}
printf("trace_marker_async_begin has been running times is:%d\n", traceCount);
traceCount++;
}
exit(pidChild);
} else {
pid_t pidCChild;
int traceCount = 0;
bool trace_sucess = false;
char buf[BUFFER_LEN] = {0};
// start process again
......@@ -71,16 +66,13 @@ static void trace_marker_stresstest_0010(void)
if (pidCChild < 0) {
t_printf("error in fork!");
} else if (pidCChild == 0) {
while (1) {
while (traceCount <= 5000) {
snprintf(buf, BUFFER_LEN, "%d", traceCount);
system("cd /sys/kernel/debug/tracing;echo 1 > tracing_on");
trace_marker_begin("Trace_Marker", buf);
trace_marker_end();
system("cd /sys/kernel/debug/tracing;echo 0 > tracing_on");
if (traceCount % RUNNUM == 0) {
printf("trace_marker_begin has been running times is:%d\n", traceCount);
}
printf("trace_marker_begin has been running times is:%d\n", traceCount);
traceCount++;
}
exit(pidCChild);
......@@ -88,14 +80,11 @@ static void trace_marker_stresstest_0010(void)
pidCParent = getpid();
int traceCount = 0;
while (1) {
while (traceCount <= 5000) {
system("cd /sys/kernel/debug/tracing;echo 1 > tracing_on");
trace_marker_count("traceCount", traceCount);
system("cd /sys/kernel/debug/tracing;echo 0 > tracing_on");
if (traceCount % RUNNUM == 0) {
printf("trace_marker_count has been running times is:%d\n", traceCount);
}
printf("trace_marker_count has been running times is:%d\n", traceCount);
traceCount++;
}
exit(pidCParent);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或