libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Fix incorrect naming of triggered

This commit is contained in:
Troy 2024-03-26 20:52:55 +08:00 committed by Meco Man
parent 46d6036c28
commit 9fc7c7569b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/libc/posix/io/epoll/epoll.c
View File

@ -6,7 +6,9 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2023-07-29 zmq810150896 first version * 2023-07-29 zmq810150896 first version
* 2024/03/26 TroyMitchelle Add comments for all functions and members within structure members * 2024/03/26 TroyMitchelle Add comments for all functions,
members within structure members and
fix incorrect naming of triggered
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -44,7 +46,7 @@ struct rt_fd_list
struct rt_eventpoll struct rt_eventpoll
{ {
rt_uint32_t tirggered; /**< Indicates if the wait thread is triggered */ rt_uint32_t triggered; /**< Indicates if the wait thread is triggered */
rt_wqueue_t epoll_read; /**< Epoll read queue */ rt_wqueue_t epoll_read; /**< Epoll read queue */
rt_thread_t polling_thread; /**< Polling thread */ rt_thread_t polling_thread; /**< Polling thread */
struct rt_mutex lock; /**< Mutex lock */ struct rt_mutex lock; /**< Mutex lock */
@ -203,7 +205,7 @@ static int epoll_wqueue_callback(struct rt_wqueue_node *wait, void *key)
rt_slist_append(&ep->rdl_head, &fdlist->rdl_node); rt_slist_append(&ep->rdl_head, &fdlist->rdl_node);
fdlist->exclusive = 0; fdlist->exclusive = 0;
fdlist->is_rdl_node = RT_TRUE; fdlist->is_rdl_node = RT_TRUE;
ep->tirggered = 1; ep->triggered = 1;
ep->eventpoll_num++; ep->eventpoll_num++;
rt_wqueue_wakeup(&ep->epoll_read, (void *)POLLIN); rt_wqueue_wakeup(&ep->epoll_read, (void *)POLLIN);
} }
@ -678,7 +680,7 @@ static int epoll_wait_timeout(struct rt_eventpoll *ep, int msec)
level = rt_spin_lock_irqsave(&ep->spinlock); level = rt_spin_lock_irqsave(&ep->spinlock);
if (timeout != 0 && !ep->tirggered) if (timeout != 0 && !ep->triggered)
{ {
if (rt_thread_suspend_with_flag(thread, RT_KILLABLE) == RT_EOK) if (rt_thread_suspend_with_flag(thread, RT_KILLABLE) == RT_EOK)
{ {
@ -698,7 +700,7 @@ static int epoll_wait_timeout(struct rt_eventpoll *ep, int msec)
} }
} }
ret = !ep->tirggered; ret = !ep->triggered;
rt_spin_unlock_irqrestore(&ep->spinlock, level); rt_spin_unlock_irqrestore(&ep->spinlock, level);
return ret; return ret;
@ -867,7 +869,7 @@ static int epoll_do(struct rt_eventpoll *ep, struct epoll_event *events, int max
if (event_num || istimeout) if (event_num || istimeout)
{ {
level = rt_spin_lock_irqsave(&ep->spinlock); level = rt_spin_lock_irqsave(&ep->spinlock);
ep->tirggered = 0; ep->triggered = 0;
rt_spin_unlock_irqrestore(&ep->spinlock, level); rt_spin_unlock_irqrestore(&ep->spinlock, level);
if ((timeout >= 0) || (event_num > 0)) if ((timeout >= 0) || (event_num > 0))
break; break;