Changeset 3cc5ccda in mainline

Timestamp:

2011-02-09T08:26:36Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

61bb85d

Parents:

ad29045

Message:

Use mutex to guard the tracker_list
Do not resolve finished trackers immediately, create list for postprocessing instead (fixes list contention)

Location:

uspace/drv/uhci-hcd

Files:

• uhci.c (modified) (6 diffs)
• uhci.h (modified) (2 diffs)
• uhci_struct/queue_head.h (modified) (1 diff)

uspace/drv/uhci-hcd/uhci.c

@@ -33 +33 @@
  */
 #include <errno.h>
+#include <adt/list.h>
 
 #include <usb/debug.h>
@@ -89 +90 @@
 
         list_initialize(&instance->tracker_list);
+        fibril_mutex_initialize(&instance->tracker_list_mutex);
 
         instance->cleaner = fibril_create(uhci_clean_finished, instance);
@@ -164 +166 @@
         /* TODO: check available bandwith here */
 
+        usb_log_debug2("Scheduler(%d) acquiring tracker list mutex.\n",
+            fibril_get_id());
+        fibril_mutex_lock(&instance->tracker_list_mutex);
+        usb_log_debug2("Scheduler(%d) acquired tracker list mutex.\n",
+            fibril_get_id());
+
         transfer_list_t *list =
             instance->transfers[low_speed][tracker->transfer_type];
@@ -170 +178 @@
         list_append(&tracker->link, &instance->tracker_list);
 
+        usb_log_debug2("Scheduler(%d) releasing tracker list mutex.\n",
+            fibril_get_id());
+        fibril_mutex_unlock(&instance->tracker_list_mutex);
+        usb_log_debug2("Scheduler(%d) released tracker list mutex.\n",
+            fibril_get_id());
+
         return EOK;
 }
@@ -180 +194 @@
 
         while(1) {
+                LIST_INITIALIZE(done_trackers);
                 /* tracker iteration */
+
+                usb_log_debug2("Cleaner(%d) acquiring tracker list mutex.\n",
+                    fibril_get_id());
+                fibril_mutex_lock(&instance->tracker_list_mutex);
+                usb_log_debug2("Cleaner(%d) acquired tracker list mutex.\n",
+                    fibril_get_id());
+
                 link_t *current = instance->tracker_list.next;
                 while (current != &instance->tracker_list)
                 {
+
                         link_t *next = current->next;
                         tracker_t *tracker = list_get_instance(current, tracker_t, link);
@@ -196 +219 @@
                                     tracker->td->status, tracker->td->device);
                                 list_remove(current);
-                                tracker->next_step(tracker);
+                                list_append(current, &done_trackers);
                         }
                         current = next;
+                }
+
+                usb_log_debug2("Cleaner(%d) releasing tracker list mutex.\n",
+                    fibril_get_id());
+                fibril_mutex_unlock(&instance->tracker_list_mutex);
+                usb_log_debug2("Cleaner(%d) released tracker list mutex.\n",
+                    fibril_get_id());
+
+                while (!list_empty(&done_trackers)) {
+                        tracker_t *tracker = list_get_instance(
+                          done_trackers.next, tracker_t, link);
+                        list_remove(&tracker->link);
+                        tracker->next_step(tracker);
                 }
                 async_usleep(UHCI_CLEANER_TIMEOUT);

uspace/drv/uhci-hcd/uhci.h

@@ -37 +37 @@
 
 #include <fibril.h>
+#include <fibril_synch.h>
 #include <adt/list.h>
 
@@ -81 +82 @@
 
         link_t tracker_list;
+        fibril_mutex_t tracker_list_mutex;
 
         transfer_list_t transfers_bulk_full;

uspace/drv/uhci-hcd/uhci_struct/queue_head.h

@@ -43 +43 @@
 
 typedef struct queue_head {
-        link_pointer_t next_queue;
-        link_pointer_t element;
+        volatile link_pointer_t next_queue;
+        volatile link_pointer_t element;
 } __attribute__((packed)) queue_head_t;