Changeset 6819

Timestamp:

Oct 1, 2008, 4:26:38 AM (14 years ago)

Author:

charles

Message:

(libT) maybe fix the evhttp issues that softwareelves reported

Location:

trunk/libtransmission

Files:

• rpc-server.c (modified) (7 diffs)
• trevent.c (modified) (3 diffs)

trunk/libtransmission/rpc-server.c

@@ -399 +399 @@
 
 static void
-startServer( tr_rpc_server * server )
-{
+startServer( void * vserver )
+{
+    tr_rpc_server * server  = vserver;
+
     fprintf( stderr, "%s:%d in startServer; current context is %p\n", __FILE__, __LINE__, server->httpd );
 
@@ -424 +426 @@
 }
 
-void
-tr_rpcSetEnabled( tr_rpc_server * server,
-                  int             isEnabled )
-{
-    server->isEnabled = isEnabled != 0;
-
-    if( !isEnabled )
+static void
+onEnabledChanged( void * vserver )
+{
+    tr_rpc_server * server = vserver;
+
+    if( !server->isEnabled )
         stopServer( server );
     else
         startServer( server );
 }
+    
+
+void
+tr_rpcSetEnabled( tr_rpc_server * server,
+                  int             isEnabled )
+{
+    server->isEnabled = isEnabled != 0;
+
+    tr_runInEventThread( server->session, onEnabledChanged, server );
+}
 
 int
@@ -442 +453 @@
 }
 
+static void
+restartServer( void * vserver )
+{
+    tr_rpc_server * server = vserver;
+
+    if( server->isEnabled )
+    {
+        stopServer( server );
+        startServer( server );
+    }
+}
+
 void
 tr_rpcSetPort( tr_rpc_server * server,
@@ -451 +474 @@
 
         if( server->isEnabled )
-        {
-            stopServer( server );
-            startServer( server );
-        }
+            tr_runInEventThread( server->session, restartServer, server );
     }
 }
@@ -530 +550 @@
 ****/
 
-void
-tr_rpcClose( tr_rpc_server ** ps )
-{
-    tr_rpc_server * s = *ps;
-
-    *ps = NULL;
-
+static void
+closeServer( void * vserver )
+{
+    tr_rpc_server * s = vserver;
     stopServer( s );
     tr_free( s->acl );
@@ -542 +559 @@
     tr_free( s->password );
     tr_free( s );
+}
+
+void
+tr_rpcClose( tr_rpc_server ** ps )
+{
+    tr_runInEventThread( (*ps)->session, closeServer, *ps );
+    *ps = NULL;
 }
 
@@ -563 +587 @@
     s->isPasswordEnabled = isPasswordEnabled != 0;
     s->isEnabled = isEnabled != 0;
-
     if( isEnabled )
-        startServer( s );
+        tr_runInEventThread( session, startServer, s );
     return s;
 }

trunk/libtransmission/trevent.c

@@ -146 +146 @@
 libeventThreadFunc( void * veh )
 {
-    tr_event_handle * eh = (tr_event_handle *) veh;
+    tr_event_handle * eh = veh;
 
     tr_dbg( "Starting libevent thread" );
@@ -155 +155 @@
 #endif
 
-    eh->base = event_init( );
     eh->h->events = eh;
-    event_set_log_callback( logFunc );
 
     /* listen to the pipe's read fd */
@@ -183 +181 @@
     pipe( eh->fds );
     eh->h = handle;
+    eh->base = event_init( );
     eh->thread = tr_threadNew( libeventThreadFunc, eh );
 }