Changeset f4f866c in mainline for kernel/generic/src/main

Timestamp:

2010-04-23T21:42:26Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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 mainline changes.

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (3 diffs)
• main.c (modified) (4 diffs)
• version.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -67 +67 @@
 #include <debug.h>
 #include <str.h>
+#include <sysinfo/stats.h>
 
 #ifdef CONFIG_SMP
@@ -122 +123 @@
                 } else
                         panic("Unable to create kmp thread.");
+                
                 thread_join(thread);
                 thread_detach(thread);
@@ -149 +151 @@
          */
         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

kernel/generic/src/main/main.c

@@ -84 +84 @@
 #include <main/main.h>
 #include <ipc/event.h>
+#include <sysinfo/sysinfo.h>
+#include <sysinfo/stats.h>
 
 /** Global configuration structure. */
@@ -209 +211 @@
         /* Initialize at least 1 memory segment big enough for slab to work. */
         LOG_EXEC(slab_cache_init());
+        LOG_EXEC(sysinfo_init());
         LOG_EXEC(btree_init());
         LOG_EXEC(as_init());
@@ -223 +226 @@
         
         printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
-            config.cpu_count, SIZE2MB(zone_total_size()));
-        
+            config.cpu_count, SIZE2MB(zones_total_size()));
+
         LOG_EXEC(cpu_init());
         
@@ -247 +250 @@
         LOG_EXEC(event_init());
         LOG_EXEC(klog_init());
+        LOG_EXEC(stats_init());
         
         /*

kernel/generic/src/main/version.c

@@ -59 +59 @@
 {
         printf("%s, release %s (%s)%s\nBuilt%s for %s\n%s\n",
-                project, release, name, revision, timestamp, arch, copyright);
+            project, release, name, revision, timestamp, arch, copyright);
 }