gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add Test programs for Issue#1029

Browse Source
This commit is contained in:
Ken Sato
2018-01-10 11:22:05 +09:00
parent 0fa88f513f
commit 38bbb4e390
6 changed files with 384 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
test/mng_mod/issues/1029/1029.patch Normal file
View File

@ -0,0 +1,173 @@
diff --git a/kernel/include/process.h b/kernel/include/process.h
index 1bd70e1..240fe03 100644
--- a/kernel/include/process.h
+++ b/kernel/include/process.h
@@ -697,6 +697,9 @@ struct thread {
// for performance counter
unsigned long pmc_alloc_map;
unsigned long extra_reg_alloc_map;
+
+// TestCode for #1029
+int started;
};
#define VM_RANGE_CACHE_SIZE 4
diff --git a/kernel/process.c b/kernel/process.c
index cdd4ab3..a3e6c8a 100644
--- a/kernel/process.c
+++ b/kernel/process.c
@@ -125,6 +125,7 @@ init_process(struct process *proc, struct process *parent)
proc->mpol_threshold = parent->mpol_threshold;
memcpy(proc->rlimit, parent->rlimit,
sizeof(struct rlimit) * MCK_RLIM_MAX);
+#define POSTK_DEBUG_TEMP_FIX_69 1 // TestCode for #1029
#ifdef POSTK_DEBUG_TEMP_FIX_69 /* Fix problem not to inherit parent cpu_set. */
memcpy(&proc->cpu_set, &parent->cpu_set,
sizeof(proc->cpu_set));
@@ -3104,12 +3105,16 @@ out_schedule:
schedule();
}
+// TestCode for #1029
+int cases[13] = {0};
void schedule(void)
{
struct cpu_local_var *v;
struct thread *next, *prev, *thread, *tmp = NULL;
int switch_ctx = 0;
struct thread *last;
+// TestCode for #1029
+int runq_cnt = 0, case_num = 0, not_started = 0;
if (cpu_local_var(no_preempt)) {
kprintf("%s: WARNING can't schedule() while no preemption, cnt: %d\n",
@@ -3139,6 +3144,62 @@ redo:
}
}
+// TestCode for #1029
+// flag for thread is started or not
+if (prev) {
+ prev->started = 1;
+}
+
+// check runq
+runq_cnt = 0;
+not_started = 0;
+list_for_each_entry_safe(thread, tmp, &(v->runq), sched_list) {
+ if (thread->tid == prev->tid) {
+ continue;
+ }
+ runq_cnt++;
+ if (!thread->started) {
+ not_started = 1;
+ }
+}
+
+// test cases
+if (!prev) {
+ case_num = 0;
+} else if (prev == &cpu_local_var(idle)) { // prev is idle
+ if (runq_cnt == 0) { // runq is empty
+ case_num = 1;
+ } else if (not_started) { // runq has other NOT_started thread
+ case_num = 2;
+ } else { // runq has other started thread
+ case_num = 3;
+ }
+} else if (v->flags & CPU_FLAG_NEED_MIGRATE) { // prev is NEED_MIGRATE
+ if (runq_cnt == 0) { // runq is empty
+ case_num = 4;
+ } else if (not_started) { // runq has other NOT_started thread
+ case_num = 5;
+ } else { // runq has other started thread
+ case_num = 6;
+ }
+} else if (prev->status != PS_EXITED) { // prev is NOT EXITED
+ if (runq_cnt == 0) { // runq is empty
+ case_num = 7;
+ } else if (not_started) { // runq has other NOT_started thread
+ case_num = 8;
+ } else { // runq has other started thread
+ case_num = 9;
+ }
+} else { // prev is NOT EXITED
+ if (runq_cnt == 0) { // runq is empty
+ case_num = 10;
+ } else if (not_started) { // runq has other NOT_started thread
+ case_num = 11;
+ } else { // runq has other started thread
+ case_num = 12;
+ }
+}
+
if (v->flags & CPU_FLAG_NEED_MIGRATE ||
prev->status == PS_EXITED) {
next = &cpu_local_var(idle);
@@ -3172,6 +3233,58 @@ redo:
set_timer();
+// TestCode for #1029
+switch (case_num) {
+case 0:
+ break;
+case 1:
+ if (!cases[case_num]) {
+ if (!switch_ctx) {
+ kprintf("[OK] CT_%03d not_switch\n", case_num);
+ } else {
+ kprintf("[NG] CT_%03d %d -> %d\n", case_num, prev->tid, next->tid);
+ }
+ cases[case_num] = 1;
+ }
+ break;
+case 4:
+case 5:
+case 6:
+case 7:
+case 10:
+case 11:
+case 12:
+ // switch to idle
+ if (!cases[case_num]) {
+ if (next == &cpu_local_var(idle)) {
+ kprintf("[OK] CT_%03d switch to idle %d => %d\n", case_num,
+ prev ? prev->tid : 0, next ? next->tid : 0);
+ } else {
+ kprintf("[NG] CT_%03d %d => %d\n", case_num, prev->tid, next->tid);
+ }
+ cases[case_num] = 1;
+ }
+ break;
+case 2:
+case 3:
+case 8:
+case 9:
+ // switch to NOT idle
+ if (!cases[case_num]) {
+ if (next != &cpu_local_var(idle)) {
+ kprintf("[OK] CT_%03d %d => %d\n", case_num,
+ prev ? prev->tid : 0, next ? next->tid : 0);
+ } else {
+ kprintf("[NG] CT_%03d\n", case_num);
+ }
+ cases[case_num] = 1;
+ }
+ break;
+
+default:
+ kprintf("unexpected case_num\n");
+}
+
if (switch_ctx) {
dkprintf("schedule: %d => %d \n",
prev ? prev->tid : 0, next ? next->tid : 0);
@@ -3260,6 +3373,7 @@ redo:
/* Have we migrated to another core meanwhile? */
if (v != get_this_cpu_local_var()) {
+ switch_ctx = 0;
goto redo;
}
}