Skip to content

Commit e924b8c

Browse files
yourtionyourtion
committed
设定任务优先级（2）
1 parent e467f40 commit e924b8c

File tree

4 files changed

+119
-54
lines changed

4 files changed

+119
-54
lines changed

‎16_day/bootpack.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ void HariMain(void)
5151
shtctl = shtctl_init(memman, binfo->vram, binfo->scrnx, binfo->scrny);
5252
task_a = task_init(memman);
5353
fifo.task = task_a;
54+
task_run(task_a, 1, 0);
5455

5556
/* sht_back */
5657
sht_back = sheet_alloc(shtctl);
@@ -75,7 +76,7 @@ void HariMain(void)
7576
task_b[i]->tss.fs = 1 * 8;
7677
task_b[i]->tss.gs = 1 * 8;
7778
*((int *) (task_b[i]->tss.esp + 4)) = (int) sht_win_b[i];
78-
task_run(task_b[i], i + 1);
79+
task_run(task_b[i], 2, i + 1);
7980
}
8081

8182
/* sht_win */

‎16_day/bootpack.h‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ void inthandler20(int *esp);
188188
/* mtask.c */
189189
#define MAX_TASKS 1000 /*最大任务数量*/
190190
#define TASK_GDT0 3 /*定义从GDT的几号开始分配给TSS */
191+
#define MAX_TASKS_LV 100
192+
#define MAX_TASKLEVELS 10
191193
struct TSS32 {
192194
int backlink, esp0, ss0, esp1, ss1, esp2, ss2, cr3;
193195
int eip, eflags, eax, ecx, edx, ebx, esp, ebp, esi, edi;
@@ -196,18 +198,23 @@ struct TSS32 {
196198
};
197199
struct TASK {
198200
int sel, flags; /* sel用来存放GDT的编号*/
199-
int priority; /* 优先级 */
201+
int level, priority; /* 优先级 */
200202
struct TSS32 tss;
201203
};
204+
struct TASKLEVEL {
205+
int running; /*正在运行的任务数量*/
206+
int now; /*这个变量用来记录当前正在运行的是哪个任务*/
207+
struct TASK *tasks[MAX_TASKS_LV];
208+
};
202209
struct TASKCTL {
203-
int running; /*正在运行的任务数量*/
204-
int now; /*这个变量用来记录当前正在运行的是哪个任务*/
205-
struct TASK *tasks[MAX_TASKS];
210+
int now_lv; /*现在活动中的LEVEL */
211+
char lv_change; /*在下次任务切换时是否需要改变LEVEL */
212+
struct TASKLEVEL level[MAX_TASKLEVELS];
206213
struct TASK tasks0[MAX_TASKS];
207214
};
208215
extern struct TIMER *task_timer;
209216
struct TASK *task_init(struct MEMMAN *memman);
210217
struct TASK *task_alloc(void);
211-
void task_run(struct TASK *task, int priority);
218+
void task_run(struct TASK *task, int level, int priority);
212219
void task_switch(void);
213220
void task_sleep(struct TASK *task);

‎16_day/fifo.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int fifo32_put(struct FIFO32 *fifo, int data)
3333
fifo->free--;
3434
if (fifo->task != 0) {
3535
if (fifo->task->flags != 2) { /*如果任务处于休眠状态*/
36-
task_run(fifo->task, 0); /*将任务唤醒*/
36+
task_run(fifo->task, -1, 0); /*将任务唤醒*/
3737
}
3838
}
3939
return 0;

‎16_day/mtask.c‎

Lines changed: 104 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,65 @@
55
struct TASKCTL *taskctl;
66
struct TIMER *task_timer;
77

8+
struct TASK *task_now(void)
9+
{
10+
struct TASKLEVEL *tl = &taskctl->level[taskctl->now_lv];
11+
return tl->tasks[tl->now];
12+
}
13+
14+
void task_add(struct TASK *task)
15+
{
16+
struct TASKLEVEL *tl = &taskctl->level[task->level];
17+
tl->tasks[tl->running] = task;
18+
tl->running++;
19+
task->flags = 2; /*活动中*/
20+
return;
21+
}
22+
23+
void task_remove(struct TASK *task)
24+
{
25+
int i;
26+
struct TASKLEVEL *tl = &taskctl->level[task->level];
27+
28+
/*寻找task所在的位置*/
29+
for (i = 0; i < tl->running; i++) {
30+
if (tl->tasks[i] == task) {
31+
/*在这里 */
32+
break;
33+
}
34+
}
35+
36+
tl->running--;
37+
if (i < tl->now) {
38+
tl->now--; /*需要移动成员，要相应地处理 */
39+
}
40+
if (tl->now >= tl->running) {
41+
/*如果now的值出现异常，则进行修正*/
42+
tl->now = 0;
43+
}
44+
task->flags = 1; /* 休眠中 */
45+
46+
/* 移动 */
47+
for (; i < tl->running; i++) {
48+
tl->tasks[i] = tl->tasks[i + 1];
49+
}
50+
return;
51+
}
52+
53+
void task_switchsub(void)
54+
{
55+
int i;
56+
/*寻找最上层的LEVEL */
57+
for (i = 0; i < MAX_TASKLEVELS; i++) {
58+
if (taskctl->level[i].running > 0) {
59+
break; /*找到了*/
60+
}
61+
}
62+
taskctl->now_lv = i;
63+
taskctl->lv_change = 0;
64+
return;
65+
}
66+
867
struct TASK *task_init(struct MEMMAN *memman)
968
{
1069
int i;
@@ -17,13 +76,16 @@ struct TASK *task_init(struct MEMMAN *memman)
1776
taskctl->tasks0[i].sel = (TASK_GDT0 + i) * 8;
1877
set_segmdesc(gdt + TASK_GDT0 + i, 103, (int) &taskctl->tasks0[i].tss, AR_TSS32);
1978
}
20-
79+
for (i = 0; i < MAX_TASKLEVELS; i++) {
80+
taskctl->level[i].running = 0;
81+
taskctl->level[i].now = 0;
82+
}
2183
task = task_alloc();
2284
task->flags = 2; /*活动中标志*/
23-
task->priority = 2; /* 0.02秒 */
24-
taskctl->running = 1;
25-
taskctl->now = 0;
26-
taskctl->tasks[0] = task;
85+
task->priority = 2; /* 0.02秒*/
86+
task->level = 0; /*最高LEVEL */
87+
task_add(task);
88+
task_switchsub(); /* LEVEL 设置*/
2789
load_tr(task->sel);
2890
task_timer = timer_alloc();
2991
timer_settime(task_timer, task->priority);
@@ -58,64 +120,59 @@ struct TASK *task_alloc(void)
58120
return 0; /*全部正在使用*/
59121
}
60122

61-
void task_run(struct TASK *task, int priority)
123+
void task_run(struct TASK *task, int level, int priority)
62124
{
125+
if (level < 0) {
126+
level = task->level; /*不改变LEVEL */
127+
}
63128
if (priority > 0) {
64129
task->priority = priority;
65130
}
131+
if (task->flags == 2 && task->level != level) {
132+
/*改变活动中的LEVEL */
133+
task_remove(task); /*这里执行之后flag的值会变为1，于是下面的if语句块也会被执行*/
134+
}
66135
if (task->flags != 2) {
67-
task->flags = 2; /*活动中标志*/
68-
taskctl->tasks[taskctl->running] = task;
69-
taskctl->running++;
136+
/*从休眠状态唤醒的情形*/
137+
task->level = level;
138+
task_add(task);
70139
}
140+
taskctl->lv_change = 1; /*下次任务切换时检查LEVEL */
71141
return;
72142
}
73143

74-
void task_switch(void){
75-
struct TASK *task;
76-
taskctl->now++;
77-
if (taskctl->now == taskctl->running) {
78-
taskctl->now = 0;
144+
void task_switch(void)
145+
{
146+
struct TASKLEVEL *tl = &taskctl->level[taskctl->now_lv];
147+
struct TASK *new_task, *now_task = tl->tasks[tl->now];
148+
tl->now++;
149+
if (tl->now == tl->running) {
150+
tl->now = 0;
79151
}
80-
task = taskctl->tasks[taskctl->now];
81-
timer_settime(task_timer, task->priority);
82-
if (taskctl->running >= 2) {
83-
farjmp(0, task->sel);
152+
if (taskctl->lv_change != 0) {
153+
task_switchsub();
154+
tl = &taskctl->level[taskctl->now_lv];
155+
}
156+
new_task = tl->tasks[tl->now];
157+
timer_settime(task_timer, new_task->priority);
158+
if (new_task != now_task) {
159+
farjmp(0, new_task->sel);
84160
}
85161
return;
86162
}
87163

88164
void task_sleep(struct TASK *task)
89165
{
90-
int i;
91-
char ts = 0;
92-
if (task->flags == 2) { /*如果指定任务处于唤醒状态*/
93-
if (task == taskctl->tasks[taskctl->now]) {
94-
ts = 1; /*让自己休眠的话，稍后需要进行任务切换*/
95-
}
96-
/*寻找task所在的位置*/
97-
for (i = 0; i < taskctl->running; i++) {
98-
if (taskctl->tasks[i] == task) {
99-
/*在这里*/
100-
break;
101-
}
102-
}
103-
taskctl->running--;
104-
if (i < taskctl->now) {
105-
taskctl->now--; /*需要移动成员，要相应地处理*/
106-
}
107-
/*移动成员*/
108-
for (; i < taskctl->running; i++) {
109-
taskctl->tasks[i] = taskctl->tasks[i + 1];
110-
}
111-
task->flags = 1; /*不工作的状态*/
112-
if (ts != 0) {
113-
/*任务切换*/
114-
if (taskctl->now >= taskctl->running) {
115-
/*如果now的值出现异常，则进行修正*/
116-
taskctl->now = 0;
117-
}
118-
farjmp(0, taskctl->tasks[taskctl->now]->sel);
166+
struct TASK *now_task;
167+
if (task->flags == 2) {
168+
/*如果处于活动状态*/
169+
now_task = task_now();
170+
task_remove(task); /*执行此语句的话flags将变为1 */
171+
if (task == now_task) {
172+
/*如果是让自己休眠，则需要进行任务切换*/
173+
task_switchsub();
174+
now_task = task_now(); /*在设定后获取当前任务的值*/
175+
farjmp(0, now_task->sel);
119176
}
120177
}
121178
return;

0 commit comments

Comments
 (0)