Changeset 7528

Timestamp:

Dec 29, 2008, 6:10:07 PM (12 years ago)

Author:

charles

Message:

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

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (6 diffs)
• publish.c (modified) (3 diffs)
• publish.h (modified) (3 diffs)
• tracker.c (modified) (7 diffs)

trunk/libtransmission/peer-msgs.c

@@ -297 +297 @@
     tr_torrent *           torrent;
 
-    tr_publisher_t *       publisher;
+    tr_publisher           publisher;
 
     struct evbuffer *      outMessages; /* all the non-piece messages */
@@ -531 +531 @@
     assert( msgs->peer->msgs == msgs );
 
-    tr_publisherPublish( msgs->publisher, msgs->peer, e );
+    tr_publisherPublish( &msgs->publisher, msgs->peer, e );
 }
 
@@ -2210 +2210 @@
 
     m = tr_new0( tr_peermsgs, 1 );
-    m->publisher = tr_publisherNew( );
+    m->publisher = TR_PUBLISHER_INIT;
     m->peer = peer;
     m->session = torrent->session;
@@ -2230 +2230 @@
     peer->msgs = m;
 
-    *setme = tr_publisherSubscribe( m->publisher, func, userData );
+    *setme = tr_publisherSubscribe( &m->publisher, func, userData );
 
     if( tr_peerIoSupportsLTEP( peer->io ) )
@@ -2249 +2249 @@
     {
         tr_timerFree( &msgs->pexTimer );
-        tr_publisherFree( &msgs->publisher );
+        tr_publisherDestruct( &msgs->publisher );
         reqListClear( &msgs->clientWillAskFor );
         reqListClear( &msgs->clientAskedFor );
@@ -2268 +2268 @@
                         tr_publisher_tag tag )
 {
-    tr_publisherUnsubscribe( peer->publisher, tag );
-}
-
+    tr_publisherUnsubscribe( &peer->publisher, tag );
+}
+

trunk/libtransmission/publish.c

@@ -22 +22 @@
 };
 
-struct tr_publisher_s
-{
-    tr_list *  list;
-};
-
-tr_publisher_t*
-tr_publisherNew( void )
-{
-    return tr_new0( tr_publisher_t, 1 );
-}
+const tr_publisher TR_PUBLISHER_INIT = { NULL };
 
 void
-tr_publisherFree( tr_publisher_t ** p )
+tr_publisherDestruct( tr_publisher * p )
 {
-    assert( p );
-    assert( *p );
-
-    tr_list_free( &( *p )->list, NULL );
-    tr_free( *p );
-    *p = NULL;
+    tr_list_free( &p->list, NULL );
 }
 
 tr_publisher_tag
-tr_publisherSubscribe( tr_publisher_t * p,
-                       tr_delivery_func func,
-                       void *           user_data )
+tr_publisherSubscribe( tr_publisher     * p,
+                       tr_delivery_func   func,
+                       void *             user_data )
 {
     struct tr_publisher_node * node = tr_new( struct tr_publisher_node, 1 );
@@ -58 +44 @@
 
 void
-tr_publisherUnsubscribe( tr_publisher_t * p,
+tr_publisherUnsubscribe( tr_publisher * p,
                          tr_publisher_tag tag )
 {
@@ -66 +52 @@
 
 void
-tr_publisherPublish( tr_publisher_t * p,
+tr_publisherPublish( tr_publisher * p,
                      void *           source,
                      void *           event )

trunk/libtransmission/publish.h

@@ -18 +18 @@
 #define _TR_PUBLISHER_H_
 
+struct tr_list;
+
 /**
 ***  A lightweight implementation of the 'Observable' design pattern.
 **/
 
-typedef struct tr_publisher_s tr_publisher_t;
+typedef struct tr_publisher
+{
+    struct tr_list * list;
+}
+tr_publisher;
 
 typedef void * tr_publisher_tag;
@@ -34 +40 @@
 **/
 
-tr_publisher_tag tr_publisherSubscribe( tr_publisher_t * publisher,
+tr_publisher_tag tr_publisherSubscribe( tr_publisher   * publisher,
                                         tr_delivery_func delivery_func,
                                         void *           user_data );
 
-void             tr_publisherUnsubscribe( tr_publisher_t * publisher,
+void             tr_publisherUnsubscribe( tr_publisher   * publisher,
                                           tr_publisher_tag tag );
 
@@ -45 +51 @@
 **/
 
-tr_publisher_t * tr_publisherNew( void );
+extern const tr_publisher TR_PUBLISHER_INIT;
 
-void             tr_publisherFree( tr_publisher_t ** publisher );
+void             tr_publisherDestruct( tr_publisher * );
 
-void             tr_publisherPublish( tr_publisher_t * publisher,
+void             tr_publisherPublish( tr_publisher * publisher,
                                       void *           source,
                                       void *           event );

trunk/libtransmission/tracker.c

@@ -93 +93 @@
     tr_session *      session;
 
-    tr_publisher_t *  publisher;
+    tr_publisher      publisher;
 
     /* torrent hash string */
@@ -200 +200 @@
         event.messageType = type;
         event.text = msg;
-        tr_publisherPublish( t->publisher, t, &event );
+        tr_publisherPublish( &t->publisher, t, &event );
     }
 }
@@ -239 +239 @@
     event.compactLen = compactLen;
     if( compactLen )
-        tr_publisherPublish( t->publisher, t, &event );
+        tr_publisherPublish( &t->publisher, t, &event );
 }
 
@@ -1049 +1049 @@
 
     t = tr_new0( tr_tracker, 1 );
-    t->publisher = tr_publisherNew( );
+    t->publisher                = TR_PUBLISHER_INIT;
     t->session                  = torrent->session;
     t->scrapeIntervalSec        = DEFAULT_SCRAPE_INTERVAL_SEC;
@@ -1082 +1082 @@
     tr_tracker * t = vt;
 
-    tr_publisherFree( &t->publisher );
+    tr_publisherDestruct( &t->publisher );
     tr_free( t->name );
     tr_free( t->trackerID );
@@ -1106 +1106 @@
                      void *           user_data )
 {
-    return tr_publisherSubscribe( t->publisher, func, user_data );
+    return tr_publisherSubscribe( &t->publisher, func, user_data );
 }
 
@@ -1114 +1114 @@
 {
     if( t )
-        tr_publisherUnsubscribe( t->publisher, tag );
+        tr_publisherUnsubscribe( &t->publisher, tag );
 }