Changeset 7580 for trunk/libtransmission/bandwidth.h

Timestamp:

Jan 2, 2009, 7:56:06 PM (12 years ago)

Author:

charles

Message:

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

File:

• trunk/libtransmission/bandwidth.h (modified) (4 diffs)

trunk/libtransmission/bandwidth.h

@@ -20 +20 @@
 #include "transmission.h"
 #include "ptrarray.h"
+#include "utils.h" /* tr_new(), tr_free() */
 
 struct tr_peerIo;
@@ -103 +104 @@
     tr_session * session;
     tr_ptrArray children; /* struct tr_bandwidth */
-    tr_ptrArray peers; /* tr_peerIo */
+    struct tr_peerIo * peer;
 }
 tr_bandwidth;
@@ -112 +113 @@
 **/
 
+tr_bandwidth* tr_bandwidthConstruct( tr_bandwidth * bandwidth,
+                                     tr_session   * session,
+                                     tr_bandwidth * parent );
+
 /** @brief create a new tr_bandwidth object */
-tr_bandwidth*
-         tr_bandwidthNew              ( tr_session          * session,
-                                        tr_bandwidth        * parent );
-
-/** @brief destroy a tr_bandwidth object */
-void     tr_bandwidthFree             ( tr_bandwidth        * bandwidth );
+static inline tr_bandwidth* tr_bandwidthNew( tr_session * session, tr_bandwidth * parent )
+{
+    return tr_bandwidthConstruct( tr_new0( tr_bandwidth, 1 ), session, parent );
+}
+
+tr_bandwidth* tr_bandwidthDestruct( tr_bandwidth * bandwidth );
+
+/** @brief free a tr_bandwidth object */
+static inline void tr_bandwidthFree( tr_bandwidth * bandwidth )
+{
+    tr_free( tr_bandwidthDestruct( bandwidth ) );
+}
 
 /** @brief test to see if the pointer refers to a live bandwidth object */
@@ -220 +231 @@
  * in that particular case we want to ignore the global speed limit...
  */
-void    tr_bandwidthHonorParentLimits ( tr_bandwidth        * bandwidth,
-                                        tr_direction          direction,
-                                        tr_bool               isEnabled );
-
-/******
-*******
-******/
-
-/**
- * @brief add a tr_peerIo to this bandwidth's list.
- * They will be notified when more bandwidth is made available for them to consume.
- */
-void tr_bandwidthAddPeer( tr_bandwidth        * bandwidth,
+static inline void tr_bandwidthHonorParentLimits ( tr_bandwidth        * bandwidth,
+                                                   tr_direction          direction,
+                                                   tr_bool               isEnabled )
+{
+    assert( tr_isBandwidth( bandwidth ) );
+    assert( tr_isDirection( direction ) );
+
+    bandwidth->band[direction].honorParentLimits = isEnabled;
+}
+
+/******
+*******
+******/
+
+void tr_bandwidthSetPeer( tr_bandwidth        * bandwidth,
                           struct tr_peerIo    * peerIo );
 
-/**
- * @brief remove a peer-io from this bandwidth's list.
- */
-void tr_bandwidthRemovePeer( tr_bandwidth        * bandwidth,
-                             struct tr_peerIo    * peerIo );
-
 #endif