Changeset 10800

Timestamp:

Jun 19, 2010, 2:33:10 PM (12 years ago)

Author:

charles

Message:

(trunk) #3256 "libtransmission/publish.[ch] should be replaced" -- apply publish.diff for 2.10

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (2 diffs)
• announcer.c (modified) (9 diffs)
• announcer.h (modified) (3 diffs)
• peer-common.h (modified) (1 diff)
• peer-mgr.c (modified) (4 diffs)
• peer-mgr.h (modified) (2 diffs)
• peer-msgs.c (modified) (7 diffs)
• peer-msgs.h (modified) (3 diffs)
• publish.c (deleted)
• publish.h (deleted)
• torrent.c (modified) (3 diffs)
• torrent.h (modified) (1 diff)
• webseed.c (modified) (4 diffs)
• webseed.h (modified) (1 diff)

trunk/libtransmission/Makefile.am

@@ -45 +45 @@
     port-forwarding.c \
     ptrarray.c \
-    publish.c \
     ratecontrol.c \
     resume.c \
@@ -97 +96 @@
     port-forwarding.h \
     ptrarray.h \
-    publish.h \
     ratecontrol.h \
     resume.h \

trunk/libtransmission/announcer.c

@@ -22 +22 @@
 #include "net.h"
 #include "ptrarray.h"
-#include "publish.h"
 #include "session.h"
 #include "tr-dht.h"
@@ -531 +530 @@
 {
     tr_ptrArray tiers;
-    tr_publisher publisher;
+    tr_tracker_callback * callback;
+    void * callbackData;
 }
 tr_torrent_tiers;
@@ -540 +540 @@
     tr_torrent_tiers * tiers = tr_new0( tr_torrent_tiers, 1 );
     tiers->tiers = TR_PTR_ARRAY_INIT;
-    tiers->publisher = TR_PUBLISHER_INIT;
     return tiers;
 }
@@ -547 +546 @@
 tiersFree( tr_torrent_tiers * tiers )
 {
-    tr_publisherDestruct( &tiers->publisher );
     tr_ptrArrayDestruct( &tiers->tiers, tierFree );
     tr_free( tiers );
@@ -594 +592 @@
         event.text = msg;
         event.tracker = tier->currentTracker ? tier->currentTracker->announce : NULL;
-        tr_publisherPublish( &tiers->publisher, tier, &event );
+
+        if( tiers->callback != NULL )
+            tiers->callback( tier->tor, &event, tiers->callbackData );
     }
 }
@@ -641 +641 @@
     e.compactLen = compactLen;
 
-    tr_publisherPublish( &tier->tor->tiers->publisher, tier, &e );
+    if( tier->tor->tiers->callback != NULL )
+        tier->tor->tiers->callback( tier->tor, &e, NULL );
 
     return compactLen / 6;
@@ -845 +846 @@
 
 tr_torrent_tiers *
-tr_announcerAddTorrent( tr_announcer * announcer, tr_torrent * tor )
+tr_announcerAddTorrent( tr_announcer * announcer, tr_torrent * tor,
+                        tr_tracker_callback * callback, void * callbackData )
 {
     tr_torrent_tiers * tiers;
@@ -853 +855 @@
 
     tiers = tiersNew( );
+    tiers->callback = callback;
+    tiers->callbackData = callbackData;
 
     addTorrentToTier( announcer, tiers, tor );
@@ -928 +932 @@
     /* cleanup */
     tr_ptrArrayDestruct( &oldTiers, tierFree );
-}
-
-tr_publisher_tag
-tr_announcerSubscribe( struct tr_torrent_tiers   * tiers,
-                       tr_delivery_func            func,
-                       void                      * userData )
-{
-    return tr_publisherSubscribe( &tiers->publisher, func, userData );
-}
-
-void
-tr_announcerUnsubscribe( struct tr_torrent_tiers  * tiers,
-                         tr_publisher_tag           tag )
-{
-    if( tiers )
-        tr_publisherUnsubscribe( &tiers->publisher, tag );
 }
 

trunk/libtransmission/announcer.h

@@ -19 +19 @@
 
 #include "transmission.h"
-#include "publish.h"
 
 struct tr_announcer;
@@ -56 +55 @@
 tr_tracker_event;
 
+typedef void tr_tracker_callback ( tr_torrent              * tor,
+                                   const tr_tracker_event  * event,
+                                   void                    * client_data );
+
 /**
 ***  Session ctor/dtor
@@ -68 +71 @@
 **/
 
-struct tr_torrent_tiers * tr_announcerAddTorrent( struct tr_announcer  *,
-                                                  tr_torrent           * );
+struct tr_torrent_tiers * tr_announcerAddTorrent( struct tr_announcer *,
+                                                  tr_torrent          * torrent,
+                                                  tr_tracker_callback * cb,
+                                                  void                * cbdata );
 
 tr_bool tr_announcerHasBacklog( const struct tr_announcer * );
 
 void tr_announcerResetTorrent( struct tr_announcer*, tr_torrent* );
-
-tr_publisher_tag tr_announcerSubscribe( struct tr_torrent_tiers  * tiers,
-                                        tr_delivery_func           func,
-                                        void                     * userData );
-
-void tr_announcerUnsubscribe( struct tr_torrent_tiers  * tiers,
-                              tr_publisher_tag           tag );
 
 void tr_announcerRemoveTorrent( struct tr_announcer * ,

trunk/libtransmission/peer-common.h

@@ -85 +85 @@
 tr_peer_event;
 
+struct tr_peer;
+
+typedef void tr_peer_callback( struct tr_peer      * peer,
+                              const tr_peer_event  * event,
+                              void                 * client_data );
+
 #ifdef WIN32
  #define EMSGSIZE WSAEMSGSIZE

trunk/libtransmission/peer-mgr.c

@@ -393 +393 @@
 
     if( peer->msgs != NULL )
-    {
-        tr_peerMsgsUnsubscribe( peer->msgs, peer->msgsTag );
         tr_peerMsgsFree( peer->msgs );
-    }
 
     tr_peerIoClear( peer->io );
@@ -458 +455 @@
 }
 
-static void peerCallbackFunc( void * vpeer, void * vevent, void * vt );
+static void peerCallbackFunc( tr_peer *, const tr_peer_event *, void * );
 
 static Torrent*
@@ -1339 +1336 @@
 
 static void
-peerCallbackFunc( void * vpeer, void * vevent, void * vt )
-{
-    tr_peer * peer = vpeer; /* may be NULL if peer is a webseed */
+peerCallbackFunc( tr_peer * peer, const tr_peer_event * e, void * vt )
+{
     Torrent * t = vt;
-    const tr_peer_event * e = vevent;
 
     torrentLock( t );
@@ -1707 +1702 @@
                                                                 balanced by our unref in peerDestructor()  */
                 tr_peerIoSetParent( peer->io, t->tor->bandwidth );
-                tr_peerMsgsNew( t->tor, peer, peerCallbackFunc, t, &peer->msgsTag );
+                tr_peerMsgsNew( t->tor, peer, peerCallbackFunc, t );
 
                 success = TRUE;

trunk/libtransmission/peer-mgr.h

@@ -29 +29 @@
 #include "net.h"
 #include "peer-common.h" /* struct peer_request */
-#include "publish.h" /* tr_publisher_tag */
 
 /**
@@ -125 +124 @@
 
     struct tr_peermsgs     * msgs;
-    tr_publisher_tag         msgsTag;
 }
 tr_peer;

trunk/libtransmission/peer-msgs.c

@@ -202 +202 @@
     tr_torrent *           torrent;
 
-    tr_publisher           publisher;
+    tr_peer_callback      * callback;
+    void                  * callbackData;
 
     struct evbuffer *      outMessages; /* all the non-piece messages */
@@ -471 +472 @@
     assert( msgs->peer->msgs == msgs );
 
-    tr_publisherPublish( &msgs->publisher, msgs->peer, e );
+    if( msgs->callback != NULL )
+        msgs->callback( msgs->peer, e, msgs->callbackData );
 }
 
@@ -2316 +2318 @@
 
 tr_peermsgs*
-tr_peerMsgsNew( struct tr_torrent * torrent,
-                struct tr_peer    * peer,
-                tr_delivery_func    func,
-                void              * userData,
-                tr_publisher_tag  * setme )
+tr_peerMsgsNew( struct tr_torrent    * torrent,
+                struct tr_peer       * peer,
+                tr_peer_callback     * callback,
+                void                 * callbackData )
 {
     tr_peermsgs * m;
@@ -2328 +2329 @@
 
     m = tr_new0( tr_peermsgs, 1 );
-    m->publisher = TR_PUBLISHER_INIT;
+    m->callback = callback;
+    m->callbackData = callbackData;
     m->peer = peer;
     m->torrent = torrent;
@@ -2344 +2346 @@
     peer->msgs = m;
 
-    *setme = tr_publisherSubscribe( &m->publisher, func, userData );
-
     if( tr_peerIoSupportsLTEP( peer->io ) )
         sendLtepHandshake( m );
@@ -2372 +2372 @@
     {
         evtimer_del( &msgs->pexTimer );
-        tr_publisherDestruct( &msgs->publisher );
 
         evbuffer_free( msgs->incoming.block );
@@ -2383 +2382 @@
     }
 }
-
-void
-tr_peerMsgsUnsubscribe( tr_peermsgs *    peer,
-                        tr_publisher_tag tag )
-{
-    tr_publisherUnsubscribe( &peer->publisher, tag );
-}

trunk/libtransmission/peer-msgs.h

@@ -20 +20 @@
 #include <inttypes.h>
 #include "peer-common.h"
-#include "publish.h"
 
 struct tr_torrent;
@@ -33 +32 @@
 typedef struct tr_peermsgs tr_peermsgs;
 
-tr_peermsgs* tr_peerMsgsNew( struct tr_torrent * torrent,
-                             struct tr_peer *    peer,
-                             tr_delivery_func    func,
-                             void *              user,
-                             tr_publisher_tag *  setme );
-
+tr_peermsgs* tr_peerMsgsNew( struct tr_torrent    * torrent,
+                             struct tr_peer       * peer,
+                             tr_peer_callback     * callback,
+                             void                 * callback_data );
 
 void         tr_peerMsgsSetChoke( tr_peermsgs *, int doChoke );
@@ -56 +53 @@
 void         tr_peerMsgsFree( tr_peermsgs* );
 
-void         tr_peerMsgsUnsubscribe( tr_peermsgs      * peer,
-                                     tr_publisher_tag   tag );
-
 size_t       tr_generateAllowedSet( tr_piece_index_t  * setmePieces,
                                     size_t              desiredSetSize,

trunk/libtransmission/torrent.c

@@ -361 +361 @@
 
 static void
-onTrackerResponse( void * tracker UNUSED,
-                   void * vevent,
-                   void * user_data )
-{
-    tr_torrent * tor = user_data;
-    tr_tracker_event * event = vevent;
-
+onTrackerResponse( tr_torrent * tor, const tr_tracker_event * event, void * unused UNUSED )
+{
     switch( event->messageType )
     {
@@ -728 +723 @@
     }
 
-    tor->tiers = tr_announcerAddTorrent( tor->session->announcer, tor );
-    tor->tiersSubscription = tr_announcerSubscribe( tor->tiers, onTrackerResponse, tor );
+    tor->tiers = tr_announcerAddTorrent( tor->session->announcer, tor, onTrackerResponse, NULL );
 
     if( doStart )
@@ -1315 +1309 @@
     tr_cpDestruct( &tor->completion );
 
-    tr_announcerUnsubscribe( tor->tiers, tor->tiersSubscription );
     tr_announcerRemoveTorrent( session->announcer, tor );
 

trunk/libtransmission/torrent.h

@@ -195 +195 @@
 
     struct tr_torrent_tiers  * tiers;
-    struct tr_publisher_tag  * tiersSubscription;
 
     time_t                     dhtAnnounceAt;

trunk/libtransmission/webseed.c

@@ -32 +32 @@
     char              * url;
 
-    tr_delivery_func  * callback;
-    void *              callback_userdata;
+    tr_peer_callback  * callback;
+    void              * callback_data;
 
     tr_piece_index_t    pieceIndex;
@@ -53 +53 @@
 
 static void
-publish( tr_webseed *    w,
-         tr_peer_event * e )
-{
-    if( w->callback )
-        w->callback( NULL, e, w->callback_userdata );
+publish( tr_webseed * w, tr_peer_event * e )
+{
+    if( w->callback != NULL )
+        w->callback( NULL, e, w->callback_data );
 }
 
@@ -237 +236 @@
 tr_webseed*
 tr_webseedNew( struct tr_torrent * torrent,
-               const char *        url,
-               tr_delivery_func    callback,
-               void *              callback_userdata )
+               const char        * url,
+               tr_peer_callback  * callback,
+               void              * callback_data )
 {
     tr_webseed * w = tr_new0( tr_webseed, 1 );
@@ -248 +247 @@
     w->url = tr_strdup( url );
     w->callback = callback;
-    w->callback_userdata = callback_userdata;
+    w->callback_data = callback_data;
     tr_rcConstruct( &w->rateDown );
-/*fprintf( stderr, "w->callback_userdata is %p\n", w->callback_userdata );*/
     return w;
 }

trunk/libtransmission/webseed.h

@@ -21 +21 @@
 
 #include "peer-common.h"
-#include "publish.h"
 
 tr_webseed* tr_webseedNew( struct tr_torrent * torrent,
-                           const char *        url,
-                           tr_delivery_func    delivery_func,
-                           void *              delivery_userdata );
+                           const char        * url,
+                           tr_peer_callback  * callback,
+                           void              * callback_data );
 
 void        tr_webseedFree( tr_webseed * );