Changeset 76fca31 in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2008-12-16T19:02:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5ae4443

Parents:

8fe5980

Message:

kconsole is optional
kernel & uspace framebuffer rewrite with speedups (some things are slightly broken yet)

File:

• kernel/generic/src/main/kinit.c (modified) (7 diffs)

kernel/generic/src/main/kinit.c

@@ -83 +83 @@
 void kinit(void *arg)
 {
-        thread_t *t;
+
+#if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
+        thread_t *thread;
+#endif
 
         /*
@@ -101 +104 @@
                  * 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\n");
+                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) {
@@ -126 +125 @@
                  */
                 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 */
-
+        
         /*
          * At this point SMP, if present, is configured.
@@ -145 +143 @@
         arch_post_smp_init();
 
-        /*
-         * Create kernel console.
-         */
-        t = thread_create(kconsole, (void *) "kconsole", TASK, 0, "kconsole",
-            false);
-        if (t)
-                thread_ready(t);
-        else
-                panic("thread_create/kconsole\n");
-
+#ifdef CONFIG_KCONSOLE
+        if (stdin) {
+                /*
+                 * Create kernel console.
+                 */
+                thread = thread_create(kconsole_thread, NULL, TASK, 0, "kconsole", false);
+                if (thread != NULL)
+                        thread_ready(thread);
+                else
+                        printf("Unable to create kconsole thread\n");
+        }
+#endif /* CONFIG_KCONSOLE */
+        
         interrupts_enable();
         
@@ -165 +166 @@
         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;
                 }
-
+                
                 int rc = program_create_from_image((void *) init.tasks[i].addr,
                     "init-bin", &programs[i]);
-
-                if (rc == 0 && programs[i].task != NULL) {
+                
+                if ((rc == 0) && (programs[i].task != NULL)) {
                         /*
                          * Set capabilities to init userspace tasks.
@@ -185 +186 @@
                 } 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);
                 }
         }
@@ -204 +203 @@
         }
 
+#ifdef CONFIG_KCONSOLE
         if (!stdin) {
+                printf("kinit: No stdin\nKernel alive: ");
+                
+                uint64_t i = 0;
                 while (1) {
+                        printf(PRIu64 " ", i);
                         thread_sleep(1);
-                        printf("kinit... ");
-                }
-        }
+                        i++;
+                }
+        }
+#endif /* CONFIG_KCONSOLE */
 }