Changeset 7524 for trunk/libtransmission/bandwidth.c

Timestamp:

Dec 29, 2008, 8:54:36 AM (12 years ago)

Author:

charles

Message:

(trunk libT) avoid some unnecessary memory fragmentation... for composited objects that have a tr_ptrArray, contain the tr_ptrArray directly rather than a pointer to one allocated elsewhere on the heap.

File:

• trunk/libtransmission/bandwidth.c (modified) (12 diffs)

trunk/libtransmission/bandwidth.c

@@ -99 +99 @@
     int magicNumber;
     tr_session * session;
-    tr_ptrArray * children; /* struct tr_bandwidth */
-    tr_ptrArray * peers; /* tr_peerIo */
+    tr_ptrArray children; /* struct tr_bandwidth */
+    tr_ptrArray peers; /* tr_peerIo */
 };
 
@@ -131 +131 @@
     tr_bandwidth * b = tr_new0( tr_bandwidth, 1 );
     b->session = session;
-    b->children = tr_ptrArrayNew( );
-    b->peers = tr_ptrArrayNew( );
+    b->children = TR_PTR_ARRAY_INIT;
+    b->peers = TR_PTR_ARRAY_INIT;
     b->magicNumber = MAGIC_NUMBER;
     b->band[TR_UP].honorParentLimits = TRUE;
@@ -146 +146 @@
 
     tr_bandwidthSetParent( b, NULL );
-    tr_ptrArrayFree( b->peers, NULL );
-    tr_ptrArrayFree( b->children, NULL );
+    tr_ptrArrayDestruct( &b->peers, NULL );
+    tr_ptrArrayDestruct( &b->children, NULL );
     b->magicNumber = 0xDEAD;
     tr_free( b );
@@ -167 +167 @@
         assert( tr_isBandwidth( b->parent ) );
 
-        tr_ptrArrayRemoveSorted( b->parent->children, b, comparePointers );
+        tr_ptrArrayRemoveSorted( &b->parent->children, b, comparePointers );
         b->parent = NULL;
     }
@@ -176 +176 @@
         assert( parent->parent != b );
 
-        tr_ptrArrayInsertSorted( parent->children, b, comparePointers );
+        tr_ptrArrayInsertSorted( &parent->children, b, comparePointers );
         b->parent = parent;
     }
@@ -270 +270 @@
     {
         int i;
-        const int n = tr_ptrArraySize( b->peers );
+        const int n = TR_PTR_ARRAY_LENGTH( &b->peers );
         for( i=0; i<n; ++i )
-            tr_ptrArrayAppend( peer_pool, tr_ptrArrayNth( b->peers, i ) );
+            tr_ptrArrayAppend( peer_pool, tr_ptrArrayNth( &b->peers, i ) );
     }
 
@@ -282 +282 @@
     /* all children should reallocate too */
     if( 1 ) {
-        int i, n=0;
-        struct tr_bandwidth ** children = (struct tr_bandwidth**) tr_ptrArrayPeek( b->children, &n );
+        int i;
+        struct tr_bandwidth ** children = (struct tr_bandwidth**) TR_PTR_ARRAY_DATA( &b->children );
+        const int n = TR_PTR_ARRAY_LENGTH( &b->children );
         for( i=0; i<n; ++i )
             allocateBandwidth( children[i], dir, period_msec, peer_pool );
@@ -295 +296 @@
 {
     int i, n, peerCount;
-    tr_ptrArray * tmp;
+    tr_ptrArray tmp = TR_PTR_ARRAY_INIT;
     struct tr_peerIo ** peers;
     const uint64_t now = tr_date( );
@@ -304 +305 @@
      * 1. allocate bandwidth to b and its subtree
      * 2. accumulate an array of all the peerIos from b and its subtree. */
-    tmp = tr_ptrArrayNew( );
-    allocateBandwidth( b, dir, period_msec, tmp );
-    peers = (struct tr_peerIo**) tr_ptrArrayPeek( tmp, &peerCount );
+    allocateBandwidth( b, dir, period_msec, &tmp );
+    peers = (struct tr_peerIo**) tr_ptrArrayPeek( &tmp, &peerCount );
 
     /* Stop all peers from listening for the socket to be ready for IO.
@@ -348 +348 @@
 
     /* cleanup */
-    tr_ptrArrayFree( tmp, NULL );
+    tr_ptrArrayDestruct( &tmp, NULL );
 }
 
@@ -362 +362 @@
     assert( tr_isPeerIo( peerIo ) );
 
-    tr_ptrArrayInsertSorted( b->peers, peerIo, comparePointers );
+    tr_ptrArrayInsertSorted( &b->peers, peerIo, comparePointers );
 }
 
@@ -372 +372 @@
     assert( tr_isPeerIo( peerIo ) );
 
-    tr_ptrArrayRemoveSorted( b->peers, peerIo, comparePointers );
+    tr_ptrArrayRemoveSorted( &b->peers, peerIo, comparePointers );
 }