Changeset 4040

Timestamp:

Dec 2, 2007, 4:35:44 PM (14 years ago)

Author:

charles

Message:

possible fix for the crash reported by sedatg in ticket #519

File:

• trunk/libtransmission/platform.c (modified) (7 diffs)

trunk/libtransmission/platform.c

@@ -39 +39 @@
   #include <shlobj.h> /* for CSIDL_APPDATA, CSIDL_PROFILE */
 #else
+  #define _XOPEN_SOURCE 500 /* needed for recursive locks. */
   #include <pthread.h>
 #endif
@@ -190 +191 @@
 struct tr_lock
 {
-    uint32_t depth;
+    int depth;
 #ifdef __BEOS__
     sem_id lock;
@@ -211 +212 @@
     l->lock = create_sem( 1, "" );
 #elif defined(WIN32)
-    InitializeCriticalSection( &l->lock );
-#else
-    pthread_mutex_init( &l->lock, NULL );
+    InitializeCriticalSection( &l->lock ); /* critical sections support recursion */
+#else
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_init( &attr );
+    pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE );
+    pthread_mutex_init( &l->lock, &attr );
 #endif
 
@@ -237 +241 @@
     const tr_thread_id currentThread = tr_getCurrentThread( );
 
-    if( l->lockThread == currentThread )
-    {
-        ++l->depth;
-    }
-    else
-    {
-#ifdef __BEOS__
-        acquire_sem( l->lock );
-#elif defined(WIN32)
-        EnterCriticalSection( &l->lock );
-#else
-        pthread_mutex_lock( &l->lock );
-#endif
-        l->lockThread = currentThread;
-        l->depth = 1;
-    }
+#ifdef __BEOS__
+    acquire_sem( l->lock );
+#elif defined(WIN32)
+    EnterCriticalSection( &l->lock );
+#else
+    pthread_mutex_lock( &l->lock );
+#endif
+    l->lockThread = currentThread;
+    ++l->depth;
 }
 
@@ -267 +264 @@
     assert( tr_lockHave( l ) );
 
-    if( !--l->depth )
-    {
-        l->lockThread = 0;
-#ifdef __BEOS__
-        release_sem( l->lock );
-#elif defined(WIN32)
-        LeaveCriticalSection( &l->lock );
-#else
-        pthread_mutex_unlock( &l->lock );
-#endif
-    }
+#ifdef __BEOS__
+    release_sem( l->lock );
+#elif defined(WIN32)
+    LeaveCriticalSection( &l->lock );
+#else
+    pthread_mutex_unlock( &l->lock );
+#endif
+    --l->depth;
 }
 
@@ -852 +846 @@
     }
 
-    bzero( &snl, sizeof( snl ) );
+    memset( &snl, 0, sizeof(snl) );
     snl.nl_family = AF_NETLINK;
 
-    bzero( &req, sizeof( req ) );
+    memset( &req, 0, sizeof(req) );
     req.nlh.nlmsg_len = NLMSG_LENGTH( sizeof( req.rtg ) );
     req.nlh.nlmsg_type = RTM_GETROUTE;
@@ -893 +887 @@
     for( ;; )
     {
-        bzero( &snl, sizeof( snl ) );
         slen = sizeof( snl );
+        memset( &snl, 0, slen );
         res = recvfrom( fd, buf, len, 0, (struct sockaddr *) &snl, &slen );
         if( 0 > res )