From e16e660d4de1595958d948163cd797d84d0613f8 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 1 Aug 2025 22:46:16 -0500 Subject: [PATCH] Cleanup: Fix alphabetic ordering in mocks. --- level_0/f_thread/tests/unit/c/mock-thread.c | 108 ++++++++++++++-------------- level_0/f_thread/tests/unit/c/mock-thread.h | 65 ++++++++--------- 2 files changed, 87 insertions(+), 86 deletions(-) diff --git a/level_0/f_thread/tests/unit/c/mock-thread.c b/level_0/f_thread/tests/unit/c/mock-thread.c index e6367c0..2935fcf 100644 --- a/level_0/f_thread/tests/unit/c/mock-thread.c +++ b/level_0/f_thread/tests/unit/c/mock-thread.c @@ -607,12 +607,18 @@ int __wrap_pthread_kill(pthread_t thread, int sig) { return 0; } -pthread_t __wrap_pthread_self(void) { +int __wrap_pthread_mutex_destroy(pthread_mutex_t *mutex) { - return mock_type(int); + const bool failure = mock_type(bool); + + if (failure) { + return mock_type(int); + } + + return 0; } -int __wrap_pthread_setattr_default_np(const pthread_attr_t *attr) { +int __wrap_pthread_mutex_getprioceiling(const pthread_mutex_t * restrict mutex, int *prioceiling) { const bool failure = mock_type(bool); @@ -623,7 +629,7 @@ int __wrap_pthread_setattr_default_np(const pthread_attr_t *attr) { return 0; } -int __wrap_pthread_setcancelstate(int state, int *oldstate) { +int __wrap_pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) { const bool failure = mock_type(bool); @@ -634,7 +640,7 @@ int __wrap_pthread_setcancelstate(int state, int *oldstate) { return 0; } -int __wrap_pthread_setcanceltype(int type, int *oldtype) { +int __wrap_pthread_mutex_lock(pthread_mutex_t *mutex) { const bool failure = mock_type(bool); @@ -645,7 +651,7 @@ int __wrap_pthread_setcanceltype(int type, int *oldtype) { return 0; } -int __wrap_pthread_setconcurrency(int new_level) { +int __wrap_pthread_mutex_setprioceiling(pthread_mutex_t *mutex, int prioceiling, int *old_ceiling) { const bool failure = mock_type(bool); @@ -656,7 +662,7 @@ int __wrap_pthread_setconcurrency(int new_level) { return 0; } -int __wrap_pthread_setname_np(pthread_t thread, const char *name) { +int __wrap_pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *timeout) { const bool failure = mock_type(bool); @@ -667,7 +673,7 @@ int __wrap_pthread_setname_np(pthread_t thread, const char *name) { return 0; } -int __wrap_pthread_setschedparam(pthread_t pthread, int policy, const struct sched_param *param) { +int __wrap_pthread_mutex_trylock(pthread_mutex_t *mutex) { const bool failure = mock_type(bool); @@ -678,7 +684,7 @@ int __wrap_pthread_setschedparam(pthread_t pthread, int policy, const struct sch return 0; } -int __wrap_pthread_setschedprio(pthread_t thread, int prio) { +int __wrap_pthread_mutex_unlock(pthread_mutex_t *mutex) { const bool failure = mock_type(bool); @@ -689,7 +695,7 @@ int __wrap_pthread_setschedprio(pthread_t thread, int prio) { return 0; } -int __wrap_pthread_setspecific(pthread_key_t key, const void *value) { +int __wrap_pthread_mutexattr_destroy(pthread_mutexattr_t *attr) { const bool failure = mock_type(bool); @@ -700,7 +706,7 @@ int __wrap_pthread_setspecific(pthread_key_t key, const void *value) { return 0; } -int __wrap_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset) { +int __wrap_pthread_mutexattr_init(pthread_mutexattr_t *attr) { const bool failure = mock_type(bool); @@ -711,7 +717,7 @@ int __wrap_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset) { return 0; } -int __wrap_pthread_sigqueue(pthread_t thread, int sig, const union sigval value) { +int __wrap_pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *attr, int *prioceiling) { const bool failure = mock_type(bool); @@ -722,7 +728,7 @@ int __wrap_pthread_sigqueue(pthread_t thread, int sig, const union sigval value) return 0; } -int __wrap_pthread_spin_destroy(pthread_spinlock_t *spinlock) { +int __wrap_pthread_mutexattr_getprotocol(const pthread_mutexattr_t *attr, int *protocol) { const bool failure = mock_type(bool); @@ -733,7 +739,7 @@ int __wrap_pthread_spin_destroy(pthread_spinlock_t *spinlock) { return 0; } -int __wrap_pthread_spin_init(pthread_spinlock_t *spinlock, int pshared) { +int __wrap_pthread_mutexattr_getpshared(const pthread_mutexattr_t *attr, int *pshared) { const bool failure = mock_type(bool); @@ -744,7 +750,7 @@ int __wrap_pthread_spin_init(pthread_spinlock_t *spinlock, int pshared) { return 0; } -int __wrap_pthread_spin_lock(pthread_spinlock_t *spinlock) { +int __wrap_pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *kind) { const bool failure = mock_type(bool); @@ -755,7 +761,7 @@ int __wrap_pthread_spin_lock(pthread_spinlock_t *spinlock) { return 0; } -int __wrap_pthread_spin_trylock(pthread_spinlock_t *spinlock) { +int __wrap_pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr, int prioceiling) { const bool failure = mock_type(bool); @@ -766,7 +772,7 @@ int __wrap_pthread_spin_trylock(pthread_spinlock_t *spinlock) { return 0; } -int __wrap_pthread_spin_unlock(pthread_spinlock_t *spinlock) { +int __wrap_pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr, int protocol) { const bool failure = mock_type(bool); @@ -777,10 +783,18 @@ int __wrap_pthread_spin_unlock(pthread_spinlock_t *spinlock) { return 0; } -void __wrap_pthread_testcancel(void) { +int __wrap_pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared) { + + const bool failure = mock_type(bool); + + if (failure) { + return mock_type(int); + } + + return 0; } -int __wrap_pthread_timedjoin_np(pthread_t thread, void **retval) { +int __wrap_pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind) { const bool failure = mock_type(bool); @@ -791,7 +805,7 @@ int __wrap_pthread_timedjoin_np(pthread_t thread, void **retval) { return 0; } -int __wrap_pthread_tryjoin_np(pthread_t thread, void **retval, const struct timespec *abstime) { +int __wrap_pthread_once(pthread_once_t *once_control, void (*init_routine)(void)) { const bool failure = mock_type(bool); @@ -945,18 +959,12 @@ int __wrap_pthread_rwlockattr_setpshared(pthread_rwlockattr_t *attr, int pshared return 0; } -int __wrap_pthread_mutex_destroy(pthread_mutex_t *mutex) { - - const bool failure = mock_type(bool); - - if (failure) { - return mock_type(int); - } +pthread_t __wrap_pthread_self(void) { - return 0; + return mock_type(int); } -int __wrap_pthread_mutex_getprioceiling(const pthread_mutex_t * restrict mutex, int *prioceiling) { +int __wrap_pthread_setattr_default_np(const pthread_attr_t *attr) { const bool failure = mock_type(bool); @@ -967,7 +975,7 @@ int __wrap_pthread_mutex_getprioceiling(const pthread_mutex_t * restrict mutex, return 0; } -int __wrap_pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) { +int __wrap_pthread_setcancelstate(int state, int *oldstate) { const bool failure = mock_type(bool); @@ -978,7 +986,7 @@ int __wrap_pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t return 0; } -int __wrap_pthread_mutex_lock(pthread_mutex_t *mutex) { +int __wrap_pthread_setcanceltype(int type, int *oldtype) { const bool failure = mock_type(bool); @@ -989,7 +997,7 @@ int __wrap_pthread_mutex_lock(pthread_mutex_t *mutex) { return 0; } -int __wrap_pthread_mutex_setprioceiling(pthread_mutex_t *mutex, int prioceiling, int *old_ceiling) { +int __wrap_pthread_setconcurrency(int new_level) { const bool failure = mock_type(bool); @@ -1000,7 +1008,7 @@ int __wrap_pthread_mutex_setprioceiling(pthread_mutex_t *mutex, int prioceiling, return 0; } -int __wrap_pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *timeout) { +int __wrap_pthread_setname_np(pthread_t thread, const char *name) { const bool failure = mock_type(bool); @@ -1011,7 +1019,7 @@ int __wrap_pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec return 0; } -int __wrap_pthread_mutex_trylock(pthread_mutex_t *mutex) { +int __wrap_pthread_setschedparam(pthread_t pthread, int policy, const struct sched_param *param) { const bool failure = mock_type(bool); @@ -1022,7 +1030,7 @@ int __wrap_pthread_mutex_trylock(pthread_mutex_t *mutex) { return 0; } -int __wrap_pthread_mutex_unlock(pthread_mutex_t *mutex) { +int __wrap_pthread_setschedprio(pthread_t thread, int prio) { const bool failure = mock_type(bool); @@ -1033,7 +1041,7 @@ int __wrap_pthread_mutex_unlock(pthread_mutex_t *mutex) { return 0; } -int __wrap_pthread_mutexattr_destroy(pthread_mutexattr_t *attr) { +int __wrap_pthread_setspecific(pthread_key_t key, const void *value) { const bool failure = mock_type(bool); @@ -1044,7 +1052,7 @@ int __wrap_pthread_mutexattr_destroy(pthread_mutexattr_t *attr) { return 0; } -int __wrap_pthread_mutexattr_init(pthread_mutexattr_t *attr) { +int __wrap_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset) { const bool failure = mock_type(bool); @@ -1055,7 +1063,7 @@ int __wrap_pthread_mutexattr_init(pthread_mutexattr_t *attr) { return 0; } -int __wrap_pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *attr, int *prioceiling) { +int __wrap_pthread_sigqueue(pthread_t thread, int sig, const union sigval value) { const bool failure = mock_type(bool); @@ -1066,7 +1074,7 @@ int __wrap_pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *attr, int return 0; } -int __wrap_pthread_mutexattr_getprotocol(const pthread_mutexattr_t *attr, int *protocol) { +int __wrap_pthread_spin_destroy(pthread_spinlock_t *spinlock) { const bool failure = mock_type(bool); @@ -1077,7 +1085,7 @@ int __wrap_pthread_mutexattr_getprotocol(const pthread_mutexattr_t *attr, int *p return 0; } -int __wrap_pthread_mutexattr_getpshared(const pthread_mutexattr_t *attr, int *pshared) { +int __wrap_pthread_spin_init(pthread_spinlock_t *spinlock, int pshared) { const bool failure = mock_type(bool); @@ -1088,7 +1096,7 @@ int __wrap_pthread_mutexattr_getpshared(const pthread_mutexattr_t *attr, int *ps return 0; } -int __wrap_pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *kind) { +int __wrap_pthread_spin_lock(pthread_spinlock_t *spinlock) { const bool failure = mock_type(bool); @@ -1099,7 +1107,7 @@ int __wrap_pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *kind) return 0; } -int __wrap_pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr, int prioceiling) { +int __wrap_pthread_spin_trylock(pthread_spinlock_t *spinlock) { const bool failure = mock_type(bool); @@ -1110,7 +1118,7 @@ int __wrap_pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr, int prioc return 0; } -int __wrap_pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr, int protocol) { +int __wrap_pthread_spin_unlock(pthread_spinlock_t *spinlock) { const bool failure = mock_type(bool); @@ -1121,18 +1129,10 @@ int __wrap_pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr, int protocol return 0; } -int __wrap_pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared) { - - const bool failure = mock_type(bool); - - if (failure) { - return mock_type(int); - } - - return 0; +void __wrap_pthread_testcancel(void) { } -int __wrap_pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind) { +int __wrap_pthread_timedjoin_np(pthread_t thread, void **retval) { const bool failure = mock_type(bool); @@ -1143,7 +1143,7 @@ int __wrap_pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind) { return 0; } -int __wrap_pthread_once(pthread_once_t *once_control, void (*init_routine)(void)) { +int __wrap_pthread_tryjoin_np(pthread_t thread, void **retval, const struct timespec *abstime) { const bool failure = mock_type(bool); diff --git a/level_0/f_thread/tests/unit/c/mock-thread.h b/level_0/f_thread/tests/unit/c/mock-thread.h index f80e3f4..1a59e3b 100644 --- a/level_0/f_thread/tests/unit/c/mock-thread.h +++ b/level_0/f_thread/tests/unit/c/mock-thread.h @@ -31,6 +31,7 @@ const static int mock_errno_generic = 32767; extern f_status_t __wrap_f_memory_array_adjust(const f_number_unsigned_t length, const size_t width, void ** array, f_number_unsigned_t * const used, f_number_unsigned_t * const size); extern f_status_t __wrap_f_memory_array_resize(const f_number_unsigned_t length, const size_t width, void ** array, f_number_unsigned_t * const used, f_number_unsigned_t * const size); + extern int __wrap_pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)); extern int __wrap_pthread_attr_destroy(pthread_attr_t *attr); extern int __wrap_pthread_attr_getaffinity_np(const pthread_attr_t *attr, size_t cpusetsize, cpu_set_t *cpuset); @@ -86,38 +87,6 @@ extern int __wrap_pthread_join(pthread_t pthread, void **value_ptr); extern int __wrap_pthread_key_create(pthread_key_t *key, void (*destructor)(void*)); extern int __wrap_pthread_key_delete(pthread_key_t key); extern int __wrap_pthread_kill(pthread_t thread, int sig); -extern pthread_t __wrap_pthread_self(void); -extern int __wrap_pthread_setattr_default_np(const pthread_attr_t *attr); -extern int __wrap_pthread_setcancelstate(int state, int *oldstate); -extern int __wrap_pthread_setcanceltype(int type, int *oldtype); -extern int __wrap_pthread_setconcurrency(int new_level); -extern int __wrap_pthread_setname_np(pthread_t thread, const char *name); -extern int __wrap_pthread_setschedparam(pthread_t pthread, int policy, const struct sched_param *param); -extern int __wrap_pthread_setschedprio(pthread_t thread, int prio); -extern int __wrap_pthread_setspecific(pthread_key_t key, const void *value); -extern int __wrap_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset); -extern int __wrap_pthread_sigqueue(pthread_t thread, int sig, const union sigval value); -extern int __wrap_pthread_spin_destroy(pthread_spinlock_t *spinlock); -extern int __wrap_pthread_spin_init(pthread_spinlock_t *spinlock, int pshared); -extern int __wrap_pthread_spin_lock(pthread_spinlock_t *spinlock); -extern int __wrap_pthread_spin_trylock(pthread_spinlock_t *spinlock); -extern int __wrap_pthread_spin_unlock(pthread_spinlock_t *spinlock); -extern void __wrap_pthread_testcancel(void); -extern int __wrap_pthread_timedjoin_np(pthread_t thread, void **retval); -extern int __wrap_pthread_tryjoin_np(pthread_t thread, void **retval, const struct timespec *abstime); -extern int __wrap_pthread_rwlock_destroy(pthread_rwlock_t *rwlock); -extern int __wrap_pthread_rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr); -extern int __wrap_pthread_rwlock_rdlock(pthread_rwlock_t *rwlock); -extern int __wrap_pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock, const struct timespec *abstime); -extern int __wrap_pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, const struct timespec *abstime); -extern int __wrap_pthread_rwlock_tryrdlock(pthread_rwlock_t *rwlock); -extern int __wrap_pthread_rwlock_trywrlock(pthread_rwlock_t *rwlock); -extern int __wrap_pthread_rwlock_unlock(pthread_rwlock_t *rwlock); -extern int __wrap_pthread_rwlock_wrlock(pthread_rwlock_t *rwlock); -extern int __wrap_pthread_rwlockattr_destroy(pthread_rwlockattr_t *attr); -extern int __wrap_pthread_rwlockattr_init(pthread_rwlockattr_t *attr); -extern int __wrap_pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *attr, int *pshared); -extern int __wrap_pthread_rwlockattr_setpshared(pthread_rwlockattr_t *attr, int pshared); extern int __wrap_pthread_mutex_destroy(pthread_mutex_t *mutex); extern int __wrap_pthread_mutex_getprioceiling(const pthread_mutex_t * restrict mutex, int *prioceiling); extern int __wrap_pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr); @@ -137,6 +106,38 @@ extern int __wrap_pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr, int p extern int __wrap_pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared); extern int __wrap_pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind); extern int __wrap_pthread_once(pthread_once_t *once_control, void (*init_routine)(void)); +extern int __wrap_pthread_rwlock_destroy(pthread_rwlock_t *rwlock); +extern int __wrap_pthread_rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr); +extern int __wrap_pthread_rwlock_rdlock(pthread_rwlock_t *rwlock); +extern int __wrap_pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock, const struct timespec *abstime); +extern int __wrap_pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, const struct timespec *abstime); +extern int __wrap_pthread_rwlock_tryrdlock(pthread_rwlock_t *rwlock); +extern int __wrap_pthread_rwlock_trywrlock(pthread_rwlock_t *rwlock); +extern int __wrap_pthread_rwlock_unlock(pthread_rwlock_t *rwlock); +extern int __wrap_pthread_rwlock_wrlock(pthread_rwlock_t *rwlock); +extern int __wrap_pthread_rwlockattr_destroy(pthread_rwlockattr_t *attr); +extern int __wrap_pthread_rwlockattr_init(pthread_rwlockattr_t *attr); +extern int __wrap_pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *attr, int *pshared); +extern int __wrap_pthread_rwlockattr_setpshared(pthread_rwlockattr_t *attr, int pshared); +extern pthread_t __wrap_pthread_self(void); +extern int __wrap_pthread_setattr_default_np(const pthread_attr_t *attr); +extern int __wrap_pthread_setcancelstate(int state, int *oldstate); +extern int __wrap_pthread_setcanceltype(int type, int *oldtype); +extern int __wrap_pthread_setconcurrency(int new_level); +extern int __wrap_pthread_setname_np(pthread_t thread, const char *name); +extern int __wrap_pthread_setschedparam(pthread_t pthread, int policy, const struct sched_param *param); +extern int __wrap_pthread_setschedprio(pthread_t thread, int prio); +extern int __wrap_pthread_setspecific(pthread_key_t key, const void *value); +extern int __wrap_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset); +extern int __wrap_pthread_sigqueue(pthread_t thread, int sig, const union sigval value); +extern int __wrap_pthread_spin_destroy(pthread_spinlock_t *spinlock); +extern int __wrap_pthread_spin_init(pthread_spinlock_t *spinlock, int pshared); +extern int __wrap_pthread_spin_lock(pthread_spinlock_t *spinlock); +extern int __wrap_pthread_spin_trylock(pthread_spinlock_t *spinlock); +extern int __wrap_pthread_spin_unlock(pthread_spinlock_t *spinlock); +extern void __wrap_pthread_testcancel(void); +extern int __wrap_pthread_timedjoin_np(pthread_t thread, void **retval); +extern int __wrap_pthread_tryjoin_np(pthread_t thread, void **retval, const struct timespec *abstime); extern int __wrap_sem_close(sem_t *sem); extern int __wrap_sem_destroy(sem_t *sem); extern int __wrap_sem_getvalue(sem_t * restrict sem, int * restrict sval); -- 1.8.3.1