Changeset 679 for GPL/trunk/lib32/waitqueue.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/waitqueue.c (modified) (5 diffs)

GPL/trunk/lib32/waitqueue.c

@@ -38 +38 @@
 //******************************************************************************
 //******************************************************************************
-void add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait)
+void add_wait_queue(struct wait_queue_head *q, struct wait_queue_entry * wait)
 {
 //    dprintf3(("WARNING: add_wait_queue STUB"));
@@ -44 +44 @@
 //******************************************************************************
 //******************************************************************************
-void add_wait_queue_exclusive(wait_queue_head_t *q)
+void add_wait_queue_exclusive(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry)
 {
 //    dprintf3(("WARNING: add_wait_queue_exclusive STUB"));
@@ -50 +50 @@
 //******************************************************************************
 //******************************************************************************
-void remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait)
+void remove_wait_queue(struct wait_queue_head *q, struct wait_queue_entry * wait)
 {
 //    dprintf(("WARNING: remove_wait_queue STUB"));
@@ -75 +75 @@
 //******************************************************************************
 //******************************************************************************
-void init_waitqueue_entry(wait_queue_t *q, struct task_struct *p)
+void init_waitqueue_entry(struct wait_queue_entry *wq_entry, struct task_struct *p)
 {
 //    dprintf(("WARNING: init_waitqueue_entry STUB"));
@@ -88 +88 @@
 //******************************************************************************
 //******************************************************************************
+/**
+ * complete: - signals a single thread waiting on this completion
+ * @x:  holds the state of this particular completion
+ *
+ * This will wake up a single thread waiting on this completion. Threads will be
+ * awakened in the same order in which they were queued.
+ *
+ * See also complete_all(), wait_for_completion() and related routines.
+ *
+ * It may be assumed that this function implies a write memory barrier before
+ * changing the task state if and only if any tasks are woken up.
+ */
+void complete(struct completion *x)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&x->wait.lock, flags);
+        x->done++;
+        __wake_up_locked(&x->wait, TASK_NORMAL, 1);
+        spin_unlock_irqrestore(&x->wait.lock, flags);
+}
+/**
+ * complete_all: - signals all threads waiting on this completion
+ * @x:  holds the state of this particular completion
+ *
+ * This will wake up all threads waiting on this particular completion event.
+ *
+ * If this function wakes up a task, it executes a full memory barrier before
+ * accessing the task state.
+ *
+ * Since complete_all() sets the completion of @x permanently to done
+ * to allow multiple waiters to finish, a call to reinit_completion()
+ * must be used on @x if @x is to be used again. The code must make
+ * sure that all waiters have woken and finished before reinitializing
+ * @x. Also note that the function completion_done() can not be used
+ * to know if there are still waiters after complete_all() has been called.
+ */
+void complete_all(struct completion *x)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&x->wait.lock, flags);
+        __wake_up_locked(&x->wait, TASK_NORMAL, 1);
+        spin_unlock_irqrestore(&x->wait.lock, flags);
+}
+//******************************************************************************
+//******************************************************************************
+void __wake_up_locked(wait_queue_head_t *q, unsigned int mode, int nr)
+{
+    dprintf3(("WARNING: __wake_up_locked STUB"));
+}
+//******************************************************************************
+//******************************************************************************
+/**
+ * wait_for_completion: - waits for completion of a task
+ * @x:  holds the state of this particular completion
+ *
+ * This waits to be signaled for completion of a specific task. It is NOT
+ * interruptible and there is no timeout.
+ *
+ * See also similar routines (i.e. wait_for_completion_timeout()) with timeout
+ * and interrupt capability. Also see complete().
+ */
+void wait_for_completion(struct completion *x)
+{
+    dprintf3(("WARNING: wait_for_completion STUB"));
+}
+
+
+/**
+ * wait_for_completion_timeout: - waits for completion of a task (w/timeout)
+ * @x:  holds the state of this particular completion
+ * @timeout:  timeout value in jiffies
+ *
+ * This waits for either a completion of a specific task to be signaled or for a
+ * specified timeout to expire. The timeout is in jiffies. It is not
+ * interruptible.
+ *
+ * Return: 0 if timed out, and positive (at least 1, or number of jiffies left
+ * till timeout) if completed.
+ */
+unsigned long wait_for_completion_timeout(struct completion *x, unsigned long timeout)
+{
+    dprintf3(("WARNING: wait_for_completion_timeout STUB"));
+    return 1;
+}