Changeset 125

Timestamp:

Jun 10, 2007, 10:14:08 AM (18 years ago)

Author:

Brendan Oakley

Message:

Added some tasklet code to correct type mismatches with task queues

Location:

GPL/trunk

Files:

• alsa-kernel/include/sound/compat_22.h (modified) (1 diff)
• include/linux/interrupt.h (modified) (1 diff)
• lib32/task.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/include/sound/compat_22.h

@@ -380 +380 @@
 #define up_write(x) up(x)
 
-/* this is identical with tq_struct but the "routine" field is renamed to "func" */
-struct tasklet_struct {
-        struct tasklet_struct *next;    /* linked list of active bh's */
-        unsigned long sync;             /* must be initialized to zero */
-        void (*func)(void *);           /* function to call */
-        void *data;                     /* argument to function */
-};
-
-#define tasklet_init(t,f,d)     do { \
-        (t)->next = NULL; \
-        (t)->sync = 0; \
-        (t)->func = (void (*)(void *))(f); \
-        (t)->data = (void *)(d); \
-} while (0)
-
 #define tasklet_unlock_wait(t)  while (test_bit(0, &(t)->sync)) { }
 #define tasklet_kill(t)         tasklet_unlock_wait(t) /* FIXME: world is not perfect... */

GPL/trunk/include/linux/interrupt.h

@@ -50 +50 @@
         ISICOM_BH
 };
+/* Tasklets --- multithreaded analogue of BHs.
+
+   Main feature differing them of generic softirqs: tasklet
+   is running only on one CPU simultaneously.
+
+   Main feature differing them of BHs: different tasklets
+   may be run simultaneously on different CPUs.
+
+   Properties:
+   * If tasklet_schedule() is called, then tasklet is guaranteed
+     to be executed on some cpu at least once after this.
+   * If the tasklet is already scheduled, but its excecution is still not
+     started, it will be executed only once.
+   * If this tasklet is already running on another CPU (or schedule is called
+     from tasklet itself), it is rescheduled for later.
+   * Tasklet is strictly serialized wrt itself, but not
+     wrt another tasklets. If client needs some intertask synchronization,
+     he makes it with spinlocks.
+ */
+
+struct tasklet_struct
+{
+        struct tasklet_struct *next;
+        unsigned long state;
+        atomic_t count;
+        void (*func)(unsigned long);
+        unsigned long data;
+};
+
+extern void tasklet_hi_schedule(struct tasklet_struct *t);
+
+extern void tasklet_init(struct tasklet_struct *t,
+                         void (*func)(unsigned long), unsigned long data);
 
 /*

GPL/trunk/lib32/task.c

@@ -27 +27 @@
 #include <linux/fs.h>
 #include <linux/tqueue.h>
+#include <linux/interrupt.h>
 #define LINUX
 #include <ossdefos2.h>
@@ -33 +34 @@
 struct task_struct *current = &current_task;
 
-void tasklet_hi_schedule(struct tq_struct *t)
+void tasklet_hi_schedule(struct tasklet_struct *t)
 {
-  if(t && t->routine) {
-        t->routine(t->data);
+  if(t && t->func) {
+        t->func(t->data);
   }
+}
+
+void tasklet_init(struct tasklet_struct *t,
+                  void (*func)(unsigned long), unsigned long data)
+{
+        t->next = NULL;
+        t->state = 0;
+        t->func = func;
+        t->data = data;
 }