Changeset 7136

Timestamp:

Nov 23, 2008, 4:30:09 PM (12 years ago)

Author:

charles

Message:

minor code cleanup

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (9 diffs)
• ptrarray.h (modified) (1 diff)
• transmission.h (modified) (1 diff)

trunk/libtransmission/peer-msgs.c

@@ -345 +345 @@
 }
 
-#define dbgmsg( msgs, ... ) myDebug( __FILE__, __LINE__, msgs, __VA_ARGS__ )
+#define dbgmsg( msgs, ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            myDebug( __FILE__, __LINE__, msgs, __VA_ARGS__ ); \
+    } while( 0 )
 
 /**
@@ -911 +915 @@
     **/
 
-    dbgmsg( msgs, "added req for piece %lu", (unsigned long)index );
+    dbgmsg( msgs, "adding req for %"PRIu32":%"PRIu32"->%"PRIu32" to our `will request' list",
+            index, offset, length );
     req.time_requested = time( NULL );
     reqListAppend( &msgs->clientWillAskFor, &req );
@@ -923 +928 @@
     struct request_list a = msgs->clientWillAskFor;
     struct request_list b = msgs->clientAskedFor;
+    dbgmsg( msgs, "cancelling all requests to peer" );
 
     msgs->clientAskedFor = REQUEST_LIST_INIT;
@@ -950 +956 @@
     assert( length > 0 );
 
+
     /* have we asked the peer for this piece? */
     req.index = pieceIndex;
@@ -956 +963 @@
 
     /* if it's only in the queue and hasn't been sent yet, free it */
-    if( reqListRemove( &msgs->clientWillAskFor, &req ) )
+    if( reqListRemove( &msgs->clientWillAskFor, &req ) ) {
+        dbgmsg( msgs, "cancelling %"PRIu32":%"PRIu32"->%"PRIu32"\n", pieceIndex, offset, length );
         fireCancelledReq( msgs, &req );
+    }
 
     /* if it's already been sent, send a cancel message too */
     if( reqListRemove( &msgs->clientAskedFor, &req ) ) {
+        dbgmsg( msgs, "cancelling %"PRIu32":%"PRIu32"->%"PRIu32"\n", pieceIndex, offset, length );
         protocolSendCancel( msgs, &req );
         fireCancelledReq( msgs, &req );
@@ -1034 +1044 @@
     }
 
-    dbgmsg( msgs, "here is the ltep handshake we got [%*.*s]", len, len,
-            tmp );
+    dbgmsg( msgs, "here is the handshake: [%*.*s]", len, len,  tmp );
 
     /* does the peer prefer encrypted connections? */
@@ -1691 +1700 @@
 
     peer->minActiveRequests = 4;
-    peer->maxActiveRequests = peer->minActiveRequests +
-                              estimatedBlocksInNext30Seconds;
+    peer->maxActiveRequests = peer->minActiveRequests + estimatedBlocksInNext30Seconds;
     return TRUE;
 }
@@ -1748 +1756 @@
             msgs->outMessagesBatchedAt = now;
         }
-        else if( haveMessages
-               && ( ( now - msgs->outMessagesBatchedAt ) >
-                   msgs->outMessagesBatchPeriod ) )
+        else if( ( haveMessages ) &&
+                 ( ( now - msgs->outMessagesBatchedAt ) > msgs->outMessagesBatchPeriod ) )
         {
-            dbgmsg( msgs, "flushing outMessages... (length is %zu)", EVBUFFER_LENGTH( msgs->outMessages ) );
+            dbgmsg( msgs, "flushing outMessages... to %p (length is %zu)", msgs->io, EVBUFFER_LENGTH( msgs->outMessages ) );
             tr_peerIoWriteBuf( msgs->io, msgs->outMessages, FALSE );
             msgs->clientSentAnythingAt = now;
@@ -2015 +2022 @@
         tr_peerIoWriteBytes ( msgs->io, out, benc, bencLen );
         pokeBatchPeriod( msgs, IMMEDIATE_PRIORITY_INTERVAL_SECS );
-        dbgmsg( msgs, "outMessage size is now %d",
-               (int)EVBUFFER_LENGTH( out ) );
+        dbgmsg( msgs, "sending a pex message; outMessage size is now %zu", EVBUFFER_LENGTH( out ) );
 
         /* cleanup */

trunk/libtransmission/ptrarray.h

@@ -37 +37 @@
 tr_ptrArray * tr_ptrArrayDup( tr_ptrArray* );
 
-void          tr_ptrArrayForeach(
-                        tr_ptrArray*,
-    PtrArrayForeachFunc func );
+void          tr_ptrArrayForeach( tr_ptrArray         * array,
+                                  PtrArrayForeachFunc   func );
 
 void          tr_ptrArrayFree( tr_ptrArray         * array,

trunk/libtransmission/transmission.h

@@ -45 +45 @@
 #ifndef PRIu64
  #define PRIu64 "llu"
+#endif
+#ifndef PRIu32
+ #define PRIu32 "lu"
 #endif
 #include <time.h> /* time_t */