Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sched: replace sync pause with async pause for nxsched_suspend #13734

Merged
merged 1 commit into from
Oct 5, 2024
Merged

sched: replace sync pause with async pause for nxsched_suspend #13734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 87 additions & 8 deletions sched/sched/sched_suspend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,57 @@

#include "sched/sched.h"

#ifdef CONFIG_SMP
/****************************************************************************
* Private Type Declarations
****************************************************************************/

struct suspend_arg_s
{
pid_t pid;
cpu_set_t saved_affinity;
uint16_t saved_flags;
bool need_restore;
};

/****************************************************************************
* Private Functions
****************************************************************************/

static int nxsched_suspend_handler(FAR void *cookie)
{
FAR struct suspend_arg_s *arg = cookie;
FAR struct tcb_s *tcb;
irqstate_t flags;

flags = enter_critical_section();
tcb = nxsched_get_tcb(arg->pid);

if (!tcb || tcb->task_state == TSTATE_TASK_INVALID ||
(tcb->flags & TCB_FLAG_EXIT_PROCESSING) != 0)
{
/* There is no TCB with this pid or, if there is, it is not a task. */

leave_critical_section(flags);
return OK;
}

if (arg->need_restore)
{
tcb->affinity = arg->saved_affinity;
tcb->flags = arg->saved_flags;
}

nxsched_remove_readytorun(tcb, false);

tcb->task_state = TSTATE_TASK_STOPPED;
dq_addlast((FAR dq_entry_t *)tcb, &g_stoppedtasks);

leave_critical_section(flags);
return OK;
}
#endif

/****************************************************************************
* Public Functions
****************************************************************************/
Expand Down Expand Up @@ -94,18 +145,46 @@ void nxsched_suspend(FAR struct tcb_s *tcb)

/* Remove the tcb task from the ready-to-run list. */

switch_needed = nxsched_remove_readytorun(tcb, true);
#ifdef CONFIG_SMP
if (tcb->task_state == TSTATE_TASK_RUNNING && tcb->cpu != this_cpu())
{
struct suspend_arg_s arg;

if ((tcb->flags & TCB_FLAG_CPU_LOCKED) != 0)
{
arg.pid = tcb->pid;
arg.need_restore = false;
}
else
{
arg.pid = tcb->pid;
arg.saved_flags = tcb->flags;
arg.saved_affinity = tcb->affinity;
arg.need_restore = true;

tcb->flags |= TCB_FLAG_CPU_LOCKED;
CPU_SET(tcb->cpu, &tcb->affinity);
}

nxsched_smp_call_single(tcb->cpu, nxsched_suspend_handler,
&arg, true);
}
else
#endif
{
switch_needed = nxsched_remove_readytorun(tcb, true);

/* Add the task to the specified blocked task list */
/* Add the task to the specified blocked task list */

tcb->task_state = TSTATE_TASK_STOPPED;
dq_addlast((FAR dq_entry_t *)tcb, list_stoppedtasks());
tcb->task_state = TSTATE_TASK_STOPPED;
dq_addlast((FAR dq_entry_t *)tcb, list_stoppedtasks());

/* Now, perform the context switch if one is needed */
/* Now, perform the context switch if one is needed */

if (switch_needed)
{
up_switch_context(this_task(), rtcb);
if (switch_needed)
{
up_switch_context(this_task(), rtcb);
}
}
}

Expand Down
Loading