Changeset 7792

Timestamp:

Jan 24, 2009, 5:20:07 PM (12 years ago)

Author:

charles

Message:

(trunk libT) more debugging messages

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (3 diffs)
• handshake.h (modified) (1 diff)
• peer-io.c (modified) (3 diffs)
• peer-io.h (modified) (1 diff)
• peer-mgr.c (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -229 +229 @@
 
 static int tr_handshakeDone( tr_handshake * handshake,
-                             int            isConnected );
+                             tr_bool        isConnected );
 
 enum
@@ -1079 +1079 @@
 static int
 fireDoneFunc( tr_handshake * handshake,
-              int            isConnected )
+              tr_bool        isConnected )
 {
     const uint8_t * peer_id = isConnected && handshake->havePeerID
@@ -1105 +1105 @@
 static int
 tr_handshakeDone( tr_handshake * handshake,
-                  int            isOK )
+                  tr_bool        isOK )
 {
     tr_bool success;

trunk/libtransmission/handshake.h

@@ -27 +27 @@
 typedef tr_bool ( *handshakeDoneCB )( struct tr_handshake * handshake,
                                       struct tr_peerIo *    io,
-                                      int                   isConnected,
+                                      tr_bool               isConnected,
                                       const uint8_t *       peerId,
                                       void *                userData );

trunk/libtransmission/peer-io.c

@@ -451 +451 @@
 
 void
-tr_peerIoRef( tr_peerIo * io )
-{
-    assert( tr_isPeerIo( io ) );
+tr_peerIoRefImpl( const char * file, int line, tr_peerIo * io )
+{
+    assert( tr_isPeerIo( io ) );
+
+    dbgmsg( io, "%s:%d is incrementing the IO's refcount from %d to %d\n",
+                file, line, io->refCount, io->refCount+1 );
 
     ++io->refCount;
@@ -459 +462 @@
 
 void
-tr_peerIoUnref( tr_peerIo * io )
-{
-    assert( tr_isPeerIo( io ) );
+tr_peerIoUnrefImpl( const char * file, int line, tr_peerIo * io )
+{
+    assert( tr_isPeerIo( io ) );
+
+    dbgmsg( io, "%s:%d is decrementing the IO's refcount from %d to %d\n",
+                file, line, io->refCount, io->refCount+1 );
 
     if( !--io->refCount )
@@ -468 +474 @@
 
 const tr_address*
-tr_peerIoGetAddress( const tr_peerIo * io,
-                           tr_port   * port )
+tr_peerIoGetAddress( const tr_peerIo * io, tr_port   * port )
 {
     assert( tr_isPeerIo( io ) );

trunk/libtransmission/peer-io.h

@@ -121 +121 @@
                                   int                       socket );
 
-void tr_peerIoRef               ( tr_peerIo * io );
-
-void tr_peerIoUnref             ( tr_peerIo * io );
+void tr_peerIoRefImpl           ( const char              * file,
+                                  int                       line,
+                                  tr_peerIo               * io );
+
+#define tr_peerIoRef(io) tr_peerIoRefImpl( __FILE__, __LINE__, (io) );
+
+void tr_peerIoUnrefImpl         ( const char              * file,
+                                  int                       line,
+                                  tr_peerIo               * io );
+
+#define tr_peerIoUnref(io) tr_peerIoUnrefImpl( __FILE__, __LINE__, (io) );
 
 tr_bool     tr_isPeerIo         ( const tr_peerIo         * io );

trunk/libtransmission/peer-mgr.c

@@ -1161 +1161 @@
 myHandshakeDoneCB( tr_handshake  * handshake,
                    tr_peerIo     * io,
-                   int             isConnected,
+                   tr_bool         isConnected,
                    const uint8_t * peer_id,
                    void          * vmanager )
@@ -1174 +1174 @@
 
     assert( io );
-    assert( isConnected == 0 || isConnected == 1 );
+    assert( tr_isBool( ok ) );
 
     t = tr_peerIoHasTorrentHash( io )