BuildSystem:

[handbrake-jp/handbrake-jp-git.git] / libhb / ports.c

diff --git a/libhb/ports.c b/libhb/ports.c
index 27879dd..3754a45 100644 (file)
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -1,10 +1,10 @@
 /* $Id: ports.c,v 1.15 2005/10/15 18:05:03 titer Exp $
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include <time.h> 
+#include <time.h>
 #include <sys/time.h>
 
 #if defined( SYS_BEOS )
@@ -212,7 +212,7 @@ void hb_get_tempory_filename( hb_handle_t * h, char name[1024],
 
     hb_get_tempory_directory( h, name );
     strcat( name, "/" );
-    
+
     va_start( args, fmt );
     vsnprintf( &name[strlen(name)], 1024 - strlen(name), fmt, args );
     va_end( args );
@@ -285,7 +285,7 @@ static void hb_thread_func( void * _t )
     t->function( t->arg );
 
     /* Inform that the thread can be joined now */
-    hb_log( "thread %x exited (\"%s\")", t->thread, t->name );
+    hb_deep_log( 2, "thread %x exited (\"%s\")", t->thread, t->name );
     hb_lock( t->lock );
     t->exited = 1;
     hb_unlock( t->lock );
@@ -330,7 +330,7 @@ hb_thread_t * hb_thread_init( char * name, void (* function)(void *),
 //        SetThreadPriority( GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL );
 #endif
 
-    hb_log( "thread %x started (\"%s\")", t->thread, t->name );
+    hb_deep_log( 2, "thread %x started (\"%s\")", t->thread, t->name );
     return t;
 }
 
@@ -347,21 +347,21 @@ void hb_thread_close( hb_thread_t ** _t )
 #if defined( SYS_BEOS )
     long exit_value;
     wait_for_thread( t->thread, &exit_value );
-    
+
 #elif USE_PTHREAD
     pthread_join( t->thread, NULL );
 
 //#elif defined( SYS_CYGWIN )
 //    WaitForSingleObject( t->thread, INFINITE );
 #endif
-    
-    hb_log( "thread %x joined (\"%s\")",
+
+    hb_deep_log( 2, "thread %x joined (\"%s\")",
             t->thread, t->name );
 
     hb_lock_close( &t->lock );
     free( t->name );
     free( t );
-    *_t = NULL; 
+    *_t = NULL;
 }
 
 /************************************************************************
@@ -409,7 +409,15 @@ hb_lock_t * hb_lock_init()
 #if defined( SYS_BEOS )
     l->sem = create_sem( 1, "sem" );
 #elif USE_PTHREAD
-    pthread_mutex_init( &l->mutex, NULL );
+    pthread_mutexattr_t mta;
+
+    pthread_mutexattr_init(&mta);
+
+#if defined( SYS_CYGWIN )
+    pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_NORMAL);
+#endif
+
+    pthread_mutex_init( &l->mutex, &mta );
 //#elif defined( SYS_CYGWIN )
 //    l->mutex = CreateMutex( 0, FALSE, 0 );
 #endif
@@ -591,7 +599,7 @@ hb_net_t * hb_net_open( char * address, int port )
         free( n );
         return NULL;
     }
-    
+
     return n;
 }