Changeset 4036

Timestamp:

Dec 1, 2007, 11:08:34 PM (14 years ago)

Author:

charles

Message:

improve upload speeds when the speed limits are uncapped.

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (2 diffs)
• peer-io.c (modified) (6 diffs)
• peer-io.h (modified) (1 diff)
• peer-msgs.c (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -969 +969 @@
 {
     dbgmsg( handshake, "handshakeDone: %s", isOK ? "connected" : "aborting" );
-    tr_peerIoSetIOFuncs( handshake->io, NULL, NULL, NULL );
+    tr_peerIoSetIOFuncs( handshake->io, NULL, NULL, NULL, NULL );
 
     fireDoneFunc( handshake, isOK );
@@ -1031 +1031 @@
     handshake->handle = tr_peerIoGetHandle( io );
     
-    tr_peerIoSetIOFuncs( handshake->io, canRead, gotError, handshake );
+    tr_peerIoSetIOFuncs( handshake->io, canRead, NULL, gotError, handshake );
 
     if( tr_peerIoIsIncoming( handshake->io ) )

trunk/libtransmission/peer-io.c

@@ -62 +62 @@
 
     tr_can_read_cb     canRead;
+    tr_did_write_cb    didWrite;
     tr_net_error_cb    gotError;
     void             * userData;
@@ -71 +72 @@
 ***
 **/
+
+static void
+didWriteWrapper( struct bufferevent * e, void * userData )
+{
+    tr_peerIo * c = (tr_peerIo *) userData;
+    if( c->didWrite != NULL )
+        (*c->didWrite)( e, c->userData );
+}
 
 static void
@@ -135 +144 @@
     c->bufev = bufferevent_new( c->socket,
                                 canReadWrapper,
-                                NULL,
+                                didWriteWrapper,
                                 gotErrorWrapper,
                                 c );
@@ -193 +202 @@
     {
         io->canRead = NULL;
+        io->didWrite = NULL;
         io->gotError = NULL;
         tr_runInEventThread( io->handle, io_dtor, io );
@@ -242 +252 @@
 tr_peerIoSetIOFuncs( tr_peerIo          * io,
                      tr_can_read_cb       readcb,
+                     tr_did_write_cb      writecb,
                      tr_net_error_cb      errcb,
                      void               * userData )
 {
     io->canRead = readcb;
+    io->didWrite = writecb;
     io->gotError = errcb;
     io->userData = userData;
@@ -273 +285 @@
 
         io->bufev = bufferevent_new( io->socket,
-                                     canReadWrapper, NULL, gotErrorWrapper,
+                                     canReadWrapper,
+                                     didWriteWrapper,
+                                     gotErrorWrapper,
                                      io );
         bufferevent_settimeout( io->bufev, io->timeout, io->timeout );

trunk/libtransmission/peer-io.h

@@ -100 +100 @@
 typedef enum { READ_MORE, READ_AGAIN, READ_DONE } ReadState;
 typedef ReadState (*tr_can_read_cb)(struct bufferevent*, void* user_data);
+typedef void (*tr_did_write_cb)(struct bufferevent *, void *);
 typedef void (*tr_net_error_cb)(struct bufferevent *, short what, void *);
 
 void  tr_peerIoSetIOFuncs( tr_peerIo        * io,
                            tr_can_read_cb     readcb,
+                           tr_did_write_cb    writecb,
                            tr_net_error_cb    errcb,
                            void             * user_data );

trunk/libtransmission/peer-msgs.c

@@ -1411 +1411 @@
 }
 
+static void
+didWrite( struct bufferevent * evin UNUSED, void * vmsgs )
+{
+    pulse( vmsgs );
+}
+
 static ReadState
 canRead( struct bufferevent * evin, void * vmsgs )
@@ -1844 +1850 @@
     
     tr_peerIoSetTimeoutSecs( m->io, 150 ); /* timeout after N seconds of inactivity */
-    tr_peerIoSetIOFuncs( m->io, canRead, gotError, m );
+    tr_peerIoSetIOFuncs( m->io, canRead, didWrite, gotError, m );
     ratePulse( m );