Changeset 8a64e81e in mainline

Timestamp:

2012-07-06T13:31:02Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

0d56712

Parents:

518dd43

Message:

workq: Add work queues: allow blocking work items, queuing items from interrupt handlers.

Location:

kernel

Files:

• Makefile (modified) (2 diffs)
• generic/include/proc/thread.h (modified) (1 diff)
• generic/include/synch/workqueue.h (added)
• generic/src/console/cmd.c (modified) (4 diffs)
• generic/src/main/kinit.c (modified) (2 diffs)
• generic/src/main/main.c (modified) (2 diffs)
• generic/src/proc/scheduler.c (modified) (2 diffs)
• generic/src/proc/thread.c (modified) (4 diffs)
• generic/src/synch/workqueue.c (added)
• test/synch/workq-test-core.h (added)
• test/synch/workqueue1.c (added)
• test/synch/workqueue1.def (added)
• test/synch/workqueue2.c (added)
• test/synch/workqueue2.def (added)
• test/synch/workqueue3.c (added)
• test/synch/workqueue3.def (added)
• test/test.c (modified) (1 diff)
• test/test.h (modified) (1 diff)

kernel/Makefile

@@ -252 +252 @@
         generic/src/synch/waitq.c \
         generic/src/synch/futex.c \
+        generic/src/synch/workqueue.c \
         generic/src/synch/rcu.c \
         generic/src/smp/ipi.c \
@@ -303 +304 @@
                 test/synch/semaphore1.c \
                 test/synch/semaphore2.c \
+                test/synch/workqueue1.c \
+                test/synch/workqueue2.c \
+                test/synch/workqueue3.c \
                 test/print/print1.c \
                 test/print/print2.c \

kernel/generic/include/proc/thread.h

@@ -180 +180 @@
         /** Thread ID. */
         thread_id_t tid;
+
+        /** Work queue this thread belongs to or NULL. Immutable. */
+        struct work_queue *workq;
+        /** Links work queue threads. Protected by workq->lock. */
+        link_t workq_link; 
+        /** True if the worker was blocked and is not running. 
+         * 
+         * Protected by thread->lock.
+         */
+        bool workq_blocked;
+        /** True if the worker will block in order to become idle. 
+         * 
+         * Protected by workq->lock.
+         */
+        bool workq_idling;
         
         /** Architecture-specific data. */

kernel/generic/src/console/cmd.c

@@ -68 +68 @@
 #include <sysinfo/sysinfo.h>
 #include <symtab.h>
+#include <synch/workqueue.h>
 #include <errno.h>
 
@@ -447 +448 @@
         .argc = 1,
         .argv = &zone_argv
+};
+
+/* Data and methods for the 'workq' command */
+static int cmd_workq(cmd_arg_t *argv);
+static cmd_info_t workq_info = {
+        .name = "workq",
+        .description = "Show global workq information.",
+        .func = cmd_workq,
+        .argc = 0
 };
 
@@ -522 +532 @@
         &uptime_info,
         &version_info,
+        &workq_info,
         &zones_info,
         &zone_info,
@@ -1015 +1026 @@
 }
 
+/** Prints information about the global work queue.
+ *
+ * @param argv Ignores
+ *
+ * @return Always 1
+ */
+int cmd_workq(cmd_arg_t *argv)
+{
+        workq_global_print_info();
+        return 1;
+}
+
+
 /** Command for listing memory zones
  *

kernel/generic/src/main/kinit.c

@@ -77 +77 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
+#include <synch/workqueue.h>
 
 #define ALIVE_CHARS  4
@@ -103 +104 @@
          */
         thread_detach(THREAD);
-        
+
         interrupts_disable();
+        
+        /*
+         * Start processing work queue items. Some may have been queued during boot.
+         */
+        workq_global_worker_init();
         
 #ifdef CONFIG_SMP

kernel/generic/src/main/main.c

@@ -75 +75 @@
 #include <synch/waitq.h>
 #include <synch/futex.h>
+#include <synch/workqueue.h>
 #include <smp/smp_call.h>
 #include <arch/arch.h>
@@ -249 +250 @@
 
         smp_call_init();
+        workq_global_init();
         clock_counter_init();
         timeout_init();

kernel/generic/src/proc/scheduler.c

@@ -52 +52 @@
 #include <atomic.h>
 #include <synch/spinlock.h>
+#include <synch/workqueue.h>
 #include <config.h>
 #include <context.h>
@@ -126 +127 @@
 static void after_thread_ran(void)
 {
+        workq_after_thread_ran();
         after_thread_ran_arch();
 }

kernel/generic/src/proc/thread.c

@@ -46 +46 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
+#include <synch/workqueue.h>
 #include <cpu.h>
 #include <str.h>
@@ -260 +261 @@
 }
 
+/** Invoked right before thread_ready() readies the thread. thread is locked. */
+static void before_thread_is_ready(thread_t *thread)
+{
+        ASSERT(irq_spinlock_locked(&thread->lock));
+        workq_before_thread_is_ready(thread);
+}
+
 /** Make thread ready
  *
@@ -273 +281 @@
         ASSERT(thread->state != Ready);
 
+        before_thread_is_ready(thread);
+        
         int i = (thread->priority < RQ_COUNT - 1) ?
             ++thread->priority : thread->priority;
@@ -378 +388 @@
         
         thread->task = task;
+        
+        thread->workq = NULL;
         
         thread->fpu_context_exists = false;

kernel/test/test.c

@@ -50 +50 @@
 #include <synch/semaphore1.def>
 #include <synch/semaphore2.def>
+#include <synch/workqueue1.def>
+#include <synch/workqueue2.def>
+#include <synch/workqueue3.def>
 #include <print/print1.def>
 #include <print/print2.def>

kernel/test/test.h

@@ -76 +76 @@
 extern const char *test_thread1(void);
 extern const char *test_smpcall1(void);
+extern const char *test_workqueue1(void);
+extern const char *test_workqueue2(void);
+extern const char *test_workqueue2stop(void);
+extern const char *test_workqueue3(void);
+extern const char *test_workqueue3quit(void);
+
 
 extern test_t tests[];