(trunk libT) more heap pruning: avoid four unnecessary malloc() + free() calls per...

This commit also changes tr_recentHistory from being a general-purpose tool to being a little more hardcoded for the only purpose it's used, in tr_peerMgr. If its files (history.[ch]) don't find any other "customers" in libtransmission, eventually it should be demoted to being a private helper class inside of peer-mgr.c and have the history.[ch] files removed from the build.

diff --git a/libtransmission/history-test.c b/libtransmission/history-test.c
index dc1103a5f49f5f4e8664e6d372fe6279c352a00d..d606f134d3d4cad09a53262bdf7ff9a596a0dede 100644 (file)
--- a/libtransmission/history-test.c
+++ b/libtransmission/history-test.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h> /* memset() */
 
 #include "transmission.h"
 #include "history.h"
@@ -34,7 +35,8 @@ test1( void )
 {
     tr_recentHistory h;
 
-    tr_historyConstruct( &h, 60, 10 );
+    memset( &h, 0, sizeof( tr_recentHistory ) );
+
     tr_historyAdd( &h, 10000, 1 );
     check( (int)tr_historyGet( &h, 12000, 1000 ) == 0 )
     check( (int)tr_historyGet( &h, 12000, 3000 ) == 1 )
@@ -44,7 +46,6 @@ test1( void )
     check( (int)tr_historyGet( &h, 22000,  3000 ) == 1 )
     check( (int)tr_historyGet( &h, 22000, 15000 ) == 2 )
     check( (int)tr_historyGet( &h, 22000, 20000 ) == 2 )
-    tr_historyDestruct( &h );
 
     return 0;
 }

diff --git a/libtransmission/history.c b/libtransmission/history.c
index 296f634f08f813cf851eccbd7303b7d35e1e2875..187df81d53e3510066f315d89a67a76707c22ee4 100644 (file)
--- a/libtransmission/history.c
+++ b/libtransmission/history.c
@@ -20,10 +20,10 @@
 void
 tr_historyAdd( tr_recentHistory * h, time_t now, unsigned int n )
 {
-    if( h->slices[h->newest].date + (time_t)h->precision >= now )
+    if( h->slices[h->newest].date == now )
         h->slices[h->newest].n += n;
     else {
-        if( ++h->newest == h->sliceCount ) h->newest = 0;
+        if( ++h->newest == TR_RECENT_HISTORY_PERIOD_SEC ) h->newest = 0;
         h->slices[h->newest].date = now;
         h->slices[h->newest].n = n;
     }
@@ -43,27 +43,9 @@ tr_historyGet( const tr_recentHistory * h, time_t now, unsigned int sec )
 
         n += h->slices[i].n;
 
-        if( --i == -1 ) i = h->sliceCount - 1; /* circular history */
+        if( --i == -1 ) i = TR_RECENT_HISTORY_PERIOD_SEC - 1; /* circular history */
         if( i == h->newest ) break; /* we've come all the way around */
     }
 
     return n;
 }
-
-void
-tr_historyConstruct( tr_recentHistory * h, unsigned int seconds, unsigned int precision )
-{
-    memset( h, 0, sizeof( tr_recentHistory ) );
-
-    assert( precision <= seconds );
-
-    h->precision = precision;
-    h->sliceCount = seconds / precision;
-    h->slices = tr_new0( struct tr_history_slice, h->sliceCount );
-}
-
-void
-tr_historyDestruct( tr_recentHistory * h )
-{
-    tr_free( h->slices );
-}

diff --git a/libtransmission/history.h b/libtransmission/history.h
index a464e4a030e747cf7040d2f390ea90708b2614fe..cb0870400e23ab5ea9bc045f66495870449ff8a7 100644 (file)
--- a/libtransmission/history.h
+++ b/libtransmission/history.h
@@ -25,33 +25,26 @@
  * to estimate the speed over the last N seconds.
  */
 
-struct tr_history_slice
+enum
 {
-    unsigned int n;
-    time_t date;
+    TR_RECENT_HISTORY_PERIOD_SEC = 60
 };
+
+
 typedef struct tr_recentHistory
 {
     /* these are PRIVATE IMPLEMENTATION details included for composition only.
      * Don't access these directly! */
+
     int newest;
-    int sliceCount;
-    unsigned int precision;
-    struct tr_history_slice * slices;
+
+    struct {
+        unsigned int n;
+        time_t date;
+    } slices[TR_RECENT_HISTORY_PERIOD_SEC];
 }
 tr_recentHistory;
 
-/**
- * @brief construct a new tr_recentHistory object
- * @param seconds how many seconds of history this object should remember
- * @param precision how precise the history should be, in seconds
- *        For a precision of 10 seconds and a history of 2 minutes, makes 12 bins.
- */
-void tr_historyConstruct( tr_recentHistory *, unsigned int seconds, unsigned int precision );
-
-/** @brief destruct an existing tr_recentHistory object. */
-void tr_historyDestruct( tr_recentHistory * );
-
 /**
  * @brief add a counter to the recent history object.
  * @param when the current time in sec, such as from tr_time()

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index d18de21a8a17184c3934abf34e87fdc44015fc9f..149dc177c3136c23b4cc525b911f431278dbc33a 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -375,11 +375,6 @@ tr_peerConstruct( tr_peer * peer )
     memset( peer, 0, sizeof( tr_peer ) );
 
     peer->have = TR_BITFIELD_INIT;
-
-    tr_historyConstruct( &peer->blocksSentToClient,  CANCEL_HISTORY_SEC, ( RECHOKE_PERIOD_MSEC / 1000 ) );
-    tr_historyConstruct( &peer->blocksSentToPeer,    CANCEL_HISTORY_SEC, ( RECHOKE_PERIOD_MSEC / 1000 ) );
-    tr_historyConstruct( &peer->cancelsSentToClient, CANCEL_HISTORY_SEC, ( RECHOKE_PERIOD_MSEC / 1000 ) );
-    tr_historyConstruct( &peer->cancelsSentToPeer,   CANCEL_HISTORY_SEC, ( REFILL_UPKEEP_PERIOD_MSEC / 1000 ) );
 }
 
 static tr_peer*
@@ -431,11 +426,6 @@ tr_peerDestruct( tr_torrent * tor, tr_peer * peer )
         tr_peerIoUnref( peer->io ); /* balanced by the ref in handshakeDoneCB() */
     }
 
-    tr_historyDestruct( &peer->blocksSentToClient  );
-    tr_historyDestruct( &peer->blocksSentToPeer    );
-    tr_historyDestruct( &peer->cancelsSentToClient );
-    tr_historyDestruct( &peer->cancelsSentToPeer   );
-
     tr_bitfieldDestruct( &peer->have );
     tr_bitfieldDestruct( &peer->blame );
     tr_free( peer->client );