Changeset 8e7c9fe in mainline for uspace/srv/net/ethip/atrans.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/net/ethip/atrans.c (modified) (1 diff)

uspace/srv/net/ethip/atrans.c

@@ -103 +103 @@
 }
 
-int atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
+static int atrans_lookup_locked(addr32_t ip_addr, addr48_t mac_addr)
 {
-        fibril_mutex_lock(&atrans_list_lock);
         ethip_atrans_t *atrans = atrans_find(ip_addr);
-        if (atrans == NULL) {
-                fibril_mutex_unlock(&atrans_list_lock);
+        if (atrans == NULL)
                 return ENOENT;
-        }
-        
-        fibril_mutex_unlock(&atrans_list_lock);
+
         addr48(atrans->mac_addr, mac_addr);
         return EOK;
 }
 
-int atrans_wait_timeout(suseconds_t timeout)
+int atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
 {
+        int rc;
+
         fibril_mutex_lock(&atrans_list_lock);
-        int rc = fibril_condvar_wait_timeout(&atrans_cv, &atrans_list_lock,
-            timeout);
+        rc = atrans_lookup_locked(ip_addr, mac_addr);
         fibril_mutex_unlock(&atrans_list_lock);
-        
+
+        return rc;
+}
+
+static void atrans_lookup_timeout_handler(void *arg)
+{
+        bool *timedout = (bool *)arg;
+
+        fibril_mutex_lock(&atrans_list_lock);
+        *timedout = true;
+        fibril_mutex_unlock(&atrans_list_lock);
+        fibril_condvar_broadcast(&atrans_cv);
+}
+
+int atrans_lookup_timeout(addr32_t ip_addr, suseconds_t timeout,
+    addr48_t mac_addr)
+{
+        fibril_timer_t *t;
+        bool timedout;
+        int rc;
+
+        t = fibril_timer_create(NULL);
+        if (t == NULL)
+                return ENOMEM;
+
+        timedout = false;
+        fibril_timer_set(t, timeout, atrans_lookup_timeout_handler, &timedout);
+
+        fibril_mutex_lock(&atrans_list_lock);
+
+        while ((rc = atrans_lookup_locked(ip_addr, mac_addr)) == ENOENT &&
+            !timedout) {
+                fibril_condvar_wait(&atrans_cv, &atrans_list_lock);
+        }
+
+        fibril_mutex_unlock(&atrans_list_lock);
+        (void) fibril_timer_clear(t);
+        fibril_timer_destroy(t);
+
         return rc;
 }