Changeset 2cb5e64 in mainline

Timestamp:

2006-06-04T19:47:36Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7509ddc

Parents:

c4e4507

Message:

Make use of thread_join_timeout() and thread_detach() in kernel.

Improved comments in slab.h.

Files:

• arch/ia32/include/smp/mps.h (modified) (1 diff)
• arch/ia32/src/smp/mps.c (modified) (1 diff)
• arch/ia32/src/smp/smp.c (modified) (2 diffs)
• generic/include/mm/slab.h (modified) (3 diffs)
• generic/include/proc/thread.h (modified) (2 diffs)
• generic/src/main/kinit.c (modified) (2 diffs)
• generic/src/proc/scheduler.c (modified) (1 diff)

arch/ia32/include/smp/mps.h

@@ -117 +117 @@
 
 extern waitq_t ap_completion_wq;
-extern waitq_t kmp_completion_wq;
 
 extern struct smp_config_operations mps_config_operations;

arch/ia32/src/smp/mps.c

@@ -80 +80 @@
 
 waitq_t ap_completion_wq;
-waitq_t kmp_completion_wq;
-
 
 /*

arch/ia32/src/smp/smp.c

@@ -85 +85 @@
                 io_apic = (__u32 *) io_apic_address;
         }
-
-        /* 
-         * Must be initialized outside the kmp thread, since it is waited
-         * on before the kmp thread is created.
-         */
-        waitq_initialize(&kmp_completion_wq);
-
 }
 
@@ -173 +166 @@
                         printf("INIT IPI for l_apic%d failed\n", ops->cpu_apic_id(i));
         }
-
-        /*
-         * Wakeup the kinit thread so that
-         * system initialization can go on.
-         */
-        waitq_wakeup(&kmp_completion_wq, WAKEUP_FIRST);
 }
 

generic/include/mm/slab.h

@@ -79 +79 @@
         link_t link;
         /* Configuration */
-        size_t size;      /**< Size of SLAB position - align_up(sizeof(obj)) */
+        size_t size;      /**< Size of slab position - align_up(sizeof(obj)) */
         int (*constructor)(void *obj, int kmflag);
         int (*destructor)(void *obj);
@@ -92 +92 @@
         atomic_t allocated_objs;
         atomic_t cached_objs;
-        atomic_t magazine_counter; /*<< How many magazines in magazines list */
+        atomic_t magazine_counter; /**< How many magazines in magazines list */
 
         /* Slabs */
@@ -118 +118 @@
 extern count_t slab_reclaim(int flags);
 
-/** Initialize SLAB subsytem */
+/** Initialize slab subsytem */
 extern void slab_cache_init(void);
 extern void slab_enable_cpucache(void);
 
-/* KConsole debug */
+/* kconsole debug */
 extern void slab_print_list(void);
 
-/* Malloc support */
+/* malloc support */
 extern void * malloc(unsigned int size, int flags);
 extern void free(void *obj);

generic/include/proc/thread.h

@@ -38 +38 @@
 #include <time/timeout.h>
 #include <synch/rwlock.h>
+#include <synch/synch.h>
 #include <config.h>
 #include <adt/btree.h>
@@ -155 +156 @@
 extern void thread_usleep(__u32 usec);
 
+#define thread_join(t)  thread_join_timeout((t), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
 extern int thread_join_timeout(thread_t *t, __u32 usec, int flags);
 extern void thread_detach(thread_t *t);

generic/src/main/kinit.c

@@ -83 +83 @@
         task_t *utask;
 
+        /*
+         * Detach kinit as nobody will call thread_join_timeout() on it.
+         */
+        thread_detach(THREAD);
+
         interrupts_disable();
 
@@ -99 +104 @@
                         spinlock_unlock(&t->lock);
                         thread_ready(t);
-                        waitq_sleep(&kmp_completion_wq);
                 }
-                else panic("thread_create/kmp\n");
+                else {
+                        panic("thread_create/kmp\n");
+                }
+                thread_join(t);
         }
 #endif /* CONFIG_SMP */

generic/src/proc/scheduler.c

@@ -517 +517 @@
         ipl_t ipl;
 
+        /*
+         * Detach kcpulb as nobody will call thread_join_timeout() on it.
+         */
+        thread_detach(THREAD);
+        
 loop:
         /*