diff options
| author | Bernard Xiong <[email protected]> | 2013-01-08 18:13:32 -0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-01-08 18:13:32 -0800 |
| commit | accace98e05eda28c116eb04502eb92d01b6ef1e (patch) | |
| tree | 4a425c96e0be3980779c8205c7c3fe2f1a144630 /components/pthreads | |
| parent | 1fab41d48a490f6483582147500d43f4ca889a8e (diff) | |
| parent | 02b8e9366f362926799bfaecc0891830ba62f646 (diff) | |
Merge pull request #8 from mbbill/correct_crlf
Correct crlf
Diffstat (limited to 'components/pthreads')
| -rw-r--r-- | components/pthreads/SConscript | 16 | ||||
| -rw-r--r-- | components/pthreads/clock_time.c | 280 | ||||
| -rw-r--r-- | components/pthreads/mqueue.c | 598 | ||||
| -rw-r--r-- | components/pthreads/mqueue.h | 86 | ||||
| -rw-r--r-- | components/pthreads/posix_types.h | 402 | ||||
| -rw-r--r-- | components/pthreads/pthread.c | 956 | ||||
| -rw-r--r-- | components/pthreads/pthread.h | 548 | ||||
| -rw-r--r-- | components/pthreads/pthread_attr.c | 356 | ||||
| -rw-r--r-- | components/pthreads/pthread_barrier.c | 170 | ||||
| -rw-r--r-- | components/pthreads/pthread_cond.c | 386 | ||||
| -rw-r--r-- | components/pthreads/pthread_internal.h | 134 | ||||
| -rw-r--r-- | components/pthreads/pthread_mutex.c | 412 | ||||
| -rw-r--r-- | components/pthreads/pthread_rwlock.c | 558 | ||||
| -rw-r--r-- | components/pthreads/pthread_spin.c | 102 | ||||
| -rw-r--r-- | components/pthreads/pthread_tls.c | 172 | ||||
| -rw-r--r-- | components/pthreads/sched.c | 64 | ||||
| -rw-r--r-- | components/pthreads/semaphore.h | 66 |
17 files changed, 2653 insertions, 2653 deletions
diff --git a/components/pthreads/SConscript b/components/pthreads/SConscript index 9fe796d225..c1211343ec 100644 --- a/components/pthreads/SConscript +++ b/components/pthreads/SConscript @@ -1,8 +1,8 @@ -Import('RTT_ROOT')
-from building import *
-
-src = Glob('*.c')
-CPPPATH = [RTT_ROOT + '/components/pthreads']
-group = DefineGroup('pthreads', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH)
-
-Return('group')
+Import('RTT_ROOT') +from building import * + +src = Glob('*.c') +CPPPATH = [RTT_ROOT + '/components/pthreads'] +group = DefineGroup('pthreads', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) + +Return('group') diff --git a/components/pthreads/clock_time.c b/components/pthreads/clock_time.c index 4323addc67..52034936ec 100644 --- a/components/pthreads/clock_time.c +++ b/components/pthreads/clock_time.c @@ -1,140 +1,140 @@ -/*
- * File : clock_time.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2012, RT-Thread Development Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date Author Notes
- * 2012-12-08 Bernard fix the issue of _timevalue.tv_usec initialization,
- * which found by Rob <[email protected]>
- */
-#include <rtthread.h>
-#include <pthread.h>
-
-struct timeval _timevalue;
-void clock_time_system_init()
-{
- time_t time;
- rt_tick_t tick;
- rt_device_t device;
-
- time = 0;
- device = rt_device_find("rtc");
- if (device != RT_NULL)
- {
- /* get realtime seconds */
- rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
- }
-
- /* get tick */
- tick = rt_tick_get();
-
- _timevalue.tv_usec = (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK;
- _timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1;
-}
-
-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);
-
-int clock_getres (clockid_t clockid, struct timespec *res)
-{
- if ((clockid != CLOCK_REALTIME) || (res == RT_NULL))
- {
- rt_set_errno(EINVAL);
- return -1;
- }
-
- res->tv_sec = 0;
- res->tv_nsec = NANOSECOND_PER_SECOND/RT_TICK_PER_SECOND;
-
- return 0;
-}
-RTM_EXPORT(clock_getres);
-
-int clock_gettime (clockid_t clockid, struct timespec *tp)
-{
- rt_tick_t tick;
-
- if ((clockid != CLOCK_REALTIME) || (tp == RT_NULL))
- {
- rt_set_errno(EINVAL);
- return -1;
- }
-
- /* get tick */
- tick = rt_tick_get();
-
- tp->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND;
- tp->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * NANOSECOND_PER_TICK) * 1000;
-
- return 0;
-}
-RTM_EXPORT(clock_gettime);
-
-int clock_settime (clockid_t clockid, const struct timespec *tp)
-{
- int second;
- rt_tick_t tick;
- rt_device_t device;
-
- if ((clockid != CLOCK_REALTIME) || (tp == RT_NULL))
- {
- rt_set_errno(EINVAL);
- return -1;
- }
-
- /* get second */
- second = tp->tv_sec;
- /* get tick */
- tick = rt_tick_get();
-
- /* update timevalue */
- _timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK;
- _timevalue.tv_sec = second - tick/RT_TICK_PER_SECOND - 1;
-
- /* update for RTC device */
- device = rt_device_find("rtc");
- if (device != RT_NULL)
- {
- /* set realtime seconds */
- rt_device_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &second);
- }
- else return -1;
-
- return 0;
-}
-RTM_EXPORT(clock_settime);
+/* + * File : clock_time.c + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2012, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2012-12-08 Bernard fix the issue of _timevalue.tv_usec initialization, + * which found by Rob <[email protected]> + */ +#include <rtthread.h> +#include <pthread.h> + +struct timeval _timevalue; +void clock_time_system_init() +{ + time_t time; + rt_tick_t tick; + rt_device_t device; + + time = 0; + device = rt_device_find("rtc"); + if (device != RT_NULL) + { + /* get realtime seconds */ + rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time); + } + + /* get tick */ + tick = rt_tick_get(); + + _timevalue.tv_usec = (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; + _timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1; +} + +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); + +int clock_getres (clockid_t clockid, struct timespec *res) +{ + if ((clockid != CLOCK_REALTIME) || (res == RT_NULL)) + { + rt_set_errno(EINVAL); + return -1; + } + + res->tv_sec = 0; + res->tv_nsec = NANOSECOND_PER_SECOND/RT_TICK_PER_SECOND; + + return 0; +} +RTM_EXPORT(clock_getres); + +int clock_gettime (clockid_t clockid, struct timespec *tp) +{ + rt_tick_t tick; + + if ((clockid != CLOCK_REALTIME) || (tp == RT_NULL)) + { + rt_set_errno(EINVAL); + return -1; + } + + /* get tick */ + tick = rt_tick_get(); + + tp->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND; + tp->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * NANOSECOND_PER_TICK) * 1000; + + return 0; +} +RTM_EXPORT(clock_gettime); + +int clock_settime (clockid_t clockid, const struct timespec *tp) +{ + int second; + rt_tick_t tick; + rt_device_t device; + + if ((clockid != CLOCK_REALTIME) || (tp == RT_NULL)) + { + rt_set_errno(EINVAL); + return -1; + } + + /* get second */ + second = tp->tv_sec; + /* get tick */ + tick = rt_tick_get(); + + /* update timevalue */ + _timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; + _timevalue.tv_sec = second - tick/RT_TICK_PER_SECOND - 1; + + /* update for RTC device */ + device = rt_device_find("rtc"); + if (device != RT_NULL) + { + /* set realtime seconds */ + rt_device_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &second); + } + else return -1; + + return 0; +} +RTM_EXPORT(clock_settime); diff --git a/components/pthreads/mqueue.c b/components/pthreads/mqueue.c index 1f44a98eff..f441011e1c 100644 --- a/components/pthreads/mqueue.c +++ b/components/pthreads/mqueue.c @@ -1,299 +1,299 @@ -#include "mqueue.h"
-#include "pthread_internal.h"
-
-static mqd_t posix_mq_list = RT_NULL;
-static struct rt_semaphore posix_mq_lock;
-void posix_mq_system_init()
-{
- rt_sem_init(&posix_mq_lock, "pmq", 1, RT_IPC_FLAG_FIFO);
-}
-
-rt_inline void posix_mq_insert(mqd_t pmq)
-{
- pmq->next = posix_mq_list;
- posix_mq_list = pmq;
-}
-
-static void posix_mq_delete(mqd_t pmq)
-{
- mqd_t iter;
- if (posix_mq_list == pmq)
- {
- posix_mq_list = pmq->next;
-
- rt_mq_delete(pmq->mq);
- rt_free(pmq);
-
- return;
- }
- for (iter = posix_mq_list; iter->next != RT_NULL; iter = iter->next)
- {
- if (iter->next == pmq)
- {
- /* delete this mq */
- if (pmq->next != RT_NULL)
- iter->next = pmq->next;
- else
- iter->next = RT_NULL;
-
- /* delete RT-Thread mqueue */
- rt_mq_delete(pmq->mq);
- rt_free(pmq);
- return ;
- }
- }
-}
-
-static mqd_t posix_mq_find(const char* name)
-{
- mqd_t iter;
- rt_object_t object;
-
- for (iter = posix_mq_list; iter != RT_NULL; iter = iter->next)
- {
- object = (rt_object_t)(iter->mq);
-
- if (strncmp(object->name, name, RT_NAME_MAX) == 0)
- {
- return iter;
- }
- }
-
- return RT_NULL;
-}
-
-int mq_setattr(mqd_t mqdes, const struct mq_attr *mqstat,
- struct mq_attr *omqstat)
-{
- rt_set_errno(-RT_ERROR);
- return -1;
-}
-RTM_EXPORT(mq_setattr);
-
-int mq_getattr(mqd_t mqdes, struct mq_attr *mqstat)
-{
- if ((mqdes == RT_NULL) || mqstat == RT_NULL)
- {
- rt_set_errno(EBADF);
- return -1;
- }
-
- mqstat->mq_maxmsg = mqdes->mq->max_msgs;
- mqstat->mq_msgsize = mqdes->mq->msg_size;
- mqstat->mq_curmsgs = 0;
- mqstat->mq_flags = 0;
-
- return 0;
-}
-RTM_EXPORT(mq_getattr);
-
-mqd_t mq_open(const char *name, int oflag, ...)
-{
- mqd_t mqdes;
- va_list arg;
- mode_t mode;
- struct mq_attr *attr = RT_NULL;
-
- /* lock posix mqueue list */
- rt_sem_take(&posix_mq_lock, RT_WAITING_FOREVER);
-
- mqdes = RT_NULL;
- if (oflag & O_CREAT)
- {
- va_start(arg, oflag);
- mode = (mode_t) va_arg(arg, unsigned int); mode = mode;
- attr = (struct mq_attr *) va_arg(arg, struct mq_attr *);
- va_end(arg);
-
- if (oflag & O_EXCL)
- {
- if (posix_mq_find(name) != RT_NULL)
- {
- rt_set_errno(EEXIST);
- goto __return;
- }
- }
- mqdes = (mqd_t) rt_malloc (sizeof(struct mqdes));
- if (mqdes == RT_NULL)
- {
- rt_set_errno(ENFILE);
- goto __return;
- }
-
- /* create RT-Thread message queue */
- mqdes->mq = rt_mq_create(name, attr->mq_msgsize, attr->mq_maxmsg, RT_IPC_FLAG_FIFO);
- if (mqdes->mq == RT_NULL) /* create failed */
- {
- rt_set_errno(ENFILE);
- goto __return;
- }
- /* initialize reference count */
- mqdes->refcount = 1;
- mqdes->unlinked = 0;
-
- /* insert mq to posix mq list */
- posix_mq_insert(mqdes);
- }
- else
- {
- /* find mqueue */
- mqdes = posix_mq_find(name);
- if (mqdes != RT_NULL)
- {
- mqdes->refcount ++; /* increase reference count */
- }
- else
- {
- rt_set_errno(ENOENT);
- goto __return;
- }
- }
- rt_sem_release(&posix_mq_lock);
- return mqdes;
-
-__return:
- /* release lock */
- rt_sem_release(&posix_mq_lock);
-
- /* release allocated memory */
- if (mqdes != RT_NULL)
- {
- if (mqdes->mq != RT_NULL)
- {
- /* delete RT-Thread message queue */
- rt_mq_delete(mqdes->mq);
- }
- rt_free(mqdes);
- }
- return RT_NULL;
-}
-RTM_EXPORT(mq_open);
-
-ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio)
-{
- rt_err_t result;
-
- if ((mqdes == RT_NULL) || (msg_ptr == RT_NULL))
- {
- rt_set_errno(EINVAL);
- return -1;
- }
-
- result = rt_mq_recv(mqdes->mq, msg_ptr, msg_len, RT_WAITING_FOREVER);
- if (result == RT_EOK)
- return msg_len;
-
- rt_set_errno(EBADF);
- return -1;
-}
-RTM_EXPORT(mq_receive);
-
-int mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio)
-{
- rt_err_t result;
-
- if ((mqdes == RT_NULL) || (msg_ptr == RT_NULL))
- {
- rt_set_errno(EINVAL);
- return -1;
- }
-
- result = rt_mq_send(mqdes->mq, (void*)msg_ptr, msg_len);
- if (result == RT_EOK)
- return 0;
-
- rt_set_errno(EBADF);
- return -1;
-}
-RTM_EXPORT(mq_send);
-
-ssize_t mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
- unsigned *msg_prio, const struct timespec *abs_timeout)
-{
- int tick;
- rt_err_t result;
-
- /* parameters check */
- if ((mqdes == RT_NULL) || (msg_ptr == RT_NULL))
- {
- rt_set_errno(EINVAL);
- return -1;
- }
-
- tick = clock_time_to_tick(abs_timeout);
-
- result = rt_mq_recv(mqdes->mq, msg_ptr, msg_len, tick);
- if (result == RT_EOK) return msg_len;
-
- if (result == -RT_ETIMEOUT)
- rt_set_errno(ETIMEDOUT);
- else
- rt_set_errno(EBADMSG);
-
- return -1;
-}
-RTM_EXPORT(mq_timedreceive);
-
-int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio,
- const struct timespec *abs_timeout)
-{
- /* RT-Thread does not support timed send */
- return mq_send(mqdes, msg_ptr, msg_len, msg_prio);
-}
-RTM_EXPORT(mq_timedsend);
-
-int mq_notify(mqd_t mqdes, const struct sigevent *notification)
-{
- rt_set_errno(-RT_ERROR);
- return -1;
-}
-RTM_EXPORT(mq_notify);
-
-int mq_close(mqd_t mqdes)
-{
- if (mqdes == RT_NULL)
- {
- rt_set_errno(EINVAL);
- return -1;
- }
-
- /* lock posix mqueue list */
- rt_sem_take(&posix_mq_lock, RT_WAITING_FOREVER);
- mqdes->refcount --;
- if (mqdes->refcount == 0)
- {
- /* delete from posix mqueue list */
- if (mqdes->unlinked)
- posix_mq_delete(mqdes);
- }
- rt_sem_release(&posix_mq_lock);
-
- return 0;
-}
-RTM_EXPORT(mq_close);
-
-int mq_unlink(const char *name)
-{
- mqd_t pmq;
-
- /* lock posix mqueue list */
- rt_sem_take(&posix_mq_lock, RT_WAITING_FOREVER);
- pmq = posix_mq_find(name);
- if (pmq != RT_NULL)
- {
- pmq->unlinked = 1;
- if (pmq->refcount == 0)
- {
- /* remove this mqueue */
- posix_mq_delete(pmq);
- }
- rt_sem_release(&posix_mq_lock);
- return 0;
- }
- rt_sem_release(&posix_mq_lock);
-
- /* no this entry */
- rt_set_errno(ENOENT);
- return -1;
-}
-RTM_EXPORT(mq_unlink);
+#include "mqueue.h" +#include "pthread_internal.h" + +static mqd_t posix_mq_list = RT_NULL; +static struct rt_semaphore posix_mq_lock; +void posix_mq_system_init() +{ + rt_sem_init(&posix_mq_lock, "pmq", 1, RT_IPC_FLAG_FIFO); +} + +rt_inline void posix_mq_insert(mqd_t pmq) +{ + pmq->next = posix_mq_list; + posix_mq_list = pmq; +} + +static void posix_mq_delete(mqd_t pmq) +{ + mqd_t iter; + if (posix_mq_list == pmq) + { + posix_mq_list = pmq->next; + + rt_mq_delete(pmq->mq); + rt_free(pmq); + + return; + } + for (iter = posix_mq_list; iter->next != RT_NULL; iter = iter->next) + { + if (iter->next == pmq) + { + /* delete this mq */ + if (pmq->next != RT_NULL) + iter->next = pmq->next; + else + iter->next = RT_NULL; + + /* delete RT-Thread mqueue */ + rt_mq_delete(pmq->mq); + rt_free(pmq); + return ; + } + } +} + +static mqd_t posix_mq_find(const char* name) +{ + mqd_t iter; + rt_object_t object; + + for (iter = posix_mq_list; iter != RT_NULL; iter = iter->next) + { + object = (rt_object_t)(iter->mq); + + if (strncmp(object->name, name, RT_NAME_MAX) == 0) + { + return iter; + } + } + + return RT_NULL; +} + +int mq_setattr(mqd_t mqdes, const struct mq_attr *mqstat, + struct mq_attr *omqstat) +{ + rt_set_errno(-RT_ERROR); + return -1; +} +RTM_EXPORT(mq_setattr); + +int mq_getattr(mqd_t mqdes, struct mq_attr *mqstat) +{ + if ((mqdes == RT_NULL) || mqstat == RT_NULL) + { + rt_set_errno(EBADF); + return -1; + } + + mqstat->mq_maxmsg = mqdes->mq->max_msgs; + mqstat->mq_msgsize = mqdes->mq->msg_size; + mqstat->mq_curmsgs = 0; + mqstat->mq_flags = 0; + + return 0; +} +RTM_EXPORT(mq_getattr); + +mqd_t mq_open(const char *name, int oflag, ...) +{ + mqd_t mqdes; + va_list arg; + mode_t mode; + struct mq_attr *attr = RT_NULL; + + /* lock posix mqueue list */ + rt_sem_take(&posix_mq_lock, RT_WAITING_FOREVER); + + mqdes = RT_NULL; + if (oflag & O_CREAT) + { + va_start(arg, oflag); + mode = (mode_t) va_arg(arg, unsigned int); mode = mode; + attr = (struct mq_attr *) va_arg(arg, struct mq_attr *); + va_end(arg); + + if (oflag & O_EXCL) + { + if (posix_mq_find(name) != RT_NULL) + { + rt_set_errno(EEXIST); + goto __return; + } + } + mqdes = (mqd_t) rt_malloc (sizeof(struct mqdes)); + if (mqdes == RT_NULL) + { + rt_set_errno(ENFILE); + goto __return; + } + + /* create RT-Thread message queue */ + mqdes->mq = rt_mq_create(name, attr->mq_msgsize, attr->mq_maxmsg, RT_IPC_FLAG_FIFO); + if (mqdes->mq == RT_NULL) /* create failed */ + { + rt_set_errno(ENFILE); + goto __return; + } + /* initialize reference count */ + mqdes->refcount = 1; + mqdes->unlinked = 0; + + /* insert mq to posix mq list */ + posix_mq_insert(mqdes); + } + else + { + /* find mqueue */ + mqdes = posix_mq_find(name); + if (mqdes != RT_NULL) + { + mqdes->refcount ++; /* increase reference count */ + } + else + { + rt_set_errno(ENOENT); + goto __return; + } + } + rt_sem_release(&posix_mq_lock); + return mqdes; + +__return: + /* release lock */ + rt_sem_release(&posix_mq_lock); + + /* release allocated memory */ + if (mqdes != RT_NULL) + { + if (mqdes->mq != RT_NULL) + { + /* delete RT-Thread message queue */ + rt_mq_delete(mqdes->mq); + } + rt_free(mqdes); + } + return RT_NULL; +} +RTM_EXPORT(mq_open); + +ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio) +{ + rt_err_t result; + + if ((mqdes == RT_NULL) || (msg_ptr == RT_NULL)) + { + rt_set_errno(EINVAL); + return -1; + } + + result = rt_mq_recv(mqdes->mq, msg_ptr, msg_len, RT_WAITING_FOREVER); + if (result == RT_EOK) + return msg_len; + + rt_set_errno(EBADF); + return -1; +} +RTM_EXPORT(mq_receive); + +int mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio) +{ + rt_err_t result; + + if ((mqdes == RT_NULL) || (msg_ptr == RT_NULL)) + { + rt_set_errno(EINVAL); + return -1; + } + + result = rt_mq_send(mqdes->mq, (void*)msg_ptr, msg_len); + if (result == RT_EOK) + return 0; + + rt_set_errno(EBADF); + return -1; +} +RTM_EXPORT(mq_send); + +ssize_t mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, + unsigned *msg_prio, const struct timespec *abs_timeout) +{ + int tick; + rt_err_t result; + + /* parameters check */ + if ((mqdes == RT_NULL) || (msg_ptr == RT_NULL)) + { + rt_set_errno(EINVAL); + return -1; + } + + tick = clock_time_to_tick(abs_timeout); + + result = rt_mq_recv(mqdes->mq, msg_ptr, msg_len, tick); + if (result == RT_EOK) return msg_len; + + if (result == -RT_ETIMEOUT) + rt_set_errno(ETIMEDOUT); + else + rt_set_errno(EBADMSG); + + return -1; +} +RTM_EXPORT(mq_timedreceive); + +int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio, + const struct timespec *abs_timeout) +{ + /* RT-Thread does not support timed send */ + return mq_send(mqdes, msg_ptr, msg_len, msg_prio); +} +RTM_EXPORT(mq_timedsend); + +int mq_notify(mqd_t mqdes, const struct sigevent *notification) +{ + rt_set_errno(-RT_ERROR); + return -1; +} +RTM_EXPORT(mq_notify); + +int mq_close(mqd_t mqdes) +{ + if (mqdes == RT_NULL) + { + rt_set_errno(EINVAL); + return -1; + } + + /* lock posix mqueue list */ + rt_sem_take(&posix_mq_lock, RT_WAITING_FOREVER); + mqdes->refcount --; + if (mqdes->refcount == 0) + { + /* delete from posix mqueue list */ + if (mqdes->unlinked) + posix_mq_delete(mqdes); + } + rt_sem_release(&posix_mq_lock); + + return 0; +} +RTM_EXPORT(mq_close); + +int mq_unlink(const char *name) +{ + mqd_t pmq; + + /* lock posix mqueue list */ + rt_sem_take(&posix_mq_lock, RT_WAITING_FOREVER); + pmq = posix_mq_find(name); + if (pmq != RT_NULL) + { + pmq->unlinked = 1; + if (pmq->refcount == 0) + { + /* remove this mqueue */ + posix_mq_delete(pmq); + } + rt_sem_release(&posix_mq_lock); + return 0; + } + rt_sem_release(&posix_mq_lock); + + /* no this entry */ + rt_set_errno(ENOENT); + return -1; +} +RTM_EXPORT(mq_unlink); diff --git a/components/pthreads/mqueue.h b/components/pthreads/mqueue.h index d0788857be..5c17884721 100644 --- a/components/pthreads/mqueue.h +++ b/components/pthreads/mqueue.h @@ -1,43 +1,43 @@ -#ifndef __MQUEUE_H__
-#define __MQUEUE_H__
-
-#include <rtthread.h>
-#include <pthread.h>
-
-struct mqdes
-{
- /* reference count and unlinked */
- rt_uint16_t refcount;
- rt_uint16_t unlinked;
-
- /* RT-Thread message queue */
- rt_mq_t mq;
- /* next posix mqueue */
- struct mqdes* next;
-};
-typedef struct mqdes* mqd_t;
-
-struct mq_attr
-{
- long mq_flags; /* Message queue flags. */
- long mq_maxmsg; /* Maximum number of messages. */
- long mq_msgsize; /* Maximum message size. */
- long mq_curmsgs; /* Number of messages currently queued. */
-};
-
-int mq_close(mqd_t mqdes);
-int mq_getattr(mqd_t mqdes, struct mq_attr *mqstat);
-int mq_notify(mqd_t mqdes, const struct sigevent *notification);
-mqd_t mq_open(const char *name, int oflag, ...);
-ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio);
-int mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio);
-int mq_setattr(mqd_t mqdes, const struct mq_attr *mqstat,
- struct mq_attr *omqstat);
-ssize_t mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
- unsigned *msg_prio, const struct timespec *abs_timeout);
-int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio,
- const struct timespec *abs_timeout);
-
-int mq_unlink(const char *name);
-
-#endif
+#ifndef __MQUEUE_H__ +#define __MQUEUE_H__ + +#include <rtthread.h> +#include <pthread.h> + +struct mqdes +{ + /* reference count and unlinked */ + rt_uint16_t refcount; + rt_uint16_t unlinked; + + /* RT-Thread message queue */ + rt_mq_t mq; + /* next posix mqueue */ + struct mqdes* next; +}; +typedef struct mqdes* mqd_t; + +struct mq_attr +{ + long mq_flags; /* Message queue flags. */ + long mq_maxmsg; /* Maximum number of messages. */ + long mq_msgsize; /* Maximum message size. */ + long mq_curmsgs; /* Number of messages currently queued. */ +}; + +int mq_close(mqd_t mqdes); +int mq_getattr(mqd_t mqdes, struct mq_attr *mqstat); +int mq_notify(mqd_t mqdes, const struct sigevent *notification); +mqd_t mq_open(const char *name, int oflag, ...); +ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio); +int mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio); +int mq_setattr(mqd_t mqdes, const struct mq_attr *mqstat, + struct mq_attr *omqstat); +ssize_t mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, + unsigned *msg_prio, const struct timespec *abs_timeout); +int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio, + const struct timespec *abs_timeout); + +int mq_unlink(const char *name); + +#endif diff --git a/components/pthreads/posix_types.h b/components/pthreads/posix_types.h index 9e7b6362d4..2fcbb71045 100644 --- a/components/pthreads/posix_types.h +++ b/components/pthreads/posix_types.h @@ -1,201 +1,201 @@ -#ifndef __POSIX_TYPES_H__
-#define __POSIX_TYPES_H__
-
-#include <rtthread.h>
-
-/* compatible in different compiler and C runtime library */
-#ifdef RT_USING_NEWLIB
-/* normarlly, GNU GCC will use newlib as C runtime library */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <sys/fcntl.h>
-
-#include <errno.h>
-#include <stdarg.h>
-
-#define ESHUTDOWN 180
-
-#else
-
-/* ARM compiler and IAR compiler */
-#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__)
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-
-typedef rt_int32_t clockid_t;
-typedef rt_int32_t key_t; /* Used for interprocess communication. */
-typedef rt_int32_t pid_t; /* Used for process IDs and process group IDs. */
-typedef signed long ssize_t; /* Used for a count of bytes or an error indication. */
-typedef signed long time_t; /* Used for time in seconds. */
-
-struct timespec {
- time_t tv_sec; /* seconds */
- long tv_nsec; /* nanoseconds */
-};
-
-struct timeval {
- long tv_sec; /* seconds */
- long tv_usec; /* microseconds */
-};
-
-/* errno definitions */
-#define EPERM 1 /* Operation not permitted */
-#define ENOENT 2 /* No such file or directory */
-#define ESRCH 3 /* No such process */
-#define EINTR 4 /* Interrupted system call */
-#define EIO 5 /* I/O error */
-#define ENXIO 6 /* No such device or address */
-#define E2BIG 7 /* Arg list too long */
-#define ENOEXEC 8 /* Exec format error */
-#define EBADF 9 /* Bad file number */
-#define ECHILD 10 /* No child processes */
-#define EAGAIN 11 /* Try again */
-#define ENOMEM 12 /* Out of memory */
-#define EACCES 13 /* Permission denied */
-#define EFAULT 14 /* Bad address */
-#define ENOTBLK 15 /* Block device required */
-#define EBUSY 16 /* Device or resource busy */
-#define EEXIST 17 /* File exists */
-#define EXDEV 18 /* Cross-device link */
-#define ENODEV 19 /* No such device */
-#define ENOTDIR 20 /* Not a directory */
-#define EISDIR 21 /* Is a directory */
-#define EINVAL 22 /* Invalid argument */
-#define ENFILE 23 /* File table overflow */
-#define EMFILE 24 /* Too many open files */
-#define ENOTTY 25 /* Not a typewriter */
-#define ETXTBSY 26 /* Text file busy */
-#define EFBIG 27 /* File too large */
-#define ENOSPC 28 /* No space left on device */
-#define ESPIPE 29 /* Illegal seek */
-#define EROFS 30 /* Read-only file system */
-#define EMLINK 31 /* Too many links */
-#define EPIPE 32 /* Broken pipe */
-#define EDOM 33 /* Math argument out of domain of func */
-#define ERANGE 34 /* Math result not representable */
-#define ENOMSG 35 /* No message of desired type */
-#define EIDRM 36 /* Identifier removed */
-#define ECHRNG 37 /* Channel number out of range */
-#define EL2NSYNC 38 /* Level 2 not synchronized */
-#define EL3HLT 39 /* Level 3 halted */
-#define EL3RST 40 /* Level 3 reset */
-#define ELNRNG 41 /* Link number out of range */
-#define EUNATCH 42 /* Protocol driver not attached */
-#define ENOCSI 43 /* No CSI structure available */
-#define EL2HLT 44 /* Level 2 halted */
-#define EDEADLK 45 /* Resource deadlock would occur */
-#define ENOLCK 46 /* No record locks available */
-#define EBADE 50 /* Invalid exchange */
-#define EBADR 51 /* Invalid request descriptor */
-#define EXFULL 52 /* Exchange full */
-#define ENOANO 53 /* No anode */
-#define EBADRQC 54 /* Invalid request code */
-#define EBADSLT 55 /* Invalid slot */
-#define EDEADLOCK 56 /* File locking deadlock error */
-#define EBFONT 59 /* Bad font file format */
-#define ENOSTR 60 /* Device not a stream */
-#define ENODATA 61 /* No data available */
-#define ETIME 62 /* Timer expired */
-#define ENOSR 63 /* Out of streams resources */
-#define ENONET 64 /* Machine is not on the network */
-#define ENOPKG 65 /* Package not installed */
-#define EREMOTE 66 /* Object is remote */
-#define ENOLINK 67 /* Link has been severed */
-#define EADV 68 /* Advertise error */
-#define ESRMNT 69 /* Srmount error */
-#define ECOMM 70 /* Communication error on send */
-#define EPROTO 71 /* Protocol error */
-#define EDOTDOT 73 /* RFS specific error */
-#define EMULTIHOP 74 /* Multihop attempted */
-#define EBADMSG 77 /* Not a data message */
-#define ENAMETOOLONG 78 /* File name too long */
-#define EOVERFLOW 79 /* Value too large for defined data type */
-#define ENOTUNIQ 80 /* Name not unique on network */
-#define EBADFD 81 /* File descriptor in bad state */
-#define EREMCHG 82 /* Remote address changed */
-#define ELIBACC 83 /* Can not access a needed shared library */
-#define ELIBBAD 84 /* Accessing a corrupted shared library */
-#define ELIBSCN 85 /* .lib section in a.out corrupted */
-#define ELIBMAX 86 /* Attempting to link in too many shared libraries */
-#define ELIBEXEC 87 /* Cannot exec a shared library directly */
-#define EILSEQ 88 /* Illegal byte sequence */
-#define ENOSYS 89 /* Function not implemented */
-#define ELOOP 90 /* Too many symbolic links encountered */
-#define ERESTART 91 /* Interrupted system call should be restarted */
-#define ESTRPIPE 92 /* Streams pipe error */
-#define ENOTEMPTY 93 /* Directory not empty */
-#define EUSERS 94 /* Too many users */
-#define ENOTSOCK 95 /* Socket operation on non-socket */
-#define EDESTADDRREQ 96 /* Destination address required */
-#define EMSGSIZE 97 /* Message too long */
-#define EPROTOTYPE 98 /* Protocol wrong type for socket */
-#define ENOPROTOOPT 99 /* Protocol not available */
-#define EPROTONOSUPPORT 120 /* Protocol not supported */
-#define ESOCKTNOSUPPORT 121 /* Socket type not supported */
-#define EOPNOTSUPP 122 /* Operation not supported on transport endpoint */
-#define ENOTSUP EOPNOTSUPP/* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT 123 /* Protocol family not supported */
-#define EAFNOSUPPORT 124 /* Address family not supported by protocol */
-#define EADDRINUSE 125 /* Address already in use */
-#define EADDRNOTAVAIL 126 /* Cannot assign requested address */
-#define ENETDOWN 127 /* Network is down */
-#define ENETUNREACH 128 /* Network is unreachable */
-#define ENETRESET 129 /* Network dropped connection because of reset */
-#define ECONNABORTED 130 /* Software caused connection abort */
-#define ECONNRESET 131 /* Connection reset by peer */
-#define ENOBUFS 132 /* No buffer space available */
-#define EISCONN 133 /* Transport endpoint is already connected */
-#define ENOTCONN 134 /* Transport endpoint is not connected */
-#define EUCLEAN 135 /* Structure needs cleaning */
-#define ENOTNAM 137 /* Not a XENIX named type file */
-#define ENAVAIL 138 /* No XENIX semaphores available */
-#define EISNAM 139 /* Is a named type file */
-#define EREMOTEIO 140 /* Remote I/O error */
-#define EINIT 141 /* Reserved */
-#define EREMDEV 142 /* Error 142 */
-#define ESHUTDOWN 143 /* Cannot send after transport endpoint shutdown */
-#define ETOOMANYREFS 144 /* Too many references: cannot splice */
-#define ETIMEDOUT 145 /* Connection timed out */
-#define ECONNREFUSED 146 /* Connection refused */
-#define EHOSTDOWN 147 /* Host is down */
-#define EHOSTUNREACH 148 /* No route to host */
-#define EWOULDBLOCK EAGAIN /* Operation would block */
-#define EALREADY 149 /* Operation already in progress */
-#define EINPROGRESS 150 /* Operation now in progress */
-#define ESTALE 151 /* Stale NFS file handle */
-#define ECANCELED 158 /* AIO operation canceled */
-#define ENOMEDIUM 159 /* No medium found */
-#define EMEDIUMTYPE 160 /* Wrong medium type */
-#define ENOKEY 161 /* Required key not available */
-#define EKEYEXPIRED 162 /* Key has expired */
-#define EKEYREVOKED 163 /* Key has been revoked */
-#define EKEYREJECTED 164 /* Key was rejected by service */
-#define EDQUOT 1133 /* Quota exceeded */
-
-#ifdef RT_USING_DFS
-#include <dfs_posix.h>
-#else
-typedef rt_uint16_t mode_t;
-#define O_RDONLY 0x0000000
-#define O_WRONLY 0x0000001
-#define O_RDWR 0x0000002
-#define O_ACCMODE 0x0000003
-#define O_CREAT 0x0000100
-#define O_EXCL 0x0000200
-#define O_TRUNC 0x0001000
-#define O_APPEND 0x0002000
-#define O_DIRECTORY 0x0200000
-#endif
-
-#elif defined (__GNUC__) /* GNU GCC Compiler, with minilibc */
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#endif
-
-#endif
-
-#endif
+#ifndef __POSIX_TYPES_H__ +#define __POSIX_TYPES_H__ + +#include <rtthread.h> + +/* compatible in different compiler and C runtime library */ +#ifdef RT_USING_NEWLIB +/* normarlly, GNU GCC will use newlib as C runtime library */ +#include <sys/types.h> +#include <sys/time.h> +#include <sys/signal.h> +#include <sys/fcntl.h> + +#include <errno.h> +#include <stdarg.h> + +#define ESHUTDOWN 180 + +#else + +/* ARM compiler and IAR compiler */ +#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) +#include <stddef.h> +#include <stdarg.h> +#include <string.h> + +typedef rt_int32_t clockid_t; +typedef rt_int32_t key_t; /* Used for interprocess communication. */ +typedef rt_int32_t pid_t; /* Used for process IDs and process group IDs. */ +typedef signed long ssize_t; /* Used for a count of bytes or an error indication. */ +typedef signed long time_t; /* Used for time in seconds. */ + +struct timespec { + time_t tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ +}; + +struct timeval { + long tv_sec; /* seconds */ + long tv_usec; /* microseconds */ +}; + +/* errno definitions */ +#define EPERM 1 /* Operation not permitted */ +#define ENOENT 2 /* No such file or directory */ +#define ESRCH 3 /* No such process */ +#define EINTR 4 /* Interrupted system call */ +#define EIO 5 /* I/O error */ +#define ENXIO 6 /* No such device or address */ +#define E2BIG 7 /* Arg list too long */ +#define ENOEXEC 8 /* Exec format error */ +#define EBADF 9 /* Bad file number */ +#define ECHILD 10 /* No child processes */ +#define EAGAIN 11 /* Try again */ +#define ENOMEM 12 /* Out of memory */ +#define EACCES 13 /* Permission denied */ +#define EFAULT 14 /* Bad address */ +#define ENOTBLK 15 /* Block device required */ +#define EBUSY 16 /* Device or resource busy */ +#define EEXIST 17 /* File exists */ +#define EXDEV 18 /* Cross-device link */ +#define ENODEV 19 /* No such device */ +#define ENOTDIR 20 /* Not a directory */ +#define EISDIR 21 /* Is a directory */ +#define EINVAL 22 /* Invalid argument */ +#define ENFILE 23 /* File table overflow */ +#define EMFILE 24 /* Too many open files */ +#define ENOTTY 25 /* Not a typewriter */ +#define ETXTBSY 26 /* Text file busy */ +#define EFBIG 27 /* File too large */ +#define ENOSPC 28 /* No space left on device */ +#define ESPIPE 29 /* Illegal seek */ +#define EROFS 30 /* Read-only file system */ +#define EMLINK 31 /* Too many links */ +#define EPIPE 32 /* Broken pipe */ +#define EDOM 33 /* Math argument out of domain of func */ +#define ERANGE 34 /* Math result not representable */ +#define ENOMSG 35 /* No message of desired type */ +#define EIDRM 36 /* Identifier removed */ +#define ECHRNG 37 /* Channel number out of range */ +#define EL2NSYNC 38 /* Level 2 not synchronized */ +#define EL3HLT 39 /* Level 3 halted */ +#define EL3RST 40 /* Level 3 reset */ +#define ELNRNG 41 /* Link number out of range */ +#define EUNATCH 42 /* Protocol driver not attached */ +#define ENOCSI 43 /* No CSI structure available */ +#define EL2HLT 44 /* Level 2 halted */ +#define EDEADLK 45 /* Resource deadlock would occur */ +#define ENOLCK 46 /* No record locks available */ +#define EBADE 50 /* Invalid exchange */ +#define EBADR 51 /* Invalid request descriptor */ +#define EXFULL 52 /* Exchange full */ +#define ENOANO 53 /* No anode */ +#define EBADRQC 54 /* Invalid request code */ +#define EBADSLT 55 /* Invalid slot */ +#define EDEADLOCK 56 /* File locking deadlock error */ +#define EBFONT 59 /* Bad font file format */ +#define ENOSTR 60 /* Device not a stream */ +#define ENODATA 61 /* No data available */ +#define ETIME 62 /* Timer expired */ +#define ENOSR 63 /* Out of streams resources */ +#define ENONET 64 /* Machine is not on the network */ +#define ENOPKG 65 /* Package not installed */ +#define EREMOTE 66 /* Object is remote */ +#define ENOLINK 67 /* Link has been severed */ +#define EADV 68 /* Advertise error */ +#define ESRMNT 69 /* Srmount error */ +#define ECOMM 70 /* Communication error on send */ +#define EPROTO 71 /* Protocol error */ +#define EDOTDOT 73 /* RFS specific error */ +#define EMULTIHOP 74 /* Multihop attempted */ +#define EBADMSG 77 /* Not a data message */ +#define ENAMETOOLONG 78 /* File name too long */ +#define EOVERFLOW 79 /* Value too large for defined data type */ +#define ENOTUNIQ 80 /* Name not unique on network */ +#define EBADFD 81 /* File descriptor in bad state */ +#define EREMCHG 82 /* Remote address changed */ +#define ELIBACC 83 /* Can not access a needed shared library */ +#define ELIBBAD 84 /* Accessing a corrupted shared library */ +#define ELIBSCN 85 /* .lib section in a.out corrupted */ +#define ELIBMAX 86 /* Attempting to link in too many shared libraries */ +#define ELIBEXEC 87 /* Cannot exec a shared library directly */ +#define EILSEQ 88 /* Illegal byte sequence */ +#define ENOSYS 89 /* Function not implemented */ +#define ELOOP 90 /* Too many symbolic links encountered */ +#define ERESTART 91 /* Interrupted system call should be restarted */ +#define ESTRPIPE 92 /* Streams pipe error */ +#define ENOTEMPTY 93 /* Directory not empty */ +#define EUSERS 94 /* Too many users */ +#define ENOTSOCK 95 /* Socket operation on non-socket */ +#define EDESTADDRREQ 96 /* Destination address required */ +#define EMSGSIZE 97 /* Message too long */ +#define EPROTOTYPE 98 /* Protocol wrong type for socket */ +#define ENOPROTOOPT 99 /* Protocol not available */ +#define EPROTONOSUPPORT 120 /* Protocol not supported */ +#define ESOCKTNOSUPPORT 121 /* Socket type not supported */ +#define EOPNOTSUPP 122 /* Operation not supported on transport endpoint */ +#define ENOTSUP EOPNOTSUPP/* Operation not supported on transport endpoint */ +#define EPFNOSUPPORT 123 /* Protocol family not supported */ +#define EAFNOSUPPORT 124 /* Address family not supported by protocol */ +#define EADDRINUSE 125 /* Address already in use */ +#define EADDRNOTAVAIL 126 /* Cannot assign requested address */ +#define ENETDOWN 127 /* Network is down */ +#define ENETUNREACH 128 /* Network is unreachable */ +#define ENETRESET 129 /* Network dropped connection because of reset */ +#define ECONNABORTED 130 /* Software caused connection abort */ +#define ECONNRESET 131 /* Connection reset by peer */ +#define ENOBUFS 132 /* No buffer space available */ +#define EISCONN 133 /* Transport endpoint is already connected */ +#define ENOTCONN 134 /* Transport endpoint is not connected */ +#define EUCLEAN 135 /* Structure needs cleaning */ +#define ENOTNAM 137 /* Not a XENIX named type file */ +#define ENAVAIL 138 /* No XENIX semaphores available */ +#define EISNAM 139 /* Is a named type file */ +#define EREMOTEIO 140 /* Remote I/O error */ +#define EINIT 141 /* Reserved */ +#define EREMDEV 142 /* Error 142 */ +#define ESHUTDOWN 143 /* Cannot send after transport endpoint shutdown */ +#define ETOOMANYREFS 144 /* Too many references: cannot splice */ +#define ETIMEDOUT 145 /* Connection timed out */ +#define ECONNREFUSED 146 /* Connection refused */ +#define EHOSTDOWN 147 /* Host is down */ +#define EHOSTUNREACH 148 /* No route to host */ +#define EWOULDBLOCK EAGAIN /* Operation would block */ +#define EALREADY 149 /* Operation already in progress */ +#define EINPROGRESS 150 /* Operation now in progress */ +#define ESTALE 151 /* Stale NFS file handle */ +#define ECANCELED 158 /* AIO operation canceled */ +#define ENOMEDIUM 159 /* No medium found */ +#define EMEDIUMTYPE 160 /* Wrong medium type */ +#define ENOKEY 161 /* Required key not available */ +#define EKEYEXPIRED 162 /* Key has expired */ +#define EKEYREVOKED 163 /* Key has been revoked */ +#define EKEYREJECTED 164 /* Key was rejected by service */ +#define EDQUOT 1133 /* Quota exceeded */ + +#ifdef RT_USING_DFS +#include <dfs_posix.h> +#else +typedef rt_uint16_t mode_t; +#define O_RDONLY 0x0000000 +#define O_WRONLY 0x0000001 +#define O_RDWR 0x0000002 +#define O_ACCMODE 0x0000003 +#define O_CREAT 0x0000100 +#define O_EXCL 0x0000200 +#define O_TRUNC 0x0001000 +#define O_APPEND 0x0002000 +#define O_DIRECTORY 0x0200000 +#endif + +#elif defined (__GNUC__) /* GNU GCC Compiler, with minilibc */ +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#endif + +#endif + +#endif diff --git a/components/pthreads/pthread.c b/components/pthreads/pthread.c index 576ed1e87a..4455885652 100644 --- a/components/pthreads/pthread.c +++ b/components/pthreads/pthread.c @@ -1,478 +1,478 @@ -#include <pthread.h>
-#include <sched.h>
-#include "pthread_internal.h"
-
-int pthread_system_init(void)
-{
- /* initialize clock and time */
- clock_time_system_init();
-
- /* initialize key area */
- pthread_key_system_init();
- /* initialize posix mqueue */
- posix_mq_system_init();
- /* initialize posix semaphore */
- posix_sem_system_init();
-
- return 0;
-}
-
-static void _pthread_cleanup(rt_thread_t tid)
-{
- _pthread_data_t *ptd;
- ptd = _pthread_get_data(tid);
-
- /* clear cleanup function */
- tid->cleanup = RT_NULL;
- if (ptd->attr.detachstate == PTHREAD_CREATE_JOINABLE)
- {
- rt_sem_release(ptd->joinable_sem);
- }
- else
- {
- /* release pthread resource */
- pthread_detach(tid);
- }
-}
-
-static void pthread_entry_stub(void* parameter)
-{
- _pthread_data_t *ptd;
- void* value;
-
- ptd = (_pthread_data_t*)parameter;
-
- /* execute pthread entry */
- value = ptd->thread_entry(ptd->thread_parameter);
- /* set value */
- ptd->return_value = value;
-}
-
-int pthread_create (pthread_t *tid, const pthread_attr_t *attr,
- void *(*start) (void *), void *parameter)
-{
- int result;
- void* stack;
- char name[RT_NAME_MAX];
- static rt_uint16_t pthread_number = 0;
- _pthread_data_t *ptd;
-
- /* tid shall be provided */
- RT_ASSERT(tid != RT_NULL);
-
- /* allocate posix thread data */
- ptd = (_pthread_data_t*)rt_malloc(sizeof(_pthread_data_t));
- if (ptd == RT_NULL) return ENOMEM;
- /* clean posix thread data memory */
- rt_memset(ptd, 0, sizeof(_pthread_data_t));
- ptd->canceled = 0;
- ptd->cancelstate = PTHREAD_CANCEL_DISABLE;
- ptd->canceltype = PTHREAD_CANCEL_DEFERRED;
- ptd->magic = PTHREAD_MAGIC;
-
- if (attr != RT_NULL) ptd->attr = *attr;
- else
- {
- /* use default attribute */
- pthread_attr_init(&ptd->attr);
- }
-
- rt_snprintf(name, sizeof(name), "pth%02d", pthread_number ++);
- if (ptd->attr.stack_base == 0)
- {
- stack = (void*)rt_malloc(ptd->attr.stack_size);
- }
- else stack = (void*)(ptd->attr.stack_base);
-
- if (stack == RT_NULL)
- {
- rt_free(ptd);
- return ENOMEM;
- }
-
- /* pthread is a static thread object */
- ptd->tid = (rt_thread_t) rt_malloc(sizeof(struct rt_thread));
- if (ptd->tid == RT_NULL)
- {
- if (ptd->attr.stack_base ==0) rt_free(stack);
- rt_free(ptd);
- return ENOMEM;
- }
-
- if (ptd->attr.detachstate == PTHREAD_CREATE_JOINABLE)
- {
- ptd->joinable_sem = rt_sem_create(name, 0, RT_IPC_FLAG_FIFO);
- if (ptd->joinable_sem == RT_NULL)
- {
- if (ptd->attr.stack_base !=0) rt_free(stack);
- rt_free(ptd);
- return ENOMEM;
- }
- }
- else ptd->joinable_sem = RT_NULL;
-
- /* set parameter */
- ptd->thread_entry = start;
- ptd->thread_parameter = parameter;
-
- /* initial this pthread to system */
- if (rt_thread_init(ptd->tid, name, pthread_entry_stub, ptd,
- stack, ptd->attr.stack_size,
- ptd->attr.priority, 5) != RT_EOK)
- {
- if (ptd->attr.stack_base ==0) rt_free(stack);
- if (ptd->joinable_sem != RT_NULL) rt_sem_delete(ptd->joinable_sem);
- rt_free(ptd);
- return EINVAL;
- }
-
- /* set pthread id */
- *tid = ptd->tid;
-
- /* set pthread cleanup function and ptd data */
- (*tid)->cleanup = _pthread_cleanup;
- (*tid)->user_data = (rt_uint32_t)ptd;
-
- /* start thread */
- result = rt_thread_startup(*tid);
- if (result == RT_EOK) return 0;
-
- /* start thread failed */
- rt_thread_detach(ptd->tid);
- if (ptd->attr.stack_base ==0) rt_free(stack);
- if (ptd->joinable_sem != RT_NULL) rt_sem_delete(ptd->joinable_sem);
-
- rt_free(ptd);
- return EINVAL;
-}
-RTM_EXPORT(pthread_create);
-
-int pthread_detach(pthread_t thread)
-{
- _pthread_data_t* ptd;
-
- ptd = _pthread_get_data(thread);
-
- if (thread->stat == RT_THREAD_CLOSE)
- {
- /* delete joinable semaphore */
- if (ptd->joinable_sem != RT_NULL)
- rt_sem_delete(ptd->joinable_sem);
- /* detach thread object */
- rt_thread_detach(ptd->tid);
-
- /* release thread resource */
- if (ptd->attr.stack_base == RT_NULL)
- {
- /* release thread allocated stack */
- rt_free(ptd->tid->stack_addr);
- }
-
- /*
- * if this thread create the local thread data,
- * delete it
- */
- if (ptd->tls != RT_NULL) rt_free(ptd->tls);
- rt_free(ptd->tid);
- rt_free(ptd);
- }
- else
- {
- rt_enter_critical();
- /* change to detach state */
- ptd->attr.detachstate = PTHREAD_CREATE_DETACHED;
-
- /* detach joinable semaphore */
- rt_sem_delete(ptd->joinable_sem);
- ptd->joinable_sem = RT_NULL;
- rt_exit_critical();
- }
-
- return 0;
-}
-RTM_EXPORT(pthread_detach);
-
-int pthread_join (pthread_t thread, void **value_ptr)
-{
- _pthread_data_t* ptd;
- rt_err_t result;
-
- if (thread == rt_thread_self())
- {
- /* join self */
- return EDEADLK;
- }
-
- ptd = _pthread_get_data(thread);
- if (ptd->attr.detachstate == PTHREAD_CREATE_DETACHED)
- return EINVAL; /* join on a detached pthread */
-
- result = rt_sem_take(ptd->joinable_sem, RT_WAITING_FOREVER);
- if (result == RT_EOK)
- {
- /* get return value */
- if (value_ptr != RT_NULL) *value_ptr = ptd->return_value;
-
- /* release resource */
- pthread_detach(thread);
- }
- else return ESRCH;
-
- return 0;
-}
-RTM_EXPORT(pthread_join);
-
-void pthread_exit (void* value)
-{
- _pthread_data_t* ptd;
- _pthread_cleanup_t* cleanup;
- extern _pthread_key_data_t _thread_keys[PTHREAD_KEY_MAX];
-
- ptd = _pthread_get_data(rt_thread_self());
-
- rt_enter_critical();
- /* disable cancel */
- ptd->cancelstate = PTHREAD_CANCEL_DISABLE;
- /* set return value */
- ptd->return_value = value;
- rt_exit_critical();
-
- /* invoke pushed cleanup */
- while (ptd->cleanup != RT_NULL)
- {
- cleanup = ptd->cleanup;
- ptd->cleanup = cleanup->next;
-
- cleanup->cleanup_func(cleanup->parameter);
- /* release this cleanup function */
- rt_free(cleanup);
- }
-
- /* destruct thread local key */
- if (ptd->tls != RT_NULL)
- {
- void* data;
- rt_uint32_t index;
-
- for (index = 0; index < PTHREAD_KEY_MAX; index ++)
- {
- if (_thread_keys[index].is_used)
- {
- data = ptd->tls[index];
- if (data)
- _thread_keys[index].destructor(data);
- }
- }
-
- /* release tls area */
- rt_free(ptd->tls);
- ptd->tls = RT_NULL;
- }
-
- if (ptd->attr.detachstate == PTHREAD_CREATE_JOINABLE)
- {
- /* release the joinable pthread */
- rt_sem_release(ptd->joinable_sem);
- }
-
- /* detach thread */
- rt_thread_detach(ptd->tid);
- /* reschedule thread */
- rt_schedule();
-}
-RTM_EXPORT(pthread_exit);
-
-int pthread_once(pthread_once_t * once_control, void (*init_routine) (void))
-{
- RT_ASSERT(once_control != RT_NULL);
- RT_ASSERT(init_routine != RT_NULL);
-
- rt_enter_critical();
- if (!(*once_control))
- {
- /* call routine once */
- *once_control = 1;
- rt_exit_critical();
-
- init_routine();
- }
- rt_exit_critical();
-
- return 0;
-}
-RTM_EXPORT(pthread_once);
-
-int pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void))
-{
- return ENOTSUP;
-}
-RTM_EXPORT(pthread_atfork);
-
-int pthread_kill(pthread_t thread, int sig)
-{
- return ENOTSUP;
-}
-RTM_EXPORT(pthread_kill);
-
-void pthread_cleanup_pop(int execute)
-{
- _pthread_data_t* ptd;
- _pthread_cleanup_t* cleanup;
-
- /* get posix thread data */
- ptd = _pthread_get_data(rt_thread_self());
- RT_ASSERT(ptd != RT_NULL);
-
- if (execute)
- {
- rt_enter_critical();
- cleanup = ptd->cleanup;
- if (cleanup)
- ptd->cleanup = cleanup->next;
- rt_exit_critical();
-
- if (cleanup)
- {
- cleanup->cleanup_func(cleanup->parameter);
-
- rt_free(cleanup);
- }
- }
-}
-RTM_EXPORT(pthread_cleanup_pop);
-
-void pthread_cleanup_push(void (*routine)(void*), void *arg)
-{
- _pthread_data_t* ptd;
- _pthread_cleanup_t* cleanup;
-
- /* get posix thread data */
- ptd = _pthread_get_data(rt_thread_self());
- RT_ASSERT(ptd != RT_NULL);
-
- cleanup = (_pthread_cleanup_t*)rt_malloc(sizeof(_pthread_cleanup_t));
- if (cleanup != RT_NULL)
- {
- cleanup->cleanup_func = routine;
- cleanup->parameter = arg;
-
- rt_enter_critical();
- cleanup->next = ptd->cleanup;
- ptd->cleanup = cleanup;
- rt_exit_critical();
- }
-}
-RTM_EXPORT(pthread_cleanup_push);
-
-/*
- * According to IEEE Std 1003.1, 2004 Edition , following pthreads
- * interface support cancellation point:
- * mq_receive()
- * mq_send()
- * mq_timedreceive()
- * mq_timedsend()
- * msgrcv()
- * msgsnd()
- * msync()
- * pthread_cond_timedwait()
- * pthread_cond_wait()
- * pthread_join()
- * pthread_testcancel()
- * sem_timedwait()
- * sem_wait()
- *
- * A cancellation point may also occur when a thread is
- * executing the following functions:
- * pthread_rwlock_rdlock()
- * pthread_rwlock_timedrdlock()
- * pthread_rwlock_timedwrlock()
- * pthread_rwlock_wrlock()
- *
- * The pthread_cancel(), pthread_setcancelstate(), and pthread_setcanceltype()
- * functions are defined to be async-cancel safe.
- */
-
-int pthread_setcancelstate(int state, int *oldstate)
-{
- _pthread_data_t* ptd;
-
- /* get posix thread data */
- ptd = _pthread_get_data(rt_thread_self());
- RT_ASSERT(ptd != RT_NULL);
-
- if ((state == PTHREAD_CANCEL_ENABLE) || (state == PTHREAD_CANCEL_DISABLE))
- {
- if (oldstate) *oldstate = ptd->cancelstate;
- ptd->cancelstate = state;
-
- return 0;
- }
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_setcancelstate);
-
-int pthread_setcanceltype(int type, int *oldtype)
-{
- _pthread_data_t* ptd;
-
- /* get posix thread data */
- ptd = _pthread_get_data(rt_thread_self());
- RT_ASSERT(ptd != RT_NULL);
-
- if ((type != PTHREAD_CANCEL_DEFERRED) && (type != PTHREAD_CANCEL_ASYNCHRONOUS))
- return EINVAL;
-
- if (oldtype) *oldtype = ptd->canceltype;
- ptd->canceltype = type;
-
- return 0;
-}
-RTM_EXPORT(pthread_setcanceltype);
-
-void pthread_testcancel(void)
-{
- int cancel=0;
- _pthread_data_t* ptd;
-
- /* get posix thread data */
- ptd = _pthread_get_data(rt_thread_self());
- RT_ASSERT(ptd != RT_NULL);
-
- if (ptd->cancelstate == PTHREAD_CANCEL_ENABLE) cancel = ptd->canceled;
- if (cancel) pthread_exit((void*)PTHREAD_CANCELED);
-}
-RTM_EXPORT(pthread_testcancel);
-
-int pthread_cancel(pthread_t thread)
-{
- _pthread_data_t* ptd;
-
- /* cancel self */
- if (thread == rt_thread_self()) return 0;
-
- /* get posix thread data */
- ptd = _pthread_get_data(thread);
- RT_ASSERT(ptd != RT_NULL);
-
- /* set canceled */
- if (ptd->cancelstate == PTHREAD_CANCEL_ENABLE)
- {
- ptd->canceled = 1;
- if (ptd->canceltype == PTHREAD_CANCEL_ASYNCHRONOUS)
- {
- /*
- * to detach thread.
- * this thread will be removed from scheduler list
- * and because there is a cleanup function in the
- * thread (pthread_cleanup), it will move to defunct
- * thread list and wait for handling in idle thread.
- */
- rt_thread_detach(thread);
- }
- }
-
- return 0;
-}
-RTM_EXPORT(pthread_cancel);
-
+#include <pthread.h> +#include <sched.h> +#include "pthread_internal.h" + +int pthread_system_init(void) +{ + /* initialize clock and time */ + clock_time_system_init(); + + /* initialize key area */ + pthread_key_system_init(); + /* initialize posix mqueue */ + posix_mq_system_init(); + /* initialize posix semaphore */ + posix_sem_system_init(); + + return 0; +} + +static void _pthread_cleanup(rt_thread_t tid) +{ + _pthread_data_t *ptd; + ptd = _pthread_get_data(tid); + + /* clear cleanup function */ + tid->cleanup = RT_NULL; + if (ptd->attr.detachstate == PTHREAD_CREATE_JOINABLE) + { + rt_sem_release(ptd->joinable_sem); + } + else + { + /* release pthread resource */ + pthread_detach(tid); + } +} + +static void pthread_entry_stub(void* parameter) +{ + _pthread_data_t *ptd; + void* value; + + ptd = (_pthread_data_t*)parameter; + + /* execute pthread entry */ + value = ptd->thread_entry(ptd->thread_parameter); + /* set value */ + ptd->return_value = value; +} + +int pthread_create (pthread_t *tid, const pthread_attr_t *attr, + void *(*start) (void *), void *parameter) +{ + int result; + void* stack; + char name[RT_NAME_MAX]; + static rt_uint16_t pthread_number = 0; + _pthread_data_t *ptd; + + /* tid shall be provided */ + RT_ASSERT(tid != RT_NULL); + + /* allocate posix thread data */ + ptd = (_pthread_data_t*)rt_malloc(sizeof(_pthread_data_t)); + if (ptd == RT_NULL) return ENOMEM; + /* clean posix thread data memory */ + rt_memset(ptd, 0, sizeof(_pthread_data_t)); + ptd->canceled = 0; + ptd->cancelstate = PTHREAD_CANCEL_DISABLE; + ptd->canceltype = PTHREAD_CANCEL_DEFERRED; + ptd->magic = PTHREAD_MAGIC; + + if (attr != RT_NULL) ptd->attr = *attr; + else + { + /* use default attribute */ + pthread_attr_init(&ptd->attr); + } + + rt_snprintf(name, sizeof(name), "pth%02d", pthread_number ++); + if (ptd->attr.stack_base == 0) + { + stack = (void*)rt_malloc(ptd->attr.stack_size); + } + else stack = (void*)(ptd->attr.stack_base); + + if (stack == RT_NULL) + { + rt_free(ptd); + return ENOMEM; + } + + /* pthread is a static thread object */ + ptd->tid = (rt_thread_t) rt_malloc(sizeof(struct rt_thread)); + if (ptd->tid == RT_NULL) + { + if (ptd->attr.stack_base ==0) rt_free(stack); + rt_free(ptd); + return ENOMEM; + } + + if (ptd->attr.detachstate == PTHREAD_CREATE_JOINABLE) + { + ptd->joinable_sem = rt_sem_create(name, 0, RT_IPC_FLAG_FIFO); + if (ptd->joinable_sem == RT_NULL) + { + if (ptd->attr.stack_base !=0) rt_free(stack); + rt_free(ptd); + return ENOMEM; + } + } + else ptd->joinable_sem = RT_NULL; + + /* set parameter */ + ptd->thread_entry = start; + ptd->thread_parameter = parameter; + + /* initial this pthread to system */ + if (rt_thread_init(ptd->tid, name, pthread_entry_stub, ptd, + stack, ptd->attr.stack_size, + ptd->attr.priority, 5) != RT_EOK) + { + if (ptd->attr.stack_base ==0) rt_free(stack); + if (ptd->joinable_sem != RT_NULL) rt_sem_delete(ptd->joinable_sem); + rt_free(ptd); + return EINVAL; + } + + /* set pthread id */ + *tid = ptd->tid; + + /* set pthread cleanup function and ptd data */ + (*tid)->cleanup = _pthread_cleanup; + (*tid)->user_data = (rt_uint32_t)ptd; + + /* start thread */ + result = rt_thread_startup(*tid); + if (result == RT_EOK) return 0; + + /* start thread failed */ + rt_thread_detach(ptd->tid); + if (ptd->attr.stack_base ==0) rt_free(stack); + if (ptd->joinable_sem != RT_NULL) rt_sem_delete(ptd->joinable_sem); + + rt_free(ptd); + return EINVAL; +} +RTM_EXPORT(pthread_create); + +int pthread_detach(pthread_t thread) +{ + _pthread_data_t* ptd; + + ptd = _pthread_get_data(thread); + + if (thread->stat == RT_THREAD_CLOSE) + { + /* delete joinable semaphore */ + if (ptd->joinable_sem != RT_NULL) + rt_sem_delete(ptd->joinable_sem); + /* detach thread object */ + rt_thread_detach(ptd->tid); + + /* release thread resource */ + if (ptd->attr.stack_base == RT_NULL) + { + /* release thread allocated stack */ + rt_free(ptd->tid->stack_addr); + } + + /* + * if this thread create the local thread data, + * delete it + */ + if (ptd->tls != RT_NULL) rt_free(ptd->tls); + rt_free(ptd->tid); + rt_free(ptd); + } + else + { + rt_enter_critical(); + /* change to detach state */ + ptd->attr.detachstate = PTHREAD_CREATE_DETACHED; + + /* detach joinable semaphore */ + rt_sem_delete(ptd->joinable_sem); + ptd->joinable_sem = RT_NULL; + rt_exit_critical(); + } + + return 0; +} +RTM_EXPORT(pthread_detach); + +int pthread_join (pthread_t thread, void **value_ptr) +{ + _pthread_data_t* ptd; + rt_err_t result; + + if (thread == rt_thread_self()) + { + /* join self */ + return EDEADLK; + } + + ptd = _pthread_get_data(thread); + if (ptd->attr.detachstate == PTHREAD_CREATE_DETACHED) + return EINVAL; /* join on a detached pthread */ + + result = rt_sem_take(ptd->joinable_sem, RT_WAITING_FOREVER); + if (result == RT_EOK) + { + /* get return value */ + if (value_ptr != RT_NULL) *value_ptr = ptd->return_value; + + /* release resource */ + pthread_detach(thread); + } + else return ESRCH; + + return 0; +} +RTM_EXPORT(pthread_join); + +void pthread_exit (void* value) +{ + _pthread_data_t* ptd; + _pthread_cleanup_t* cleanup; + extern _pthread_key_data_t _thread_keys[PTHREAD_KEY_MAX]; + + ptd = _pthread_get_data(rt_thread_self()); + + rt_enter_critical(); + /* disable cancel */ + ptd->cancelstate = PTHREAD_CANCEL_DISABLE; + /* set return value */ + ptd->return_value = value; + rt_exit_critical(); + + /* invoke pushed cleanup */ + while (ptd->cleanup != RT_NULL) + { + cleanup = ptd->cleanup; + ptd->cleanup = cleanup->next; + + cleanup->cleanup_func(cleanup->parameter); + /* release this cleanup function */ + rt_free(cleanup); + } + + /* destruct thread local key */ + if (ptd->tls != RT_NULL) + { + void* data; + rt_uint32_t index; + + for (index = 0; index < PTHREAD_KEY_MAX; index ++) + { + if (_thread_keys[index].is_used) + { + data = ptd->tls[index]; + if (data) + _thread_keys[index].destructor(data); + } + } + + /* release tls area */ + rt_free(ptd->tls); + ptd->tls = RT_NULL; + } + + if (ptd->attr.detachstate == PTHREAD_CREATE_JOINABLE) + { + /* release the joinable pthread */ + rt_sem_release(ptd->joinable_sem); + } + + /* detach thread */ + rt_thread_detach(ptd->tid); + /* reschedule thread */ + rt_schedule(); +} +RTM_EXPORT(pthread_exit); + +int pthread_once(pthread_once_t * once_control, void (*init_routine) (void)) +{ + RT_ASSERT(once_control != RT_NULL); + RT_ASSERT(init_routine != RT_NULL); + + rt_enter_critical(); + if (!(*once_control)) + { + /* call routine once */ + *once_control = 1; + rt_exit_critical(); + + init_routine(); + } + rt_exit_critical(); + + return 0; +} +RTM_EXPORT(pthread_once); + +int pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) +{ + return ENOTSUP; +} +RTM_EXPORT(pthread_atfork); + +int pthread_kill(pthread_t thread, int sig) +{ + return ENOTSUP; +} +RTM_EXPORT(pthread_kill); + +void pthread_cleanup_pop(int execute) +{ + _pthread_data_t* ptd; + _pthread_cleanup_t* cleanup; + + /* get posix thread data */ + ptd = _pthread_get_data(rt_thread_self()); + RT_ASSERT(ptd != RT_NULL); + + if (execute) + { + rt_enter_critical(); + cleanup = ptd->cleanup; + if (cleanup) + ptd->cleanup = cleanup->next; + rt_exit_critical(); + + if (cleanup) + { + cleanup->cleanup_func(cleanup->parameter); + + rt_free(cleanup); + } + } +} +RTM_EXPORT(pthread_cleanup_pop); + +void pthread_cleanup_push(void (*routine)(void*), void *arg) +{ + _pthread_data_t* ptd; + _pthread_cleanup_t* cleanup; + + /* get posix thread data */ + ptd = _pthread_get_data(rt_thread_self()); + RT_ASSERT(ptd != RT_NULL); + + cleanup = (_pthread_cleanup_t*)rt_malloc(sizeof(_pthread_cleanup_t)); + if (cleanup != RT_NULL) + { + cleanup->cleanup_func = routine; + cleanup->parameter = arg; + + rt_enter_critical(); + cleanup->next = ptd->cleanup; + ptd->cleanup = cleanup; + rt_exit_critical(); + } +} +RTM_EXPORT(pthread_cleanup_push); + +/* + * According to IEEE Std 1003.1, 2004 Edition , following pthreads + * interface support cancellation point: + * mq_receive() + * mq_send() + * mq_timedreceive() + * mq_timedsend() + * msgrcv() + * msgsnd() + * msync() + * pthread_cond_timedwait() + * pthread_cond_wait() + * pthread_join() + * pthread_testcancel() + * sem_timedwait() + * sem_wait() + * + * A cancellation point may also occur when a thread is + * executing the following functions: + * pthread_rwlock_rdlock() + * pthread_rwlock_timedrdlock() + * pthread_rwlock_timedwrlock() + * pthread_rwlock_wrlock() + * + * The pthread_cancel(), pthread_setcancelstate(), and pthread_setcanceltype() + * functions are defined to be async-cancel safe. + */ + +int pthread_setcancelstate(int state, int *oldstate) +{ + _pthread_data_t* ptd; + + /* get posix thread data */ + ptd = _pthread_get_data(rt_thread_self()); + RT_ASSERT(ptd != RT_NULL); + + if ((state == PTHREAD_CANCEL_ENABLE) || (state == PTHREAD_CANCEL_DISABLE)) + { + if (oldstate) *oldstate = ptd->cancelstate; + ptd->cancelstate = state; + + return 0; + } + + return EINVAL; +} +RTM_EXPORT(pthread_setcancelstate); + +int pthread_setcanceltype(int type, int *oldtype) +{ + _pthread_data_t* ptd; + + /* get posix thread data */ + ptd = _pthread_get_data(rt_thread_self()); + RT_ASSERT(ptd != RT_NULL); + + if ((type != PTHREAD_CANCEL_DEFERRED) && (type != PTHREAD_CANCEL_ASYNCHRONOUS)) + return EINVAL; + + if (oldtype) *oldtype = ptd->canceltype; + ptd->canceltype = type; + + return 0; +} +RTM_EXPORT(pthread_setcanceltype); + +void pthread_testcancel(void) +{ + int cancel=0; + _pthread_data_t* ptd; + + /* get posix thread data */ + ptd = _pthread_get_data(rt_thread_self()); + RT_ASSERT(ptd != RT_NULL); + + if (ptd->cancelstate == PTHREAD_CANCEL_ENABLE) cancel = ptd->canceled; + if (cancel) pthread_exit((void*)PTHREAD_CANCELED); +} +RTM_EXPORT(pthread_testcancel); + +int pthread_cancel(pthread_t thread) +{ + _pthread_data_t* ptd; + + /* cancel self */ + if (thread == rt_thread_self()) return 0; + + /* get posix thread data */ + ptd = _pthread_get_data(thread); + RT_ASSERT(ptd != RT_NULL); + + /* set canceled */ + if (ptd->cancelstate == PTHREAD_CANCEL_ENABLE) + { + ptd->canceled = 1; + if (ptd->canceltype == PTHREAD_CANCEL_ASYNCHRONOUS) + { + /* + * to detach thread. + * this thread will be removed from scheduler list + * and because there is a cleanup function in the + * thread (pthread_cleanup), it will move to defunct + * thread list and wait for handling in idle thread. + */ + rt_thread_detach(thread); + } + } + + return 0; +} +RTM_EXPORT(pthread_cancel); + diff --git a/components/pthreads/pthread.h b/components/pthreads/pthread.h index 67d8f62c9f..fa56219224 100644 --- a/components/pthreads/pthread.h +++ b/components/pthreads/pthread.h @@ -1,274 +1,274 @@ -/*
- * File : pthread.h
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2010, RT-Thread Development Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date Author Notes
- * 2010-10-26 Bernard the first version
- */
-#ifndef __PTHREAD_H__
-#define __PTHREAD_H__
-
-#include <rtthread.h>
-#include <posix_types.h>
-
-#define PTHREAD_KEY_MAX 8
-
-#define PTHREAD_COND_INITIALIZER {-1, 0}
-#define PTHREAD_RWLOCK_INITIALIZER {-1, 0}
-#define PTHREAD_MUTEX_INITIALIZER {-1, 0}
-
-#define PTHREAD_CREATE_JOINABLE 0x00
-#define PTHREAD_CREATE_DETACHED 0x01
-
-#define PTHREAD_EXPLICIT_SCHED 0
-#define PTHREAD_INHERIT_SCHED 1
-
-typedef rt_thread_t pthread_t;
-typedef long pthread_condattr_t;
-typedef long pthread_rwlockattr_t;
-typedef long pthread_mutexattr_t;
-typedef long pthread_barrierattr_t;
-
-typedef int pthread_key_t;
-typedef int pthread_once_t;
-
-enum {
- PTHREAD_CANCEL_ASYNCHRONOUS = 0,
- PTHREAD_CANCEL_ENABLE,
- PTHREAD_CANCEL_DEFERRED,
- PTHREAD_CANCEL_DISABLE,
- PTHREAD_CANCELED
-};
-
-enum {
- PTHREAD_MUTEX_NORMAL = 0,
- PTHREAD_MUTEX_RECURSIVE = 1,
- PTHREAD_MUTEX_ERRORCHECK = 2,
- PTHREAD_MUTEX_ERRORCHECK_NP = PTHREAD_MUTEX_ERRORCHECK,
- PTHREAD_MUTEX_RECURSIVE_NP = PTHREAD_MUTEX_RECURSIVE,
- PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL
-};
-
-/* init value for pthread_once_t */
-#define PTHREAD_ONCE_INIT 0
-
-enum {
- PTHREAD_PRIO_INHERIT =0,
- PTHREAD_PRIO_NONE,
- PTHREAD_PRIO_PROTECT,
-};
-
-#define PTHREAD_PROCESS_PRIVATE 0
-#define PTHREAD_PROCESS_SHARED 1
-
-#define PTHREAD_SCOPE_PROCESS 0
-#define PTHREAD_SCOPE_SYSTEM 1
-
-struct pthread_attr
-{
- void* stack_base;
- rt_uint16_t stack_size; /* stack size of thread */
-
- rt_uint8_t priority; /* priority of thread */
- rt_uint8_t detachstate; /* detach state */
- rt_uint8_t policy; /* scheduler policy */
- rt_uint8_t inheritsched; /* Inherit parent prio/policy */
-};
-typedef struct pthread_attr pthread_attr_t;
-
-struct pthread_mutex
-{
- pthread_mutexattr_t attr;
- struct rt_mutex lock;
-};
-typedef struct pthread_mutex pthread_mutex_t;
-
-struct pthread_cond
-{
- pthread_condattr_t attr;
- struct rt_semaphore sem;
-};
-typedef struct pthread_cond pthread_cond_t;
-
-struct pthread_rwlock
-{
- pthread_rwlockattr_t attr;
-
- pthread_mutex_t rw_mutex; /* basic lock on this struct */
- pthread_cond_t rw_condreaders; /* for reader threads waiting */
- pthread_cond_t rw_condwriters; /* for writer threads waiting */
-
- int rw_nwaitreaders; /* the number waiting */
- int rw_nwaitwriters; /* the number waiting */
- int rw_refcount;
-};
-typedef struct pthread_rwlock pthread_rwlock_t;
-
-/* spinlock implementation, (ADVANCED REALTIME THREADS)*/
-struct pthread_spinlock
-{
- int lock;
-};
-typedef struct pthread_spinlock pthread_spinlock_t;
-
-struct pthread_barrier
-{
- int count;
- pthread_cond_t cond;
- pthread_mutex_t mutex;
-};
-typedef struct pthread_barrier pthread_barrier_t;
-
-/* pthread thread interface */
-int pthread_attr_destroy(pthread_attr_t *attr);
-int pthread_attr_init(pthread_attr_t *attr);
-
-int pthread_system_init(void);
-int pthread_create (pthread_t *tid, const pthread_attr_t *attr,
- void *(*start) (void *), void *arg);
-
-int pthread_detach (pthread_t thread);
-int pthread_join (pthread_t thread, void **value_ptr);
-
-rt_inline int pthread_equal (pthread_t t1, pthread_t t2)
-{
- return t1 == t2;
-}
-
-rt_inline pthread_t pthread_self (void)
-{
- return rt_thread_self();
-}
-
-void pthread_exit (void *value_ptr);
-int pthread_once(pthread_once_t * once_control, void (*init_routine) (void));
-
-/* pthread cleanup */
-void pthread_cleanup_pop(int execute);
-void pthread_cleanup_push(void (*routine)(void*), void *arg);
-
-/* pthread cancel */
-int pthread_cancel(pthread_t thread);
-void pthread_testcancel(void);
-int pthread_setcancelstate(int state, int *oldstate);
-int pthread_setcanceltype(int type, int *oldtype);
-
-int pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void));
-int pthread_kill(pthread_t thread, int sig);
-
-/* pthread mutex interface */
-int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr);
-int pthread_mutex_destroy(pthread_mutex_t *mutex);
-int pthread_mutex_lock(pthread_mutex_t *mutex);
-int pthread_mutex_unlock(pthread_mutex_t *mutex);
-int pthread_mutex_trylock(pthread_mutex_t *mutex);
-
-int pthread_mutexattr_init(pthread_mutexattr_t *attr);
-int pthread_mutexattr_destroy(pthread_mutexattr_t *attr);
-int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type);
-int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type);
-int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared);
-int pthread_mutexattr_getpshared(pthread_mutexattr_t *attr, int *pshared);
-
-/* pthread condition interface */
-int pthread_condattr_destroy(pthread_condattr_t *attr);
-int pthread_condattr_init(pthread_condattr_t *attr);
-
-/* ADVANCED REALTIME feature in IEEE Std 1003.1, 2004 Edition */
-int pthread_condattr_getclock(const pthread_condattr_t *attr,
- clockid_t *clock_id);
-int pthread_condattr_setclock(pthread_condattr_t *attr,
- clockid_t clock_id);
-
-int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
-int pthread_cond_destroy(pthread_cond_t *cond);
-int pthread_cond_broadcast(pthread_cond_t *cond);
-int pthread_cond_signal(pthread_cond_t *cond);
-
-int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
-int pthread_cond_timedwait(pthread_cond_t *cond,
- pthread_mutex_t * mutex,
- const struct timespec *abstime);
-
-/* pthread rwlock interface */
-int pthread_rwlockattr_init (pthread_rwlockattr_t *attr);
-int pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr);
-int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared);
-int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared);
-
-int pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr);
-int pthread_rwlock_destroy (pthread_rwlock_t *rwlock);
-
-int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock);
-int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock);
-
-int pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, const struct timespec *abstime);
-int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, const struct timespec *abstime);
-
-int pthread_rwlock_unlock (pthread_rwlock_t *rwlock);
-
-int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock);
-int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock);
-
-/* pthread spinlock interface */
-int pthread_spin_init (pthread_spinlock_t *lock, int pshared);
-int pthread_spin_destroy (pthread_spinlock_t *lock);
-
-int pthread_spin_lock (pthread_spinlock_t * lock);
-int pthread_spin_trylock (pthread_spinlock_t * lock);
-int pthread_spin_unlock (pthread_spinlock_t * lock);
-
-/* pthread barrier interface */
-int pthread_barrierattr_destroy(pthread_barrierattr_t *attr);
-int pthread_barrierattr_init(pthread_barrierattr_t *attr);
-int pthread_barrierattr_getpshared(const pthread_barrierattr_t *attr, int *pshared);
-int pthread_barrierattr_setpshared(pthread_barrierattr_t *attr, int pshared);
-
-int pthread_barrier_destroy(pthread_barrier_t *barrier);
-int pthread_barrier_init(pthread_barrier_t *barrier,
- const pthread_barrierattr_t *attr, unsigned count);
-
-int pthread_barrier_wait(pthread_barrier_t *barrier);
-
-/* Signal Generation and Delivery, P1003.1b-1993, p. 63
- NOTE: P1003.1c/D10, p. 34 adds sigev_notify_function and
- sigev_notify_attributes to the sigevent structure. */
-union sigval {
- int sival_int; /* Integer signal value */
- void *sival_ptr; /* Pointer signal value */
-};
-
-struct sigevent {
- int sigev_notify; /* Notification type */
- int sigev_signo; /* Signal number */
- union sigval sigev_value; /* Signal value */
- void (*sigev_notify_function)( union sigval );
- /* Notification function */
- pthread_attr_t *sigev_notify_attributes; /* Notification Attributes */
-};
-
-/* posix clock and timer */
-#define MILLISECOND_PER_SECOND 1000UL
-#define MICROSECOND_PER_SECOND 1000000UL
-#define NANOSECOND_PER_SECOND 1000000000UL
-
-#define MILLISECOND_PER_TICK (MILLISECOND_PER_SECOND / RT_TICK_PER_SECOND)
-#define MICROSECOND_PER_TICK (MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND)
-#define NANOSECOND_PER_TICK (NANOSECOND_PER_SECOND / RT_TICK_PER_SECOND)
-
-#ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME 0
-#endif
-
-int clock_getres (clockid_t clockid, struct timespec *res);
-int clock_gettime (clockid_t clockid, struct timespec *tp);
-int clock_settime (clockid_t clockid, const struct timespec *tp);
-
-#endif
-
+/* + * File : pthread.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2010, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2010-10-26 Bernard the first version + */ +#ifndef __PTHREAD_H__ +#define __PTHREAD_H__ + +#include <rtthread.h> +#include <posix_types.h> + +#define PTHREAD_KEY_MAX 8 + +#define PTHREAD_COND_INITIALIZER {-1, 0} +#define PTHREAD_RWLOCK_INITIALIZER {-1, 0} +#define PTHREAD_MUTEX_INITIALIZER {-1, 0} + +#define PTHREAD_CREATE_JOINABLE 0x00 +#define PTHREAD_CREATE_DETACHED 0x01 + +#define PTHREAD_EXPLICIT_SCHED 0 +#define PTHREAD_INHERIT_SCHED 1 + +typedef rt_thread_t pthread_t; +typedef long pthread_condattr_t; +typedef long pthread_rwlockattr_t; +typedef long pthread_mutexattr_t; +typedef long pthread_barrierattr_t; + +typedef int pthread_key_t; +typedef int pthread_once_t; + +enum { + PTHREAD_CANCEL_ASYNCHRONOUS = 0, + PTHREAD_CANCEL_ENABLE, + PTHREAD_CANCEL_DEFERRED, + PTHREAD_CANCEL_DISABLE, + PTHREAD_CANCELED +}; + +enum { + PTHREAD_MUTEX_NORMAL = 0, + PTHREAD_MUTEX_RECURSIVE = 1, + PTHREAD_MUTEX_ERRORCHECK = 2, + PTHREAD_MUTEX_ERRORCHECK_NP = PTHREAD_MUTEX_ERRORCHECK, + PTHREAD_MUTEX_RECURSIVE_NP = PTHREAD_MUTEX_RECURSIVE, + PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL +}; + +/* init value for pthread_once_t */ +#define PTHREAD_ONCE_INIT 0 + +enum { + PTHREAD_PRIO_INHERIT =0, + PTHREAD_PRIO_NONE, + PTHREAD_PRIO_PROTECT, +}; + +#define PTHREAD_PROCESS_PRIVATE 0 +#define PTHREAD_PROCESS_SHARED 1 + +#define PTHREAD_SCOPE_PROCESS 0 +#define PTHREAD_SCOPE_SYSTEM 1 + +struct pthread_attr +{ + void* stack_base; + rt_uint16_t stack_size; /* stack size of thread */ + + rt_uint8_t priority; /* priority of thread */ + rt_uint8_t detachstate; /* detach state */ + rt_uint8_t policy; /* scheduler policy */ + rt_uint8_t inheritsched; /* Inherit parent prio/policy */ +}; +typedef struct pthread_attr pthread_attr_t; + +struct pthread_mutex +{ + pthread_mutexattr_t attr; + struct rt_mutex lock; +}; +typedef struct pthread_mutex pthread_mutex_t; + +struct pthread_cond +{ + pthread_condattr_t attr; + struct rt_semaphore sem; +}; +typedef struct pthread_cond pthread_cond_t; + +struct pthread_rwlock +{ + pthread_rwlockattr_t attr; + + pthread_mutex_t rw_mutex; /* basic lock on this struct */ + pthread_cond_t rw_condreaders; /* for reader threads waiting */ + pthread_cond_t rw_condwriters; /* for writer threads waiting */ + + int rw_nwaitreaders; /* the number waiting */ + int rw_nwaitwriters; /* the number waiting */ + int rw_refcount; +}; +typedef struct pthread_rwlock pthread_rwlock_t; + +/* spinlock implementation, (ADVANCED REALTIME THREADS)*/ +struct pthread_spinlock +{ + int lock; +}; +typedef struct pthread_spinlock pthread_spinlock_t; + +struct pthread_barrier +{ + int count; + pthread_cond_t cond; + pthread_mutex_t mutex; +}; +typedef struct pthread_barrier pthread_barrier_t; + +/* pthread thread interface */ +int pthread_attr_destroy(pthread_attr_t *attr); +int pthread_attr_init(pthread_attr_t *attr); + +int pthread_system_init(void); +int pthread_create (pthread_t *tid, const pthread_attr_t *attr, + void *(*start) (void *), void *arg); + +int pthread_detach (pthread_t thread); +int pthread_join (pthread_t thread, void **value_ptr); + +rt_inline int pthread_equal (pthread_t t1, pthread_t t2) +{ + return t1 == t2; +} + +rt_inline pthread_t pthread_self (void) +{ + return rt_thread_self(); +} + +void pthread_exit (void *value_ptr); +int pthread_once(pthread_once_t * once_control, void (*init_routine) (void)); + +/* pthread cleanup */ +void pthread_cleanup_pop(int execute); +void pthread_cleanup_push(void (*routine)(void*), void *arg); + +/* pthread cancel */ +int pthread_cancel(pthread_t thread); +void pthread_testcancel(void); +int pthread_setcancelstate(int state, int *oldstate); +int pthread_setcanceltype(int type, int *oldtype); + +int pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)); +int pthread_kill(pthread_t thread, int sig); + +/* pthread mutex interface */ +int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr); +int pthread_mutex_destroy(pthread_mutex_t *mutex); +int pthread_mutex_lock(pthread_mutex_t *mutex); +int pthread_mutex_unlock(pthread_mutex_t *mutex); +int pthread_mutex_trylock(pthread_mutex_t *mutex); + +int pthread_mutexattr_init(pthread_mutexattr_t *attr); +int pthread_mutexattr_destroy(pthread_mutexattr_t *attr); +int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type); +int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type); +int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared); +int pthread_mutexattr_getpshared(pthread_mutexattr_t *attr, int *pshared); + +/* pthread condition interface */ +int pthread_condattr_destroy(pthread_condattr_t *attr); +int pthread_condattr_init(pthread_condattr_t *attr); + +/* ADVANCED REALTIME feature in IEEE Std 1003.1, 2004 Edition */ +int pthread_condattr_getclock(const pthread_condattr_t *attr, + clockid_t *clock_id); +int pthread_condattr_setclock(pthread_condattr_t *attr, + clockid_t clock_id); + +int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); +int pthread_cond_destroy(pthread_cond_t *cond); +int pthread_cond_broadcast(pthread_cond_t *cond); +int pthread_cond_signal(pthread_cond_t *cond); + +int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex); +int pthread_cond_timedwait(pthread_cond_t *cond, + pthread_mutex_t * mutex, + const struct timespec *abstime); + +/* pthread rwlock interface */ +int pthread_rwlockattr_init (pthread_rwlockattr_t *attr); +int pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr); +int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared); +int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared); + +int pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr); +int pthread_rwlock_destroy (pthread_rwlock_t *rwlock); + +int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock); +int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock); + +int pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, const struct timespec *abstime); +int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, const struct timespec *abstime); + +int pthread_rwlock_unlock (pthread_rwlock_t *rwlock); + +int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock); +int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock); + +/* pthread spinlock interface */ +int pthread_spin_init (pthread_spinlock_t *lock, int pshared); +int pthread_spin_destroy (pthread_spinlock_t *lock); + +int pthread_spin_lock (pthread_spinlock_t * lock); +int pthread_spin_trylock (pthread_spinlock_t * lock); +int pthread_spin_unlock (pthread_spinlock_t * lock); + +/* pthread barrier interface */ +int pthread_barrierattr_destroy(pthread_barrierattr_t *attr); +int pthread_barrierattr_init(pthread_barrierattr_t *attr); +int pthread_barrierattr_getpshared(const pthread_barrierattr_t *attr, int *pshared); +int pthread_barrierattr_setpshared(pthread_barrierattr_t *attr, int pshared); + +int pthread_barrier_destroy(pthread_barrier_t *barrier); +int pthread_barrier_init(pthread_barrier_t *barrier, + const pthread_barrierattr_t *attr, unsigned count); + +int pthread_barrier_wait(pthread_barrier_t *barrier); + +/* Signal Generation and Delivery, P1003.1b-1993, p. 63 + NOTE: P1003.1c/D10, p. 34 adds sigev_notify_function and + sigev_notify_attributes to the sigevent structure. */ +union sigval { + int sival_int; /* Integer signal value */ + void *sival_ptr; /* Pointer signal value */ +}; + +struct sigevent { + int sigev_notify; /* Notification type */ + int sigev_signo; /* Signal number */ + union sigval sigev_value; /* Signal value */ + void (*sigev_notify_function)( union sigval ); + /* Notification function */ + pthread_attr_t *sigev_notify_attributes; /* Notification Attributes */ +}; + +/* posix clock and timer */ +#define MILLISECOND_PER_SECOND 1000UL +#define MICROSECOND_PER_SECOND 1000000UL +#define NANOSECOND_PER_SECOND 1000000000UL + +#define MILLISECOND_PER_TICK (MILLISECOND_PER_SECOND / RT_TICK_PER_SECOND) +#define MICROSECOND_PER_TICK (MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND) +#define NANOSECOND_PER_TICK (NANOSECOND_PER_SECOND / RT_TICK_PER_SECOND) + +#ifndef CLOCK_REALTIME +#define CLOCK_REALTIME 0 +#endif + +int clock_getres (clockid_t clockid, struct timespec *res); +int clock_gettime (clockid_t clockid, struct timespec *tp); +int clock_settime (clockid_t clockid, const struct timespec *tp); + +#endif + diff --git a/components/pthreads/pthread_attr.c b/components/pthreads/pthread_attr.c index 1946722602..c2fe4a85b9 100644 --- a/components/pthreads/pthread_attr.c +++ b/components/pthreads/pthread_attr.c @@ -1,178 +1,178 @@ -#include <rtthread.h>
-#include "pthread.h"
-#include "sched.h"
-#include <string.h>
-
-#define DEFAULT_STACK_SIZE 2048
-#define DEFAULT_PRIORITY (RT_THREAD_PRIORITY_MAX/2 + RT_THREAD_PRIORITY_MAX/4)
-
-const pthread_attr_t pthread_default_attr =
-{
- 0, /* stack base */
- DEFAULT_STACK_SIZE, /* stack size */
- DEFAULT_PRIORITY, /* priority */
- PTHREAD_CREATE_JOINABLE, /* detach state */
- SCHED_FIFO, /* scheduler policy */
- PTHREAD_INHERIT_SCHED /* Inherit parent prio/policy */
-};
-
-int pthread_attr_init(pthread_attr_t *attr)
-{
- RT_ASSERT(attr != RT_NULL);
-
- *attr = pthread_default_attr;
-
- return 0;
-}
-RTM_EXPORT(pthread_attr_init);
-
-int pthread_attr_destroy(pthread_attr_t *attr)
-{
- RT_ASSERT(attr != RT_NULL);
-
- memset(attr, 0, sizeof(pthread_attr_t));
- return 0;
-}
-RTM_EXPORT(pthread_attr_destroy);
-
-int pthread_attr_setdetachstate(pthread_attr_t * attr, int state)
-{
- RT_ASSERT(attr != RT_NULL);
-
- if (state != PTHREAD_CREATE_JOINABLE && state != PTHREAD_CREATE_DETACHED)
- return EINVAL;
-
- attr->detachstate = state;
- return 0;
-}
-RTM_EXPORT(pthread_attr_setdetachstate);
-
-int pthread_attr_getdetachstate(pthread_attr_t const * attr, int *state)
-{
- RT_ASSERT(attr != RT_NULL);
-
- *state = (int)attr->detachstate;
-
- return 0;
-}
-RTM_EXPORT(pthread_attr_getdetachstate);
-
-int pthread_attr_setschedpolicy(pthread_attr_t * attr, int policy)
-{
- RT_ASSERT(attr != RT_NULL);
-
- attr->policy = policy;
- return 0;
-}
-RTM_EXPORT(pthread_attr_setschedpolicy);
-
-int pthread_attr_getschedpolicy(pthread_attr_t const *attr, int *policy)
-{
- RT_ASSERT(attr != RT_NULL);
-
- *policy = (int)attr->policy;
- return 0;
-}
-RTM_EXPORT(pthread_attr_getschedpolicy);
-
-int pthread_attr_setschedparam(pthread_attr_t *attr, struct sched_param const *param)
-{
- RT_ASSERT(attr != RT_NULL);
- RT_ASSERT(param != RT_NULL);
-
- attr->priority = param->sched_priority;
- return 0;
-}
-RTM_EXPORT(pthread_attr_setschedparam);
-
-int pthread_attr_getschedparam(pthread_attr_t const *attr, struct sched_param *param)
-{
- RT_ASSERT(attr != RT_NULL);
- RT_ASSERT(param != RT_NULL);
-
- param->sched_priority = attr->priority;
- return 0;
-}
-RTM_EXPORT(pthread_attr_getschedparam);
-
-int pthread_attr_setstacksize(pthread_attr_t * attr, size_t stack_size)
-{
- RT_ASSERT(attr != RT_NULL);
-
- attr->stack_size = stack_size;
- return 0;
-}
-RTM_EXPORT(pthread_attr_setstacksize);
-
-int pthread_attr_getstacksize(pthread_attr_t const * attr, size_t *stack_size)
-{
- RT_ASSERT(attr != RT_NULL);
-
- *stack_size = attr->stack_size;
- return 0;
-}
-RTM_EXPORT(pthread_attr_getstacksize);
-
-int pthread_attr_setstackaddr(pthread_attr_t * attr, void * stack_addr)
-{
- RT_ASSERT(attr != RT_NULL);
- return ENOTSUP;
-}
-RTM_EXPORT(pthread_attr_setstackaddr);
-
-int pthread_attr_getstackaddr(pthread_attr_t const * attr, void ** stack_addr)
-{
- RT_ASSERT(attr != RT_NULL);
- return ENOTSUP;
-}
-RTM_EXPORT(pthread_attr_getstackaddr);
-
-int pthread_attr_setstack(pthread_attr_t * attr, void *stack_base, size_t stack_size)
-{
- RT_ASSERT(attr != RT_NULL);
-
- attr->stack_base = stack_base;
- attr->stack_size = RT_ALIGN_DOWN(stack_size, RT_ALIGN_SIZE);
-
- return 0;
-}
-RTM_EXPORT(pthread_attr_setstack);
-
-int pthread_attr_getstack(pthread_attr_t const * attr, void **stack_base, size_t *stack_size)
-{
- RT_ASSERT(attr != RT_NULL);
-
- *stack_base = attr->stack_base;
- *stack_size = attr->stack_size;
-
- return 0;
-}
-RTM_EXPORT(pthread_attr_getstack);
-
-int pthread_attr_setguardsize(pthread_attr_t * attr, size_t guard_size)
-{
- return ENOTSUP;
-}
-
-int pthread_attr_getguardsize(pthread_attr_t const * attr, size_t *guard_size)
-{
- return ENOTSUP;
-}
-RTM_EXPORT(pthread_attr_getguardsize);
-
-int pthread_attr_setscope(pthread_attr_t *attr, int scope)
-{
- if (scope == PTHREAD_SCOPE_SYSTEM)
- return 0;
- if (scope == PTHREAD_SCOPE_PROCESS)
- return ENOTSUP;
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_attr_setscope);
-
-int pthread_attr_getscope(pthread_attr_t const *attr)
-{
- return PTHREAD_SCOPE_SYSTEM;
-}
-RTM_EXPORT(pthread_attr_getscope);
+#include <rtthread.h> +#include "pthread.h" +#include "sched.h" +#include <string.h> + +#define DEFAULT_STACK_SIZE 2048 +#define DEFAULT_PRIORITY (RT_THREAD_PRIORITY_MAX/2 + RT_THREAD_PRIORITY_MAX/4) + +const pthread_attr_t pthread_default_attr = +{ + 0, /* stack base */ + DEFAULT_STACK_SIZE, /* stack size */ + DEFAULT_PRIORITY, /* priority */ + PTHREAD_CREATE_JOINABLE, /* detach state */ + SCHED_FIFO, /* scheduler policy */ + PTHREAD_INHERIT_SCHED /* Inherit parent prio/policy */ +}; + +int pthread_attr_init(pthread_attr_t *attr) +{ + RT_ASSERT(attr != RT_NULL); + + *attr = pthread_default_attr; + + return 0; +} +RTM_EXPORT(pthread_attr_init); + +int pthread_attr_destroy(pthread_attr_t *attr) +{ + RT_ASSERT(attr != RT_NULL); + + memset(attr, 0, sizeof(pthread_attr_t)); + return 0; +} +RTM_EXPORT(pthread_attr_destroy); + +int pthread_attr_setdetachstate(pthread_attr_t * attr, int state) +{ + RT_ASSERT(attr != RT_NULL); + + if (state != PTHREAD_CREATE_JOINABLE && state != PTHREAD_CREATE_DETACHED) + return EINVAL; + + attr->detachstate = state; + return 0; +} +RTM_EXPORT(pthread_attr_setdetachstate); + +int pthread_attr_getdetachstate(pthread_attr_t const * attr, int *state) +{ + RT_ASSERT(attr != RT_NULL); + + *state = (int)attr->detachstate; + + return 0; +} +RTM_EXPORT(pthread_attr_getdetachstate); + +int pthread_attr_setschedpolicy(pthread_attr_t * attr, int policy) +{ + RT_ASSERT(attr != RT_NULL); + + attr->policy = policy; + return 0; +} +RTM_EXPORT(pthread_attr_setschedpolicy); + +int pthread_attr_getschedpolicy(pthread_attr_t const *attr, int *policy) +{ + RT_ASSERT(attr != RT_NULL); + + *policy = (int)attr->policy; + return 0; +} +RTM_EXPORT(pthread_attr_getschedpolicy); + +int pthread_attr_setschedparam(pthread_attr_t *attr, struct sched_param const *param) +{ + RT_ASSERT(attr != RT_NULL); + RT_ASSERT(param != RT_NULL); + + attr->priority = param->sched_priority; + return 0; +} +RTM_EXPORT(pthread_attr_setschedparam); + +int pthread_attr_getschedparam(pthread_attr_t const *attr, struct sched_param *param) +{ + RT_ASSERT(attr != RT_NULL); + RT_ASSERT(param != RT_NULL); + + param->sched_priority = attr->priority; + return 0; +} +RTM_EXPORT(pthread_attr_getschedparam); + +int pthread_attr_setstacksize(pthread_attr_t * attr, size_t stack_size) +{ + RT_ASSERT(attr != RT_NULL); + + attr->stack_size = stack_size; + return 0; +} +RTM_EXPORT(pthread_attr_setstacksize); + +int pthread_attr_getstacksize(pthread_attr_t const * attr, size_t *stack_size) +{ + RT_ASSERT(attr != RT_NULL); + + *stack_size = attr->stack_size; + return 0; +} +RTM_EXPORT(pthread_attr_getstacksize); + +int pthread_attr_setstackaddr(pthread_attr_t * attr, void * stack_addr) +{ + RT_ASSERT(attr != RT_NULL); + return ENOTSUP; +} +RTM_EXPORT(pthread_attr_setstackaddr); + +int pthread_attr_getstackaddr(pthread_attr_t const * attr, void ** stack_addr) +{ + RT_ASSERT(attr != RT_NULL); + return ENOTSUP; +} +RTM_EXPORT(pthread_attr_getstackaddr); + +int pthread_attr_setstack(pthread_attr_t * attr, void *stack_base, size_t stack_size) +{ + RT_ASSERT(attr != RT_NULL); + + attr->stack_base = stack_base; + attr->stack_size = RT_ALIGN_DOWN(stack_size, RT_ALIGN_SIZE); + + return 0; +} +RTM_EXPORT(pthread_attr_setstack); + +int pthread_attr_getstack(pthread_attr_t const * attr, void **stack_base, size_t *stack_size) +{ + RT_ASSERT(attr != RT_NULL); + + *stack_base = attr->stack_base; + *stack_size = attr->stack_size; + + return 0; +} +RTM_EXPORT(pthread_attr_getstack); + +int pthread_attr_setguardsize(pthread_attr_t * attr, size_t guard_size) +{ + return ENOTSUP; +} + +int pthread_attr_getguardsize(pthread_attr_t const * attr, size_t *guard_size) +{ + return ENOTSUP; +} +RTM_EXPORT(pthread_attr_getguardsize); + +int pthread_attr_setscope(pthread_attr_t *attr, int scope) +{ + if (scope == PTHREAD_SCOPE_SYSTEM) + return 0; + if (scope == PTHREAD_SCOPE_PROCESS) + return ENOTSUP; + + return EINVAL; +} +RTM_EXPORT(pthread_attr_setscope); + +int pthread_attr_getscope(pthread_attr_t const *attr) +{ + return PTHREAD_SCOPE_SYSTEM; +} +RTM_EXPORT(pthread_attr_getscope); diff --git a/components/pthreads/pthread_barrier.c b/components/pthreads/pthread_barrier.c index e3860ab469..b6f4092e8b 100644 --- a/components/pthreads/pthread_barrier.c +++ b/components/pthreads/pthread_barrier.c @@ -1,85 +1,85 @@ -#include <pthread.h>
-
-int pthread_barrierattr_destroy(pthread_barrierattr_t *attr)
-{
- if (!attr) return EINVAL;
- return 0;
-}
-RTM_EXPORT(pthread_barrierattr_destroy);
-
-int pthread_barrierattr_init(pthread_barrierattr_t *attr)
-{
- if (!attr) return EINVAL;
- *attr = PTHREAD_PROCESS_PRIVATE;
-
- return 0;
-}
-RTM_EXPORT(pthread_barrierattr_init);
-
-int pthread_barrierattr_getpshared(const pthread_barrierattr_t *attr, int *pshared)
-{
- if (!attr) return EINVAL;
- *pshared = (int)*attr;
-
- return 0;
-}
-RTM_EXPORT(pthread_barrierattr_getpshared);
-
-int pthread_barrierattr_setpshared(pthread_barrierattr_t *attr, int pshared)
-{
- if (!attr) return EINVAL;
- if (pshared == PTHREAD_PROCESS_PRIVATE) attr = PTHREAD_PROCESS_PRIVATE;
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_barrierattr_setpshared);
-
-int pthread_barrier_destroy(pthread_barrier_t *barrier)
-{
- rt_err_t result;
-
- if (!barrier) return EINVAL;
-
- result = pthread_cond_destroy(&(barrier->cond));
-
- return result;
-}
-RTM_EXPORT(pthread_barrier_destroy);
-
-int pthread_barrier_init(pthread_barrier_t *barrier,
- const pthread_barrierattr_t *attr, unsigned count)
-{
- if (!barrier) return EINVAL;
- if (attr &&(*attr != PTHREAD_PROCESS_PRIVATE)) return EINVAL;
-
- barrier->count = count;
- pthread_cond_init(&(barrier->cond), NULL);
- pthread_mutex_init(&(barrier->mutex), NULL);
-
- return 0;
-}
-RTM_EXPORT(pthread_barrier_init);
-
-int pthread_barrier_wait(pthread_barrier_t *barrier)
-{
- rt_err_t result;
- if (!barrier) return EINVAL;
-
- result = pthread_mutex_lock(&(barrier->mutex));
- if (result != 0) return EINVAL;
-
- if (barrier->count == 0) result = EINVAL;
- else
- {
- barrier->count -= 1;
- if (barrier->count == 0) /* broadcast condition */
- pthread_cond_broadcast(&(barrier->cond));
- else
- pthread_cond_wait(&(barrier->cond), &(barrier->mutex));
- }
-
- pthread_mutex_unlock(&(barrier->mutex));
- return result;
-}
-RTM_EXPORT(pthread_barrier_wait);
-
+#include <pthread.h> + +int pthread_barrierattr_destroy(pthread_barrierattr_t *attr) +{ + if (!attr) return EINVAL; + return 0; +} +RTM_EXPORT(pthread_barrierattr_destroy); + +int pthread_barrierattr_init(pthread_barrierattr_t *attr) +{ + if (!attr) return EINVAL; + *attr = PTHREAD_PROCESS_PRIVATE; + + return 0; +} +RTM_EXPORT(pthread_barrierattr_init); + +int pthread_barrierattr_getpshared(const pthread_barrierattr_t *attr, int *pshared) +{ + if (!attr) return EINVAL; + *pshared = (int)*attr; + + return 0; +} +RTM_EXPORT(pthread_barrierattr_getpshared); + +int pthread_barrierattr_setpshared(pthread_barrierattr_t *attr, int pshared) +{ + if (!attr) return EINVAL; + if (pshared == PTHREAD_PROCESS_PRIVATE) attr = PTHREAD_PROCESS_PRIVATE; + + return EINVAL; +} +RTM_EXPORT(pthread_barrierattr_setpshared); + +int pthread_barrier_destroy(pthread_barrier_t *barrier) +{ + rt_err_t result; + + if (!barrier) return EINVAL; + + result = pthread_cond_destroy(&(barrier->cond)); + + return result; +} +RTM_EXPORT(pthread_barrier_destroy); + +int pthread_barrier_init(pthread_barrier_t *barrier, + const pthread_barrierattr_t *attr, unsigned count) +{ + if (!barrier) return EINVAL; + if (attr &&(*attr != PTHREAD_PROCESS_PRIVATE)) return EINVAL; + + barrier->count = count; + pthread_cond_init(&(barrier->cond), NULL); + pthread_mutex_init(&(barrier->mutex), NULL); + + return 0; +} +RTM_EXPORT(pthread_barrier_init); + +int pthread_barrier_wait(pthread_barrier_t *barrier) +{ + rt_err_t result; + if (!barrier) return EINVAL; + + result = pthread_mutex_lock(&(barrier->mutex)); + if (result != 0) return EINVAL; + + if (barrier->count == 0) result = EINVAL; + else + { + barrier->count -= 1; + if (barrier->count == 0) /* broadcast condition */ + pthread_cond_broadcast(&(barrier->cond)); + else + pthread_cond_wait(&(barrier->cond), &(barrier->mutex)); + } + + pthread_mutex_unlock(&(barrier->mutex)); + return result; +} +RTM_EXPORT(pthread_barrier_wait); + diff --git a/components/pthreads/pthread_cond.c b/components/pthreads/pthread_cond.c index 581d20e04f..4f9dba9cd5 100644 --- a/components/pthreads/pthread_cond.c +++ b/components/pthreads/pthread_cond.c @@ -1,193 +1,193 @@ -#include <pthread.h>
-#include "pthread_internal.h"
-
-int pthread_condattr_destroy(pthread_condattr_t *attr)
-{
- if (!attr) return EINVAL;
-
- return 0;
-}
-RTM_EXPORT(pthread_condattr_destroy);
-
-int pthread_condattr_init(pthread_condattr_t *attr)
-{
- if (!attr) return EINVAL;
- *attr = PTHREAD_PROCESS_PRIVATE;
-
- return 0;
-}
-RTM_EXPORT(pthread_condattr_init);
-
-int pthread_condattr_getclock(const pthread_condattr_t *attr,
- clockid_t *clock_id)
-{
- return 0;
-}
-RTM_EXPORT(pthread_condattr_getclock);
-
-int pthread_condattr_setclock(pthread_condattr_t *attr,
- clockid_t clock_id)
-{
- return 0;
-}
-RTM_EXPORT(pthread_condattr_setclock);
-
-int pthread_condattr_getpshared(const pthread_condattr_t *attr, int *pshared)
-{
- if (!attr || !pshared) return EINVAL;
-
- *pshared = PTHREAD_PROCESS_PRIVATE;
- return 0;
-}
-RTM_EXPORT(pthread_condattr_getpshared);
-
-int pthread_condattr_setpshared(pthread_condattr_t*attr, int pshared)
-{
- if ((pshared != PTHREAD_PROCESS_PRIVATE) && (pshared != PTHREAD_PROCESS_SHARED))
- return EINVAL;
-
- if (pshared != PTHREAD_PROCESS_PRIVATE)
- return ENOSYS;
-
- return 0;
-}
-RTM_EXPORT(pthread_condattr_setpshared);
-
-int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
-{
- rt_err_t result;
- char cond_name[RT_NAME_MAX];
- static rt_uint16_t cond_num = 0;
-
- /* parameter check */
- if (cond == RT_NULL) return EINVAL;
- if ((attr != RT_NULL) && (*attr != PTHREAD_PROCESS_PRIVATE)) return EINVAL;
-
- rt_snprintf(cond_name, sizeof(cond_name),
- "cond%02d", cond_num++);
-
- cond->attr = *attr;
- result = rt_sem_init(&cond->sem, cond_name, 0, RT_IPC_FLAG_FIFO);
- if (result != RT_EOK) return EINVAL;
-
- /* detach the object from system object container */
- rt_object_detach(&(cond->sem.parent.parent));
-
- return 0;
-}
-RTM_EXPORT(pthread_cond_init);
-
-int pthread_cond_destroy(pthread_cond_t *cond)
-{
- rt_err_t result;
- if (cond == RT_NULL) return EINVAL;
- if (cond->attr == -1) return 0; /* which is not initialized */
-
- result = rt_sem_trytake(&(cond->sem));
- if (result != RT_EOK) return EBUSY;
-
- /* clean condition */
- rt_memset(cond, 0, sizeof(pthread_cond_t));
- cond->attr = -1;
-
- return 0;
-}
-RTM_EXPORT(pthread_cond_destroy);
-
-int pthread_cond_broadcast(pthread_cond_t *cond)
-{
- rt_err_t result;
- if (cond->attr == -1)
- pthread_cond_init(cond, RT_NULL);
-
- rt_enter_critical();
- while (1)
- {
- /* try to take condition semaphore */
- result = rt_sem_trytake(&(cond->sem));
- if (result == -RT_ETIMEOUT)
- {
- /* it's timeout, release this semaphore */
- rt_sem_release(&(cond->sem));
- }
- else if (result == RT_EOK)
- {
- /* has taken this semaphore, release it */
- rt_sem_release(&(cond->sem));
- break;
- }
- else
- {
- rt_exit_critical();
- return EINVAL;
- }
- }
- rt_exit_critical();
-
- return 0;
-}
-RTM_EXPORT(pthread_cond_broadcast);
-
-int pthread_cond_signal(pthread_cond_t *cond)
-{
- rt_err_t result;
-
- if (cond->attr == -1)
- pthread_cond_init(cond, RT_NULL);
-
- result = rt_sem_release(&(cond->sem));
- if (result == RT_EOK) return 0;
-
- return 0;
-}
-RTM_EXPORT(pthread_cond_signal);
-
-rt_err_t _pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
- rt_int32_t timeout)
-{
- rt_err_t result;
-
- if (!cond || !mutex) return -RT_ERROR;
- /* check whether initialized */
- if (cond->attr == -1) pthread_cond_init(cond, RT_NULL);
-
- /* The mutex was not owned by the current thread at the time of the call. */
- if (mutex->lock.owner != pthread_self()) return -RT_ERROR;
- /* unlock a mutex failed */
- if (pthread_mutex_unlock(mutex) != 0)
- return -RT_ERROR;
-
- result = rt_sem_take(&(cond->sem), timeout);
- /* lock mutex again */
- pthread_mutex_lock(mutex);
- return result;
-}
-RTM_EXPORT(_pthread_cond_timedwait);
-
-int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
- rt_err_t result;
-
- result = _pthread_cond_timedwait(cond, mutex, RT_WAITING_FOREVER);
- if (result == RT_EOK) return 0;
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_cond_wait);
-
-int pthread_cond_timedwait(pthread_cond_t *cond,
- pthread_mutex_t * mutex,
- const struct timespec *abstime)
-{
- int timeout;
- rt_err_t result;
-
- timeout = clock_time_to_tick(abstime);
- result = _pthread_cond_timedwait(cond, mutex, timeout);
- if (result == RT_EOK) return 0;
- if (result == -RT_ETIMEOUT) return ETIMEDOUT;
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_cond_timedwait);
-
+#include <pthread.h> +#include "pthread_internal.h" + +int pthread_condattr_destroy(pthread_condattr_t *attr) +{ + if (!attr) return EINVAL; + + return 0; +} +RTM_EXPORT(pthread_condattr_destroy); + +int pthread_condattr_init(pthread_condattr_t *attr) +{ + if (!attr) return EINVAL; + *attr = PTHREAD_PROCESS_PRIVATE; + + return 0; +} +RTM_EXPORT(pthread_condattr_init); + +int pthread_condattr_getclock(const pthread_condattr_t *attr, + clockid_t *clock_id) +{ + return 0; +} +RTM_EXPORT(pthread_condattr_getclock); + +int pthread_condattr_setclock(pthread_condattr_t *attr, + clockid_t clock_id) +{ + return 0; +} +RTM_EXPORT(pthread_condattr_setclock); + +int pthread_condattr_getpshared(const pthread_condattr_t *attr, int *pshared) +{ + if (!attr || !pshared) return EINVAL; + + *pshared = PTHREAD_PROCESS_PRIVATE; + return 0; +} +RTM_EXPORT(pthread_condattr_getpshared); + +int pthread_condattr_setpshared(pthread_condattr_t*attr, int pshared) +{ + if ((pshared != PTHREAD_PROCESS_PRIVATE) && (pshared != PTHREAD_PROCESS_SHARED)) + return EINVAL; + + if (pshared != PTHREAD_PROCESS_PRIVATE) + return ENOSYS; + + return 0; +} +RTM_EXPORT(pthread_condattr_setpshared); + +int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) +{ + rt_err_t result; + char cond_name[RT_NAME_MAX]; + static rt_uint16_t cond_num = 0; + + /* parameter check */ + if (cond == RT_NULL) return EINVAL; + if ((attr != RT_NULL) && (*attr != PTHREAD_PROCESS_PRIVATE)) return EINVAL; + + rt_snprintf(cond_name, sizeof(cond_name), + "cond%02d", cond_num++); + + cond->attr = *attr; + result = rt_sem_init(&cond->sem, cond_name, 0, RT_IPC_FLAG_FIFO); + if (result != RT_EOK) return EINVAL; + + /* detach the object from system object container */ + rt_object_detach(&(cond->sem.parent.parent)); + + return 0; +} +RTM_EXPORT(pthread_cond_init); + +int pthread_cond_destroy(pthread_cond_t *cond) +{ + rt_err_t result; + if (cond == RT_NULL) return EINVAL; + if (cond->attr == -1) return 0; /* which is not initialized */ + + result = rt_sem_trytake(&(cond->sem)); + if (result != RT_EOK) return EBUSY; + + /* clean condition */ + rt_memset(cond, 0, sizeof(pthread_cond_t)); + cond->attr = -1; + + return 0; +} +RTM_EXPORT(pthread_cond_destroy); + +int pthread_cond_broadcast(pthread_cond_t *cond) +{ + rt_err_t result; + if (cond->attr == -1) + pthread_cond_init(cond, RT_NULL); + + rt_enter_critical(); + while (1) + { + /* try to take condition semaphore */ + result = rt_sem_trytake(&(cond->sem)); + if (result == -RT_ETIMEOUT) + { + /* it's timeout, release this semaphore */ + rt_sem_release(&(cond->sem)); + } + else if (result == RT_EOK) + { + /* has taken this semaphore, release it */ + rt_sem_release(&(cond->sem)); + break; + } + else + { + rt_exit_critical(); + return EINVAL; + } + } + rt_exit_critical(); + + return 0; +} +RTM_EXPORT(pthread_cond_broadcast); + +int pthread_cond_signal(pthread_cond_t *cond) +{ + rt_err_t result; + + if (cond->attr == -1) + pthread_cond_init(cond, RT_NULL); + + result = rt_sem_release(&(cond->sem)); + if (result == RT_EOK) return 0; + + return 0; +} +RTM_EXPORT(pthread_cond_signal); + +rt_err_t _pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, + rt_int32_t timeout) +{ + rt_err_t result; + + if (!cond || !mutex) return -RT_ERROR; + /* check whether initialized */ + if (cond->attr == -1) pthread_cond_init(cond, RT_NULL); + + /* The mutex was not owned by the current thread at the time of the call. */ + if (mutex->lock.owner != pthread_self()) return -RT_ERROR; + /* unlock a mutex failed */ + if (pthread_mutex_unlock(mutex) != 0) + return -RT_ERROR; + + result = rt_sem_take(&(cond->sem), timeout); + /* lock mutex again */ + pthread_mutex_lock(mutex); + return result; +} +RTM_EXPORT(_pthread_cond_timedwait); + +int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) +{ + rt_err_t result; + + result = _pthread_cond_timedwait(cond, mutex, RT_WAITING_FOREVER); + if (result == RT_EOK) return 0; + + return EINVAL; +} +RTM_EXPORT(pthread_cond_wait); + +int pthread_cond_timedwait(pthread_cond_t *cond, + pthread_mutex_t * mutex, + const struct timespec *abstime) +{ + int timeout; + rt_err_t result; + + timeout = clock_time_to_tick(abstime); + result = _pthread_cond_timedwait(cond, mutex, timeout); + if (result == RT_EOK) return 0; + if (result == -RT_ETIMEOUT) return ETIMEDOUT; + + return EINVAL; +} +RTM_EXPORT(pthread_cond_timedwait); + diff --git a/components/pthreads/pthread_internal.h b/components/pthreads/pthread_internal.h index 0a585b9ff8..1fec536fe9 100644 --- a/components/pthreads/pthread_internal.h +++ b/components/pthreads/pthread_internal.h @@ -1,67 +1,67 @@ -#ifndef __PTHREAD_INTERNAL_H__
-#define __PTHREAD_INTERNAL_H__
-
-#include <rtthread.h>
-#include <pthread.h>
-
-struct _pthread_cleanup
-{
- void (*cleanup_func)(void* parameter);
- void* parameter;
-
- struct _pthread_cleanup* next;
-};
-typedef struct _pthread_cleanup _pthread_cleanup_t;
-
-struct _pthread_key_data
-{
- int is_used;
- void (*destructor)(void* parameter);
-};
-typedef struct _pthread_key_data _pthread_key_data_t;
-
-#define PTHREAD_MAGIC 0x70746873
-struct _pthread_data
-{
- rt_uint32_t magic;
- pthread_attr_t attr;
- rt_thread_t tid;
-
- void* (*thread_entry)(void* parameter);
- void* thread_parameter;
-
- /* return value */
- void* return_value;
-
- /* semaphore for joinable thread */
- rt_sem_t joinable_sem;
-
- /* cancel state and type */
- rt_uint8_t cancelstate;
- volatile rt_uint8_t canceltype;
- volatile rt_uint8_t canceled;
-
- _pthread_cleanup_t* cleanup;
- void** tls; /* thread-local storage area */
-};
-typedef struct _pthread_data _pthread_data_t;
-
-rt_inline _pthread_data_t* _pthread_get_data(pthread_t thread)
-{
- _pthread_data_t* ptd;
- RT_ASSERT(thread != RT_NULL);
-
- ptd = (_pthread_data_t*)thread->user_data;
- RT_ASSERT(ptd != RT_NULL);
- RT_ASSERT(ptd->magic == PTHREAD_MAGIC);
-
- return ptd;
-}
-
-int clock_time_to_tick(const struct timespec *time);
-void clock_time_system_init(void);
-void posix_mq_system_init(void);
-void posix_sem_system_init(void);
-void pthread_key_system_init(void);
-
-#endif
+#ifndef __PTHREAD_INTERNAL_H__ +#define __PTHREAD_INTERNAL_H__ + +#include <rtthread.h> +#include <pthread.h> + +struct _pthread_cleanup +{ + void (*cleanup_func)(void* parameter); + void* parameter; + + struct _pthread_cleanup* next; +}; +typedef struct _pthread_cleanup _pthread_cleanup_t; + +struct _pthread_key_data +{ + int is_used; + void (*destructor)(void* parameter); +}; +typedef struct _pthread_key_data _pthread_key_data_t; + +#define PTHREAD_MAGIC 0x70746873 +struct _pthread_data +{ + rt_uint32_t magic; + pthread_attr_t attr; + rt_thread_t tid; + + void* (*thread_entry)(void* parameter); + void* thread_parameter; + + /* return value */ + void* return_value; + + /* semaphore for joinable thread */ + rt_sem_t joinable_sem; + + /* cancel state and type */ + rt_uint8_t cancelstate; + volatile rt_uint8_t canceltype; + volatile rt_uint8_t canceled; + + _pthread_cleanup_t* cleanup; + void** tls; /* thread-local storage area */ +}; +typedef struct _pthread_data _pthread_data_t; + +rt_inline _pthread_data_t* _pthread_get_data(pthread_t thread) +{ + _pthread_data_t* ptd; + RT_ASSERT(thread != RT_NULL); + + ptd = (_pthread_data_t*)thread->user_data; + RT_ASSERT(ptd != RT_NULL); + RT_ASSERT(ptd->magic == PTHREAD_MAGIC); + + return ptd; +} + +int clock_time_to_tick(const struct timespec *time); +void clock_time_system_init(void); +void posix_mq_system_init(void); +void posix_sem_system_init(void); +void pthread_key_system_init(void); + +#endif diff --git a/components/pthreads/pthread_mutex.c b/components/pthreads/pthread_mutex.c index 486b389b1c..34ff91e451 100644 --- a/components/pthreads/pthread_mutex.c +++ b/components/pthreads/pthread_mutex.c @@ -1,206 +1,206 @@ -#include <rtthread.h>
-#include "pthread.h"
-
-#define MUTEXATTR_SHARED_MASK 0x0010
-#define MUTEXATTR_TYPE_MASK 0x000f
-
-const pthread_mutexattr_t pthread_default_mutexattr = PTHREAD_PROCESS_PRIVATE;
-
-int pthread_mutexattr_init(pthread_mutexattr_t *attr)
-{
- if (attr)
- {
- *attr = pthread_default_mutexattr;
- return 0;
- }
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_mutexattr_init);
-
-int pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
-{
- if (attr)
- {
- *attr = -1;
- return 0;
- }
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_mutexattr_destroy);
-
-int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type)
-{
- if (attr && type)
- {
- int atype = (*attr & MUTEXATTR_TYPE_MASK);
-
- if (atype >= PTHREAD_MUTEX_NORMAL && atype <= PTHREAD_MUTEX_ERRORCHECK)
- {
- *type = atype;
- return 0;
- }
- }
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_mutexattr_gettype);
-
-int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type)
-{
- if (attr && type >= PTHREAD_MUTEX_NORMAL &&
- type <= PTHREAD_MUTEX_ERRORCHECK )
- {
- *attr = (*attr & ~MUTEXATTR_TYPE_MASK) | type;
- return 0;
- }
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_mutexattr_settype);
-
-int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared)
-{
- if (!attr) return EINVAL;
-
- switch (pshared)
- {
- case PTHREAD_PROCESS_PRIVATE:
- *attr &= ~MUTEXATTR_SHARED_MASK;
- return 0;
-
- case PTHREAD_PROCESS_SHARED:
- *attr |= MUTEXATTR_SHARED_MASK;
- return 0;
- }
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_mutexattr_setpshared);
-
-int pthread_mutexattr_getpshared(pthread_mutexattr_t *attr, int *pshared)
-{
- if (!attr || !pshared) return EINVAL;
-
- *pshared = (*attr & MUTEXATTR_SHARED_MASK) ? PTHREAD_PROCESS_SHARED
- : PTHREAD_PROCESS_PRIVATE;
- return 0;
-}
-RTM_EXPORT(pthread_mutexattr_getpshared);
-
-int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
-{
- rt_err_t result;
- char name[RT_NAME_MAX];
- static rt_uint16_t pthread_mutex_number = 0;
-
- if (!mutex) return EINVAL;
-
- /* build mutex name */
- rt_snprintf(name, sizeof(name), "pmtx%02d", pthread_mutex_number ++);
- if (attr == RT_NULL) mutex->attr = pthread_default_mutexattr;
- else mutex->attr = *attr;
-
- /* init mutex lock */
- result = rt_mutex_init(&(mutex->lock), name, RT_IPC_FLAG_FIFO);
- if (result != RT_EOK) return EINVAL;
-
- /* detach the object from system object container */
- rt_object_detach(&(mutex->lock.parent.parent));
-
- return 0;
-}
-RTM_EXPORT(pthread_mutex_init);
-
-int pthread_mutex_destroy(pthread_mutex_t *mutex)
-{
- if (!mutex || mutex->attr == -1) return EINVAL;
-
- /* it's busy */
- if (mutex->lock.owner != RT_NULL) return EBUSY;
-
- rt_memset(mutex, 0, sizeof(pthread_mutex_t));
- mutex->attr = -1;
-
- return 0;
-}
-RTM_EXPORT(pthread_mutex_destroy);
-
-int pthread_mutex_lock(pthread_mutex_t *mutex)
-{
- int mtype;
- rt_err_t result;
-
- if (!mutex) return EINVAL;
-
- if (mutex->attr == -1)
- {
- /* init mutex */
- pthread_mutex_init(mutex, RT_NULL);
- }
-
- mtype = mutex->attr & MUTEXATTR_TYPE_MASK;
- rt_enter_critical();
- if (mutex->lock.owner == rt_thread_self() && mtype != PTHREAD_MUTEX_RECURSIVE)
- {
- rt_exit_critical();
- return EDEADLK;
- }
- rt_exit_critical();
-
- result = rt_mutex_take(&(mutex->lock), RT_WAITING_FOREVER);
- if (result == RT_EOK) return 0;
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_mutex_lock);
-
-int pthread_mutex_unlock(pthread_mutex_t *mutex)
-{
- rt_err_t result;
-
- if (!mutex) return EINVAL;
- if (mutex->attr == -1)
- {
- /* init mutex */
- pthread_mutex_init(mutex, RT_NULL);
- }
-
- if (mutex->lock.owner != rt_thread_self())
- {
- int mtype;
- mtype = mutex->attr & MUTEXATTR_TYPE_MASK;
-
- /* error check, return EPERM */
- if (mtype == PTHREAD_MUTEX_ERRORCHECK) return EPERM;
-
- /* no thread waiting on this mutex */
- if (mutex->lock.owner == RT_NULL) return 0;
- }
-
- result = rt_mutex_release(&(mutex->lock));
- if (result == RT_EOK) return 0;
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_mutex_unlock);
-
-int pthread_mutex_trylock(pthread_mutex_t *mutex)
-{
- rt_err_t result;
-
- if (!mutex) return EINVAL;
- if (mutex->attr == -1)
- {
- /* init mutex */
- pthread_mutex_init(mutex, RT_NULL);
- }
-
- result = rt_mutex_take(&(mutex->lock), 0);
- if (result == RT_EOK) return 0;
-
- return EBUSY;
-}
-RTM_EXPORT(pthread_mutex_trylock);
-
+#include <rtthread.h> +#include "pthread.h" + +#define MUTEXATTR_SHARED_MASK 0x0010 +#define MUTEXATTR_TYPE_MASK 0x000f + +const pthread_mutexattr_t pthread_default_mutexattr = PTHREAD_PROCESS_PRIVATE; + +int pthread_mutexattr_init(pthread_mutexattr_t *attr) +{ + if (attr) + { + *attr = pthread_default_mutexattr; + return 0; + } + + return EINVAL; +} +RTM_EXPORT(pthread_mutexattr_init); + +int pthread_mutexattr_destroy(pthread_mutexattr_t *attr) +{ + if (attr) + { + *attr = -1; + return 0; + } + + return EINVAL; +} +RTM_EXPORT(pthread_mutexattr_destroy); + +int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type) +{ + if (attr && type) + { + int atype = (*attr & MUTEXATTR_TYPE_MASK); + + if (atype >= PTHREAD_MUTEX_NORMAL && atype <= PTHREAD_MUTEX_ERRORCHECK) + { + *type = atype; + return 0; + } + } + + return EINVAL; +} +RTM_EXPORT(pthread_mutexattr_gettype); + +int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) +{ + if (attr && type >= PTHREAD_MUTEX_NORMAL && + type <= PTHREAD_MUTEX_ERRORCHECK ) + { + *attr = (*attr & ~MUTEXATTR_TYPE_MASK) | type; + return 0; + } + + return EINVAL; +} +RTM_EXPORT(pthread_mutexattr_settype); + +int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared) +{ + if (!attr) return EINVAL; + + switch (pshared) + { + case PTHREAD_PROCESS_PRIVATE: + *attr &= ~MUTEXATTR_SHARED_MASK; + return 0; + + case PTHREAD_PROCESS_SHARED: + *attr |= MUTEXATTR_SHARED_MASK; + return 0; + } + + return EINVAL; +} +RTM_EXPORT(pthread_mutexattr_setpshared); + +int pthread_mutexattr_getpshared(pthread_mutexattr_t *attr, int *pshared) +{ + if (!attr || !pshared) return EINVAL; + + *pshared = (*attr & MUTEXATTR_SHARED_MASK) ? PTHREAD_PROCESS_SHARED + : PTHREAD_PROCESS_PRIVATE; + return 0; +} +RTM_EXPORT(pthread_mutexattr_getpshared); + +int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) +{ + rt_err_t result; + char name[RT_NAME_MAX]; + static rt_uint16_t pthread_mutex_number = 0; + + if (!mutex) return EINVAL; + + /* build mutex name */ + rt_snprintf(name, sizeof(name), "pmtx%02d", pthread_mutex_number ++); + if (attr == RT_NULL) mutex->attr = pthread_default_mutexattr; + else mutex->attr = *attr; + + /* init mutex lock */ + result = rt_mutex_init(&(mutex->lock), name, RT_IPC_FLAG_FIFO); + if (result != RT_EOK) return EINVAL; + + /* detach the object from system object container */ + rt_object_detach(&(mutex->lock.parent.parent)); + + return 0; +} +RTM_EXPORT(pthread_mutex_init); + +int pthread_mutex_destroy(pthread_mutex_t *mutex) +{ + if (!mutex || mutex->attr == -1) return EINVAL; + + /* it's busy */ + if (mutex->lock.owner != RT_NULL) return EBUSY; + + rt_memset(mutex, 0, sizeof(pthread_mutex_t)); + mutex->attr = -1; + + return 0; +} +RTM_EXPORT(pthread_mutex_destroy); + +int pthread_mutex_lock(pthread_mutex_t *mutex) +{ + int mtype; + rt_err_t result; + + if (!mutex) return EINVAL; + + if (mutex->attr == -1) + { + /* init mutex */ + pthread_mutex_init(mutex, RT_NULL); + } + + mtype = mutex->attr & MUTEXATTR_TYPE_MASK; + rt_enter_critical(); + if (mutex->lock.owner == rt_thread_self() && mtype != PTHREAD_MUTEX_RECURSIVE) + { + rt_exit_critical(); + return EDEADLK; + } + rt_exit_critical(); + + result = rt_mutex_take(&(mutex->lock), RT_WAITING_FOREVER); + if (result == RT_EOK) return 0; + + return EINVAL; +} +RTM_EXPORT(pthread_mutex_lock); + +int pthread_mutex_unlock(pthread_mutex_t *mutex) +{ + rt_err_t result; + + if (!mutex) return EINVAL; + if (mutex->attr == -1) + { + /* init mutex */ + pthread_mutex_init(mutex, RT_NULL); + } + + if (mutex->lock.owner != rt_thread_self()) + { + int mtype; + mtype = mutex->attr & MUTEXATTR_TYPE_MASK; + + /* error check, return EPERM */ + if (mtype == PTHREAD_MUTEX_ERRORCHECK) return EPERM; + + /* no thread waiting on this mutex */ + if (mutex->lock.owner == RT_NULL) return 0; + } + + result = rt_mutex_release(&(mutex->lock)); + if (result == RT_EOK) return 0; + + return EINVAL; +} +RTM_EXPORT(pthread_mutex_unlock); + +int pthread_mutex_trylock(pthread_mutex_t *mutex) +{ + rt_err_t result; + + if (!mutex) return EINVAL; + if (mutex->attr == -1) + { + /* init mutex */ + pthread_mutex_init(mutex, RT_NULL); + } + + result = rt_mutex_take(&(mutex->lock), 0); + if (result == RT_EOK) return 0; + + return EBUSY; +} +RTM_EXPORT(pthread_mutex_trylock); + diff --git a/components/pthreads/pthread_rwlock.c b/components/pthreads/pthread_rwlock.c index 18c5115af5..3db0ecc662 100644 --- a/components/pthreads/pthread_rwlock.c +++ b/components/pthreads/pthread_rwlock.c @@ -1,279 +1,279 @@ -#include <pthread.h>
-
-int pthread_rwlockattr_init (pthread_rwlockattr_t * attr)
-{
- if (!attr) return EINVAL;
- *attr = PTHREAD_PROCESS_PRIVATE;
-
- return 0;
-}
-RTM_EXPORT(pthread_rwlockattr_init);
-
-int pthread_rwlockattr_destroy (pthread_rwlockattr_t * attr)
-{
- if (!attr) return EINVAL;
-
- return 0;
-}
-RTM_EXPORT(pthread_rwlockattr_destroy);
-
-int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t * attr, int *pshared)
-{
- if (!attr || !pshared) return EINVAL;
-
- *pshared = PTHREAD_PROCESS_PRIVATE;
- return 0;
-}
-RTM_EXPORT(pthread_rwlockattr_getpshared);
-
-int pthread_rwlockattr_setpshared (pthread_rwlockattr_t * attr, int pshared)
-{
- if (!attr || pshared != PTHREAD_PROCESS_PRIVATE) return EINVAL;
-
- return 0;
-}
-RTM_EXPORT(pthread_rwlockattr_setpshared);
-
-int pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t * attr)
-{
- if (!rwlock) return EINVAL;
-
- rwlock->attr = PTHREAD_PROCESS_PRIVATE;
- pthread_mutex_init(&(rwlock->rw_mutex), NULL);
- pthread_cond_init(&(rwlock->rw_condreaders), NULL);
- pthread_cond_init(&(rwlock->rw_condwriters), NULL);
-
- rwlock->rw_nwaitwriters = 0;
- rwlock->rw_nwaitreaders = 0;
- rwlock->rw_refcount = 0;
-
- return 0;
-}
-RTM_EXPORT(pthread_rwlock_init);
-
-int pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) return 0; /* rwlock is not initialized */
-
- if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- if (rwlock->rw_refcount != 0 ||
- rwlock->rw_nwaitreaders != 0 || rwlock->rw_nwaitwriters != 0)
- {
- result = EBUSY;
- return(EBUSY);
- }
- else
- {
- /* check whether busy */
- result = rt_sem_trytake(&(rwlock->rw_condreaders.sem));
- if (result == RT_EOK)
- {
- result = rt_sem_trytake(&(rwlock->rw_condwriters.sem));
- if (result == RT_EOK)
- {
- rt_sem_release(&(rwlock->rw_condreaders.sem));
- rt_sem_release(&(rwlock->rw_condwriters.sem));
-
- pthread_cond_destroy(&rwlock->rw_condreaders);
- pthread_cond_destroy(&rwlock->rw_condwriters);
- }
- else
- {
- rt_sem_release(&(rwlock->rw_condreaders.sem));
- result = EBUSY;
- }
- }
- else result = EBUSY;
- }
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- if (result == 0) pthread_mutex_destroy(&rwlock->rw_mutex);
-
- return result;
-}
-RTM_EXPORT(pthread_rwlock_destroy);
-
-int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL);
-
- if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- /* give preference to waiting writers */
- while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0)
- {
- rwlock->rw_nwaitreaders++;
- result = pthread_cond_wait(&rwlock->rw_condreaders, &rwlock->rw_mutex);
- rwlock->rw_nwaitreaders--;
- if (result != 0)
- break;
- }
-
- /* another reader has a read lock */
- if (result == 0) rwlock->rw_refcount++;
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- return (result);
-}
-RTM_EXPORT(pthread_rwlock_rdlock);
-
-int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL);
-
- if ((result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- if (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0)
- result = EBUSY; /* held by a writer or waiting writers */
- else
- rwlock->rw_refcount++; /* increment count of reader locks */
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- return(result);
-}
-RTM_EXPORT(pthread_rwlock_tryrdlock);
-
-int pthread_rwlock_timedrdlock (pthread_rwlock_t * rwlock, const struct timespec *abstime)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL);
-
- if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- /* give preference to waiting writers */
- while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0)
- {
- rwlock->rw_nwaitreaders++;
- result = pthread_cond_timedwait(&rwlock->rw_condreaders, &rwlock->rw_mutex, abstime);
- rwlock->rw_nwaitreaders--;
- if (result != 0)
- break;
- }
-
- /* another reader has a read lock */
- if (result == 0) rwlock->rw_refcount++;
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- return (result);
-}
-RTM_EXPORT(pthread_rwlock_timedrdlock);
-
-int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, const struct timespec *abstime)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL);
-
- if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- while (rwlock->rw_refcount != 0)
- {
- rwlock->rw_nwaitwriters++;
- result = pthread_cond_timedwait(&rwlock->rw_condwriters, &rwlock->rw_mutex, abstime);
- rwlock->rw_nwaitwriters--;
-
- if (result != 0) break;
- }
-
- if (result == 0) rwlock->rw_refcount = -1;
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- return(result);
-}
-RTM_EXPORT(pthread_rwlock_timedwrlock);
-
-int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL);
-
- if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- if (rwlock->rw_refcount != 0)
- result = EBUSY; /* held by either writer or reader(s) */
- else
- rwlock->rw_refcount = -1; /* available, indicate a writer has it */
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- return(result);
-}
-RTM_EXPORT(pthread_rwlock_trywrlock);
-
-int pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL);
-
- if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- if (rwlock->rw_refcount > 0)
- rwlock->rw_refcount--; /* releasing a reader */
- else if (rwlock->rw_refcount == -1)
- rwlock->rw_refcount = 0; /* releasing a reader */
-
- /* give preference to waiting writers over waiting readers */
- if (rwlock->rw_nwaitwriters > 0)
- {
- if (rwlock->rw_refcount == 0)
- result = pthread_cond_signal(&rwlock->rw_condwriters);
- }
- else if (rwlock->rw_nwaitreaders > 0)
- {
- result = pthread_cond_broadcast(&rwlock->rw_condreaders);
- }
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- return(result);
-}
-RTM_EXPORT(pthread_rwlock_unlock);
-
-int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
-{
- int result;
-
- if (!rwlock) return EINVAL;
- if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL);
-
- if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0)
- return(result);
-
- while (rwlock->rw_refcount != 0)
- {
- rwlock->rw_nwaitwriters++;
- result = pthread_cond_wait(&rwlock->rw_condwriters, &rwlock->rw_mutex);
- rwlock->rw_nwaitwriters--;
-
- if (result != 0) break;
- }
-
- if (result == 0) rwlock->rw_refcount = -1;
-
- pthread_mutex_unlock(&rwlock->rw_mutex);
- return(result);
-}
-RTM_EXPORT(pthread_rwlock_wrlock);
-
+#include <pthread.h> + +int pthread_rwlockattr_init (pthread_rwlockattr_t * attr) +{ + if (!attr) return EINVAL; + *attr = PTHREAD_PROCESS_PRIVATE; + + return 0; +} +RTM_EXPORT(pthread_rwlockattr_init); + +int pthread_rwlockattr_destroy (pthread_rwlockattr_t * attr) +{ + if (!attr) return EINVAL; + + return 0; +} +RTM_EXPORT(pthread_rwlockattr_destroy); + +int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t * attr, int *pshared) +{ + if (!attr || !pshared) return EINVAL; + + *pshared = PTHREAD_PROCESS_PRIVATE; + return 0; +} +RTM_EXPORT(pthread_rwlockattr_getpshared); + +int pthread_rwlockattr_setpshared (pthread_rwlockattr_t * attr, int pshared) +{ + if (!attr || pshared != PTHREAD_PROCESS_PRIVATE) return EINVAL; + + return 0; +} +RTM_EXPORT(pthread_rwlockattr_setpshared); + +int pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t * attr) +{ + if (!rwlock) return EINVAL; + + rwlock->attr = PTHREAD_PROCESS_PRIVATE; + pthread_mutex_init(&(rwlock->rw_mutex), NULL); + pthread_cond_init(&(rwlock->rw_condreaders), NULL); + pthread_cond_init(&(rwlock->rw_condwriters), NULL); + + rwlock->rw_nwaitwriters = 0; + rwlock->rw_nwaitreaders = 0; + rwlock->rw_refcount = 0; + + return 0; +} +RTM_EXPORT(pthread_rwlock_init); + +int pthread_rwlock_destroy (pthread_rwlock_t *rwlock) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) return 0; /* rwlock is not initialized */ + + if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + if (rwlock->rw_refcount != 0 || + rwlock->rw_nwaitreaders != 0 || rwlock->rw_nwaitwriters != 0) + { + result = EBUSY; + return(EBUSY); + } + else + { + /* check whether busy */ + result = rt_sem_trytake(&(rwlock->rw_condreaders.sem)); + if (result == RT_EOK) + { + result = rt_sem_trytake(&(rwlock->rw_condwriters.sem)); + if (result == RT_EOK) + { + rt_sem_release(&(rwlock->rw_condreaders.sem)); + rt_sem_release(&(rwlock->rw_condwriters.sem)); + + pthread_cond_destroy(&rwlock->rw_condreaders); + pthread_cond_destroy(&rwlock->rw_condwriters); + } + else + { + rt_sem_release(&(rwlock->rw_condreaders.sem)); + result = EBUSY; + } + } + else result = EBUSY; + } + + pthread_mutex_unlock(&rwlock->rw_mutex); + if (result == 0) pthread_mutex_destroy(&rwlock->rw_mutex); + + return result; +} +RTM_EXPORT(pthread_rwlock_destroy); + +int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL); + + if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + /* give preference to waiting writers */ + while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0) + { + rwlock->rw_nwaitreaders++; + result = pthread_cond_wait(&rwlock->rw_condreaders, &rwlock->rw_mutex); + rwlock->rw_nwaitreaders--; + if (result != 0) + break; + } + + /* another reader has a read lock */ + if (result == 0) rwlock->rw_refcount++; + + pthread_mutex_unlock(&rwlock->rw_mutex); + return (result); +} +RTM_EXPORT(pthread_rwlock_rdlock); + +int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL); + + if ((result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + if (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0) + result = EBUSY; /* held by a writer or waiting writers */ + else + rwlock->rw_refcount++; /* increment count of reader locks */ + + pthread_mutex_unlock(&rwlock->rw_mutex); + return(result); +} +RTM_EXPORT(pthread_rwlock_tryrdlock); + +int pthread_rwlock_timedrdlock (pthread_rwlock_t * rwlock, const struct timespec *abstime) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL); + + if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + /* give preference to waiting writers */ + while (rwlock->rw_refcount < 0 || rwlock->rw_nwaitwriters > 0) + { + rwlock->rw_nwaitreaders++; + result = pthread_cond_timedwait(&rwlock->rw_condreaders, &rwlock->rw_mutex, abstime); + rwlock->rw_nwaitreaders--; + if (result != 0) + break; + } + + /* another reader has a read lock */ + if (result == 0) rwlock->rw_refcount++; + + pthread_mutex_unlock(&rwlock->rw_mutex); + return (result); +} +RTM_EXPORT(pthread_rwlock_timedrdlock); + +int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, const struct timespec *abstime) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL); + + if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + while (rwlock->rw_refcount != 0) + { + rwlock->rw_nwaitwriters++; + result = pthread_cond_timedwait(&rwlock->rw_condwriters, &rwlock->rw_mutex, abstime); + rwlock->rw_nwaitwriters--; + + if (result != 0) break; + } + + if (result == 0) rwlock->rw_refcount = -1; + + pthread_mutex_unlock(&rwlock->rw_mutex); + return(result); +} +RTM_EXPORT(pthread_rwlock_timedwrlock); + +int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL); + + if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + if (rwlock->rw_refcount != 0) + result = EBUSY; /* held by either writer or reader(s) */ + else + rwlock->rw_refcount = -1; /* available, indicate a writer has it */ + + pthread_mutex_unlock(&rwlock->rw_mutex); + return(result); +} +RTM_EXPORT(pthread_rwlock_trywrlock); + +int pthread_rwlock_unlock (pthread_rwlock_t *rwlock) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL); + + if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + if (rwlock->rw_refcount > 0) + rwlock->rw_refcount--; /* releasing a reader */ + else if (rwlock->rw_refcount == -1) + rwlock->rw_refcount = 0; /* releasing a reader */ + + /* give preference to waiting writers over waiting readers */ + if (rwlock->rw_nwaitwriters > 0) + { + if (rwlock->rw_refcount == 0) + result = pthread_cond_signal(&rwlock->rw_condwriters); + } + else if (rwlock->rw_nwaitreaders > 0) + { + result = pthread_cond_broadcast(&rwlock->rw_condreaders); + } + + pthread_mutex_unlock(&rwlock->rw_mutex); + return(result); +} +RTM_EXPORT(pthread_rwlock_unlock); + +int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) +{ + int result; + + if (!rwlock) return EINVAL; + if (rwlock->attr == -1) pthread_rwlock_init(rwlock, NULL); + + if ( (result = pthread_mutex_lock(&rwlock->rw_mutex)) != 0) + return(result); + + while (rwlock->rw_refcount != 0) + { + rwlock->rw_nwaitwriters++; + result = pthread_cond_wait(&rwlock->rw_condwriters, &rwlock->rw_mutex); + rwlock->rw_nwaitwriters--; + + if (result != 0) break; + } + + if (result == 0) rwlock->rw_refcount = -1; + + pthread_mutex_unlock(&rwlock->rw_mutex); + return(result); +} +RTM_EXPORT(pthread_rwlock_wrlock); + diff --git a/components/pthreads/pthread_spin.c b/components/pthreads/pthread_spin.c index a9f0f4704a..27bb0c5762 100644 --- a/components/pthreads/pthread_spin.c +++ b/components/pthreads/pthread_spin.c @@ -1,51 +1,51 @@ -#include <pthread.h>
-
-int pthread_spin_init (pthread_spinlock_t *lock, int pshared)
-{
- if (!lock) return EINVAL;
-
- lock->lock = 0;
- return 0;
-}
-
-int pthread_spin_destroy (pthread_spinlock_t *lock)
-{
- if (!lock) return EINVAL;
-
- return 0;
-}
-
-int pthread_spin_lock (pthread_spinlock_t *lock)
-{
- if (!lock) return EINVAL;
-
- while (!(lock->lock))
- {
- lock->lock = 1;
- }
-
- return 0;
-}
-
-int pthread_spin_trylock (pthread_spinlock_t *lock)
-{
- if (!lock) return EINVAL;
-
- if (!(lock->lock))
- {
- lock->lock = 1;
- return 0;
- }
-
- return EBUSY;
-}
-
-int pthread_spin_unlock (pthread_spinlock_t *lock)
-{
- if (!lock) return EINVAL;
- if (!(lock->lock)) return EPERM;
-
- lock->lock = 0;
-
- return 0;
-}
+#include <pthread.h> + +int pthread_spin_init (pthread_spinlock_t *lock, int pshared) +{ + if (!lock) return EINVAL; + + lock->lock = 0; + return 0; +} + +int pthread_spin_destroy (pthread_spinlock_t *lock) +{ + if (!lock) return EINVAL; + + return 0; +} + +int pthread_spin_lock (pthread_spinlock_t *lock) +{ + if (!lock) return EINVAL; + + while (!(lock->lock)) + { + lock->lock = 1; + } + + return 0; +} + +int pthread_spin_trylock (pthread_spinlock_t *lock) +{ + if (!lock) return EINVAL; + + if (!(lock->lock)) + { + lock->lock = 1; + return 0; + } + + return EBUSY; +} + +int pthread_spin_unlock (pthread_spinlock_t *lock) +{ + if (!lock) return EINVAL; + if (!(lock->lock)) return EPERM; + + lock->lock = 0; + + return 0; +} diff --git a/components/pthreads/pthread_tls.c b/components/pthreads/pthread_tls.c index 9649b5dafc..c610ffc617 100644 --- a/components/pthreads/pthread_tls.c +++ b/components/pthreads/pthread_tls.c @@ -1,86 +1,86 @@ -#include <pthread.h>
-#include "pthread_internal.h"
-
-_pthread_key_data_t _thread_keys[PTHREAD_KEY_MAX];
-
-void pthread_key_system_init()
-{
- rt_memset(&_thread_keys[0], 0, sizeof(_thread_keys));
-}
-
-void *pthread_getspecific(pthread_key_t key)
-{
- struct _pthread_data* ptd;
-
- ptd = _pthread_get_data(rt_thread_self());
- RT_ASSERT(ptd != NULL);
-
- if (ptd->tls == NULL) return NULL;
-
- if ((key < PTHREAD_KEY_MAX) && (_thread_keys[key].is_used))
- return ptd->tls[key];
-
- return NULL;
-}
-RTM_EXPORT(pthread_getspecific);
-
-int pthread_setspecific(pthread_key_t key, const void *value)
-{
- struct _pthread_data* ptd;
-
- ptd = _pthread_get_data(rt_thread_self());
- RT_ASSERT(ptd != NULL);
-
- /* check tls area */
- if (ptd->tls == NULL)
- {
- ptd->tls = (void**)rt_malloc(sizeof(void*) * PTHREAD_KEY_MAX);
- }
-
- if ((key < PTHREAD_KEY_MAX) && _thread_keys[key].is_used)
- {
- ptd->tls[key] = (void *)value;
- return 0;
- }
-
- return EINVAL;
-}
-RTM_EXPORT(pthread_setspecific);
-
-int pthread_key_create(pthread_key_t *key, void (*destructor)(void*))
-{
- rt_uint32_t index;
-
- rt_enter_critical();
- for (index = 0; index < PTHREAD_KEY_MAX; index ++)
- {
- if (_thread_keys[index].is_used == 0)
- {
- _thread_keys[index].is_used = 1;
- _thread_keys[index].destructor = destructor;
-
- *key = index;
-
- rt_exit_critical();
- return 0;
- }
- }
-
- rt_exit_critical();
- return EAGAIN;
-}
-RTM_EXPORT(pthread_key_create);
-
-int pthread_key_delete(pthread_key_t key)
-{
- if (key >= PTHREAD_KEY_MAX) return EINVAL;
-
- rt_enter_critical();
- _thread_keys[key].is_used = 0;
- _thread_keys[key].destructor = 0;
- rt_exit_critical();
-
- return 0;
-}
-RTM_EXPORT(pthread_key_delete);
-
+#include <pthread.h> +#include "pthread_internal.h" + +_pthread_key_data_t _thread_keys[PTHREAD_KEY_MAX]; + +void pthread_key_system_init() +{ + rt_memset(&_thread_keys[0], 0, sizeof(_thread_keys)); +} + +void *pthread_getspecific(pthread_key_t key) +{ + struct _pthread_data* ptd; + + ptd = _pthread_get_data(rt_thread_self()); + RT_ASSERT(ptd != NULL); + + if (ptd->tls == NULL) return NULL; + + if ((key < PTHREAD_KEY_MAX) && (_thread_keys[key].is_used)) + return ptd->tls[key]; + + return NULL; +} +RTM_EXPORT(pthread_getspecific); + +int pthread_setspecific(pthread_key_t key, const void *value) +{ + struct _pthread_data* ptd; + + ptd = _pthread_get_data(rt_thread_self()); + RT_ASSERT(ptd != NULL); + + /* check tls area */ + if (ptd->tls == NULL) + { + ptd->tls = (void**)rt_malloc(sizeof(void*) * PTHREAD_KEY_MAX); + } + + if ((key < PTHREAD_KEY_MAX) && _thread_keys[key].is_used) + { + ptd->tls[key] = (void *)value; + return 0; + } + + return EINVAL; +} +RTM_EXPORT(pthread_setspecific); + +int pthread_key_create(pthread_key_t *key, void (*destructor)(void*)) +{ + rt_uint32_t index; + + rt_enter_critical(); + for (index = 0; index < PTHREAD_KEY_MAX; index ++) + { + if (_thread_keys[index].is_used == 0) + { + _thread_keys[index].is_used = 1; + _thread_keys[index].destructor = destructor; + + *key = index; + + rt_exit_critical(); + return 0; + } + } + + rt_exit_critical(); + return EAGAIN; +} +RTM_EXPORT(pthread_key_create); + +int pthread_key_delete(pthread_key_t key) +{ + if (key >= PTHREAD_KEY_MAX) return EINVAL; + + rt_enter_critical(); + _thread_keys[key].is_used = 0; + _thread_keys[key].destructor = 0; + rt_exit_critical(); + + return 0; +} +RTM_EXPORT(pthread_key_delete); + diff --git a/components/pthreads/sched.c b/components/pthreads/sched.c index 9c57ba2345..0ae0253103 100644 --- a/components/pthreads/sched.c +++ b/components/pthreads/sched.c @@ -1,32 +1,32 @@ -#include <sched.h>
-
-int sched_yield(void)
-{
- rt_thread_yield();
- return 0;
-}
-RTM_EXPORT(sched_yield);
-
-int sched_get_priority_min(int policy)
-{
- if (policy != SCHED_FIFO && policy != SCHED_RR)
- return EINVAL;
-
- return 0;
-}
-RTM_EXPORT(sched_get_priority_min);
-
-int sched_get_priority_max(int policy)
-{
- if (policy != SCHED_FIFO && policy != SCHED_RR)
- return EINVAL;
-
- return RT_THREAD_PRIORITY_MAX - 1;
-}
-RTM_EXPORT(sched_get_priority_max);
-
-int sched_setscheduler(pid_t pid, int policy)
-{
- return ENOTSUP;
-}
-RTM_EXPORT(sched_setscheduler);
+#include <sched.h> + +int sched_yield(void) +{ + rt_thread_yield(); + return 0; +} +RTM_EXPORT(sched_yield); + +int sched_get_priority_min(int policy) +{ + if (policy != SCHED_FIFO && policy != SCHED_RR) + return EINVAL; + + return 0; +} +RTM_EXPORT(sched_get_priority_min); + +int sched_get_priority_max(int policy) +{ + if (policy != SCHED_FIFO && policy != SCHED_RR) + return EINVAL; + + return RT_THREAD_PRIORITY_MAX - 1; +} +RTM_EXPORT(sched_get_priority_max); + +int sched_setscheduler(pid_t pid, int policy) +{ + return ENOTSUP; +} +RTM_EXPORT(sched_setscheduler); diff --git a/components/pthreads/semaphore.h b/components/pthreads/semaphore.h index ea3510119b..e9cface4e6 100644 --- a/components/pthreads/semaphore.h +++ b/components/pthreads/semaphore.h @@ -1,33 +1,33 @@ -#ifndef __POSIX_SEMAPHORE_H__
-#define __POSIX_SEMAPHORE_H__
-
-#include <rtthread.h>
-#include <pthread.h>
-
-struct posix_sem
-{
- /* reference count and unlinked */
- rt_uint16_t refcount;
- rt_uint8_t unlinked;
- rt_uint8_t unamed;
-
- /* RT-Thread semaphore */
- rt_sem_t sem;
-
- /* next posix semaphore */
- struct posix_sem* next;
-};
-typedef struct posix_sem sem_t;
-
-int sem_close(sem_t *sem);
-int sem_destroy(sem_t *sem);
-int sem_getvalue(sem_t *sem, int *sval);
-int sem_init(sem_t *sem, int pshared, unsigned int value);
-sem_t *sem_open(const char *name, int oflag, ...);
-int sem_post(sem_t *sem);
-int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout);
-int sem_trywait(sem_t *sem);
-int sem_unlink(const char *name);
-int sem_wait(sem_t *sem);
-
-#endif
+#ifndef __POSIX_SEMAPHORE_H__ +#define __POSIX_SEMAPHORE_H__ + +#include <rtthread.h> +#include <pthread.h> + +struct posix_sem +{ + /* reference count and unlinked */ + rt_uint16_t refcount; + rt_uint8_t unlinked; + rt_uint8_t unamed; + + /* RT-Thread semaphore */ + rt_sem_t sem; + + /* next posix semaphore */ + struct posix_sem* next; +}; +typedef struct posix_sem sem_t; + +int sem_close(sem_t *sem); +int sem_destroy(sem_t *sem); +int sem_getvalue(sem_t *sem, int *sval); +int sem_init(sem_t *sem, int pshared, unsigned int value); +sem_t *sem_open(const char *name, int oflag, ...); +int sem_post(sem_t *sem); +int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout); +int sem_trywait(sem_t *sem); +int sem_unlink(const char *name); +int sem_wait(sem_t *sem); + +#endif |
