WarlockFish/30dayMakeOS
1
0
Fork 0
forked from backup/30dayMakeOS
Code Pull Requests Activity

设定任务优先级（1）

Browse Source
This commit is contained in:
Yourtion
2016-04-25 12:45:23 +08:00
parent 70f82648ee
commit e467f40129
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
16_day/bootpack.c
View File

@@ -75,7 +75,7 @@ void HariMain(void)
task_b[i]->tss.fs = 1 * 8; task_b[i]->tss.fs = 1 * 8;
task_b[i]->tss.gs = 1 * 8; task_b[i]->tss.gs = 1 * 8;
*((int *) (task_b[i]->tss.esp + 4)) = (int) sht_win_b[i]; *((int *) (task_b[i]->tss.esp + 4)) = (int) sht_win_b[i];
task_run(task_b[i]); task_run(task_b[i], i + 1);
} }
/* sht_win */ /* sht_win */

3
16_day/bootpack.h
View File

@@ -196,6 +196,7 @@ struct TSS32 {
}; };
struct TASK { struct TASK {
int sel, flags; /* sel用来存放GDT的编号*/ int sel, flags; /* sel用来存放GDT的编号*/
int priority; /* 优先级 */
struct TSS32 tss; struct TSS32 tss;
}; };
struct TASKCTL { struct TASKCTL {
@@ -207,6 +208,6 @@ struct TASKCTL {
extern struct TIMER *task_timer; extern struct TIMER *task_timer;
struct TASK *task_init(struct MEMMAN *memman); struct TASK *task_init(struct MEMMAN *memman);
struct TASK *task_alloc(void); struct TASK *task_alloc(void);
void task_run(struct TASK *task); void task_run(struct TASK *task, int priority);
void task_switch(void); void task_switch(void);
void task_sleep(struct TASK *task); void task_sleep(struct TASK *task);

4
16_day/fifo.c
View File

@@ -18,7 +18,7 @@ void fifo32_init(struct FIFO32 *fifo, int size, int *buf, struct TASK *task)
} }
int fifo32_put(struct FIFO32 *fifo, int data) int fifo32_put(struct FIFO32 *fifo, int data)
/*给FIFO发送数据并储存在FIFO中*/ /*向FIFO写入数据并累积起来*/
{ {
if (fifo->free == 0) { if (fifo->free == 0) {
/*没有空余空间，溢出*/ /*没有空余空间，溢出*/
@@ -33,7 +33,7 @@ int fifo32_put(struct FIFO32 *fifo, int data)
fifo->free--; fifo->free--;
if (fifo->task != 0) { if (fifo->task != 0) {
if (fifo->task->flags != 2) { /*如果任务处于休眠状态*/ if (fifo->task->flags != 2) { /*如果任务处于休眠状态*/
task_run(fifo->task); /*将任务唤醒*/ task_run(fifo->task, 0); /*将任务唤醒*/
} }
} }
return 0; return 0;

33
16_day/mtask.c
View File

@@ -20,12 +20,13 @@ struct TASK *task_init(struct MEMMAN *memman)
task = task_alloc(); task = task_alloc();
task->flags = 2; /*活动中标志*/ task->flags = 2; /*活动中标志*/
task->priority = 2; /* 0.02秒 */
taskctl->running = 1; taskctl->running = 1;
taskctl->now = 0; taskctl->now = 0;
taskctl->tasks[0] = task; taskctl->tasks[0] = task;
load_tr(task->sel); load_tr(task->sel);
task_timer = timer_alloc(); task_timer = timer_alloc();
timer_settime(task_timer, 2); timer_settime(task_timer, task->priority);
return task; return task;
} }
@@ -57,23 +58,29 @@ struct TASK *task_alloc(void)
return 0; /*全部正在使用*/ return 0; /*全部正在使用*/
} }
void task_run(struct TASK *task) void task_run(struct TASK *task, int priority)
{ {
task->flags = 2; /*活动中标志*/ if (priority > 0) {
taskctl->tasks[taskctl->running] = task; task->priority = priority;
taskctl->running++; }
if (task->flags != 2) {
task->flags = 2; /*活动中标志*/
taskctl->tasks[taskctl->running] = task;
taskctl->running++;
}
return; return;
} }
void task_switch(void) void task_switch(void){
{ struct TASK *task;
timer_settime(task_timer, 2); taskctl->now++;
if (taskctl->now == taskctl->running) {
taskctl->now = 0;
}
task = taskctl->tasks[taskctl->now];
timer_settime(task_timer, task->priority);
if (taskctl->running >= 2) { if (taskctl->running >= 2) {
taskctl->now++; farjmp(0, task->sel);
if (taskctl->now == taskctl->running) {
taskctl->now = 0;
}
farjmp(0, taskctl->tasks[taskctl->now]->sel);
} }
return; return;
} }