sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wqueue: update wqueue to support using wqueue before wqueue start

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2021-12-01 23:40:16 +08:00 committed by Xiang Xiao
parent 5c5bd7161c
commit 166a9210ca
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/nuttx/semaphore.h
View File

@ -36,6 +36,21 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Initializers */
#ifdef CONFIG_PRIORITY_INHERITANCE
# if CONFIG_SEM_PREALLOCHOLDERS > 0
# define NXSEM_INITIALIZER(c, f) \
{(c), (f), NULL} /* semcount, flags, hhead */
# else
# define NXSEM_INITIALIZER(c, f) \
{(c), (f), {{NULL, 0}, {NULL, 0}}} /* semcount, flags, holder[2] */
# endif
#else /* CONFIG_PRIORITY_INHERITANCE */
# define NXSEM_INITIALIZER(c, f) \
{(c)} /* semcount, flags */
#endif /* CONFIG_PRIORITY_INHERITANCE */
/* Most internal nxsem_* interfaces are not available in the user space in /* Most internal nxsem_* interfaces are not available in the user space in
* PROTECTED and KERNEL builds. In that context, the application semaphore * PROTECTED and KERNEL builds. In that context, the application semaphore
* interfaces must be used. The differences between the two sets of * interfaces must be used. The differences between the two sets of

17
sched/wqueue/kwork_thread.c
View File

@ -73,13 +73,23 @@
#if defined(CONFIG_SCHED_HPWORK) #if defined(CONFIG_SCHED_HPWORK)
/* The state of the kernel mode, high priority work queue(s). */ /* The state of the kernel mode, high priority work queue(s). */
struct hp_wqueue_s g_hpwork; struct hp_wqueue_s g_hpwork =
{
{},
NXSEM_INITIALIZER(0, SEM_PRIO_NONE),
};
#endif /* CONFIG_SCHED_HPWORK */ #endif /* CONFIG_SCHED_HPWORK */
#if defined(CONFIG_SCHED_LPWORK) #if defined(CONFIG_SCHED_LPWORK)
/* The state of the kernel mode, low priority work queue(s). */ /* The state of the kernel mode, low priority work queue(s). */
struct lp_wqueue_s g_lpwork; struct lp_wqueue_s g_lpwork =
{
{},
NXSEM_INITIALIZER(0, SEM_PRIO_NONE),
};
#endif /* CONFIG_SCHED_LPWORK */ #endif /* CONFIG_SCHED_LPWORK */
/**************************************************************************** /****************************************************************************
@ -203,9 +213,6 @@ static int work_thread_create(FAR const char *name, int priority,
argv[0] = args; argv[0] = args;
argv[1] = NULL; argv[1] = NULL;
nxsem_init(&wqueue->sem, 0, 0);
nxsem_set_protocol(&wqueue->sem, SEM_PRIO_NONE);
/* Don't permit any of the threads to run until we have fully initialized /* Don't permit any of the threads to run until we have fully initialized
* g_hpwork and g_lpwork. * g_hpwork and g_lpwork.
*/ */