Changeset f303f2cf in mainline

Timestamp:

2014-07-17T08:38:22Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

071a2c60

Parents:

78192cc7

Message:

Make sure we wait the specified time before giving up on ARP translation.

Location:

uspace/srv/net

Files:

• ethip/arp.c (modified) (1 diff)
• ethip/atrans.c (modified) (1 diff)
• ethip/atrans.h (modified) (1 diff)
• inetsrv/inet_link.c (modified) (1 diff)
• tcp/tqueue.c (modified) (2 diffs)

uspace/srv/net/ethip/arp.c

@@ -119 +119 @@
                 return rc;
         
-        (void) atrans_wait_timeout(ARP_REQUEST_TIMEOUT);
-        
-        return atrans_lookup(ip_addr, mac_addr);
+        return atrans_lookup_timeout(ip_addr, ARP_REQUEST_TIMEOUT, mac_addr);
 }
 

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);
+
         return rc;
 }

uspace/srv/net/ethip/atrans.h

@@ -45 +45 @@
 extern int atrans_remove(addr32_t);
 extern int atrans_lookup(addr32_t, addr48_t);
-extern int atrans_wait_timeout(suseconds_t);
+extern int atrans_lookup_timeout(addr32_t, suseconds_t, addr48_t);
 
 #endif

uspace/srv/net/inetsrv/inet_link.c

@@ -465 +465 @@
         list_foreach(inet_links, link_list, inet_link_t, ilink) {
                 id_list[i++] = ilink->svc_id;
-                log_msg(LOG_DEFAULT, LVL_NOTE, "add link to list");
         }
 
         fibril_mutex_unlock(&inet_links_lock);
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "return %zu links", count);
         *rid_list = id_list;
         *rcount = count;

uspace/srv/net/tcp/tqueue.c

@@ -59 +59 @@
 static void tcp_tqueue_timer_clear(tcp_conn_t *conn);
 
-#include <stdio.h>
 int tcp_tqueue_init(tcp_tqueue_t *tqueue, tcp_conn_t *conn)
 {
-        printf("tcp_tqueue_init\n");
         tqueue->conn = conn;
         tqueue->timer = fibril_timer_create(&conn->lock);
@@ -80 +78 @@
 void tcp_tqueue_fini(tcp_tqueue_t *tqueue)
 {
-        printf("tcp_tqueue_fini\n");
         if (tqueue->timer != NULL) {
                 fibril_timer_destroy(tqueue->timer);