summaryrefslogtreecommitdiff
path: root/components/libc/pthreads
diff options
context:
space:
mode:
authorMeco Man <[email protected]>2021-02-12 20:36:17 +0800
committerMeco Man <[email protected]>2021-02-12 20:36:17 +0800
commit598aa86f750bdc96ffb427fc8507a426a99fc63f (patch)
tree4f1e75f0587c23761a5d0dbae2956b636a13aae6 /components/libc/pthreads
parent40bb949cd552ea4f71b138712680f8e08246f9d8 (diff)
move clock_time_to_tick to time.c
Diffstat (limited to 'components/libc/pthreads')
-rw-r--r--components/libc/pthreads/pthread.c33
-rw-r--r--components/libc/pthreads/pthread_internal.h3
2 files changed, 1 insertions, 35 deletions
diff --git a/components/libc/pthreads/pthread.c b/components/libc/pthreads/pthread.c
index cec76a9691..7430510bf2 100644
--- a/components/libc/pthreads/pthread.c
+++ b/components/libc/pthreads/pthread.c
@@ -688,36 +688,3 @@ int pthread_cancel(pthread_t thread)
return 0;
}
RTM_EXPORT(pthread_cancel);
-
-int clock_time_to_tick(const struct timespec *time)
-{
- int tick;
- int nsecond, second;
- struct timespec tp;
-
- RT_ASSERT(time != RT_NULL);
-
- tick = RT_WAITING_FOREVER;
- if (time != NULL)
- {
- /* get current tp */
- clock_gettime(CLOCK_REALTIME, &tp);
-
- if ((time->tv_nsec - tp.tv_nsec) < 0)
- {
- nsecond = NANOSECOND_PER_SECOND - (tp.tv_nsec - time->tv_nsec);
- second = time->tv_sec - tp.tv_sec - 1;
- }
- else
- {
- nsecond = time->tv_nsec - tp.tv_nsec;
- second = time->tv_sec - tp.tv_sec;
- }
-
- tick = second * RT_TICK_PER_SECOND + nsecond * RT_TICK_PER_SECOND / NANOSECOND_PER_SECOND;
- if (tick < 0) tick = 0;
- }
-
- return tick;
-}
-RTM_EXPORT(clock_time_to_tick);
diff --git a/components/libc/pthreads/pthread_internal.h b/components/libc/pthreads/pthread_internal.h
index a6706ca091..240741e21a 100644
--- a/components/libc/pthreads/pthread_internal.h
+++ b/components/libc/pthreads/pthread_internal.h
@@ -13,6 +13,7 @@
#include <rtthread.h>
#include <pthread.h>
+#include <sys/time.h>
struct _pthread_cleanup
{
@@ -62,8 +63,6 @@ typedef struct _pthread_data _pthread_data_t;
_pthread_data_t *_pthread_get_data(pthread_t thread);
-int clock_time_to_tick(const struct timespec *time);
-
void posix_mq_system_init(void);
void posix_sem_system_init(void);
void pthread_key_system_init(void);