Changeset 3839 for trunk/libtransmission/peer-io.c

Timestamp:

Nov 16, 2007, 8:40:03 PM (15 years ago)

Author:

charles

Message:

progress on the "speed limits kill my transfer rate" bug.

File:

• trunk/libtransmission/peer-io.c (modified) (6 diffs)

trunk/libtransmission/peer-io.c

@@ -99 +99 @@
                     continue;
             case READ_MORE:
-                tr_peerIoSetIOMode( c, EV_READ, 0 );
             case READ_DONE:
                 done = 1;
@@ -119 +118 @@
 ***
 **/
+
+void bufferevent_setwatermark(struct bufferevent *, short, size_t, size_t);
 
 static tr_peerIo*
@@ -143 +144 @@
     bufferevent_settimeout( c->bufev, IO_TIMEOUT_SECS, IO_TIMEOUT_SECS );
     bufferevent_enable( c->bufev, EV_READ|EV_WRITE );
+    bufferevent_setwatermark( c->bufev, EV_READ, 0, 1024 );
+
     return c;
 }
@@ -234 +237 @@
 }
 
+void
+tr_peerIoTryRead( tr_peerIo * io )
+{
+    if( EVBUFFER_LENGTH( io->bufev->input ) )
+        canReadWrapper( io->bufev, io );
+}
+
 void 
 tr_peerIoSetIOFuncs( tr_peerIo          * io,
@@ -246 +256 @@
     io->userData = userData;
 
-    if( EVBUFFER_LENGTH( io->bufev->input ) )
-        canReadWrapper( io->bufev, io );
-}
-
-void
-tr_peerIoSetIOMode( tr_peerIo * io, short enable, short disable )
-{
-    assert( tr_amInEventThread( io->handle ) );
-    bufferevent_enable( io->bufev, enable );
-    bufferevent_disable( io->bufev, disable );
+    tr_peerIoTryRead( io );
 }
 
@@ -285 +286 @@
         bufferevent_settimeout( io->bufev, IO_TIMEOUT_SECS, IO_TIMEOUT_SECS );
         bufferevent_enable( io->bufev, EV_READ|EV_WRITE );
+        bufferevent_setwatermark( io->bufev, EV_READ, 0, 1024 );
 
         return 0;