Changeset 06fe3b6 in mainline

Timestamp:

2013-05-06T15:58:01Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d531bd6

Parents:

eef14771

Message:

Simple retry mechanism for DNS queries.

File:

• uspace/srv/net/dnsrsrv/transport.c (modified) (3 diffs)

uspace/srv/net/dnsrsrv/transport.c

@@ -54 +54 @@
 #define REQ_TIMEOUT (5*1000*1000)
 
+/** Maximum number of retries */
+#define REQ_RETRY_MAX 3
+
 typedef struct {
         link_t lreq;
@@ -184 +187 @@
         struct sockaddr_in addr;
         trans_req_t *treq;
+        int ntry;
 
         req_data = NULL;
@@ -196 +200 @@
                 goto error;
 
-        rc = sendto(transport_fd, req_data, req_size, 0,
-            (struct sockaddr *)&addr, sizeof(addr));
-        if (rc != EOK)
-                goto error;
-
-        treq = treq_create(req);
-        if (treq == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        fibril_mutex_lock(&treq->done_lock);
-        while (treq->done != true) {
-                rc = fibril_condvar_wait_timeout(&treq->done_cv, &treq->done_lock,
-                    REQ_TIMEOUT);
-                if (rc == ETIMEOUT) {
-                        fibril_mutex_unlock(&treq->done_lock);
-                        rc = EIO;
+        ntry = 0;
+
+        while (ntry < REQ_RETRY_MAX) {
+                rc = sendto(transport_fd, req_data, req_size, 0,
+                    (struct sockaddr *)&addr, sizeof(addr));
+                if (rc != EOK)
+                        goto error;
+
+                treq = treq_create(req);
+                if (treq == NULL) {
+                        rc = ENOMEM;
                         goto error;
                 }
-        }
-
-        fibril_mutex_unlock(&treq->done_lock);
+
+
+                fibril_mutex_lock(&treq->done_lock);
+                while (treq->done != true) {
+                        rc = fibril_condvar_wait_timeout(&treq->done_cv, &treq->done_lock,
+                            REQ_TIMEOUT);
+                        if (rc == ETIMEOUT) {
+                                ++ntry;
+                                break;
+                        }
+                }
+
+                fibril_mutex_unlock(&treq->done_lock);
+
+                if (rc != ETIMEOUT)
+                        break;
+        }
+
+        if (ntry >= REQ_RETRY_MAX) {
+                rc = EIO;
+                goto error;
+        }
 
         if (treq->status != EOK) {