github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 09:47:44 +00:00
Code Issues Projects Releases Wiki Activity

hv: sched: rename schedule related structs and vars

Browse Source 
prepare_switch_out -> switch_out
prepare_switch_in -> switch_in
prepare_switch -> do_switch
run_thread_t -> thread_entry_t
sched_object -> thread_object
sched_object.thread -> thread_object.thread_entry
sched_obj -> thread_obj
sched_context -> sched_control
sched_ctx -> sched_ctl

Tracked-On: #3813
Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
Signed-off-by: Yu Wang <yu1.wang@intel.com>
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Shuo A Liu
2019-05-23 16:17:28 +08:00
committed by ACRN System Integration
parent 89f53a409a
commit 837e4d8788
7 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hypervisor/common/hv_main.c
View File

@@ -14,9 +14,9 @@
#include <trace.h>
#include <logmsg.h>
void vcpu_thread(struct sched_object *obj)
void vcpu_thread(struct thread_object *obj)
{
struct acrn_vcpu *vcpu = list_entry(obj, struct acrn_vcpu, sched_obj);
struct acrn_vcpu *vcpu = list_entry(obj, struct acrn_vcpu, thread_obj);
uint32_t basic_exit_reason = 0U;
int32_t ret = 0;
@@ -77,7 +77,7 @@ void vcpu_thread(struct sched_object *obj)
} while (1);
}
void default_idle(__unused struct sched_object *obj)
void default_idle(__unused struct thread_object *obj)
{
uint16_t pcpu_id = get_pcpu_id();

88
hypervisor/common/schedule.c
View File

@@ -15,52 +15,52 @@
void init_scheduler(void)
{
struct sched_context *ctx;
struct sched_control *ctl;
uint32_t i;
uint16_t pcpu_nums = get_pcpu_nums();
for (i = 0U; i < pcpu_nums; i++) {
ctx = &per_cpu(sched_ctx, i);
ctl = &per_cpu(sched_ctl, i);
spinlock_init(&ctx->scheduler_lock);
INIT_LIST_HEAD(&ctx->runqueue);
ctx->flags = 0UL;
ctx->curr_obj = NULL;
spinlock_init(&ctl->scheduler_lock);
INIT_LIST_HEAD(&ctl->runqueue);
ctl->flags = 0UL;
ctl->curr_obj = NULL;
}
}
void get_schedule_lock(uint16_t pcpu_id)
{
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
spinlock_obtain(&ctx->scheduler_lock);
struct sched_control *ctl = &per_cpu(sched_ctl, pcpu_id);
spinlock_obtain(&ctl->scheduler_lock);
}
void release_schedule_lock(uint16_t pcpu_id)
{
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
spinlock_release(&ctx->scheduler_lock);
struct sched_control *ctl = &per_cpu(sched_ctl, pcpu_id);
spinlock_release(&ctl->scheduler_lock);
}
void add_to_cpu_runqueue(struct sched_object *obj, uint16_t pcpu_id)
void add_to_cpu_runqueue(struct thread_object *obj, uint16_t pcpu_id)
{
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
struct sched_control *ctl = &per_cpu(sched_ctl, pcpu_id);
if (list_empty(&obj->run_list)) {
list_add_tail(&obj->run_list, &ctx->runqueue);
list_add_tail(&obj->run_list, &ctl->runqueue);
}
}
void remove_from_cpu_runqueue(struct sched_object *obj)
void remove_from_cpu_runqueue(struct thread_object *obj)
{
list_del_init(&obj->run_list);
}
static struct sched_object *get_next_sched_obj(struct sched_context *ctx)
static struct thread_object *get_next_sched_obj(struct sched_control *ctl)
{
struct sched_object *obj = NULL;
struct thread_object *obj = NULL;
if (!list_empty(&ctx->runqueue)) {
obj = get_first_item(&ctx->runqueue, struct sched_object, run_list);
if (!list_empty(&ctl->runqueue)) {
obj = get_first_item(&ctl->runqueue, struct thread_object, run_list);
} else {
obj = &get_cpu_var(idle);
}
@@ -73,9 +73,9 @@ static struct sched_object *get_next_sched_obj(struct sched_context *ctx)
*/
void make_reschedule_request(uint16_t pcpu_id, uint16_t delmode)
{
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
struct sched_control *ctl = &per_cpu(sched_ctl, pcpu_id);
bitmap_set_lock(NEED_RESCHEDULE, &ctx->flags);
bitmap_set_lock(NEED_RESCHEDULE, &ctl->flags);
if (get_pcpu_id() != pcpu_id) {
switch (delmode) {
case DEL_MODE_IPI:
@@ -93,67 +93,67 @@ void make_reschedule_request(uint16_t pcpu_id, uint16_t delmode)
bool need_reschedule(uint16_t pcpu_id)
{
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
struct sched_control *ctl = &per_cpu(sched_ctl, pcpu_id);
return bitmap_test(NEED_RESCHEDULE, &ctx->flags);
return bitmap_test(NEED_RESCHEDULE, &ctl->flags);
}
static void prepare_switch(struct sched_object *prev, struct sched_object *next)
static void do_switch(struct thread_object *prev, struct thread_object *next)
{
if ((prev != NULL) && (prev->prepare_switch_out != NULL)) {
prev->prepare_switch_out(prev);
if ((prev != NULL) && (prev->switch_out != NULL)) {
prev->switch_out(prev);
}
/* update current object */
get_cpu_var(sched_ctx).curr_obj = next;
get_cpu_var(sched_ctl).curr_obj = next;
if ((next != NULL) && (next->prepare_switch_in != NULL)) {
next->prepare_switch_in(next);
if ((next != NULL) && (next->switch_in != NULL)) {
next->switch_in(next);
}
}
void schedule(void)
{
uint16_t pcpu_id = get_pcpu_id();
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
struct sched_object *next = NULL;
struct sched_object *prev = ctx->curr_obj;
struct sched_control *ctl = &per_cpu(sched_ctl, pcpu_id);
struct thread_object *next = NULL;
struct thread_object *prev = ctl->curr_obj;
get_schedule_lock(pcpu_id);
next = get_next_sched_obj(ctx);
bitmap_clear_lock(NEED_RESCHEDULE, &ctx->flags);
next = get_next_sched_obj(ctl);
bitmap_clear_lock(NEED_RESCHEDULE, &ctl->flags);
if (prev == next) {
release_schedule_lock(pcpu_id);
} else {
prepare_switch(prev, next);
do_switch(prev, next);
release_schedule_lock(pcpu_id);
arch_switch_to(&prev->host_sp, &next->host_sp);
}
}
void run_sched_thread(struct sched_object *obj)
void run_sched_thread(struct thread_object *obj)
{
if (obj->thread != NULL) {
obj->thread(obj);
if (obj->thread_entry != NULL) {
obj->thread_entry(obj);
}
ASSERT(false, "Shouldn't go here, invalid thread!");
ASSERT(false, "Shouldn't go here, invalid thread entry!");
}
void switch_to_idle(run_thread_t idle_thread)
void switch_to_idle(thread_entry_t idle_thread)
{
uint16_t pcpu_id = get_pcpu_id();
struct sched_object *idle = &per_cpu(idle, pcpu_id);
struct thread_object *idle = &per_cpu(idle, pcpu_id);
char idle_name[16];
snprintf(idle_name, 16U, "idle%hu", pcpu_id);
(void)strncpy_s(idle->name, 16U, idle_name, 16U);
idle->thread = idle_thread;
idle->prepare_switch_out = NULL;
idle->prepare_switch_in = NULL;
get_cpu_var(sched_ctx).curr_obj = idle;
idle->thread_entry = idle_thread;
idle->switch_out = NULL;
idle->switch_in = NULL;
get_cpu_var(sched_ctl).curr_obj = idle;
run_sched_thread(idle);
}