Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- Removed reflection of signals that appear in the incorrect thread due to 

android client compile errors.
This commit is contained in:
Eric J Korpela 2013-10-17 11:47:45 -07:00
parent b97edb5606
commit c80f373fde
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/diagnostics.cpp
View File

@ -589,7 +589,6 @@ int diagnostics_cycle_logs() {
// Diagnostics for POSIX Compatible systems. // Diagnostics for POSIX Compatible systems.
// //
#if HAVE_SIGNAL_H #if HAVE_SIGNAL_H
// Set a signal handler only if it is not currently ignored // Set a signal handler only if it is not currently ignored
@ -600,7 +599,6 @@ extern "C" void boinc_set_signal_handler(int sig, handler_t handler) {
sigaction(sig, NULL, &temp); sigaction(sig, NULL, &temp);
if (temp.sa_handler != SIG_IGN) { if (temp.sa_handler != SIG_IGN) {
temp.sa_handler = (void (*)(int))handler; temp.sa_handler = (void (*)(int))handler;
// sigemptyset(&temp.sa_mask);
sigaction(sig, &temp, NULL); sigaction(sig, &temp, NULL);
} }
#else #else
@ -620,7 +618,6 @@ void boinc_set_signal_handler_force(int sig, void(*handler)(int)) {
struct sigaction temp; struct sigaction temp;
sigaction(sig, NULL, &temp); sigaction(sig, NULL, &temp);
temp.sa_handler = handler; temp.sa_handler = handler;
// sigemptyset(&temp.sa_mask);
sigaction(sig, &temp, NULL); sigaction(sig, &temp, NULL);
#else #else
void (*temp)(int); void (*temp)(int);
@ -637,8 +634,6 @@ void set_signal_exit_code(int x) {
} }
#ifdef ANDROID #ifdef ANDROID
extern pthread_t timer_thread_handle;
extern pthread_t worker_thread_handle;
const char *argv0; const char *argv0;
static char *xtoa(size_t x) { static char *xtoa(size_t x) {
@ -679,24 +674,6 @@ void boinc_catch_signal(int signal) {
return; return;
default: fprintf(stderr, "unknown signal %d\n", signal); break; default: fprintf(stderr, "unknown signal %d\n", signal); break;
} }
#ifdef ANDROID
// per-thread signal masking doesn't work
// on old (pre-4.1) versions of Android.
// If we're handling this signal in the timer thread,
// send signal explicitly to worker thread.
//
if (pthread_self() == timer_thread_handle) {
fprintf(stderr,"for worker thread sent to timer thread. Reflecting.\n");
pthread_kill(worker_thread_handle, signal);
#if defined(HAVE_SIGACTION)
sigset_t unblock;
sigemptyset(&unblock);
sigaddset(&unblock,signal);
sigprocmask(SIG_UNBLOCK,&unblock,NULL);
#endif
return;
}
#endif
#ifdef __GLIBC__ #ifdef __GLIBC__
void *array[64]; void *array[64];