Changeset 9910

Timestamp:

Jan 10, 2010, 7:52:01 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2416 "crash in event_queue_insert" -- I think this is happening if we queue up two changes, one to listen for read/write, and then a second one to delete the polling, in kqueue's event mechanism, at libcurl's request. Let's try disabling kqueue in libevent and use poll/select instead.

Location:

trunk

Files:

• libtransmission/web.c (modified) (1 diff)
• third-party/macosx-libevent-config.h (modified) (2 diffs)
• third-party/macosx-libevent-event-config.h (modified) (2 diffs)

trunk/libtransmission/web.c

@@ -346 +346 @@
     if( ( io_event != NULL ) && ( curl_what & CURL_POLL_REMOVE ) )
     {
-        CURLMcode m;
         memset( io_event, TR_MEMORY_TRASH, sizeof( struct event ) );
         tr_free( io_event );
-        m = curl_multi_assign( web->multi, fd, NULL );
-        assert( m == CURLM_OK );
         /*fprintf( stderr, "-1 io_events to %d\n", --num_events );*/
     }

trunk/third-party/macosx-libevent-config.h

@@ -51 +51 @@
 
 /* Define to 1 if you have the `kqueue' function. */
-#define HAVE_KQUEUE 1
+/* #define HAVE_KQUEUE 1 */
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
@@ -195 +195 @@
 
 /* Define if kqueue works correctly with pipes */
-#define HAVE_WORKING_KQUEUE 1
+/* #define HAVE_WORKING_KQUEUE 1 */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.

trunk/third-party/macosx-libevent-event-config.h

@@ -58 +58 @@
 
 /* Define to 1 if you have the `kqueue' function. */
-#define _EVENT_HAVE_KQUEUE 1
+/* #define _EVENT_HAVE_KQUEUE 1 */
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
@@ -202 +202 @@
 
 /* Define if kqueue works correctly with pipes */
-#define _EVENT_HAVE_WORKING_KQUEUE 1
+/* #define _EVENT_HAVE_WORKING_KQUEUE 1 */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.