riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14709 from bergzand/pr/sched/return_thread

Browse Source
This commit is contained in:
Kaspar Schleiser 2020-09-03 10:18:47 +02:00 committed by GitHub
commit 77735e7e10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/include/sched.h
View File

@ -137,9 +137,12 @@ typedef enum {
/** /**
* @brief Triggers the scheduler to schedule the next thread * @brief Triggers the scheduler to schedule the next thread
* @returns 1 if sched_active_thread/sched_active_pid was changed, 0 otherwise. *
* @returns The new thread to schedule if sched_active_thread/sched_active_pid
* was changed,
* @returns NULL if the active thread was not changed.
*/ */
int sched_run(void); thread_t *sched_run(void);
/** /**
* @brief Set the status of the specified process * @brief Set the status of the specified process

75
core/sched.c
View File

@ -138,21 +138,20 @@ static void _unschedule(thread_t *active_thread)
#endif #endif
} }
int __attribute__((used)) sched_run(void) thread_t *__attribute__((used)) sched_run(void)
{ {
thread_t *active_thread = thread_get_active(); thread_t *active_thread = thread_get_active();
thread_t *previous_thread = active_thread;
if (!IS_USED(MODULE_CORE_IDLE_THREAD)) { if (!IS_USED(MODULE_CORE_IDLE_THREAD) && !runqueue_bitcache) {
if (!runqueue_bitcache) { if (active_thread) {
if (active_thread) { _unschedule(active_thread);
_unschedule(active_thread); active_thread = NULL;
active_thread = NULL;
}
do {
sched_arch_idle();
} while (!runqueue_bitcache);
} }
do {
sched_arch_idle();
} while (!runqueue_bitcache);
} }
sched_context_switch_request = 0; sched_context_switch_request = 0;
@ -168,39 +167,51 @@ int __attribute__((used)) sched_run(void)
: active_thread->pid), : active_thread->pid),
next_thread->pid); next_thread->pid);
if (active_thread == next_thread) { next_thread->status = STATUS_RUNNING;
DEBUG("sched_run: done, sched_active_thread was not changed.\n");
return 0;
}
if (active_thread) { if (previous_thread == next_thread) {
_unschedule(active_thread); #ifdef MODULE_SCHED_CB
/* Call the sched callback again only if the active thread is NULL. When
* active_thread is NULL, there was a sleep in between descheduling the
* previous thread and scheduling the new thread. Call the callback here
* again ensures that the time sleeping doesn't count as running the
* previous thread
*/
if (sched_cb && !active_thread) {
sched_cb(KERNEL_PID_UNDEF, next_thread->pid);
}
#endif
DEBUG("sched_run: done, sched_active_thread was not changed.\n");
} }
else {
if (active_thread) {
_unschedule(active_thread);
}
sched_active_pid = next_thread->pid;
sched_active_thread = next_thread;
#ifdef MODULE_SCHED_CB #ifdef MODULE_SCHED_CB
if (sched_cb) { if (sched_cb) {
sched_cb(KERNEL_PID_UNDEF, next_thread->pid); sched_cb(KERNEL_PID_UNDEF, next_thread->pid);
} }
#endif #endif
next_thread->status = STATUS_RUNNING;
sched_active_pid = next_thread->pid;
sched_active_thread = next_thread;
#ifdef PICOLIBC_TLS #ifdef PICOLIBC_TLS
_set_tls(next_thread->tls); _set_tls(next_thread->tls);
#endif #endif
#ifdef MODULE_MPU_STACK_GUARD #ifdef MODULE_MPU_STACK_GUARD
mpu_configure( mpu_configure(
2, /* MPU region 2 */ 2, /* MPU region 2 */
(uintptr_t)sched_active_thread->stack_start + 31, /* Base Address (rounded up) */ (uintptr_t)next_thread->stack_start + 31, /* Base Address (rounded up) */
MPU_ATTR(1, AP_RO_RO, 0, 1, 0, 1, MPU_SIZE_32B) /* Attributes and Size */ MPU_ATTR(1, AP_RO_RO, 0, 1, 0, 1, MPU_SIZE_32B) /* Attributes and Size */
); );
#endif #endif
DEBUG("sched_run: done, changed sched_active_thread.\n");
}
DEBUG("sched_run: done, changed sched_active_thread.\n"); return next_thread;
return 1;
} }
void sched_set_status(thread_t *process, thread_status_t status) void sched_set_status(thread_t *process, thread_status_t status)