diff --git a/lib/posix/options/cond.c b/lib/posix/options/cond.c index 8c81de5b2f6..d1fc231c94c 100644 --- a/lib/posix/options/cond.c +++ b/lib/posix/options/cond.c @@ -105,7 +105,7 @@ static int cond_wait(pthread_cond_t *cond, pthread_mutex_t *mu, const struct tim } if (abstime != NULL) { - timeout = K_MSEC(timespec_to_clock_timeoutms(cv->attr.clock, abstime)); + timeout = K_MSEC(timespec_to_timeoutms(cv->attr.clock, abstime)); } LOG_DBG("Waiting on cond %p with timeout %llx", cv, timeout.ticks); diff --git a/lib/posix/options/mqueue.c b/lib/posix/options/mqueue.c index 72244a1981d..0eef3f81ccf 100644 --- a/lib/posix/options/mqueue.c +++ b/lib/posix/options/mqueue.c @@ -264,7 +264,7 @@ int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, } return send_message(mqd, msg_ptr, msg_len, - K_MSEC(timespec_to_clock_timeoutms(CLOCK_REALTIME, abstime))); + K_MSEC(timespec_to_timeoutms(CLOCK_REALTIME, abstime))); } /** @@ -300,7 +300,7 @@ int mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, } return receive_message(mqd, msg_ptr, msg_len, - K_MSEC(timespec_to_clock_timeoutms(CLOCK_REALTIME, abstime))); + K_MSEC(timespec_to_timeoutms(CLOCK_REALTIME, abstime))); } /** diff --git a/lib/posix/options/mutex.c b/lib/posix/options/mutex.c index ff2efc7f655..52dec35d249 100644 --- a/lib/posix/options/mutex.c +++ b/lib/posix/options/mutex.c @@ -216,7 +216,7 @@ int pthread_mutex_timedlock(pthread_mutex_t *m, return EINVAL; } - return acquire_mutex(m, K_MSEC(timespec_to_clock_timeoutms(CLOCK_REALTIME, abstime))); + return acquire_mutex(m, K_MSEC(timespec_to_timeoutms(CLOCK_REALTIME, abstime))); } /** diff --git a/lib/posix/options/posix_clock.h b/lib/posix/options/posix_clock.h index c0ebe66fde6..5ff56724541 100644 --- a/lib/posix/options/posix_clock.h +++ b/lib/posix/options/posix_clock.h @@ -22,8 +22,7 @@ static inline bool timespec_is_valid(const struct timespec *ts) return (ts->tv_nsec >= 0) && (ts->tv_nsec < NSEC_PER_SEC); } -uint32_t timespec_to_clock_timeoutms(clockid_t clock_id, const struct timespec *abstime); -uint32_t timespec_to_timeoutms(const struct timespec *abstime); +uint32_t timespec_to_timeoutms(clockid_t clock_id, const struct timespec *abstime); __syscall int __posix_clock_get_base(clockid_t clock_id, struct timespec *ts); diff --git a/lib/posix/options/pthread.c b/lib/posix/options/pthread.c index bc88ea29fe2..c505b8564bb 100644 --- a/lib/posix/options/pthread.c +++ b/lib/posix/options/pthread.c @@ -1154,8 +1154,8 @@ int pthread_timedjoin_np(pthread_t pthread, void **status, const struct timespec return EINVAL; } - return pthread_timedjoin_internal( - pthread, status, K_MSEC(timespec_to_clock_timeoutms(CLOCK_REALTIME, abstime))); + return pthread_timedjoin_internal(pthread, status, + K_MSEC(timespec_to_timeoutms(CLOCK_REALTIME, abstime))); } /** diff --git a/lib/posix/options/rwlock.c b/lib/posix/options/rwlock.c index 39404c9229f..b7eb21bd6be 100644 --- a/lib/posix/options/rwlock.c +++ b/lib/posix/options/rwlock.c @@ -211,7 +211,7 @@ int pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock, return EINVAL; } - if (read_lock_acquire(rwl, timespec_to_clock_timeoutms(CLOCK_REALTIME, abstime)) != 0U) { + if (read_lock_acquire(rwl, timespec_to_timeoutms(CLOCK_REALTIME, abstime)) != 0U) { ret = ETIMEDOUT; } @@ -282,7 +282,7 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, return EINVAL; } - if (write_lock_acquire(rwl, timespec_to_clock_timeoutms(CLOCK_REALTIME, abstime)) != 0U) { + if (write_lock_acquire(rwl, timespec_to_timeoutms(CLOCK_REALTIME, abstime)) != 0U) { ret = ETIMEDOUT; } diff --git a/lib/posix/options/semaphore.c b/lib/posix/options/semaphore.c index 77a879a8cb9..55ac57c5cfd 100644 --- a/lib/posix/options/semaphore.c +++ b/lib/posix/options/semaphore.c @@ -166,7 +166,7 @@ int sem_timedwait(sem_t *semaphore, struct timespec *abstime) return -1; } - if (k_sem_take(semaphore, K_MSEC(timespec_to_clock_timeoutms(CLOCK_REALTIME, abstime)))) { + if (k_sem_take(semaphore, K_MSEC(timespec_to_timeoutms(CLOCK_REALTIME, abstime)))) { errno = ETIMEDOUT; return -1; } diff --git a/lib/posix/options/timespec_to_timeout.c b/lib/posix/options/timespec_to_timeout.c index a3373a9a7bf..d307efa736e 100644 --- a/lib/posix/options/timespec_to_timeout.c +++ b/lib/posix/options/timespec_to_timeout.c @@ -10,7 +10,7 @@ #include #include -uint32_t timespec_to_clock_timeoutms(clockid_t clock_id, const struct timespec *abstime) +uint32_t timespec_to_timeoutms(clockid_t clock_id, const struct timespec *abstime) { int64_t milli_secs, secs, nsecs; struct timespec curtime; @@ -27,8 +27,3 @@ uint32_t timespec_to_clock_timeoutms(clockid_t clock_id, const struct timespec * return milli_secs; } - -uint32_t timespec_to_timeoutms(const struct timespec *abstime) -{ - return timespec_to_clock_timeoutms(CLOCK_MONOTONIC, abstime); -}