Changeset 809feccc in rtems

Timestamp:

01/25/01 22:59:32 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

37535317

Parents:

c54152a2

Message:

2001-01-25 Eric Norum <eric.norum@…>

• lib/tftpDriver.c: Reduce first timeout interval. This improves throughput on systems which are dropping packets. Only the first timeout is reduced. This keeps the number of extra packets down on networks that are very busy and dropping lots of packets.

Files:

• c/src/exec/libnetworking/ChangeLog (modified) (1 diff)
• c/src/exec/libnetworking/lib/tftpDriver.c (modified) (6 diffs)
• c/src/libnetworking/ChangeLog (modified) (1 diff)
• c/src/libnetworking/lib/tftpDriver.c (modified) (6 diffs)
• cpukit/libnetworking/ChangeLog (modified) (1 diff)
• cpukit/libnetworking/lib/tftpDriver.c (modified) (6 diffs)

c/src/exec/libnetworking/ChangeLog

@@ +1 @@
+2001-01-25      Eric Norum <eric.norum@usask.ca>
+
+        * lib/tftpDriver.c: Reduce first timeout interval.  This
+        improves throughput on systems which are dropping packets.  
+        Only the first timeout is reduced.  This keeps the number
+        of extra packets down on networks that are very busy and
+        dropping lots of packets.
+
 2001-01-24      Sergei Organov <osv@javad.ru>
 

c/src/exec/libnetworking/lib/tftpDriver.c

@@ -50 +50 @@
  * Default limits
  */
-#define PACKET_REPLY_MILLISECONDS     6000
-#define OPEN_RETRY_LIMIT              10
-#define IO_RETRY_LIMIT                10
+#define PACKET_FIRST_TIMEOUT_MILLISECONDS  400
+#define PACKET_TIMEOUT_MILLISECONDS        6000
+#define OPEN_RETRY_LIMIT                   10
+#define IO_RETRY_LIMIT                     10
 
 /*
@@ -306 +307 @@
  */
 static int
-getPacket (struct tftpStream *tp)
+getPacket (struct tftpStream *tp, int retryCount)
 {
     int len;
     struct timeval tv;
 
-    tv.tv_sec = PACKET_REPLY_MILLISECONDS / 1000;
-    tv.tv_usec = (PACKET_REPLY_MILLISECONDS % 1000) * 1000;
+    if (retryCount == 0) {
+        tv.tv_sec = PACKET_FIRST_TIMEOUT_MILLISECONDS / 1000;
+        tv.tv_usec = (PACKET_FIRST_TIMEOUT_MILLISECONDS % 1000) * 1000;
+    }
+    else {
+        tv.tv_sec = PACKET_TIMEOUT_MILLISECONDS / 1000;
+        tv.tv_usec = (PACKET_TIMEOUT_MILLISECONDS % 1000) * 1000;
+    }
     setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
     for (;;) {
@@ -548 +555 @@
      */
     tp->firstReply = 1;
+    retryCount = 0;
     for (;;) {
         /*
@@ -583 +591 @@
          * Get reply
          */
-        len = getPacket (tp);
+        len = getPacket (tp, retryCount);
         if (len >= (int) sizeof tp->pkbuf.tftpACK) {
             int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
@@ -670 +678 @@
         retryCount = 0;
         for (;;) {
-            int len = getPacket (tp);
+            int len = getPacket (tp, retryCount);
             if (len >= (int)sizeof tp->pkbuf.tftpACK) {
                 int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
@@ -716 +724 @@
                                         sizeof tp->farAddress) < 0)
             return EIO;
-        rlen = getPacket (tp);
+        rlen = getPacket (tp, retryCount);
         if (rlen >= (int)sizeof tp->pkbuf.tftpACK) {
             int opcode = ntohs (tp->pkbuf.tftpACK.opcode);

c/src/libnetworking/ChangeLog

@@ +1 @@
+2001-01-25      Eric Norum <eric.norum@usask.ca>
+
+        * lib/tftpDriver.c: Reduce first timeout interval.  This
+        improves throughput on systems which are dropping packets.  
+        Only the first timeout is reduced.  This keeps the number
+        of extra packets down on networks that are very busy and
+        dropping lots of packets.
+
 2001-01-24      Sergei Organov <osv@javad.ru>
 

c/src/libnetworking/lib/tftpDriver.c

@@ -50 +50 @@
  * Default limits
  */
-#define PACKET_REPLY_MILLISECONDS     6000
-#define OPEN_RETRY_LIMIT              10
-#define IO_RETRY_LIMIT                10
+#define PACKET_FIRST_TIMEOUT_MILLISECONDS  400
+#define PACKET_TIMEOUT_MILLISECONDS        6000
+#define OPEN_RETRY_LIMIT                   10
+#define IO_RETRY_LIMIT                     10
 
 /*
@@ -306 +307 @@
  */
 static int
-getPacket (struct tftpStream *tp)
+getPacket (struct tftpStream *tp, int retryCount)
 {
     int len;
     struct timeval tv;
 
-    tv.tv_sec = PACKET_REPLY_MILLISECONDS / 1000;
-    tv.tv_usec = (PACKET_REPLY_MILLISECONDS % 1000) * 1000;
+    if (retryCount == 0) {
+        tv.tv_sec = PACKET_FIRST_TIMEOUT_MILLISECONDS / 1000;
+        tv.tv_usec = (PACKET_FIRST_TIMEOUT_MILLISECONDS % 1000) * 1000;
+    }
+    else {
+        tv.tv_sec = PACKET_TIMEOUT_MILLISECONDS / 1000;
+        tv.tv_usec = (PACKET_TIMEOUT_MILLISECONDS % 1000) * 1000;
+    }
     setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
     for (;;) {
@@ -548 +555 @@
      */
     tp->firstReply = 1;
+    retryCount = 0;
     for (;;) {
         /*
@@ -583 +591 @@
          * Get reply
          */
-        len = getPacket (tp);
+        len = getPacket (tp, retryCount);
         if (len >= (int) sizeof tp->pkbuf.tftpACK) {
             int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
@@ -670 +678 @@
         retryCount = 0;
         for (;;) {
-            int len = getPacket (tp);
+            int len = getPacket (tp, retryCount);
             if (len >= (int)sizeof tp->pkbuf.tftpACK) {
                 int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
@@ -716 +724 @@
                                         sizeof tp->farAddress) < 0)
             return EIO;
-        rlen = getPacket (tp);
+        rlen = getPacket (tp, retryCount);
         if (rlen >= (int)sizeof tp->pkbuf.tftpACK) {
             int opcode = ntohs (tp->pkbuf.tftpACK.opcode);

cpukit/libnetworking/ChangeLog

@@ +1 @@
+2001-01-25      Eric Norum <eric.norum@usask.ca>
+
+        * lib/tftpDriver.c: Reduce first timeout interval.  This
+        improves throughput on systems which are dropping packets.  
+        Only the first timeout is reduced.  This keeps the number
+        of extra packets down on networks that are very busy and
+        dropping lots of packets.
+
 2001-01-24      Sergei Organov <osv@javad.ru>
 

cpukit/libnetworking/lib/tftpDriver.c

@@ -50 +50 @@
  * Default limits
  */
-#define PACKET_REPLY_MILLISECONDS     6000
-#define OPEN_RETRY_LIMIT              10
-#define IO_RETRY_LIMIT                10
+#define PACKET_FIRST_TIMEOUT_MILLISECONDS  400
+#define PACKET_TIMEOUT_MILLISECONDS        6000
+#define OPEN_RETRY_LIMIT                   10
+#define IO_RETRY_LIMIT                     10
 
 /*
@@ -306 +307 @@
  */
 static int
-getPacket (struct tftpStream *tp)
+getPacket (struct tftpStream *tp, int retryCount)
 {
     int len;
     struct timeval tv;
 
-    tv.tv_sec = PACKET_REPLY_MILLISECONDS / 1000;
-    tv.tv_usec = (PACKET_REPLY_MILLISECONDS % 1000) * 1000;
+    if (retryCount == 0) {
+        tv.tv_sec = PACKET_FIRST_TIMEOUT_MILLISECONDS / 1000;
+        tv.tv_usec = (PACKET_FIRST_TIMEOUT_MILLISECONDS % 1000) * 1000;
+    }
+    else {
+        tv.tv_sec = PACKET_TIMEOUT_MILLISECONDS / 1000;
+        tv.tv_usec = (PACKET_TIMEOUT_MILLISECONDS % 1000) * 1000;
+    }
     setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
     for (;;) {
@@ -548 +555 @@
      */
     tp->firstReply = 1;
+    retryCount = 0;
     for (;;) {
         /*
@@ -583 +591 @@
          * Get reply
          */
-        len = getPacket (tp);
+        len = getPacket (tp, retryCount);
         if (len >= (int) sizeof tp->pkbuf.tftpACK) {
             int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
@@ -670 +678 @@
         retryCount = 0;
         for (;;) {
-            int len = getPacket (tp);
+            int len = getPacket (tp, retryCount);
             if (len >= (int)sizeof tp->pkbuf.tftpACK) {
                 int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
@@ -716 +724 @@
                                         sizeof tp->farAddress) < 0)
             return EIO;
-        rlen = getPacket (tp);
+        rlen = getPacket (tp, retryCount);
         if (rlen >= (int)sizeof tp->pkbuf.tftpACK) {
             int opcode = ntohs (tp->pkbuf.tftpACK.opcode);