Changeset 46c20c8 in mainline for kernel/generic/include/synch/waitq.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• kernel/generic/include/synch/waitq.h (modified) (4 diffs)

kernel/generic/include/synch/waitq.h

@@ -36 +36 @@
 #define KERN_WAITQ_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <synch/synch.h>
@@ -46 +46 @@
 } wakeup_mode_t;
 
-/** Wait queue structure. */
+/** Wait queue structure.
+ *
+ */
 typedef struct {
-
         /** Lock protecting wait queue structure.
          *
          * Must be acquired before T.lock for each T of type thread_t.
          */
-        SPINLOCK_DECLARE(lock);
-
+        IRQ_SPINLOCK_DECLARE(lock);
+        
         /**
          * Number of waitq_wakeup() calls that didn't find a thread to wake up.
+         *
          */
         int missed_wakeups;
+        
         /** List of sleeping threads for wich there was no missed_wakeup. */
         link_t head;
@@ -69 +72 @@
 
 extern void waitq_initialize(waitq_t *);
-extern int waitq_sleep_timeout(waitq_t *, uint32_t, int);
+extern int waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int);
 extern ipl_t waitq_sleep_prepare(waitq_t *);
-extern int waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, int);
+extern int waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int);
 extern void waitq_sleep_finish(waitq_t *, int, ipl_t);
 extern void waitq_wakeup(waitq_t *, wakeup_mode_t);
@@ -77 +80 @@
 extern void waitq_interrupt_sleep(struct thread *);
 extern void waitq_unsleep(waitq_t *);
+extern int waitq_count_get(waitq_t *);
+extern void waitq_count_set(waitq_t *, int val);
 
 #endif