diff options
author | Martin Storsjo <martin@martin.st> | 2015-06-23 10:38:00 +0300 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2015-06-25 08:25:58 -0700 |
commit | 04370c1717b0dcb00001a18d2b16749c2367d3a5 (patch) | |
tree | a17b6d2ceadea669bd5b4e8bc79196240f56183c | |
parent | 086dd8ea90eaf4ead8b4927e777b1c8a19bd23a9 (diff) | |
download | android_external_libavc-04370c1717b0dcb00001a18d2b16749c2367d3a5.tar.gz android_external_libavc-04370c1717b0dcb00001a18d2b16749c2367d3a5.tar.bz2 android_external_libavc-04370c1717b0dcb00001a18d2b16749c2367d3a5.zip |
Remove all other thread implementations than pthread
Change-Id: Id30fc1a9c007f2f32ed3375bbf02085f0edad5a0
-rw-r--r-- | common/ithread.c | 368 |
1 files changed, 0 insertions, 368 deletions
diff --git a/common/ithread.c b/common/ithread.c index 8d54070..d19bdec 100644 --- a/common/ithread.c +++ b/common/ithread.c @@ -38,12 +38,6 @@ #include <string.h> #include "ih264_typedefs.h" -/* - * If the end target is bare metal, then there shall be no OS. - * In this case, the functions ithread_* used inside the h264 encoder library to assist multicore - * will not longer be functional. To resolve link issues, the functions are re-defined with no body. - */ -#ifndef BAREMETAL #include "ithread.h" @@ -52,7 +46,6 @@ #define UNUSED(x) ((void)(x)) -#ifndef X86_MSVC //#define PTHREAD_AFFINITY //#define SYSCALL_AFFINITY @@ -69,250 +62,6 @@ #include <sys/prctl.h> #endif -#endif - -#ifdef X86_MSVC - -#include <windows.h> -#define SEM_MAX_COUNT 100 -#define SEM_INCREMENT_COUNT 1 - -UWORD32 ithread_get_handle_size(void) -{ - return (sizeof(HANDLE)); -} - -UWORD32 ithread_get_mutex_lock_size(void) -{ - return (sizeof(HANDLE)); -} - -WORD32 ithread_create(void *thread_handle, void *attribute, void *strt, void *argument) -{ - HANDLE *ppv_thread_handle; - HANDLE thread_handle_value; - - UNUSED(attribute); - - if(0 == thread_handle) - return -1; - - ppv_thread_handle = (HANDLE *)thread_handle; - thread_handle_value = (void *)CreateThread - (NULL, /* Attributes */ - 1024*128, /* Stack i4_size */ - (LPTHREAD_START_ROUTINE)strt, /* Thread function */ - argument, /* Parameters */ - 0, /* Creation flags */ - NULL); /* Thread ID */ - *ppv_thread_handle = (HANDLE)thread_handle_value; - - return 0; -} - -WORD32 ithread_join(void *thread_handle, void ** val_ptr) -{ - HANDLE *ppv_thread_handle; - HANDLE thread_handle_value; - - UNUSED(val_ptr); - - if(0 == thread_handle) - return -1; - - ppv_thread_handle = (HANDLE *)thread_handle; - thread_handle_value = *ppv_thread_handle; - - if(WAIT_OBJECT_0 == WaitForSingleObject(thread_handle_value, INFINITE)) - { - CloseHandle(thread_handle_value); - } - - return 0; -} - -WORD32 ithread_get_mutex_struct_size(void) -{ - return (sizeof(HANDLE)); -} - -WORD32 ithread_mutex_init(void *mutex) -{ - HANDLE *ppv_mutex_handle; - HANDLE mutex_handle_value; - - if(0 == mutex) - return -1; - - ppv_mutex_handle = (HANDLE *)mutex; - mutex_handle_value = CreateSemaphore(NULL, 1, 1, NULL); - *ppv_mutex_handle = mutex_handle_value; - return 0; -} - -WORD32 ithread_mutex_destroy(void *mutex) -{ - HANDLE *ppv_mutex_handle; - HANDLE mutex_handle_value; - - if(0 == mutex) - return -1; - - ppv_mutex_handle = (HANDLE *)mutex; - mutex_handle_value = *ppv_mutex_handle; - CloseHandle(mutex_handle_value); - return 0; -} - -WORD32 ithread_mutex_lock(void *mutex) -{ - HANDLE *ppv_mutex_handle; - HANDLE mutex_handle_value; - DWORD result = 0; - - if(0 == mutex) - return -1; - - ppv_mutex_handle = (HANDLE *)mutex; - mutex_handle_value = *ppv_mutex_handle; - result = WaitForSingleObject(mutex_handle_value, INFINITE); - - if(WAIT_OBJECT_0 == result) - return 0; - - return 1; - -} - -WORD32 ithread_mutex_unlock(void *mutex) -{ - HANDLE *ppv_mutex_handle; - HANDLE mutex_handle_value; - DWORD result = 0; - - if(0 == mutex) - return -1; - - ppv_mutex_handle = (HANDLE *)mutex; - mutex_handle_value = *ppv_mutex_handle; - result = ReleaseSemaphore(mutex_handle_value, 1, NULL); - - if(0 == result) - return -1; - - return 0; -} - -void ithread_yield(void) { } - -void ithread_usleep(UWORD32 u4_time_us) -{ - UWORD32 u4_time_ms = u4_time_us / 1000; - Sleep(u4_time_ms); -} - -void ithread_msleep(UWORD32 u4_time_ms) -{ - Sleep(u4_time_ms); -} - -void ithread_sleep(UWORD32 u4_time) -{ - UWORD32 u4_time_ms = u4_time * 1000; - Sleep(u4_time_ms); -} - -UWORD32 ithread_get_sem_struct_size(void) -{ - return (sizeof(HANDLE)); -} - -WORD32 ithread_sem_init(void *sem,WORD32 pshared,UWORD32 value) -{ - HANDLE *sem_handle = (HANDLE *)sem; - HANDLE sem_handle_value; - - if(0 == sem) - return -1; - - sem_handle_value = CreateSemaphore(NULL, /* Security Attribute*/ - value, /* Initial count */ - SEM_MAX_COUNT,/* Max value */ - NULL); /* Name, not used */ - *sem_handle = sem_handle_value; - return 0; -} - -WORD32 ithread_sem_post(void *sem) -{ - HANDLE *sem_handle = (HANDLE *)sem; - HANDLE sem_handle_value; - - if(0 == sem) - return -1; - - sem_handle_value = *sem_handle; - - /* Post on Semaphore by releasing the lock on mutex */ - if(ReleaseSemaphore(sem_handle_value, SEM_INCREMENT_COUNT, NULL)) - return 0; - - return -1; -} - -WORD32 ithread_sem_wait(void *sem) -{ - DWORD result = 0; - HANDLE *sem_handle = (HANDLE *)sem; - HANDLE sem_handle_value; - - if(0 == sem) - return -1; - - sem_handle_value = *sem_handle; - - /* Wait on Semaphore object infinitly */ - result = WaitForSingleObject(sem_handle_value, INFINITE); - - /* If lock on semaphore is acquired, return SUCCESS */ - if(WAIT_OBJECT_0 == result) - return 0; - - /* If call timeouts, return FAILURE */ - if(WAIT_TIMEOUT == result) - return -1; - - return 0; -} - -WORD32 ithread_sem_destroy(void *sem) -{ - HANDLE *sem_handle = (HANDLE *)sem; - HANDLE sem_handle_value; - - if(0 == sem) - return -1; - - sem_handle_value = *sem_handle; - - if(FALSE == CloseHandle(sem_handle_value) ) - { - return -1; - } - return 0; -} - -WORD32 ithread_set_affinity(WORD32 core_id) -{ - return 1; -} - -void ithread_set_name(CHAR *pc_thread_name) -{ - return; -} - -#else UWORD32 ithread_get_handle_size(void) { @@ -460,120 +209,3 @@ WORD32 ithread_set_affinity(WORD32 core_id) return 1; } -#endif - -#else - -UWORD32 ithread_get_handle_size(void) -{ - return sizeof(int); -} - -UWORD32 ithread_get_mutex_lock_size(void) -{ - return sizeof(int); -} - -UWORD32 ithread_get_cond_size(void) -{ - return(sizeof(int)); -} -WORD32 ithread_create(void *thread_handle, void *attribute, void *strt, void *argument) -{ - return 0; -} - -WORD32 ithread_join(void *thread_handle, void ** val_ptr) -{ - return 0; -} - -WORD32 ithread_mutex_init(void *mutex) -{ - return 0; -} - -WORD32 ithread_mutex_destroy(void *mutex) -{ - return 0; -} - -WORD32 ithread_mutex_lock(void *mutex) -{ - return 0; -} - -WORD32 ithread_mutex_unlock(void *mutex) -{ - return 0; -} - -void ithread_yield(void) -{ - return; -} - -void ithread_sleep(UWORD32 u4_time_in_us) -{ - return; -} - -void ithread_usleep(UWORD32 u4_time_us) -{ - return; -} - -UWORD32 ithread_get_sem_strcut_size(void) -{ - return(sizeof(int)); -} - - -WORD32 ithread_sem_init(void *sem,WORD32 pshared,UWORD32 value) -{ - return 0; -} - -WORD32 ithread_sem_post(void *sem) -{ - return 0; -} - - -WORD32 ithread_sem_wait(void *sem) -{ - return 0; -} - -WORD32 ithread_sem_destroy(void *sem) -{ - return 0; -} - -void ithread_set_name(UWORD8 *pu1_thread_name) -{ - return; -} - -void ithread_condition_init(void *condition) -{ - return; -} - -void ithread_condition_signal(void * condition) -{ - return; -} - - - -void ithread_condition_wait(void *condition,void *mutex) -{ - return; -} - -WORD32 ithread_set_affinity(WORD32 core_id) -{ - return 1; -} -#endif |