From a1a56ce1d1161ad361d421077472f922fe8fb7a7 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Tue, 26 Jun 2018 11:19:38 +0800 Subject: [PATCH 1/4] [Kernel] Add flag in wait queue and fix wakeup issue. --- components/dfs/filesystems/net/net_sockets.c | 4 +- components/drivers/include/ipc/waitqueue.h | 14 +++++- components/drivers/src/pipe.c | 4 +- components/drivers/src/waitqueue.c | 48 +++++++++++++------- include/rtdef.h | 17 ++++++- src/device.c | 5 +- 6 files changed, 68 insertions(+), 24 deletions(-) diff --git a/components/dfs/filesystems/net/net_sockets.c b/components/dfs/filesystems/net/net_sockets.c index 58f16425ba..5e598c331a 100644 --- a/components/dfs/filesystems/net/net_sockets.c +++ b/components/dfs/filesystems/net/net_sockets.c @@ -141,7 +141,7 @@ int accept(int s, struct sockaddr *addr, socklen_t *addrlen) d->fops = dfs_net_get_fops(); /* initialize wait head */ lwsock = lwip_tryget_socket(new_client); - rt_list_init(&(lwsock->wait_head)); + rt_wqueue_init(&(lwsock->wait_head)); d->flags = O_RDWR; /* set flags as read and write */ d->size = 0; @@ -317,7 +317,7 @@ int socket(int domain, int type, int protocol) d->data = (void *) sock; lwsock = lwip_tryget_socket(sock); - rt_list_init(&(lwsock->wait_head)); + rt_wqueue_init(&(lwsock->wait_head)); lwsock->conn->callback = event_callback; } else diff --git a/components/drivers/include/ipc/waitqueue.h b/components/drivers/include/ipc/waitqueue.h index 1746d0f1cd..11c3e6609e 100644 --- a/components/drivers/include/ipc/waitqueue.h +++ b/components/drivers/include/ipc/waitqueue.h @@ -3,9 +3,10 @@ #include -struct rt_wqueue_node; +#define RT_WQ_FLAG_CLEAN 0x00 +#define RT_WQ_FLAG_WAKEUP 0x01 -typedef rt_list_t rt_wqueue_t; +struct rt_wqueue_node; typedef int (*rt_wqueue_func_t)(struct rt_wqueue_node *wait, void *key); struct rt_wqueue_node @@ -20,6 +21,14 @@ typedef struct rt_wqueue_node rt_wqueue_node_t; int __wqueue_default_wake(struct rt_wqueue_node *wait, void *key); +rt_inline void rt_wqueue_init(rt_wqueue_t *queue) +{ + RT_ASSERT(queue != RT_NULL); + + queue->flag = RT_WQ_FLAG_CLEAN; + rt_list_init(&(queue->waiting_list)); +} + void rt_wqueue_add(rt_wqueue_t *queue, struct rt_wqueue_node *node); void rt_wqueue_remove(struct rt_wqueue_node *node); int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int timeout); @@ -37,3 +46,4 @@ void rt_wqueue_wakeup(rt_wqueue_t *queue, void *key); #define DEFINE_WAIT(name) DEFINE_WAIT_FUNC(name, __wqueue_default_wake) #endif + diff --git a/components/drivers/src/pipe.c b/components/drivers/src/pipe.c index 09264ffbe3..973898e2cc 100644 --- a/components/drivers/src/pipe.c +++ b/components/drivers/src/pipe.c @@ -438,8 +438,8 @@ rt_pipe_t *rt_pipe_create(const char *name, int bufsz) rt_memset(pipe, 0, sizeof(rt_pipe_t)); rt_mutex_init(&(pipe->lock), name, RT_IPC_FLAG_FIFO); - rt_list_init(&(pipe->reader_queue)); - rt_list_init(&(pipe->writer_queue)); + rt_wqueue_init(&(pipe->reader_queue)); + rt_wqueue_init(&(pipe->writer_queue)); RT_ASSERT(bufsz < 0xFFFF); pipe->bufsz = bufsz; diff --git a/components/drivers/src/waitqueue.c b/components/drivers/src/waitqueue.c index 7fff2d3825..cab70858e9 100644 --- a/components/drivers/src/waitqueue.c +++ b/components/drivers/src/waitqueue.c @@ -4,14 +4,12 @@ #include #include -extern struct rt_thread *rt_current_thread; - void rt_wqueue_add(rt_wqueue_t *queue, struct rt_wqueue_node *node) { rt_base_t level; level = rt_hw_interrupt_disable(); - rt_list_insert_before(queue, &(node->list)); + rt_list_insert_before(&(queue->waiting_list), &(node->list)); rt_hw_interrupt_enable(level); } @@ -34,24 +32,30 @@ void rt_wqueue_wakeup(rt_wqueue_t *queue, void *key) rt_base_t level; register int need_schedule = 0; + rt_list_t *queue_list; struct rt_list_node *node; struct rt_wqueue_node *entry; - if (rt_list_isempty(queue)) - return; + queue_list = &(queue->waiting_list); level = rt_hw_interrupt_disable(); - for (node = queue->next; node != queue; node = node->next) - { - entry = rt_list_entry(node, struct rt_wqueue_node, list); - if (entry->wakeup(entry, key) == 0) - { - rt_thread_resume(entry->polling_thread); - need_schedule = 1; + /* set wakeup flag in the queue */ + queue->flag = RT_WQ_FLAG_WAKEUP; - rt_wqueue_remove(entry); - break; - } + if (!(rt_list_isempty(queue_list))) + { + for (node = queue_list->next; node != queue_list; node = node->next) + { + entry = rt_list_entry(node, struct rt_wqueue_node, list); + if (entry->wakeup(entry, key) == 0) + { + rt_thread_resume(entry->polling_thread); + need_schedule = 1; + + rt_wqueue_remove(entry); + break; + } + } } rt_hw_interrupt_enable(level); @@ -62,7 +66,7 @@ void rt_wqueue_wakeup(rt_wqueue_t *queue, void *key) int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec) { int tick; - rt_thread_t tid = rt_current_thread; + rt_thread_t tid = rt_thread_self(); rt_timer_t tmr = &(tid->thread_timer); struct rt_wqueue_node __wait; rt_base_t level; @@ -81,6 +85,12 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec) rt_list_init(&__wait.list); level = rt_hw_interrupt_disable(); + if (queue->flag == RT_WQ_FLAG_WAKEUP) + { + /* already wakeup */ + goto __exit_wakeup; + } + rt_wqueue_add(queue, &__wait); rt_thread_suspend(tid); @@ -97,6 +107,12 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec) rt_schedule(); + level = rt_hw_interrupt_disable(); + +__exit_wakeup: + queue->flag = 0; + rt_hw_interrupt_enable(level); + rt_wqueue_remove(&__wait); return 0; diff --git a/include/rtdef.h b/include/rtdef.h index 5f6f728967..978d8d6009 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -848,6 +848,9 @@ enum rt_device_class_type #define RT_DEVICE_CTRL_RTC_SET_ALARM 0x13 /**< set alarm */ typedef struct rt_device *rt_device_t; +/** + * operations set for device object + */ struct rt_device_ops { /* common device interface */ @@ -859,6 +862,18 @@ struct rt_device_ops rt_err_t (*control)(rt_device_t dev, int cmd, void *args); }; +#if defined(RT_USING_POSIX) +/** + * WaitQueue structure + */ +struct rt_wqueue +{ + rt_uint32_t flag; + rt_list_t waiting_list; +}; +typedef struct rt_wqueue rt_wqueue_t; +#endif + /** * Device structure */ @@ -891,7 +906,7 @@ struct rt_device #if defined(RT_USING_POSIX) const struct dfs_file_ops *fops; - rt_list_t wait_queue; + struct rt_wqueue wait_queue; #endif void *user_data; /**< device private data */ diff --git a/src/device.c b/src/device.c index 2a919cace6..0ec1e3d70e 100644 --- a/src/device.c +++ b/src/device.c @@ -29,6 +29,9 @@ */ #include +#if defined(RT_USING_POSIX) +#include /* for wqueue_init */ +#endif #ifdef RT_USING_DEVICE @@ -74,7 +77,7 @@ rt_err_t rt_device_register(rt_device_t dev, #if defined(RT_USING_POSIX) dev->fops = RT_NULL; - rt_list_init(&(dev->wait_queue)); + rt_wqueue_init(&(dev->wait_queue)); #endif return RT_EOK; From ef132f3c942fcb877523a0ea5d64559fcd05512b Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Tue, 26 Jun 2018 11:57:20 +0800 Subject: [PATCH 2/4] [Kernel] clean code for indentation. --- components/drivers/include/ipc/waitqueue.h | 34 +++++++++-- components/drivers/src/waitqueue.c | 67 +++++++++++++++------- include/rtdef.h | 4 +- src/device.c | 2 +- 4 files changed, 78 insertions(+), 29 deletions(-) diff --git a/components/drivers/include/ipc/waitqueue.h b/components/drivers/include/ipc/waitqueue.h index 11c3e6609e..8cb0989f73 100644 --- a/components/drivers/include/ipc/waitqueue.h +++ b/components/drivers/include/ipc/waitqueue.h @@ -1,3 +1,28 @@ +/* + * File : waitqueue.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Change Logs: + * Date Author Notes + * 2018/06/26 Bernard Fix the wait queue issue when wakeup a soon + * to blocked thread. + */ + #ifndef WAITQUEUE_H__ #define WAITQUEUE_H__ @@ -11,11 +36,11 @@ typedef int (*rt_wqueue_func_t)(struct rt_wqueue_node *wait, void *key); struct rt_wqueue_node { - rt_thread_t polling_thread; - rt_list_t list; + rt_thread_t polling_thread; + rt_list_t list; - rt_wqueue_func_t wakeup; - rt_uint32_t key; + rt_wqueue_func_t wakeup; + rt_uint32_t key; }; typedef struct rt_wqueue_node rt_wqueue_node_t; @@ -46,4 +71,3 @@ void rt_wqueue_wakeup(rt_wqueue_t *queue, void *key); #define DEFINE_WAIT(name) DEFINE_WAIT_FUNC(name, __wqueue_default_wake) #endif - diff --git a/components/drivers/src/waitqueue.c b/components/drivers/src/waitqueue.c index cab70858e9..a4c392a27c 100644 --- a/components/drivers/src/waitqueue.c +++ b/components/drivers/src/waitqueue.c @@ -1,3 +1,28 @@ +/* + * File : waitqueue.c + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Change Logs: + * Date Author Notes + * 2018/06/26 Bernard Fix the wait queue issue when wakeup a soon + * to blocked thread. + */ + #include #include @@ -32,30 +57,30 @@ void rt_wqueue_wakeup(rt_wqueue_t *queue, void *key) rt_base_t level; register int need_schedule = 0; - rt_list_t *queue_list; + rt_list_t *queue_list; struct rt_list_node *node; struct rt_wqueue_node *entry; - queue_list = &(queue->waiting_list); + queue_list = &(queue->waiting_list); level = rt_hw_interrupt_disable(); - /* set wakeup flag in the queue */ - queue->flag = RT_WQ_FLAG_WAKEUP; + /* set wakeup flag in the queue */ + queue->flag = RT_WQ_FLAG_WAKEUP; if (!(rt_list_isempty(queue_list))) { - for (node = queue_list->next; node != queue_list; node = node->next) - { - entry = rt_list_entry(node, struct rt_wqueue_node, list); - if (entry->wakeup(entry, key) == 0) - { - rt_thread_resume(entry->polling_thread); - need_schedule = 1; + for (node = queue_list->next; node != queue_list; node = node->next) + { + entry = rt_list_entry(node, struct rt_wqueue_node, list); + if (entry->wakeup(entry, key) == 0) + { + rt_thread_resume(entry->polling_thread); + need_schedule = 1; - rt_wqueue_remove(entry); - break; - } - } + rt_wqueue_remove(entry); + break; + } + } } rt_hw_interrupt_enable(level); @@ -85,11 +110,11 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec) rt_list_init(&__wait.list); level = rt_hw_interrupt_disable(); - if (queue->flag == RT_WQ_FLAG_WAKEUP) - { - /* already wakeup */ - goto __exit_wakeup; - } + if (queue->flag == RT_WQ_FLAG_WAKEUP) + { + /* already wakeup */ + goto __exit_wakeup; + } rt_wqueue_add(queue, &__wait); rt_thread_suspend(tid); @@ -110,7 +135,7 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec) level = rt_hw_interrupt_disable(); __exit_wakeup: - queue->flag = 0; + queue->flag = 0; rt_hw_interrupt_enable(level); rt_wqueue_remove(&__wait); diff --git a/include/rtdef.h b/include/rtdef.h index 978d8d6009..891c5a6828 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -868,8 +868,8 @@ struct rt_device_ops */ struct rt_wqueue { - rt_uint32_t flag; - rt_list_t waiting_list; + rt_uint32_t flag; + rt_list_t waiting_list; }; typedef struct rt_wqueue rt_wqueue_t; #endif diff --git a/src/device.c b/src/device.c index 0ec1e3d70e..d5535b5aa1 100644 --- a/src/device.c +++ b/src/device.c @@ -77,7 +77,7 @@ rt_err_t rt_device_register(rt_device_t dev, #if defined(RT_USING_POSIX) dev->fops = RT_NULL; - rt_wqueue_init(&(dev->wait_queue)); + rt_wqueue_init(&(dev->wait_queue)); #endif return RT_EOK; From 0cac9afc4b693c021c4ab6bb2802798472fa6d71 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Tue, 26 Jun 2018 12:02:03 +0800 Subject: [PATCH 3/4] [Kernel] clean code for indentation. --- components/drivers/src/pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/drivers/src/pipe.c b/components/drivers/src/pipe.c index 973898e2cc..a971401ce3 100644 --- a/components/drivers/src/pipe.c +++ b/components/drivers/src/pipe.c @@ -438,8 +438,8 @@ rt_pipe_t *rt_pipe_create(const char *name, int bufsz) rt_memset(pipe, 0, sizeof(rt_pipe_t)); rt_mutex_init(&(pipe->lock), name, RT_IPC_FLAG_FIFO); - rt_wqueue_init(&(pipe->reader_queue)); - rt_wqueue_init(&(pipe->writer_queue)); + rt_wqueue_init(&(pipe->reader_queue)); + rt_wqueue_init(&(pipe->writer_queue)); RT_ASSERT(bufsz < 0xFFFF); pipe->bufsz = bufsz; From 497a2dd02c3e7191552fc550c888eca4cd952ef7 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Fri, 29 Jun 2018 12:18:37 +0800 Subject: [PATCH 4/4] [Kernel] Remove the restriction of waitqueue Remove the restriction of RT_USING_POSIX for waitqueue structure. --- include/rtdef.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/rtdef.h b/include/rtdef.h index 891c5a6828..642ea0e729 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -862,7 +862,6 @@ struct rt_device_ops rt_err_t (*control)(rt_device_t dev, int cmd, void *args); }; -#if defined(RT_USING_POSIX) /** * WaitQueue structure */ @@ -872,7 +871,6 @@ struct rt_wqueue rt_list_t waiting_list; }; typedef struct rt_wqueue rt_wqueue_t; -#endif /** * Device structure