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

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

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

kernel/generic/src/main/kinit.c

@@ -66 +66 @@
 #include <ipc/ipc.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
+#include <sysinfo/stats.h>
 
 #ifdef CONFIG_SMP
@@ -94 +95 @@
 void kinit(void *arg)
 {
-
-#if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
         thread_t *thread;
-#endif
         
         /*
@@ -109 +107 @@
         if (config.cpu_count > 1) {
                 waitq_initialize(&ap_completion_wq);
+                
                 /*
                  * Create the kmp thread and wait for its completion.
@@ -117 +116 @@
                 thread = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true);
                 if (thread != NULL) {
-                        spinlock_lock(&thread->lock);
+                        irq_spinlock_lock(&thread->lock, false);
                         thread->cpu = &cpus[0];
-                        spinlock_unlock(&thread->lock);
+                        irq_spinlock_unlock(&thread->lock, false);
                         thread_ready(thread);
                 } else
                         panic("Unable to create kmp thread.");
+                
                 thread_join(thread);
                 thread_detach(thread);
-        }
-        
-        if (config.cpu_count > 1) {
+                
+                /*
+                 * For each CPU, create its load balancing thread.
+                 */
                 size_t i;
                 
-                /*
-                 * For each CPU, create its load balancing thread.
-                 */
                 for (i = 0; i < config.cpu_count; i++) {
                         thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);
                         if (thread != NULL) {
-                                spinlock_lock(&thread->lock);
+                                irq_spinlock_lock(&thread->lock, false);
                                 thread->cpu = &cpus[i];
-                                spinlock_unlock(&thread->lock);
+                                irq_spinlock_unlock(&thread->lock, false);
                                 thread_ready(thread);
                         } else
@@ -150 +148 @@
          */
         arch_post_smp_init();
+        
+        /* Start thread computing system load */
+        thread = thread_create(kload, NULL, TASK, 0, "kload", false);
+        if (thread != NULL)
+                thread_ready(thread);
+        else
+                printf("Unable to create kload thread\n");
         
 #ifdef CONFIG_KCONSOLE
@@ -175 +180 @@
                 if (init.tasks[i].addr % FRAME_SIZE) {
                         printf("init[%" PRIs "].addr is not frame aligned\n", i);
+                        programs[i].task = NULL;
                         continue;
                 }
@@ -184 +190 @@
                 
                 char namebuf[TASK_NAME_BUFLEN];
-                char *name;
-                
-                name = init.tasks[i].name;
+                
+                const char *name = init.tasks[i].name;
                 if (name[0] == 0)
                         name = "<unknown>";
@@ -194 +199 @@
                 str_cpy(namebuf + INIT_PREFIX_LEN,
                     TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name);
-
+                
                 int rc = program_create_from_image((void *) init.tasks[i].addr,
                     namebuf, &programs[i]);