aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-12-04 14:46:31 -05:00
Code

Porting: Allow build on Android

Browse Source 
This allows to build the threading module on Android. Android has
a little reduced implementation for POSIX threads.

This is a clean version of patches from
 Stephan Jauernick <info@stephan-jauernick.de> and
 Marvin Scholz <epirat07@gmail.com>.
This commit is contained in:
Philipp Schafft 2016-03-18 08:51:27 +00:00
parent d3904369e8
commit 001667626c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
thread/thread.c
View File

@ -220,7 +220,7 @@ void thread_shutdown(void)
*/ */
static void _block_signals(void) static void _block_signals(void)
{ {
#ifndef _WIN32 #if !defined(_WIN32) && !defined(__ANDROID__)
sigset_t ss; sigset_t ss;
sigfillset(&ss); sigfillset(&ss);
@ -246,7 +246,7 @@ static void _block_signals(void)
*/ */
static void _catch_signals(void) static void _catch_signals(void)
{ {
#ifndef _WIN32 #if !defined(_WIN32) && !defined(__ANDROID__)
sigset_t ss; sigset_t ss;
sigemptyset(&ss); sigemptyset(&ss);
@ -299,7 +299,11 @@ thread_type *thread_create_c(char *name, void *(*start_routine)(void *),
start->thread = thread; start->thread = thread;
pthread_attr_setstacksize (&attr, 512*1024); pthread_attr_setstacksize (&attr, 512*1024);
#ifndef __ANDROID__
pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED); pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED);
#endif
if (detached) if (detached)
{ {
pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
@ -656,7 +660,10 @@ static void *_start_routine(void *arg)
LOG_INFO4("Added thread %d [%s] started at [%s:%d]", thread->thread_id, thread->name, thread->file, thread->line); LOG_INFO4("Added thread %d [%s] started at [%s:%d]", thread->thread_id, thread->name, thread->file, thread->line);
#endif #endif
#ifndef __ANDROID__
pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL); pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
#endif
free (start); free (start);
(start_routine)(real_arg); (start_routine)(real_arg);