Changeset 3829

Timestamp:

Nov 15, 2007, 4:43:46 PM (15 years ago)

Author:

charles

Message:

remove dead code.

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (1 diff)
• trevent.c (modified) (4 diffs)
• trevent.h (modified) (1 diff)

trunk/libtransmission/peer-io.c

@@ -404 +404 @@
                 int           writeme_len )
 {
-    tr_bufferevent_write( io->handle, io->bufev, writeme, writeme_len );
+    assert( tr_amInEventThread( io->handle ) );
+    bufferevent_write( io->bufev, (void*)writeme, writeme_len );
 }
 

trunk/libtransmission/trevent.c

@@ -66 +66 @@
     TR_EV_EVHTTP_MAKE_REQUEST,
     TR_EV_BUFFEREVENT_SET,
-    TR_EV_BUFFEREVENT_WRITE,
     TR_EV_TIMER_ADD,
     TR_EV_TIMER_DEL,
@@ -148 +147 @@
                 bufferevent_enable( cmd->bufev, cmd->enable );
                 bufferevent_disable( cmd->bufev, cmd->disable );
-                break;
-
-            case TR_EV_BUFFEREVENT_WRITE:
-                bufferevent_write( cmd->bufev, cmd->buf, cmd->buflen );
-                tr_free( cmd->buf );
                 break;
 
@@ -256 +250 @@
 }
 
+int
+tr_amInEventThread( struct tr_handle * handle )
+{
+    return tr_amInThread( handle->events->thread );
+}
+
+
 void
 tr_evhttp_make_request (tr_handle                 * handle,
@@ -273 +274 @@
         cmd->evtype = type;
         cmd->uri = uri;
-        pushList( handle->events, cmd );
-    }
-}
-
-void
-tr_bufferevent_write( tr_handle             * handle,
-                      struct bufferevent    * bufev,
-                      const void            * buf,
-                      size_t                  buflen )
-{
-    if( tr_amInThread( handle->events->thread ) )
-        bufferevent_write( bufev, (void*)buf, buflen );
-    else {
-        struct tr_event_command * cmd = tr_new0( struct tr_event_command, 1 );
-        cmd->mode = TR_EV_BUFFEREVENT_WRITE;
-        cmd->bufev = bufev;
-        cmd->buf = tr_strndup( buf, buflen );
-        cmd->buflen = buflen;
         pushList( handle->events, cmd );
     }

trunk/libtransmission/trevent.h

@@ -38 +38 @@
                              char                      * uri);
 
-void tr_bufferevent_write( struct tr_handle    * tr_handle,
-                           struct bufferevent  * bufferEvent,
-                           const void          * buf,
-                           size_t                buflen );
-
-
 void tr_setBufferEventMode( struct tr_handle   * tr_handle,
                             struct bufferevent * bufferEvent,
                             short                mode_enable,
                             short                mode_disable );
+
+int tr_amInEventThread( struct tr_handle * handle );
 
 /**