Changeset 7616

Timestamp:

Jan 4, 2009, 6:01:15 PM (12 years ago)

Author:

charles

Message:

(trunk libT) minor speedup tweaks in peer-request hotspots

Location:

trunk/libtransmission

Files:

• peer-io.h (modified) (1 diff)
• request-list.c (modified) (2 diffs)
• utils.c (modified) (1 diff)

trunk/libtransmission/peer-io.h

@@ -359 +359 @@
 static inline struct evbuffer * tr_peerIoGetReadBuffer( tr_peerIo * io )
 {
-    assert( tr_isPeerIo( io ) );
-
     return io->inbuf;
 }

trunk/libtransmission/request-list.c

@@ -26 +26 @@
         return a->offset < b->offset ? -1 : 1;
 
-    if( a->length != b->length )
-        return a->length < b->length ? -1 : 1;
-
     return 0;
 }
 
 const struct request_list REQUEST_LIST_INIT = { 0, 0, NULL, NULL };
+
+static const int GROW = 8;
 
 static void
@@ -39 +38 @@
     if( list->max < max )
     {
-        list->max = max;
+        list->max = max + GROW;
         list->fifo = tr_renew( struct peer_request, list->fifo, list->max );
         list->sort = tr_renew( struct peer_request, list->sort, list->max );

trunk/libtransmission/utils.c

@@ -1302 +1302 @@
 {
     size_t first = 0;
-
-    while( nmemb > 0 )
+    const char * cbase = base;
+
+    while( nmemb )
     {
         const size_t half = nmemb / 2;
         const size_t middle = first + half;
-        const int c = compar( key, ((const char*)base) + size*middle );
+        const int c = compar( key, cbase + size*middle );
 
         if( c < 0 )