Changeset 7813

Timestamp:

Jan 29, 2009, 6:18:24 PM (12 years ago)

Author:

charles

Message:

(trunk libT) backport latest changes to 1.5x -- (1) all of libT (2) more stats in daemon (3) compiler warning in gtk

Location:

branches/1.5x

Files:

• daemon/daemon.c (modified) (2 diffs)
• daemon/remote.c (modified) (8 diffs)
• daemon/transmission-daemon.1 (modified) (2 diffs)
• daemon/transmission-remote.1 (modified) (2 diffs)
• gtk/blocklist.c (modified) (1 diff)
• libtransmission/bandwidth.c (modified) (3 diffs)
• libtransmission/bencode-test.c (modified) (1 diff)
• libtransmission/blocklist-test.c (modified) (2 diffs)
• libtransmission/clients-test.c (modified) (1 diff)
• libtransmission/completion.c (modified) (1 diff)
• libtransmission/fdlimit.c (modified) (9 diffs)
• libtransmission/handshake.c (modified) (3 diffs)
• libtransmission/handshake.h (modified) (1 diff)
• libtransmission/json-test.c (modified) (1 diff)
• libtransmission/list.c (modified) (2 diffs)
• libtransmission/peer-io.c (modified) (14 diffs)
• libtransmission/peer-io.h (modified) (4 diffs)
• libtransmission/peer-mgr.c (modified) (2 diffs)
• libtransmission/peer-msgs-test.c (modified) (1 diff)
• libtransmission/request-list-test.c (modified) (1 diff)
• libtransmission/rpc-test.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/session.c (modified) (76 diffs)
• libtransmission/session.h (modified) (2 diffs)
• libtransmission/test-peer-id.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (62 diffs)
• libtransmission/torrent.h (modified) (2 diffs)
• libtransmission/tr-getopt.c (modified) (2 diffs)
• libtransmission/tr-getopt.h (modified) (1 diff)
• libtransmission/trevent.c (modified) (8 diffs)
• libtransmission/utils-test.c (modified) (3 diffs)
• libtransmission/utils.c (modified) (3 diffs)
• libtransmission/utils.h (modified) (1 diff)
• libtransmission/verify.c (modified) (6 diffs)
• libtransmission/web.c (modified) (3 diffs)

branches/1.5x/daemon/daemon.c

@@ -67 +67 @@
     { 'u', "username", "Set username for authentication", "u", 1, "<username>" },
     { 'v', "password", "Set password for authentication", "v", 1, "<password>" },
+    { 'V', "version", "Show version number and exit", "V", 0, NULL },
     { 'w', "download-dir", "Where to save downloaded data", "w", 1, "<path>" },
     { 'P', "peerport", "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "P", 1, "<port>" },
@@ -216 +217 @@
             case 'g': /* handled above */
                       break;
+            case 'V': /* version */
+                      fprintf(stderr, "Transmission %s\n", LONG_VERSION_STRING);
+                      exit( 0 );
             case 'p': tr_bencDictAddInt( &settings, TR_PREFS_KEY_RPC_PORT, atoi( optarg ) );
                       break;

branches/1.5x/daemon/remote.c

@@ -23 +23 @@
 
 #include <libevent/event.h>
+
+#define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>
 
@@ -37 +39 @@
 #define DEFAULT_PORT atoi(TR_DEFAULT_RPC_PORT_STR)
 
-enum { TAG_LIST, TAG_DETAILS, TAG_FILES, TAG_PEERS };
+enum { TAG_SESSION, TAG_LIST, TAG_DETAILS, TAG_FILES, TAG_PEERS };
 
 static const char*
@@ -80 +82 @@
     { 'r', "remove",               "Remove the current torrent(s)", "r",  0, NULL },
     { 'R', "remove-and-delete",    "Remove the current torrent(s) and delete local data", NULL, 0, NULL },
+    { 920, "session",              "Print session information", NULL,  0, NULL },
     { 's', "start",                "Start the current torrent(s)", "s",  0, NULL },
     { 'S', "stop",                 "Stop the current torrent(s)", "S",  0, NULL },
@@ -86 +89 @@
     { 'U', "no-uplimit",           "Don't limit the global upload speed", "U",  0, NULL },
     { 'v', "verify",               "Verify the current torrent(s)", "v",  0, NULL },
+    { 'V', "version",              "Show version number and exit", "V", 0, NULL },
     { 'w', "download-dir",         "Set the default download folder", "w",  1, "<path>" },
     { 'x', "pex",                  "Enable peer exchange (PEX)", "x",  0, NULL },
@@ -436 +440 @@
                 break;
 
+            case 'V':
+                fprintf(stderr, "Transmission %s\n", LONG_VERSION_STRING);
+                exit(0);
+                break;
+
             case 'w': {
                 char * path = absolutify( optarg );
@@ -493 +502 @@
                 tr_bencDictAddStr( &top, "method", "session-set" );
                 tr_bencDictAddStr( args, "encryption", "tolerated" );
+                break;
+
+            case 920:
+                tr_bencDictAddStr( &top, "method", "session-get" );
+                tr_bencDictAddInt( &top, "tag", TAG_SESSION );
                 break;
 
@@ -712 +726 @@
     }
     return str;
+}
+
+static void
+printSession( tr_benc * top )
+{
+    tr_benc *args;
+    if( ( tr_bencDictFindDict( top, "arguments", &args ) ) )
+    {
+        const char * str;
+        int64_t      i;
+
+        printf( "VERSION\n" );
+        if( tr_bencDictFindStr( args,  "version", &str ) )
+            printf( "  Daemon version: %s\n", str );
+        if( tr_bencDictFindInt( args, "rpc-version", &i ) )
+            printf( "  RPC version: %" PRId64 "\n", i );
+        if( tr_bencDictFindInt( args, "rpc-version-minimum", &i ) )
+            printf( "  RPC minimum version: %" PRId64 "\n", i );
+        printf( "\n" );
+
+        printf( "TRANSFER\n" );
+        if( tr_bencDictFindStr( args,  "download-dir", &str ) )
+            printf( "  Download directory: %s\n", str );
+        if( tr_bencDictFindInt( args, "port", &i ) )
+            printf( "  Listenport: %" PRId64 "\n", i );
+        if( tr_bencDictFindInt( args, "port-forwarding-enabled", &i ) )
+            printf( "  Portforwarding enabled: %s\n", ( i ? "Yes" : "No" ) );
+        if( tr_bencDictFindInt( args, "pex-allowed", &i ) )
+            printf( "  Peer exchange allowed: %s\n", ( i ? "Yes" : "No" ) );
+        if( tr_bencDictFindStr( args,  "encryption", &str ) )
+            printf( "  Encryption: %s\n", str );
+        printf( "\n" );
+
+        printf( "LIMITS\n" );
+        if( tr_bencDictFindInt( args, "peer-limit", &i ) )
+            printf( "  Peer limit: %" PRId64 "\n", i );
+        if( tr_bencDictFindInt( args, "speed-limit-down-enabled", &i ) )
+            printf( "  Downloadlimit enabled: %s\n", ( i ? "Yes" : "No" ) );
+        if( tr_bencDictFindInt( args, "speed-limit-down", &i ) )
+            printf( "  Downloadlimit: %6" PRId64 " KB/sec\n", i );
+        if( tr_bencDictFindInt( args, "speed-limit-up-enabled", &i ) )
+            printf( "  Uploadlimit enabled:   %s\n", ( i ? "Yes" : "No" ) );
+        if( tr_bencDictFindInt( args, "speed-limit-up", &i ) )
+            printf( "  Uploadlimit:   %6" PRId64 " KB/sec\n", i );
+                
+    }
 }
 
@@ -1087 +1147 @@
         switch( tag )
         {
+            case TAG_SESSION:
+                printSession( &top ); break;
+
             case TAG_FILES:
                 printFileList( &top ); break;

branches/1.5x/daemon/transmission-daemon.1

@@ -24 +24 @@
 .Op Fl L Ar limit
 .Op Fl er | ep | et
+.Op Fl V
 .Op Fl w Ar download-dir
 .Ek
@@ -98 +99 @@
 Used for client authentication.
 
+.It Fl V Fl -version
+Show version number and exit
+
 .It Fl w Fl -download-dir
 Where to store downloaded data.

branches/1.5x/daemon/transmission-remote.1

@@ -34 +34 @@
 .Op Fl u Ar number | Fl U
 .Op Fl v
+.Op Fl V
 .Op Fl w Ar download-dir
 .Op Fl x | X
@@ -162 +163 @@
 .It Fl v Fl -verify
 Verify the current torrent(s)
+
+.It Fl V Fl -version
+Show version number and exit
 
 .It Fl w Fl -download-dir Ar directory

branches/1.5x/gtk/blocklist.c

@@ -6 +6 @@
 #include <glib/gi18n.h>
 
+#define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>
 

branches/1.5x/libtransmission/bandwidth.c

@@ -104 +104 @@
     tr_bandwidthSetParent( b, NULL );
     tr_ptrArrayDestruct( &b->children, NULL );
-    b->magicNumber = 0xDEAD;
-
+
+    memset( b, ~0, sizeof( tr_bandwidth ) );
     return b;
 }
@@ -208 +208 @@
     for( i=0; i<peerCount; ++i )
         tr_peerIoRef( peers[i] );
-
-    /* Stop all peers from listening for the socket to be ready for IO.
-     * See "Second phase of IO" lower in this function for more info. */
-    for( i=0; i<peerCount; ++i )
-        tr_peerIoSetEnabled( peers[i], dir, FALSE );
 
     /* First phase of IO.  Tries to distribute bandwidth fairly to keep faster
@@ -247 +242 @@
      * or (2) the next tr_bandwidthAllocate() call, when we start over again. */
     for( i=0; i<peerCount; ++i )
-        if( tr_peerIoHasBandwidthLeft( peers[i], dir ) )
-            tr_peerIoSetEnabled( peers[i], dir, TRUE );
+        tr_peerIoSetEnabled( peers[i], dir, tr_peerIoHasBandwidthLeft( peers[i], dir ) );
 
     for( i=0; i<peerCount; ++i )

branches/1.5x/libtransmission/bencode-test.c

@@ -11 +11 @@
 #include "utils.h" /* tr_free */
 
-#define VERBOSE 0
+#undef VERBOSE
 
 static int test = 0;
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                     __LINE__ ); \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 static int

branches/1.5x/libtransmission/blocklist-test.c

@@ -7 +7 @@
 #include "utils.h"
 
-#define VERBOSE 0
+#undef VERBOSE
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            if( VERBOSE ) \
-                fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A )\
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 static void
@@ -46 +53 @@
 {
 #ifndef WIN32
-    char *         tmpfile_txt = "/tmp/transmission-blocklist-test.txt";
-    char *         tmpfile_bin = "/tmp/transmission-blocklist-test.bin";
+    const char *   tmpfile_txt = "/tmp/transmission-blocklist-test.txt";
+    const char *   tmpfile_bin = "/tmp/transmission-blocklist-test.bin";
 #else
-    char *         tmpfile_txt = "transmission-blocklist-test.txt";
-    char *         tmpfile_bin = "transmission-blocklist-test.bin";
+    const char *   tmpfile_txt = "transmission-blocklist-test.txt";
+    const char *   tmpfile_bin = "transmission-blocklist-test.bin";
 #endif
     struct tr_address addr;

branches/1.5x/libtransmission/clients-test.c

@@ -5 +5 @@
 #include "clients.h"
 
-#define VERBOSE 0
+#undef VERBOSE
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            if( VERBOSE ) \
-                fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 #define TEST_CLIENT( A, B ) \

branches/1.5x/libtransmission/completion.c

@@ -325 +325 @@
     const tr_file * file = &tor->info.files[fileIndex];
     const tr_block_index_t firstBlock = file->offset / tor->blockSize;
-    const tr_block_index_t lastBlock = ( file->offset + file->length - 1 ) / tor->blockSize;
-
-    assert( tr_torBlockPiece( tor, firstBlock ) == file->firstPiece );
-    assert( tr_torBlockPiece( tor, lastBlock ) == file->lastPiece );
+    const tr_block_index_t lastBlock = file->length ? ( ( file->offset + file->length - 1 ) / tor->blockSize ) : firstBlock;
+
+    tr_assert( tr_torBlockPiece( tor, firstBlock ) == file->firstPiece,
+               "file->offset %"PRIu64"; file->length %"PRIu64"; "
+               "pieceSize %"PRIu32"; blockSize %"PRIu32"; "
+               "firstBlock %"PRIu64"; lastBlock %"PRIu64,
+               file->offset, file->length,
+               tor->info.pieceSize, tor->blockSize,
+               firstBlock, lastBlock );
+
+    tr_assert( tr_torBlockPiece( tor, lastBlock ) == file->lastPiece,
+               "file->offset %"PRIu64"; file->length %"PRIu64"; "
+               "pieceSize %"PRIu32"; blockSize %"PRIu32"; "
+               "firstBlock %"PRIu64"; lastBlock %"PRIu64,
+               file->offset, file->length,
+               tor->info.pieceSize, tor->blockSize,
+               firstBlock, lastBlock );
 
     for( block=firstBlock; block<=lastBlock; ++block )

branches/1.5x/libtransmission/fdlimit.c

@@ -27 +27 @@
 #endif
 
+#ifdef HAVE_POSIX_FADVISE
+ #ifdef _XOPEN_SOURCE
+  #undef _XOPEN_SOURCE
+ #endif
+ #define _XOPEN_SOURCE 600
+#endif
+
 #include <assert.h>
 #include <errno.h>
@@ -48 +55 @@
 #endif
 #include <unistd.h>
-#include <fcntl.h> /* O_LARGEFILE */
-
-#include <event.h>
+#include <fcntl.h> /* O_LARGEFILE posix_fadvise */
+
 #include <evutil.h>
 
@@ -74 +80 @@
     NOFILE_BUFFER = 512, /* the process' number of open files is
                             globalMaxPeers + NOFILE_BUFFER */
+
+    SYNC_INTERVAL = 15   /* (arbitrary number) how many seconds to go
+                            between fsync calls for files in heavy use */
 };
 
@@ -84 +93 @@
     int        fd;
     uint64_t   date;
+    time_t     syncAt;
 };
 
@@ -232 +242 @@
     /* open the file */
     flags = doWrite ? ( O_RDWR | O_CREAT ) : O_RDONLY;
+#ifdef O_RANDOM
+    flags |= O_RANDOM
+#endif
 #ifdef O_LARGEFILE
     flags |= O_LARGEFILE;
@@ -249 +262 @@
     if( doWrite && !alreadyExisted && ( preallocationMode == TR_PREALLOCATE_SPARSE ) )
         preallocateFileSparse( file->fd, desiredFileSize );
+
+#if defined( SYS_DARWIN )
+    fcntl( file->fd, F_NOCACHE, 1 );
+    fcntl( file->fd, F_RDAHEAD, 0 );
+#elif defined( HAVE_POSIX_FADVISE )
+    posix_fadvise( file->fd, 0, 0, POSIX_FADV_RANDOM );
+#endif
 
     tr_free( filename );
@@ -372 +392 @@
         else
         {
-            dbgmsg(
-                "everything's full!  waiting for someone else to finish something" );
+            dbgmsg( "everything's full!  waiting for someone else to finish something" );
             tr_lockUnlock( gFd->lock );
             tr_wait( 200 );
@@ -395 +414 @@
         tr_strlcpy( o->filename, filename, sizeof( o->filename ) );
         o->isWritable = doWrite;
+        o->syncAt = time( NULL ) + SYNC_INTERVAL;
     }
 
@@ -422 +442 @@
         if( o->closeWhenDone )
             TrCloseFile( i );
+        else if( o->syncAt <= time( NULL ) ) {
+            dbgmsg( "fsync()ing file '%s' in slot #%d", o->filename, i );
+            fsync( o->fd );
+#ifdef HAVE_POSIX_FADVISE
+            /* TODO: test performance with and without this */
+            posix_fadvise( o->fd, 0, 0, POSIX_FADV_DONTNEED );
+#endif
+            o->syncAt = time( NULL ) + SYNC_INTERVAL;
+        }
 
         break;

branches/1.5x/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;

branches/1.5x/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 );

branches/1.5x/libtransmission/json-test.c

@@ -6 +6 @@
 #include "utils.h" /* tr_free */
 
-#define VERBOSE 0
+#undef VERBOSE
 
 static int test = 0;
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                     __LINE__ ); \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 #include "ConvertUTF.h"

branches/1.5x/libtransmission/list.c

@@ -15 +15 @@
 #include "utils.h"
 
-/***
-****
-***/
-
-static tr_list * _unusedNodes = NULL;
-
-static const tr_list TR_LIST_INIT = { NULL, NULL, NULL };
-
 static tr_list*
 node_alloc( void )
 {
-    tr_list * node;
-
-    if( _unusedNodes == NULL )
-        node = tr_new( tr_list, 1 );
-    else {
-        node = _unusedNodes;
-        _unusedNodes = node->next;
-    }
-
-    *node = TR_LIST_INIT;
-    return node;
+    return tr_new0( tr_list, 1 );
 }
 
@@ -42 +24 @@
 node_free( tr_list* node )
 {
-    if( node )
-    {
-        *node = TR_LIST_INIT;
-        node->next = _unusedNodes;
-        _unusedNodes = node;
-    }
+    tr_free( node );
 }
 

branches/1.5x/libtransmission/peer-io.c

@@ -171 +171 @@
     return ( io != NULL )
         && ( io->magicNumber == MAGIC_NUMBER )
-        && ( io->refCount > 0 )
+        && ( io->refCount >= 0 )
         && ( tr_isBandwidth( &io->bandwidth ) )
         && ( tr_isAddress( &io->addr ) );
@@ -192 +192 @@
 
     io->hasFinishedConnecting = TRUE;
+    io->pendingEvents &= ~EV_READ;
 
     curlen = EVBUFFER_LENGTH( io->inbuf );
@@ -274 +275 @@
 
     io->hasFinishedConnecting = TRUE;
+    io->pendingEvents &= ~EV_WRITE;
 
     dbgmsg( io, "libevent says this peer is ready to write" );
@@ -344 +346 @@
 {
     tr_peerIo * io;
+
+    assert( session != NULL );
+    assert( session->events != NULL );
+    assert( tr_amInEventThread( session ) );
 
     if( socket >= 0 )
@@ -420 +426 @@
     tr_peerIo * io = vio;
 
+    assert( tr_isPeerIo( io ) );
+    assert( tr_amInEventThread( io->session ) );
+    assert( io->session->events != NULL );
+
+    dbgmsg( io, "in tr_peerIo destructor" );
     event_del( &io->event_read );
     event_del( &io->event_write );
@@ -429 +440 @@
     __tr_list_destroy( &io->outbuf_datatypes, trDatatypeFree );
 
-    io->magicNumber = 0xDEAD;
+    memset( io, ~0, sizeof( tr_peerIo ) ); 
     tr_free( io );
 }
@@ -438 +449 @@
     if( io )
     {
+        dbgmsg( io, "in tr_peerIoFree" );
         io->canRead = NULL;
         io->didWrite = NULL;
@@ -446 +458 @@
 
 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",
+                file, line, io->refCount, io->refCount+1 );
 
     ++io->refCount;
@@ -454 +469 @@
 
 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",
+                file, line, io->refCount, io->refCount-1 );
 
     if( !--io->refCount )
@@ -463 +481 @@
 
 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 ) );
@@ -824 +841 @@
     }
 
-    dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %d", (int)dir, limit, bytesUsed );
+    dbgmsg( io, "flushing peer-io, hasFinishedConnecting %d, direction %d, limit %zu, bytesUsed %d", (int)io->hasFinishedConnecting, (int)dir, limit, bytesUsed );
     return bytesUsed;
 }
@@ -835 +852 @@
 event_enable( tr_peerIo * io, short event )
 {
-    if( event & EV_READ )
+    assert( tr_amInEventThread( io->session ) );
+    assert( io->session != NULL );
+    assert( io->session->events != NULL );
+    assert( event_initialized( &io->event_read ) );
+    assert( event_initialized( &io->event_write ) );
+
+    if( ( event & EV_READ ) && ! ( io->pendingEvents & EV_READ ) )
+    {
+        dbgmsg( io, "enabling libevent ready-to-read polling" );
         event_add( &io->event_read, NULL );
-
-    if( event & EV_WRITE )
+        io->pendingEvents |= EV_READ;
+    }
+
+    if( ( event & EV_WRITE ) && ! ( io->pendingEvents & EV_WRITE ) )
+    {
+        dbgmsg( io, "enabling libevent ready-to-write polling" );
         event_add( &io->event_write, NULL );
+        io->pendingEvents |= EV_WRITE;
+    }
 }
 
@@ -845 +876 @@
 event_disable( struct tr_peerIo * io, short event )
 {
-    if( event & EV_READ )
+    assert( tr_amInEventThread( io->session ) );
+    assert( io->session != NULL );
+    assert( io->session->events != NULL );
+    assert( event_initialized( &io->event_read ) );
+    assert( event_initialized( &io->event_write ) );
+
+    if( ( event & EV_READ ) && ( io->pendingEvents & EV_READ ) )
+    {
+        dbgmsg( io, "disabling libevent ready-to-read polling" );
         event_del( &io->event_read );
-
-    if( event & EV_WRITE )
+        io->pendingEvents &= ~EV_READ;
+    }
+
+    if( ( event & EV_WRITE ) && ( io->pendingEvents & EV_WRITE ) )
+    {
+        dbgmsg( io, "disabling libevent ready-to-write polling" );
         event_del( &io->event_write );
+        io->pendingEvents &= ~EV_WRITE;
+    }
 }
 
@@ -862 +907 @@
     assert( tr_isPeerIo( io ) );
     assert( tr_isDirection( dir ) );
+    assert( tr_amInEventThread( io->session ) );
+    assert( io->session->events != NULL );
 
     if( isEnabled )

branches/1.5x/libtransmission/peer-io.h

@@ -70 +70 @@
     tr_bool               hasFinishedConnecting;
 
+    int                   pendingEvents;
+
     int                   magicNumber;
 
@@ -119 +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 );
@@ -328 +338 @@
 
 static TR_INLINE void tr_peerIoSetParent( tr_peerIo            * io,
-                                       struct tr_bandwidth  * parent )
+                                          struct tr_bandwidth  * parent )
 {
     assert( tr_isPeerIo( io ) );
@@ -341 +351 @@
 
 static TR_INLINE tr_bool tr_peerIoHasBandwidthLeft( const tr_peerIo  * io,
-                                                 tr_direction       dir )
-{
-    assert( tr_isPeerIo( io ) );
-
-    return tr_bandwidthClamp( &io->bandwidth, dir, 1024 ) > 0;
+                                                    tr_direction       dir )
+{
+    assert( tr_isPeerIo( io ) );
+
+    return !io->hasFinishedConnecting
+        || ( tr_bandwidthClamp( &io->bandwidth, dir, 1024 ) > 0 );
 }
 

branches/1.5x/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 )

branches/1.5x/libtransmission/peer-msgs-test.c

@@ -5 +5 @@
 #include "utils.h"
 
-#define VERBOSE 0
+#undef VERBOSE
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            if( VERBOSE ) \
-                fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 int

branches/1.5x/libtransmission/request-list-test.c

@@ -3 +3 @@
 #include "request-list.h"
 
-#define VERBOSE 0
+#undef VERBOSE
 
 static int test = 0;
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                     __LINE__ ); \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 static int

branches/1.5x/libtransmission/rpc-test.c

@@ -6 +6 @@
 #include "utils.h"
 
-#define VERBOSE 0
+#undef VERBOSE
 
 static int test = 0;
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            if( VERBOSE ) \
-                fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 static int

branches/1.5x/libtransmission/rpcimpl.c

@@ -511 +511 @@
     tr_benc *     list = tr_bencDictAddList( args_out, "torrents", torrentCount );
     tr_benc *     fields;
-    char *        msg = NULL;
+    const char *  msg = NULL;
 
     assert( idle_data == NULL );

branches/1.5x/libtransmission/session.c

@@ -358 +358 @@
 
 static void metainfoLookupRescan( tr_session * );
+static void tr_sessionInitImpl( void * );
 
 tr_session *
@@ -379 +380 @@
     session->lock = tr_lockNew( );
     session->tag = tr_strdup( tag );
+    session->magicNumber = SESSION_MAGIC_NUMBER;
+
     dbgmsg( "tr_sessionInit: the session's top-level bandwidth object is %p", session->bandwidth );
 
@@ -456 +459 @@
 
     tr_netInit( ); /* must go before tr_eventInit */
-
     tr_eventInit( session );
-    while( !session->events )
-        tr_wait( 50 );
+    assert( session->events != NULL );
 
     session->peerMgr = tr_peerMgrNew( session );
@@ -517 +518 @@
     tr_sessionSetSpeedLimit( session, TR_DOWN, i );
     tr_sessionSetSpeedLimitEnabled( session, TR_DOWN, j );
- 
-    /* first %s is the application name
-       second %s is the version number */
-    tr_inf( _( "%s %s started" ), TR_NAME, LONG_VERSION_STRING );
 
     /* initialize the blocklist */
@@ -531 +528 @@
     loadBlocklists( session ); 
 
+    session->rpcServer = tr_rpcInit( session, &settings ); 
+
+    tr_bencFree( &settings );
+
+    session->isWaiting = TRUE;
+    tr_runInEventThread( session, tr_sessionInitImpl, session );
+    while( session->isWaiting )
+        tr_wait( 100 );
+
+    return session;
+}
+static void
+tr_sessionInitImpl( void * vsession )
+{
+    tr_session * session = vsession;
+
+    assert( tr_isSession( session ) );
+ 
+    /* first %s is the application name
+       second %s is the version number */
+    tr_inf( _( "%s %s started" ), TR_NAME, LONG_VERSION_STRING );
+
     tr_statsInit( session );
-
     session->web = tr_webInit( session ); 
-    session->rpcServer = tr_rpcInit( session, &settings ); 
-
     metainfoLookupRescan( session );
-
-    tr_bencFree( &settings );
-    return session;
+    session->isWaiting = FALSE;
 }
 
@@ -549 +563 @@
 tr_sessionSetDownloadDir( tr_session * session, const char * dir )
 {
+    assert( tr_isSession( session ) );
+
     if( session->downloadDir != dir )
     {
@@ -559 +575 @@
 tr_sessionGetDownloadDir( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->downloadDir;
 }
@@ -569 +587 @@
 tr_globalLock( tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     tr_lockLock( session->lock );
 }
@@ -575 +595 @@
 tr_globalUnlock( tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     tr_lockUnlock( session->lock );
 }
@@ -581 +603 @@
 tr_globalIsLocked( const tr_session * session )
 {
-    return session && tr_lockHave( session->lock );
+    return tr_isSession( session ) && tr_lockHave( session->lock );
 }
 
@@ -612 +634 @@
 setPortImpl( tr_session * session, tr_port port )
 {
-    struct bind_port_data * data = tr_new( struct bind_port_data, 1 );
+    struct bind_port_data * data;
+
+    assert( tr_isSession( session ) );
+
+    data = tr_new( struct bind_port_data, 1 );
     data->session = session;
     data->port = port;
@@ -622 +648 @@
                        tr_port      port )
 {
+    assert( tr_isSession( session ) );
+
     session->isPortRandom = FALSE;
     session->peerPort = port;
@@ -630 +658 @@
 tr_sessionSetPeerPortRandom( tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     session->isPortRandom = TRUE;
     session->peerPort = getRandomPort( session );
@@ -639 +669 @@
 tr_sessionGetPeerPort( const tr_session * session )
 {
-    assert( session );
+    assert( tr_isSession( session ) );
 
     return session->peerPort;
@@ -647 +677 @@
 tr_sessionGetPortForwarding( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_sharedTraversalStatus( session->shared );
 }
@@ -657 +689 @@
 updateBandwidth( tr_session * session, tr_direction dir )
 {
-    const tr_bool zeroCase = session->speedLimit[dir] < 1 && session->isSpeedLimited[dir];
+    tr_bool zeroCase;
+
+    assert( tr_isSession( session ) );
+
+    zeroCase = session->speedLimit[dir] < 1 && session->isSpeedLimited[dir];
 
     tr_bandwidthSetLimited( session->bandwidth, dir, session->isSpeedLimited[dir] && !zeroCase );
@@ -669 +705 @@
                                 tr_bool           isLimited )
 {
-    assert( session );
+    assert( tr_isSession( session ) );
     assert( tr_isDirection( dir ) );
 
@@ -681 +717 @@
                          int             desiredSpeed )
 {
-    assert( session );
+    assert( tr_isSession( session ) );
     assert( tr_isDirection( dir ) );
 
@@ -692 +728 @@
                                tr_direction        dir )
 {
-    assert( session );
+    assert( tr_isSession( session ) );
     assert( tr_isDirection( dir ) );
 
@@ -702 +738 @@
                          tr_direction        dir )
 {
-    assert( session );
+    assert( tr_isSession( session ) );
     assert( tr_isDirection( dir ) );
 
@@ -713 +749 @@
 
 void
-tr_sessionSetPeerLimit( tr_session * session UNUSED,
+tr_sessionSetPeerLimit( tr_session * session,
                         uint16_t     maxGlobalPeers )
 {
+    assert( tr_isSession( session ) );
+
     tr_fdSetPeerLimit( maxGlobalPeers );
 }
 
 uint16_t
-tr_sessionGetPeerLimit( const tr_session * session UNUSED )
-{
+tr_sessionGetPeerLimit( const tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
     return tr_fdGetPeerLimit( );
 }
@@ -728 +768 @@
 tr_sessionSetPeerLimitPerTorrent( tr_session  * session, uint16_t n )
 {
+    assert( tr_isSession( session ) );
+
     session->peerLimitPerTorrent = n;
 }
@@ -734 +776 @@
 tr_sessionGetPeerLimitPerTorrent( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->peerLimitPerTorrent;
 }
@@ -744 +788 @@
 tr_sessionGetPieceSpeed( const tr_session * session, tr_direction dir )
 {
-    return session ? tr_bandwidthGetPieceSpeed( session->bandwidth, 0, dir ) : 0.0;
+    return tr_isSession( session ) ? tr_bandwidthGetPieceSpeed( session->bandwidth, 0, dir ) : 0.0;
 }
 
@@ -750 +794 @@
 tr_sessionGetRawSpeed( const tr_session * session, tr_direction dir )
 {
-    return session ? tr_bandwidthGetPieceSpeed( session->bandwidth, 0, dir ) : 0.0;
+    return tr_isSession( session ) ? tr_bandwidthGetPieceSpeed( session->bandwidth, 0, dir ) : 0.0;
 }
 
@@ -756 +800 @@
 tr_sessionCountTorrents( const tr_session * session )
 {
-    return session->torrentCount;
+    return tr_isSession( session ) ? session->torrentCount : 0;
 }
 
@@ -780 +824 @@
     int           i, n;
     tr_torrent ** torrents;
+
+    assert( tr_isSession( session ) );
 
     tr_statsClose( session );
@@ -822 +868 @@
     const int      maxwait_msec = SHUTDOWN_MAX_SECONDS * 1000;
     const uint64_t deadline = tr_date( ) + maxwait_msec;
+
+    assert( tr_isSession( session ) );
 
     dbgmsg( "shutting down transmission session %p", session );
@@ -884 +932 @@
     tr_torrent ** torrents;
     tr_list *     l = NULL, *list = NULL;
+
+    assert( tr_isSession( session ) );
 
     tr_ctorSetSave( ctor, FALSE ); /* since we already have them */
@@ -934 +984 @@
                          tr_bool      enabled )
 {
+    assert( tr_isSession( session ) );
+
     session->isPexEnabled = enabled != 0;
 }
@@ -940 +992 @@
 tr_sessionIsPexEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->isPexEnabled;
 }
@@ -951 +1005 @@
                                   tr_bool      enabled )
 {
+    assert( tr_isSession( session ) );
+
     session->useLazyBitfield = enabled != 0;
 }
@@ -957 +1013 @@
 tr_sessionIsLazyBitfieldEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->useLazyBitfield;
 }
@@ -968 +1026 @@
                                     tr_bool       enabled )
 {
+    assert( tr_isSession( session ) );
+
     tr_globalLock( session );
     tr_sharedTraversalEnable( session->shared, enabled );
@@ -976 +1036 @@
 tr_sessionIsPortForwardingEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_sharedTraversalIsEnabled( session->shared );
 }
@@ -989 +1051 @@
     tr_list * l;
 
+    assert( tr_isSession( session ) );
+
     for( l = session->blocklists; l; l = l->next )
         n += _tr_blocklistGetRuleCount( l->data );
@@ -997 +1061 @@
 tr_blocklistIsEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->isBlocklistEnabled;
 }
@@ -1006 +1072 @@
     tr_list * l;
 
+    assert( tr_isSession( session ) );
+
     session->isBlocklistEnabled = isEnabled != 0;
 
@@ -1015 +1083 @@
 tr_blocklistExists( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->blocklists != NULL;
 }
@@ -1025 +1095 @@
     tr_blocklist * b;
     const char *   defaultName = "level1.bin";
+
+    assert( tr_isSession( session ) );
 
     for( b = NULL, l = session->blocklists; !b && l; l = l->next )
@@ -1048 +1120 @@
     tr_list * l;
 
+    assert( tr_isSession( session ) );
+
     for( l = session->blocklists; l; l = l->next )
         if( _tr_blocklistHasAddress( l->data, addr ) )
@@ -1059 +1133 @@
 
 static int
-compareLookupEntries( const void * va,
-                      const void * vb )
+compareLookupEntries( const void * va, const void * vb )
 {
     const struct tr_metainfo_lookup * a = va;
@@ -1071 +1144 @@
 metainfoLookupResort( tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     qsort( session->metainfoLookup,
            session->metainfoLookupCount,
@@ -1078 +1153 @@
 
 static int
-compareHashStringToLookupEntry( const void * va,
-                                const void * vb )
+compareHashStringToLookupEntry( const void * va, const void * vb )
 {
     const char *                      a = va;
@@ -1110 +1184 @@
     tr_ctor *    ctor = NULL;
     tr_list *    list = NULL;
+
+    assert( tr_isSession( session ) );
 
     /* walk through the directory and find the mappings */
@@ -1193 +1269 @@
                 tr_torrent * tor )
 {
+    assert( tr_isSession( session ) );
+
     return tor ? tor->next : session->torrentList;
 }
@@ -1204 +1282 @@
                          tr_bool      isEnabled )
 {
+    assert( tr_isSession( session ) );
+
     tr_rpcSetEnabled( session->rpcServer, isEnabled );
 }
@@ -1210 +1290 @@
 tr_sessionIsRPCEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_rpcIsEnabled( session->rpcServer );
 }
@@ -1217 +1299 @@
                       tr_port      port )
 {
+    assert( tr_isSession( session ) );
+
     tr_rpcSetPort( session->rpcServer, port );
 }
@@ -1223 +1307 @@
 tr_sessionGetRPCPort( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_rpcGetPort( session->rpcServer );
 }
@@ -1231 +1317 @@
                           void *       user_data )
 {
+    assert( tr_isSession( session ) );
+
     session->rpc_func = func;
     session->rpc_func_user_data = user_data;
@@ -1239 +1327 @@
                            const char * whitelist )
 {
+    assert( tr_isSession( session ) );
+
     tr_rpcSetWhitelist( session->rpcServer, whitelist );
 }
@@ -1245 +1335 @@
 tr_sessionGetRPCWhitelist( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_rpcGetWhitelist( session->rpcServer );
 }
@@ -1252 +1344 @@
                                   tr_bool      isEnabled )
 {
+    assert( tr_isSession( session ) );
+
     tr_rpcSetWhitelistEnabled( session->rpcServer, isEnabled );
 }
@@ -1258 +1352 @@
 tr_sessionGetRPCWhitelistEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_rpcGetWhitelistEnabled( session->rpcServer );
 }
@@ -1266 +1362 @@
                           const char * password )
 {
+    assert( tr_isSession( session ) );
+
     tr_rpcSetPassword( session->rpcServer, password );
 }
@@ -1272 +1370 @@
 tr_sessionGetRPCPassword( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_rpcGetPassword( session->rpcServer );
 }
@@ -1279 +1379 @@
                           const char * username )
 {
+    assert( tr_isSession( session ) );
+
     tr_rpcSetUsername( session->rpcServer, username );
 }
@@ -1285 +1387 @@
 tr_sessionGetRPCUsername( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_rpcGetUsername( session->rpcServer );
 }
@@ -1292 +1396 @@
                                  tr_bool      isEnabled )
 {
+    assert( tr_isSession( session ) );
+
     tr_rpcSetPasswordEnabled( session->rpcServer, isEnabled );
 }
@@ -1298 +1404 @@
 tr_sessionIsRPCPasswordEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return tr_rpcIsPasswordEnabled( session->rpcServer );
 }
@@ -1308 +1416 @@
 tr_sessionIsProxyEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->isProxyEnabled;
 }
@@ -1315 +1425 @@
                            tr_bool      isEnabled )
 {
+    assert( tr_isSession( session ) );
+
     session->isProxyEnabled = isEnabled != 0;
 }
@@ -1321 +1433 @@
 tr_sessionGetProxyType( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->proxyType;
 }
@@ -1328 +1442 @@
                         tr_proxy_type type )
 {
+    assert( tr_isSession( session ) );
+
     session->proxyType = type;
 }
@@ -1334 +1450 @@
 tr_sessionGetProxy( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->proxy;
 }
@@ -1340 +1458 @@
 tr_sessionGetProxyPort( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->proxyPort;
 }
@@ -1347 +1467 @@
                     const char * proxy )
 {
+    assert( tr_isSession( session ) );
+
     if( proxy != session->proxy )
     {
@@ -1358 +1480 @@
                         tr_port      port )
 {
+    assert( tr_isSession( session ) );
+
     session->proxyPort = port;
 }
@@ -1364 +1488 @@
 tr_sessionIsProxyAuthEnabled( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->isProxyAuthEnabled;
 }
@@ -1371 +1497 @@
                                tr_bool      isEnabled )
 {
+    assert( tr_isSession( session ) );
+
     session->isProxyAuthEnabled = isEnabled != 0;
 }
@@ -1377 +1505 @@
 tr_sessionGetProxyUsername( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->proxyUsername;
 }
@@ -1384 +1514 @@
                             const char * username )
 {
+    assert( tr_isSession( session ) );
+
     if( username != session->proxyUsername )
     {
@@ -1394 +1526 @@
 tr_sessionGetProxyPassword( const tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->proxyPassword;
 }
@@ -1401 +1535 @@
                             const char * password )
 {
+    assert( tr_isSession( session ) );
+
     if( password != session->proxyPassword )
     {
@@ -1413 +1549 @@
     int ret = 0;
     tr_torrent * tor = NULL;
+
+    assert( tr_isSession( session ) );
 
     while(( tor = tr_torrentNext( session, tor )))

branches/1.5x/libtransmission/session.h

@@ -65 +65 @@
     tr_bool                      isProxyAuthEnabled;
     tr_bool                      isClosed;
+    tr_bool                      isWaiting;
     tr_bool                      useLazyBitfield;
 
     tr_bool                      isSpeedLimited[2];
     int                          speedLimit[2];
+    int                          magicNumber;
 
     tr_encryption_mode           encryptionMode;
@@ -147 +149 @@
 tr_bool      tr_globalIsLocked( const tr_session * );
 
+enum
+{
+    SESSION_MAGIC_NUMBER = 3845
+};
+
+static inline tr_bool tr_isSession( const tr_session * session )
+{
+    return ( session != NULL ) && ( session->magicNumber == SESSION_MAGIC_NUMBER );
+}
+
 #endif

branches/1.5x/libtransmission/test-peer-id.c

@@ -6 +6 @@
 #include "utils.h"
 
-#define VERBOSE 0
+#undef VERBOSE
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            if( VERBOSE ) \
-                fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 int

branches/1.5x/libtransmission/torrent.c

@@ -447 +447 @@
     tor->session   = session;
     tor->uniqueId = nextUniqueId++;
+    tor->magicNumber = TORRENT_MAGIC_NUMBER;
 
     randomizeTiers( info );
@@ -634 +635 @@
                           const char * path )
 {
+    assert( tr_isTorrent( tor  ) );
+
     if( !path || !tor->downloadDir || strcmp( path, tor->downloadDir ) )
     {
@@ -645 +648 @@
 tr_torrentGetDownloadDir( const tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor  ) );
+
     return tor->downloadDir;
 }
@@ -651 +656 @@
 tr_torrentChangeMyPort( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor  ) );
+
     if( tor->tracker )
         tr_trackerChangeMyPort( tor->tracker );
@@ -660 +667 @@
     tr_torrent * tor = vtor;
 
+    assert( tr_isTorrent( tor  ) );
+
     if( tor->isRunning )
         tr_trackerReannounce( tor->tracker );
@@ -667 +676 @@
 tr_torrentManualUpdate( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor  ) );
+
     tr_runInEventThread( tor->session, tr_torrentManualUpdateImpl, tor );
 }
@@ -673 +684 @@
 tr_torrentCanManualUpdate( const tr_torrent * tor )
 {
-    return ( tor )
-           && ( tor->isRunning )
-           && ( tr_trackerCanManualAnnounce( tor->tracker ) );
+    return ( tr_isTorrent( tor  ) )
+        && ( tor->isRunning )
+        && ( tr_trackerCanManualAnnounce( tor->tracker ) );
 }
 
@@ -681 +692 @@
 tr_torrentInfo( const tr_torrent * tor )
 {
-    return tor ? &tor->info : NULL;
+    return tr_isTorrent( tor ) ? &tor->info : NULL;
 }
 
@@ -689 +700 @@
     const time_t now = time( NULL );
 
-    return tor && ( now == tor->lastStatTime ) ? &tor->stats
-           : tr_torrentStat( tor );
+    return tr_isTorrent( tor ) && ( now == tor->lastStatTime )
+         ? &tor->stats
+         : tr_torrentStat( tor );
 }
 
@@ -696 +708 @@
 tr_torrentGetActivity( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentRecheckCompleteness( tor );
 
@@ -722 +736 @@
         return NULL;
 
+    assert( tr_isTorrent( tor ) );
     tr_torrentLock( tor );
 
@@ -845 +860 @@
     uint64_t               haveBytes = 0;
 
-    assert( tor );
+    assert( tr_isTorrent( tor ) );
     assert( fileIndex < tor->info.fileCount );
     assert( file->offset + file->length <= tor->info.totalSize );
@@ -888 +903 @@
     tr_file_stat *        walk = files;
 
+    assert( tr_isTorrent( tor ) );
+
     for( i = 0; i < n; ++i, ++walk )
     {
@@ -915 +932 @@
 tr_torrentWebSpeeds( const tr_torrent * tor )
 {
-    return tor ? tr_peerMgrWebSpeeds( tor ) : NULL;
+    return tr_isTorrent( tor )
+         ? tr_peerMgrWebSpeeds( tor )
+         : NULL;
 }
 
@@ -924 +943 @@
     tr_peer_stat * ret = NULL;
 
-    if( tor )
+    if( tr_isTorrent( tor ) )
         ret = tr_peerMgrPeerStats( tor, peerCount );
 
@@ -950 +969 @@
                           int                size )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentLock( tor );
     tr_cpGetAmountDone( &tor->completion, tab, size );
@@ -958 +979 @@
 tr_torrentResetTransferStats( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentLock( tor );
 
@@ -975 +998 @@
                        tr_bool          has )
 {
+    assert( tr_isTorrent( tor ) );
+    assert( pieceIndex < tor->info.pieceCount );
+
     tr_torrentLock( tor );
-
-    assert( tor );
-    assert( pieceIndex < tor->info.pieceCount );
 
     if( has )
@@ -999 +1022 @@
     tr_info *    inf = &tor->info;
 
-    assert( tor );
+    assert( tr_isTorrent( tor ) );
     assert( !tor->isRunning );
 
@@ -1047 +1070 @@
 {
     tr_torrent * tor = vtor;
+
+    assert( tr_isTorrent( tor ) );
 
     tr_globalLock( tor->session );
@@ -1065 +1090 @@
 checkAndStartCB( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+    assert( tr_isSession( tor->session ) );
+
     tr_runInEventThread( tor->session, checkAndStartImpl, tor );
 }
@@ -1072 +1100 @@
               int          reloadProgress )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_globalLock( tor->session );
 
@@ -1093 +1123 @@
 tr_torrentStart( tr_torrent * tor )
 {
-    if( tor )
+    if( tr_isTorrent( tor ) )
         torrentStart( tor, TRUE );
 }
@@ -1100 +1130 @@
 torrentRecheckDoneImpl( void * vtor )
 {
-    tr_torrentRecheckCompleteness( vtor );
+    tr_torrent * tor = vtor;
+
+    assert( tr_isTorrent( tor ) );
+    tr_torrentRecheckCompleteness( tor );
 }
 
@@ -1106 +1139 @@
 torrentRecheckDoneCB( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_runInEventThread( tor->session, torrentRecheckDoneImpl, tor );
 }
@@ -1112 +1147 @@
 tr_torrentVerify( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_verifyRemove( tor );
 
@@ -1127 +1164 @@
     tr_file_index_t i;
     struct evbuffer * buf = evbuffer_new( );
+
+    assert( tr_isTorrent( tor ) );
 
     for( i=0; i<tor->info.fileCount; ++i )
@@ -1145 +1184 @@
     tr_torrent * tor = vtor;
 
+    assert( tr_isTorrent( tor ) );
+
     tr_verifyRemove( tor );
     tr_peerMgrStopTorrent( tor );
@@ -1155 +1196 @@
 tr_torrentStop( tr_torrent * tor )
 {
-    if( tor )
+    if( tr_isTorrent( tor ) )
     {
         tr_globalLock( tor->session );
@@ -1173 +1214 @@
     tr_torrent * tor = vtor;
 
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentSaveResume( tor );
     tor->isRunning = 0;
@@ -1187 +1230 @@
 tr_torrentFree( tr_torrent * tor )
 {
-    if( tor )
+    if( tr_isTorrent( tor ) )
     {
         tr_session * session = tor->session;
+        assert( tr_isSession( session ) );
         tr_globalLock( session );
 
@@ -1202 +1246 @@
 tr_torrentRemove( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     tor->isDeleting = 1;
     tr_torrentFree( tor );
@@ -1235 +1281 @@
                         tr_completeness    status )
 {
-    assert( tor );
+    assert( tr_isTorrent( tor ) );
     assert( ( status == TR_LEECH )
          || ( status == TR_SEED )
@@ -1249 +1295 @@
                                    void                          * user_data )
 {
-    assert( tor );
+    assert( tr_isTorrent( tor ) );
+
     tor->completeness_func = func;
     tor->completeness_func_user_data = user_data;
@@ -1264 +1311 @@
 {
     tr_completeness completeness;
+
+    assert( tr_isTorrent( tor ) );
 
     tr_torrentLock( tor );
@@ -1309 +1358 @@
     tr_file *        file;
 
-    assert( tor );
+    assert( tr_isTorrent( tor ) );
     assert( fileIndex < tor->info.fileCount );
-    assert(
-        priority == TR_PRI_LOW || priority == TR_PRI_NORMAL || priority ==
-        TR_PRI_HIGH );
+    assert( priority == TR_PRI_LOW || priority == TR_PRI_NORMAL || priority == TR_PRI_HIGH );
 
     file = &tor->info.files[fileIndex];
@@ -1330 +1377 @@
     tr_file_index_t i;
 
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentLock( tor );
 
@@ -1344 +1393 @@
 {
     tr_priority_t ret;
+
+    assert( tr_isTorrent( tor ) );
 
     tr_torrentLock( tor );
@@ -1360 +1411 @@
     tr_priority_t * p;
 
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentLock( tor );
     p = tr_new0( tr_priority_t, tor->info.fileCount );
@@ -1379 +1432 @@
     int doDownload;
 
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentLock( tor );
 
@@ -1398 +1453 @@
     tr_piece_index_t lastPiece, lastPieceDND;
     tr_file_index_t  i;
+
+    assert( tr_isTorrent( tor ) );
 
     file = &tor->info.files[fileIndex];
@@ -1451 +1508 @@
     tr_file_index_t i;
 
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentLock( tor );
 
@@ -1466 +1525 @@
                       tr_bool           doDownload )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_torrentLock( tor );
     tr_torrentInitFileDLs( tor, files, fileCount, doDownload );
@@ -1480 +1541 @@
                         uint16_t     maxConnectedPeers )
 {
+    assert( tr_isTorrent( tor ) );
+
     tor->maxConnectedPeers = maxConnectedPeers;
 }
@@ -1486 +1549 @@
 tr_torrentGetPeerLimit( const tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     return tor->maxConnectedPeers;
 }
@@ -1498 +1563 @@
            uint32_t           offset )
 {
-    const tr_info *  inf = &tor->info;
     tr_block_index_t ret;
 
+    assert( tr_isTorrent( tor ) );
+
     ret = index;
-    ret *= ( inf->pieceSize / tor->blockSize );
+    ret *= ( tor->info.pieceSize / tor->blockSize );
     ret += offset / tor->blockSize;
     return ret;
@@ -1514 +1580 @@
 {
     int err = 0;
+
+    assert( tr_isTorrent( tor ) );
 
     if( index >= tor->info.pieceCount )
@@ -1542 +1610 @@
     uint64_t ret;
 
+    assert( tr_isTorrent( tor ) );
+
     ret = tor->info.pieceSize;
     ret *= index;
@@ -1558 +1628 @@
                            tr_bool             isChecked )
 {
+    assert( tr_isTorrent( tor ) );
+
     if( isChecked )
         tr_bitfieldAdd( &tor->checkedPieces, piece );
@@ -1572 +1644 @@
     const tr_piece_index_t begin = file->firstPiece;
     const tr_piece_index_t end = file->lastPiece + 1;
+
+    assert( tr_isTorrent( tor ) );
 
     if( isChecked )
@@ -1589 +1663 @@
     tr_bool                isChecked = TRUE;
 
+    assert( tr_isTorrent( tor ) );
+
     for( i = begin; isChecked && i < end; ++i )
         if( !tr_torrentIsPieceChecked( tor, i ) )
@@ -1599 +1675 @@
 tr_torrentUncheck( tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     tr_bitfieldRemRange ( &tor->checkedPieces, 0, tor->info.pieceCount );
 }
@@ -1605 +1683 @@
 tr_torrentCountUncheckedPieces( const tr_torrent * tor )
 {
+    assert( tr_isTorrent( tor ) );
+
     return tor->info.pieceCount - tr_bitfieldCountTrueBits( &tor->checkedPieces );
 }
@@ -1615 +1695 @@
     const size_t n = tor->info.fileCount;
     time_t *     m = tr_new0( time_t, n );
+
+    assert( tr_isTorrent( tor ) );
 
     for( i = 0; i < n; ++i )
@@ -1646 +1728 @@
     tr_benc metainfo;
 
+    assert( tr_isTorrent( tor ) );
+
     /* save to the .torrent file */
     if( !tr_bencLoadFile( tor->info.torrent, &metainfo ) )
@@ -1702 +1786 @@
                         time_t       t )
 {
+    assert( tr_isTorrent( tor ) );
+
     tor->addedDate = t;
 }
@@ -1710 +1796 @@
                            time_t       t )
 {
+    assert( tr_isTorrent( tor ) );
+
     tor->activityDate = t;
 }
@@ -1718 +1806 @@
                        time_t       t )
 {
+    assert( tr_isTorrent( tor ) );
+
     tor->doneDate = t;
 }
@@ -1732 +1822 @@
     struct stat sb;
     uint64_t bytesLeft = 0;
+
+    assert( tr_isTorrent( tor ) );
 
     for( it=tor->info.files, end=it+tor->info.fileCount; it!=end; ++it )
@@ -1810 +1902 @@
     struct stat sb;
     char * buf;
+
+    assert( tr_isTorrent( tor ) );
 
     buf = tr_buildPath( dir, base, NULL );
@@ -1853 +1947 @@
     char * root = tr_buildPath( tor->downloadDir, tmp, NULL );
 
+    assert( tr_isTorrent( tor ) );
+
     for( f=0; f<tor->info.fileCount; ++f )
         tr_ptrArrayInsertSorted( &torrentFiles, tor->info.files[f].name, vstrcmp );
@@ -1898 +1994 @@
 tr_torrentDeleteLocalData( tr_torrent * tor, tr_fileFunc fileFunc )
 {
+    assert( tr_isTorrent( tor ) );
+
     if( fileFunc == NULL )
         fileFunc = remove;

branches/1.5x/libtransmission/torrent.h

@@ -134 +134 @@
     struct tr_ratecontrol    swarmSpeed;
 
+    int                      magicNumber;
+
     int                      error;
     char                     errorString[128];
@@ -278 +280 @@
 }
 
+/***
+****
+***/
+
+enum
+{
+    TORRENT_MAGIC_NUMBER = 95549
+};
+
+static inline tr_bool tr_isTorrent( const tr_torrent * tor )
+{
+    return ( tor != NULL )
+        && ( tor->magicNumber == TORRENT_MAGIC_NUMBER )
+        && ( tr_isSession( tor->session ) );
+}
+
 #endif

branches/1.5x/libtransmission/tr-getopt.c

@@ -8 +8 @@
  * the Transmission project.
  *
- * $Id: tr-getopt.c 7658 2009-01-10 23:09:07Z charles $
+ * $Id: tr-getopt.c 7783 2009-01-23 18:44:15Z charles $
  */
 
@@ -26 +26 @@
 getArgName( const tr_option * opt )
 {
-    char * arg;
+    const char * arg;
 
     if( !opt->has_arg )

branches/1.5x/libtransmission/tr-getopt.h

@@ -31 +31 @@
 {
     int     val;          /* the value to return from tr_getopt() */
-    char *  longName;     /* --long-form */
-    char *  description;  /* option's description for tr_getopt_usage() */
-    char *  shortName;    /* short form */
+    const char *  longName;     /* --long-form */
+    const char *  description;  /* option's description for tr_getopt_usage() */
+    const char *  shortName;    /* short form */
     int     has_arg;      /* 0 for no argument, 1 for argument */
-    char *  argName;      /* argument's description for tr_getopt_usage() */
+    const char *  argName;      /* argument's description for tr_getopt_usage() */
 }
 tr_option;

branches/1.5x/libtransmission/trevent.c

@@ -233 +233 @@
 {
     tr_event_handle * eh = veh;
-
     tr_dbg( "Starting libevent thread" );
 
@@ -241 +240 @@
 #endif
 
+    eh->base = event_init( );
     eh->session->events = eh;
 
     /* listen to the pipe's read fd */
-    event_set( &eh->pipeEvent, eh->fds[0], EV_READ | EV_PERSIST,
-               readFromPipe,
-               veh );
+    event_set( &eh->pipeEvent, eh->fds[0], EV_READ | EV_PERSIST, readFromPipe, veh );
     event_add( &eh->pipeEvent, NULL );
     event_set_log_callback( logFunc );
+
+    /* loop until all the events are done */
     event_dispatch( );
 
+    /* shut down the thread */
     tr_lockFree( eh->lock );
     event_base_free( eh->base );
@@ -263 +264 @@
     tr_event_handle * eh;
 
+    session->events = NULL;
+
     eh = tr_new0( tr_event_handle, 1 );
     eh->lock = tr_lockNew( );
     pipe( eh->fds );
     eh->session = session;
-    eh->base = event_init( );
     eh->thread = tr_threadNew( libeventThreadFunc, eh );
+
+    /* wait until the libevent thread is running */
+    while( session->events == NULL )
+        tr_wait( 100 );
 }
 
@@ -274 +280 @@
 tr_eventClose( tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     session->events->die = TRUE;
     tr_deepLog( __FILE__, __LINE__, NULL, "closing trevent pipe" );
@@ -286 +294 @@
 tr_amInEventThread( tr_session * session )
 {
-    assert( session );
+    assert( tr_isSession( session ) );
     assert( session->events );
 
@@ -341 +349 @@
     tr_timer * timer;
 
-    assert( session );
-    assert( session->events );
+    assert( tr_isSession( session ) );
+    assert( session->events != NULL );
 
     timer = tr_new0( tr_timer, 1 );
@@ -374 +382 @@
                      void func( void* ), void * user_data )
 {
-    assert( session );
-    assert( session->events );
+    assert( tr_isSession( session ) );
+    assert( session->events != NULL );
 
     if( tr_amInThread( session->events->thread ) )
@@ -400 +408 @@
 tr_eventGetBase( tr_session * session )
 {
+    assert( tr_isSession( session ) );
+
     return session->events->base;
 }

branches/1.5x/libtransmission/utils-test.c

@@ -7 +7 @@
 #include "crypto.h"
 
-#define VERBOSE 0
+#undef VERBOSE
 #define NUM_LOOPS 1
 #define SPEED_TEST 0
 
 #if SPEED_TEST
- #undef VERBOSE
- #define VERBOSE 0
+ #define VERBOSE
  #undef NUM_LOOPS
  #define NUM_LOOPS 200
@@ -20 +19 @@
 static int test = 0;
 
-#define check( A ) \
+#ifdef VERBOSE
+  #define check( A ) \
     { \
         ++test; \
         if( A ){ \
-            if( VERBOSE ) \
-                fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__,\
-                         __LINE__ );\
+            fprintf( stderr, "PASS test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
         } else { \
-            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__,\
-                     __LINE__ ); \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
             return test; \
         } \
     }
+#else
+  #define check( A ) \
+    { \
+        ++test; \
+        if( !( A ) ){ \
+            fprintf( stderr, "FAIL test #%d (%s, %d)\n", test, __FILE__, __LINE__ ); \
+            return test; \
+        } \
+    }
+#endif
 
 static int
@@ -188 +195 @@
 
     /* base64 */
-    in = "YOYO!";
-    out = tr_base64_encode( in, -1, &len );
+    out = tr_base64_encode( "YOYO!", -1, &len );
     check( out );
     check( !strcmp( out, "WU9ZTyE=\n" ) );

branches/1.5x/libtransmission/utils.c

@@ -37 +37 @@
 #include "utils.h"
 #include "platform.h"
+#include "version.h"
 
 static tr_lock *      messageLock = NULL;
@@ -192 +193 @@
 
 char*
-tr_getLogTimeStr( char * buf,
-                  int    buflen )
+tr_getLogTimeStr( char * buf, int buflen )
 {
     char           tmp[64];
@@ -211 +211 @@
     return buf;
 }
+
+void
+tr_assertImpl( const char * file, int line, const char * test, const char * fmt, ... )
+{
+    char buf[64];
+    fprintf( stderr, "[%s] Transmission %s Assertion \"%s\" failed at %s:%d.  ",
+                     tr_getLogTimeStr( buf, sizeof( buf ) ),
+                      LONG_VERSION_STRING, test, file, line );
+    if( fmt && *fmt ) {
+        va_list args;
+        fputc( '(', stderr );
+        va_start( args, fmt );
+        vfprintf( stderr, fmt, args );
+        va_end( args );
+        fputs( ")  ", stderr );
+    }
+    fputs( "Please report this bug at <http://trac.transmissionbt.com/newticket>; Thank you.\n", stderr );
+    abort( );
+}
+
 
 tr_bool

branches/1.5x/libtransmission/utils.h

@@ -104 +104 @@
 ****/
 
+void tr_assertImpl( const char * file, int line, const char * test, const char * fmt, ... ) TR_GNUC_PRINTF( 4, 5 );
+
+#ifdef NDEBUG
+ #define tr_assert( test, fmt, ... )
+#else
+ #define tr_assert( test, fmt, ... ) \
+    do { if( ! ( test ) ) tr_assertImpl( __FILE__, __LINE__, #test, fmt, __VA_ARGS__ ); } while( 0 )
+#endif
+        
 int            tr_msgLoggingIsActive( int level );
 

branches/1.5x/libtransmission/verify.c

@@ -35 +35 @@
 
 static void
-fireCheckDone( tr_torrent *      torrent,
-               tr_verify_done_cb verify_done_cb )
-{
+fireCheckDone( tr_torrent * tor, tr_verify_done_cb verify_done_cb )
+{
+    assert( tr_isTorrent( tor ) );
+
     if( verify_done_cb )
-        verify_done_cb( torrent );
+        verify_done_cb( tor );
 }
 
 static struct verify_node currentNode;
-
-static tr_list *          verifyList = NULL;
-
-static tr_thread *        verifyThread = NULL;
-
-static int                stopCurrent = FALSE;
+static tr_list * verifyList = NULL;
+static tr_thread * verifyThread = NULL;
+static int stopCurrent = FALSE;
 
 static tr_lock*
@@ -145 +143 @@
 
         tr_torinf( tor, _( "Verifying torrent" ) );
+        assert( tr_isTorrent( tor ) );
         tor->verifyState = TR_VERIFY_NOW;
         buffer = tr_new( uint8_t, tor->info.pieceSize );
@@ -151 +150 @@
         tr_free( buffer );
         tor->verifyState = TR_VERIFY_NONE;
+        assert( tr_isTorrent( tor ) );
 
         if( !stopCurrent )
@@ -169 +169 @@
 {
     const int uncheckedCount = tr_torrentCountUncheckedPieces( tor );
+
+    assert( tr_isTorrent( tor ) );
 
     if( !uncheckedCount )
@@ -211 +213 @@
     tr_lockLock( lock );
 
+    assert( tr_isTorrent( tor ) );
+
     found = ( tor == currentNode.torrent )
          || ( tr_list_find( verifyList, tor, compareVerifyByTorrent ) != NULL );
@@ -222 +226 @@
 {
     tr_lock * lock = getVerifyLock( );
-
     tr_lockLock( lock );
+
+    assert( tr_isTorrent( tor ) );
 
     if( tor == currentNode.torrent )

branches/1.5x/libtransmission/web.c

@@ -15 +15 @@
 
 #include <event.h>
+
+#define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>
 
@@ -245 +247 @@
 {
     struct timeval interval;
+
+    assert( tr_amInEventThread( g->session ) );
+    assert( g->session != NULL );
+    assert( g->session->events != NULL );
+
     stop_timer( g );
     dbgmsg( "adding a timeout for %ld seconds from now", g->timer_ms/1000L );
@@ -356 +363 @@
                    | (( action & CURL_POLL_IN ) ? EV_READ : 0 )
                    | (( action & CURL_POLL_OUT ) ? EV_WRITE : 0 );
+
+    assert( tr_amInEventThread( g->session ) );
+    assert( g->session != NULL );
+    assert( g->session->events != NULL );
+
     dbgmsg( "setsock: fd is %d, curl action is %d, libevent action is %d",
             sockfd, action, kind );