X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fports.c;h=120038618bbd2197c43723285554e8085cde2445;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=10f84dc9e8062f1c804cc995ab52b35282e40c6b;hpb=8ab542f1e527adc6058fde914347a556e0b5b78b;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/libhb/ports.c b/libhb/ports.c
index 10f84dc9..12003861 100644
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -4,31 +4,67 @@
Homepage: .
It may be used under the terms of the GNU General Public License. */
-#include
-#include
+#ifdef USE_PTHREAD
+#ifdef SYS_LINUX
+#define _GNU_SOURCE
+#include
+#endif
+#include
+#endif
-#if defined( SYS_BEOS )
-#include
-#include
-#elif defined( SYS_CYGWIN )
+#ifdef SYS_BEOS
+#include
+#endif
+
+#if defined(SYS_DARWIN) || defined(SYS_FREEBSD)
+#include
+#include
+#endif
+
+#ifdef SYS_OPENBSD
+#include
+#include
+#include
+#endif
+
+#ifdef SYS_CYGWIN
#include
-#elif defined( SYS_SunOS )
-#include
#endif
-#if USE_PTHREAD
+#ifdef SYS_MINGW
#include
+#include
+#endif
+
+#ifdef SYS_SunOS
+#include
#endif
-//#ifdef SYS_CYGWIN
-//#include
-//#include
-//#else
+#include
+#include
+
+
+#ifdef SYS_MINGW
+#include
+#include
+#else
#include
#include
#include
#include
-//#endif
+#endif
+
+#if defined( SYS_LINUX )
+#include
+#include
+#include
+#elif defined( SYS_OPENBSD )
+#include
+#include
+#include
+#endif
+
+#include
#include "hb.h"
@@ -56,6 +92,40 @@ int gettimeofday( struct timeval * tv, struct timezone * tz )
#endif
*/
+int hb_dvd_region(char *device, int *region_mask)
+{
+#if defined( DVD_LU_SEND_RPC_STATE ) && defined( DVD_AUTH )
+ struct stat st;
+ dvd_authinfo ai;
+ int fd, ret;
+
+ fd = open( device, O_RDONLY );
+ if ( fd < 0 )
+ return -1;
+ if ( fstat( fd, &st ) < 0 )
+ {
+ close( fd );
+ return -1;
+ }
+ if ( !( S_ISBLK( st.st_mode ) || S_ISCHR( st.st_mode ) ) )
+ {
+ close( fd );
+ return -1;
+ }
+
+ ai.type = DVD_LU_SEND_RPC_STATE;
+ ret = ioctl(fd, DVD_AUTH, &ai);
+ close( fd );
+ if ( ret < 0 )
+ return ret;
+
+ *region_mask = ai.lrpcs.region_mask;
+ return 0;
+#else
+ return -1;
+#endif
+}
+
uint64_t hb_get_date()
{
struct timeval tv;
@@ -78,7 +148,7 @@ void hb_snooze( int delay )
snooze( 1000 * delay );
#elif defined( SYS_DARWIN ) || defined( SYS_LINUX ) || defined( SYS_FREEBSD) || defined( SYS_SunOS )
usleep( 1000 * delay );
-#elif defined( SYS_CYGWIN )
+#elif defined( SYS_CYGWIN ) || defined( SYS_MINGW )
Sleep( delay );
#endif
}
@@ -100,54 +170,36 @@ int hb_get_cpu_count()
}
cpu_count = 1;
-#if defined( SYS_BEOS )
- {
- system_info info;
- get_system_info( &info );
- cpu_count = info.cpu_count;
- }
-
-#elif defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
- FILE * info;
- char buffer[16];
-
- if( ( info = popen( "/usr/sbin/sysctl hw.ncpu", "r" ) ) )
- {
- memset( buffer, 0, 16 );
- if( fgets( buffer, 15, info ) )
- {
- if( sscanf( buffer, "hw.ncpu: %d", &cpu_count ) != 1 )
- {
- cpu_count = 1;
- }
- }
- fclose( info );
- }
+#if defined(SYS_CYGWIN) || defined(SYS_MINGW)
+ SYSTEM_INFO cpuinfo;
+ GetSystemInfo( &cpuinfo );
+ cpu_count = cpuinfo.dwNumberOfProcessors;
-#elif defined( SYS_LINUX )
+#elif defined(SYS_LINUX)
+ unsigned int bit;
+ cpu_set_t p_aff;
+ memset( &p_aff, 0, sizeof(p_aff) );
+ sched_getaffinity( 0, sizeof(p_aff), &p_aff );
+ for( cpu_count = 0, bit = 0; bit < sizeof(p_aff); bit++ )
+ cpu_count += (((uint8_t *)&p_aff)[bit / 8] >> (bit % 8)) & 1;
+
+#elif defined(SYS_BEOS)
+ system_info info;
+ get_system_info( &info );
+ cpu_count = info.cpu_count;
+
+#elif defined(SYS_DARWIN) || defined(SYS_FREEBSD) || defined(SYS_OPENBSD)
+ size_t length = sizeof( cpu_count );
+#ifdef SYS_OPENBSD
+ int mib[2] = { CTL_HW, HW_NCPU };
+ if( sysctl(mib, 2, &cpu_count, &length, NULL, 0) )
+#else
+ if( sysctlbyname("hw.ncpu", &cpu_count, &length, NULL, 0) )
+#endif
{
- FILE * info;
- char buffer[8];
-
- if( ( info = popen( "grep -c '^processor' /proc/cpuinfo",
- "r" ) ) )
- {
- memset( buffer, 0, 8 );
- if( fgets( buffer, 7, info ) )
- {
- if( sscanf( buffer, "%d", &cpu_count ) != 1 )
- {
- cpu_count = 1;
- }
- }
- fclose( info );
- }
+ cpu_count = 1;
}
-#elif defined( SYS_CYGWIN )
- SYSTEM_INFO cpuinfo;
- GetSystemInfo( &cpuinfo );
- cpu_count = cpuinfo.dwNumberOfProcessors;
#elif defined( SYS_SunOS )
{
processorid_t cpumax;
@@ -180,7 +232,7 @@ void hb_get_tempory_directory( hb_handle_t * h, char path[512] )
char base[512];
/* Create the base */
-#ifdef SYS_CYGWIN
+#if defined( SYS_CYGWIN ) || defined( SYS_MINGW )
char *p;
int i_size = GetTempPath( 512, base );
if( i_size <= 0 || i_size >= 512 )
@@ -226,11 +278,11 @@ void hb_get_tempory_filename( hb_handle_t * h, char name[1024],
***********************************************************************/
void hb_mkdir( char * name )
{
-//#ifdef SYS_CYGWIN
-// mkdir( name );
-//#else
+#ifdef SYS_MINGW
+ mkdir( name );
+#else
mkdir( name, 0755 );
-//#endif
+#endif
}
/************************************************************************
@@ -255,6 +307,27 @@ struct hb_thread_s
#endif
};
+/* Get a unique identifier to thread and represent as 64-bit unsigned.
+ * If unsupported, the value 0 is be returned.
+ * Caller should use result only for display/log purposes.
+ */
+static uint64_t hb_thread_to_integer( const hb_thread_t* t )
+{
+#if defined( USE_PTHREAD )
+ #if defined( SYS_CYGWIN )
+ return (uint64_t)t->thread;
+ #elif defined( _WIN32 ) || defined( __MINGW32__ )
+ return (uint64_t)(ptrdiff_t)t->thread.p;
+ #elif defined( SYS_DARWIN )
+ return (unsigned long)t->thread;
+ #else
+ return (uint64_t)t->thread;
+ #endif
+#else
+ return 0;
+#endif
+}
+
/************************************************************************
* hb_thread_func()
************************************************************************
@@ -285,7 +358,7 @@ static void hb_thread_func( void * _t )
t->function( t->arg );
/* Inform that the thread can be joined now */
- hb_deep_log( 2, "thread %x exited (\"%s\")", t->thread, t->name );
+ hb_deep_log( 2, "thread %"PRIx64" exited (\"%s\")", hb_thread_to_integer( t ), t->name );
hb_lock( t->lock );
t->exited = 1;
hb_unlock( t->lock );
@@ -330,7 +403,7 @@ hb_thread_t * hb_thread_init( char * name, void (* function)(void *),
// SetThreadPriority( GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL );
#endif
- hb_deep_log( 2, "thread %x started (\"%s\")", t->thread, t->name );
+ hb_deep_log( 2, "thread %"PRIx64" started (\"%s\")", hb_thread_to_integer( t ), t->name );
return t;
}
@@ -355,8 +428,7 @@ void hb_thread_close( hb_thread_t ** _t )
// WaitForSingleObject( t->thread, INFINITE );
#endif
- hb_deep_log( 2, "thread %x joined (\"%s\")",
- t->thread, t->name );
+ hb_deep_log( 2, "thread %"PRIx64" joined (\"%s\")", hb_thread_to_integer( t ), t->name );
hb_lock_close( &t->lock );
free( t->name );
@@ -412,7 +484,10 @@ hb_lock_t * hb_lock_init()
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 )
@@ -569,6 +644,23 @@ hb_net_t * hb_net_open( char * address, int port )
struct sockaddr_in sock;
struct hostent * host;
+#ifdef SYS_MINGW
+ WSADATA wsaData;
+ int iResult, winsock_init = 0;
+
+ // Initialize Winsock
+ if (!winsock_init)
+ {
+ iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
+ if (iResult != 0)
+ {
+ hb_log("WSAStartup failed: %d", iResult);
+ return NULL;
+ }
+ winsock_init = 1;
+ }
+#endif
+
/* TODO: find out why this doesn't work on Win32 */
if( !( host = gethostbyname( address ) ) )
{