Changeset d48fcc0 in mainline for uspace/lib/usb/src/pipepriv.c

Timestamp:

2011-04-09T09:45:14Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e9ce696

Parents:

a546687

Message:

Fine grain locking of USB pipes

File:

• uspace/lib/usb/src/pipepriv.c (modified) (3 diffs)

uspace/lib/usb/src/pipepriv.c

@@ -42 +42 @@
  * @param pipe Pipe to be exclusively accessed.
  */
-void pipe_acquire(usb_pipe_t *pipe)
+void pipe_start_transaction(usb_pipe_t *pipe)
 {
         fibril_mutex_lock(&pipe->hc_phone_mutex);
@@ -51 +51 @@
  * @param pipe Pipe to be released from exclusive usage.
  */
+void pipe_end_transaction(usb_pipe_t *pipe)
+{
+        fibril_mutex_unlock(&pipe->hc_phone_mutex);
+}
+
+/** Ensure exclusive access to the pipe as a whole.
+ *
+ * @param pipe Pipe to be exclusively accessed.
+ */
+void pipe_acquire(usb_pipe_t *pipe)
+{
+        fibril_mutex_lock(&pipe->guard);
+}
+
+/** Terminate exclusive access to the pipe as a whole.
+ *
+ * @param pipe Pipe to be released from exclusive usage.
+ */
 void pipe_release(usb_pipe_t *pipe)
 {
-        fibril_mutex_unlock(&pipe->hc_phone_mutex);
+        fibril_mutex_unlock(&pipe->guard);
 }
 
@@ -76 +94 @@
                         goto another_try;
                 }
+                /*
+                 * No locking is needed, refcount is zero and whole pipe
+                 * mutex is locked.
+                 */
                 pipe->hc_phone = phone;
         }