Changeset 3755

Timestamp:

Nov 8, 2007, 4:11:09 AM (15 years ago)

Author:

charles

Message:

• some work on lessening the way we hammer the router.
• move strlcpy and strlcat out of their own files and into utils.c

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (1 diff)
• peer-mgr.c (modified) (4 diffs)
• strlcat.c (deleted)
• strlcpy.c (deleted)
• utils.c (modified) (1 diff)

trunk/libtransmission/Makefile.am

@@ -27 +27 @@
     ratecontrol.c \
     shared.c \
-    strlcat.c \
-    strlcpy.c \
     torrent.c \
     tracker.c \

trunk/libtransmission/peer-mgr.c

@@ -914 +914 @@
     if( !ok || !t || !t->isRunning )
     {
+        if( t ) {
+            struct peer_atom * atom = getExistingAtom( t, addr );
+            if( atom )
+                ++atom->numFails;
+        }
+
         tr_peerIoFree( io );
     }
@@ -1584 +1590 @@
 
 static int
-compareAtomByTime( const void * va, const void * vb )
+compareCandidates( const void * va, const void * vb )
 {
     const struct peer_atom * a = * (const struct peer_atom**) va;
     const struct peer_atom * b = * (const struct peer_atom**) vb;
-    if( a->time < b->time ) return -1;
-    if( a->time > b->time ) return 1;
+    int i;
+
+    if(( i = tr_compareUint16( a->numFails, b->numFails )))
+        return i;
+
+    if( a->time != b->time )
+        return a->time < b->time ? -1 : 1;
+
     return 0;
 }
@@ -1633 +1645 @@
         }
 
+        /* we're wasting our time trying to connect to this bozo. */
+        if( atom->numFails > 10 ) {
+            tordbg( t, "RECONNECT peer %d (%s) gives us nothing but failure.",
+                    i, tr_peerIoAddrStr(&atom->addr,atom->port) );
+            continue;
+        }
+
         /* if we used this peer recently, give someone else a turn */
-        minWait = 60; /* one minute */
-        maxWait = (60 * 10); /* ten minutes */
-        wait = atom->numFails * 15; /* add 15 secs to the wait interval for each consecutive failure*/
+        minWait = 10; /* ten seconds */
+        maxWait = (60 * 20); /* twenty minutes */
+        wait = atom->numFails * 30; /* add 15 secs to the wait interval for each consecutive failure*/
         if( wait < minWait ) wait = minWait;
         if( wait > maxWait ) wait = maxWait;
@@ -1648 +1667 @@
     }
 
-    qsort( ret, retCount, sizeof(struct peer_atom*), compareAtomByTime );
+    qsort( ret, retCount, sizeof(struct peer_atom*), compareCandidates );
     *setmeSize = retCount;
     return ret;

trunk/libtransmission/utils.c

@@ -761 +761 @@
 #endif
 }
+
+/***
+****
+***/
+
+
+#ifndef HAVE_STRLCPY
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+        char *d = dst;
+        const char *s = src;
+        size_t n = siz;
+
+        /* Copy as many bytes as will fit */
+        if (n != 0) {
+                while (--n != 0) {
+                        if ((*d++ = *s++) == '\0')
+                                break;
+                }
+        }
+
+        /* Not enough room in dst, add NUL and traverse rest of src */
+        if (n == 0) {
+                if (siz != 0)
+                        *d = '\0';              /* NUL-terminate dst */
+                while (*s++)
+                        ;
+        }
+
+        return(s - src - 1);    /* count does not include NUL */
+}
+
+#endif /* HAVE_STRLCPY */
+
+
+#ifndef HAVE_STRLCAT
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+        char *d = dst;
+        const char *s = src;
+        size_t n = siz;
+        size_t dlen;
+
+        /* Find the end of dst and adjust bytes left but don't go past end */
+        while (n-- != 0 && *d != '\0')
+                d++;
+        dlen = d - dst;
+        n = siz - dlen;
+
+        if (n == 0)
+                return(dlen + strlen(s));
+        while (*s != '\0') {
+                if (n != 1) {
+                        *d++ = *s;
+                        n--;
+                }
+                s++;
+        }
+        *d = '\0';
+
+        return(dlen + (s - src));       /* count does not include NUL */
+}
+
+#endif /* HAVE_STRLCAT */