Changeset 9880

Timestamp:

Jan 4, 2010, 11:06:34 PM (12 years ago)

Author:

charles

Message:

(1.7x) backport to 1.7x: r9642 #1663 "Crashes on shutdown if libevent loop doesn't exit soon enough"

Location:

branches/1.7x

Files:

• gtk/main.c (modified) (3 diffs)
• libtransmission/session.c (modified) (3 diffs)

branches/1.7x/gtk/main.c

@@ -628 +628 @@
 }
 
-static gpointer
-quitThreadFunc( gpointer gdata )
+static gboolean
+onSessionClosed( gpointer gdata )
 {
     struct cbdata * cbdata = gdata;
-    gdk_threads_enter( );
-
-    tr_core_close( cbdata->core );
 
     /* shutdown the gui */
@@ -659 +656 @@
 
     gtk_main_quit( );
+
+    return FALSE;
+}
+
+static gpointer
+sessionCloseThreadFunc( gpointer gdata )
+{
+    /* since tr_sessionClose() is a blocking function,
+     * call it from another thread... when it's done,
+     * punt the GUI teardown back to the GTK+ thread */
+    struct cbdata * cbdata = gdata;
+    gdk_threads_enter( );
+    tr_core_close( cbdata->core );
+    gtr_idle_add( onSessionClosed, gdata );
     gdk_threads_leave( );
-
     return NULL;
 }
@@ -727 +737 @@
 
     /* shut down libT */
-    g_thread_create( quitThreadFunc, vdata, TRUE, NULL );
+    g_thread_create( sessionCloseThreadFunc, vdata, TRUE, NULL );
 }
 

branches/1.7x/libtransmission/session.c

@@ -1505 +1505 @@
 }
 
-#define SHUTDOWN_MAX_SECONDS 30
+#define SHUTDOWN_MAX_SECONDS 20
 
 void
@@ -1521 +1521 @@
     while( !session->isClosed && !deadlineReached( deadline ) )
     {
-        dbgmsg(
-            "waiting for the shutdown commands to run in the main thread" );
+        dbgmsg( "waiting for the libtransmission thread to finish" );
         tr_wait( 100 );
     }
@@ -1542 +1541 @@
     /* close the libtransmission thread */
     tr_eventClose( session );
-    while( session->events && !deadlineReached( deadline ) )
-    {
-        dbgmsg( "waiting for the libevent thread to shutdown cleanly" );
+    while( session->events != NULL )
+    {
+        static tr_bool forced = FALSE;
+        dbgmsg( "waiting for libtransmission thread to finish" );
         tr_wait( 100 );
+        if( deadlineReached( deadline ) && !forced )
+        {
+            event_loopbreak( );
+            forced = TRUE;
+        }
     }