masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 03:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent rare freeze on Android 4.2 through 4.4

Browse source 
* src/android.c (android_run_select_thread, android_init_events)
(android_select): Enable self-pipes on all Android versions <= 21.
The Android C library provides a functioning pselect on these
systems, but it does not apply the signal mask atomically.
(android_run_select_thread): Correct typo.  This never produced
any adverse consequences, as the relevant signals would already
have been blocked by `setupSystemThread'.

Do not merge to master.
This commit is contained in:
Po Lu 2025-02-28 22:36:08 +08:00
parent 5247da2e3c
commit c8cec840d7
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/android.c
View file

@ -304,7 +304,7 @@ static struct android_event_queue event_queue;
/* Semaphores used to signal select completion and start. */ /* Semaphores used to signal select completion and start. */
static sem_t android_pselect_sem, android_pselect_start_sem; static sem_t android_pselect_sem, android_pselect_start_sem;
#if __ANDROID_API__ < 16 #if __ANDROID_API__ < 21
/* Select self-pipe. */ /* Select self-pipe. */
static int select_pipe[2]; static int select_pipe[2];
@ -363,7 +363,7 @@ android_run_select_thread (void *data)
JNI_STACK_ALIGNMENT_PROLOGUE; JNI_STACK_ALIGNMENT_PROLOGUE;
int rc; int rc;
#if __ANDROID_API__ < 16 #if __ANDROID_API__ < 21
int nfds; int nfds;
fd_set readfds; fd_set readfds;
char byte; char byte;
@ -375,7 +375,7 @@ android_run_select_thread (void *data)
/* Set the name of this thread's LWP for debugging purposes. */ /* Set the name of this thread's LWP for debugging purposes. */
android_set_task_name ("`android_select'"); android_set_task_name ("`android_select'");
#if __ANDROID_API__ < 16 #if __ANDROID_API__ < 21
/* A completely different implementation is used when building for /* A completely different implementation is used when building for
Android versions earlier than 16, because pselect with a signal Android versions earlier than 16, because pselect with a signal
mask does not work there. Instead of blocking SIGUSR1 and mask does not work there. Instead of blocking SIGUSR1 and
@ -451,12 +451,12 @@ android_run_select_thread (void *data)
sem_post (&android_pselect_sem); sem_post (&android_pselect_sem);
} }
#else #else
sigfillset (&signals);
if (pthread_sigmask (SIG_BLOCK, &signals, NULL)) if (pthread_sigmask (SIG_BLOCK, &signals, NULL))
__android_log_print (ANDROID_LOG_FATAL, __func__, __android_log_print (ANDROID_LOG_FATAL, __func__,
"pthread_sigmask: %s", "pthread_sigmask: %s",
strerror (errno)); strerror (errno));
sigfillset (&signals);
sigdelset (&signals, SIGUSR1); sigdelset (&signals, SIGUSR1);
sigemptyset (&waitset); sigemptyset (&waitset);
sigaddset (&waitset, SIGUSR1); sigaddset (&waitset, SIGUSR1);
@ -514,7 +514,7 @@ android_run_select_thread (void *data)
return NULL; return NULL;
} }
#if __ANDROID_API__ >= 16 #if __ANDROID_API__ >= 21
static void static void
android_handle_sigusr1 (int sig, siginfo_t *siginfo, void *arg) android_handle_sigusr1 (int sig, siginfo_t *siginfo, void *arg)
@ -569,7 +569,7 @@ android_init_events (void)
main_thread_id = pthread_self (); main_thread_id = pthread_self ();
#if __ANDROID_API__ >= 16 #if __ANDROID_API__ >= 21
/* Before starting the select thread, make sure the disposition for /* Before starting the select thread, make sure the disposition for
SIGUSR1 is correct. */ SIGUSR1 is correct. */
@ -762,7 +762,7 @@ android_select (int nfds, fd_set *readfds, fd_set *writefds,
fd_set *exceptfds, struct timespec *timeout) fd_set *exceptfds, struct timespec *timeout)
{ {
int nfds_return; int nfds_return;
#if __ANDROID_API__ < 16 #if __ANDROID_API__ < 21
static char byte; static char byte;
#endif #endif
@ -818,7 +818,7 @@ android_select (int nfds, fd_set *readfds, fd_set *writefds,
/* Start waiting for the event queue condition to be set. */ /* Start waiting for the event queue condition to be set. */
pthread_cond_wait (&event_queue.read_var, &event_queue.mutex); pthread_cond_wait (&event_queue.read_var, &event_queue.mutex);
#if __ANDROID_API__ >= 16 #if __ANDROID_API__ >= 21
/* Interrupt the select thread now, in case it's still in /* Interrupt the select thread now, in case it's still in
pselect. */ pselect. */
pthread_kill (event_queue.select_thread, SIGUSR1); pthread_kill (event_queue.select_thread, SIGUSR1);