| 64,6 → 64,8 |
|---|
| #include <security/cap.h> |
| #include <lib/rd.h> |
| #include <ipc/ipc.h> |
| #include <debug.h> |
| #include <string.h> |
| |
| #ifdef CONFIG_SMP |
| #include <smp/smp.h> |
| 72,6 → 74,15 |
|---|
| #include <synch/waitq.h> |
| #include <synch/spinlock.h> |
| |
| #define ALIVE_CHARS 4 |
| |
| #ifdef CONFIG_KCONSOLE |
| static char alive[ALIVE_CHARS] = "-\\|/"; |
| #endif |
| |
| #define INIT_PREFIX "init:" |
| #define INIT_PREFIX_LEN 5 |
| |
| /** Kernel initialization thread. |
| * |
| * kinit takes care of higher level kernel |
| 82,8 → 93,11 |
|---|
| */ |
| void kinit(void *arg) |
| { |
| thread_t *t; |
| |
| #if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE) |
| thread_t *thread; |
| #endif |
| |
| /* |
| * Detach kinit as nobody will call thread_join_timeout() on it. |
| */ |
| 100,24 → 114,18 |
|---|
| * not mess together with kcpulb threads. |
| * Just a beautification. |
| */ |
| if ((t = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, |
| "kmp", true))) { |
| spinlock_lock(&t->lock); |
| t->cpu = &cpus[0]; |
| spinlock_unlock(&t->lock); |
| thread_ready(t); |
| thread = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true); |
| if (thread != NULL) { |
| spinlock_lock(&thread->lock); |
| thread->cpu = &cpus[0]; |
| spinlock_unlock(&thread->lock); |
| thread_ready(thread); |
| } else |
| panic("thread_create/kmp\n"); |
| thread_join(t); |
| thread_detach(t); |
| panic("Unable to create kmp thread."); |
| thread_join(thread); |
| thread_detach(thread); |
| } |
| #endif /* CONFIG_SMP */ |
| /* |
| * Now that all CPUs are up, we can report what we've found. |
| */ |
| cpu_list(); |
| |
| #ifdef CONFIG_SMP |
| if (config.cpu_count > 1) { |
| count_t i; |
| |
| 125,16 → 133,14 |
|---|
| * For each CPU, create its load balancing thread. |
| */ |
| for (i = 0; i < config.cpu_count; i++) { |
| |
| if ((t = thread_create(kcpulb, NULL, TASK, |
| THREAD_FLAG_WIRED, "kcpulb", true))) { |
| spinlock_lock(&t->lock); |
| t->cpu = &cpus[i]; |
| spinlock_unlock(&t->lock); |
| thread_ready(t); |
| thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true); |
| if (thread != NULL) { |
| spinlock_lock(&thread->lock); |
| thread->cpu = &cpus[i]; |
| spinlock_unlock(&thread->lock); |
| thread_ready(thread); |
| } else |
| panic("thread_create/kcpulb\n"); |
| |
| printf("Unable to create kcpulb thread for cpu" PRIc "\n", i); |
| } |
| } |
| #endif /* CONFIG_SMP */ |
| 144,15 → 150,18 |
|---|
| */ |
| arch_post_smp_init(); |
| |
| #ifdef CONFIG_KCONSOLE |
| if (stdin) { |
| /* |
| * Create kernel console. |
| */ |
| t = thread_create(kconsole, (void *) "kconsole", TASK, 0, "kconsole", |
| false); |
| if (t) |
| thread_ready(t); |
| thread = thread_create(kconsole_thread, NULL, TASK, 0, "kconsole", false); |
| if (thread != NULL) |
| thread_ready(thread); |
| else |
| panic("thread_create/kconsole\n"); |
| printf("Unable to create kconsole thread\n"); |
| } |
| #endif /* CONFIG_KCONSOLE */ |
| |
| interrupts_enable(); |
| |
| 164,14 → 173,31 |
|---|
| |
| for (i = 0; i < init.cnt; i++) { |
| if (init.tasks[i].addr % FRAME_SIZE) { |
| printf("init[%" PRIc "].addr is not frame aligned", i); |
| printf("init[%" PRIc "].addr is not frame aligned\n", i); |
| continue; |
| } |
| |
| /* |
| * Construct task name from the 'init:' prefix and the |
| * name stored in the init structure (if any). |
| */ |
| |
| char namebuf[TASK_NAME_BUFLEN]; |
| char *name; |
| |
| name = init.tasks[i].name; |
| if (name[0] == 0) |
| name = "<unknown>"; |
| |
| ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN); |
| str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX); |
| str_cpy(namebuf + INIT_PREFIX_LEN, |
| TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name); |
| |
| int rc = program_create_from_image((void *) init.tasks[i].addr, |
| "init-bin", &programs[i]); |
| namebuf, &programs[i]); |
| |
| if (rc == 0 && programs[i].task != NULL) { |
| if ((rc == 0) && (programs[i].task != NULL)) { |
| /* |
| * Set capabilities to init userspace tasks. |
| */ |
| 184,31 → 210,34 |
|---|
| /* It was the program loader and was registered */ |
| } else { |
| /* RAM disk image */ |
| int rd = init_rd((rd_header_t *) init.tasks[i].addr, |
| init.tasks[i].size); |
| int rd = init_rd((rd_header_t *) init.tasks[i].addr, init.tasks[i].size); |
| |
| if (rd != RE_OK) |
| printf("Init binary %" PRIc " not used, error " |
| "code %d.\n", i, rd); |
| printf("Init binary %" PRIc " not used (error %d)\n", i, rd); |
| } |
| } |
| |
| /* |
| * Run user tasks with reasonable delays |
| * Run user tasks. |
| */ |
| for (i = 0; i < init.cnt; i++) { |
| if (programs[i].task != NULL) { |
| thread_usleep(50000); |
| if (programs[i].task != NULL) |
| program_ready(&programs[i]); |
| } |
| } |
| |
| #ifdef CONFIG_KCONSOLE |
| if (!stdin) { |
| while (1) { |
| thread_sleep(10); |
| printf("kinit: No stdin\nKernel alive: ."); |
| |
| unsigned int i = 0; |
| while (true) { |
| printf("\b%c", alive[i % ALIVE_CHARS]); |
| thread_sleep(1); |
| printf("kinit... "); |
| i++; |
| } |
| } |
| #endif /* CONFIG_KCONSOLE */ |
| } |
| |
| /** @} |