tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am eeaf6544: Merge change I7934a799 into eclair-mr2

Browse source 
Merge commit 'eeaf6544b676f68ccdd70a3fa78f44789a1bf69c' into eclair-mr2-plus-aosp

* commit 'eeaf6544b676f68ccdd70a3fa78f44789a1bf69c':
  Prevent spurious EINTR to freeze process debugging
This commit is contained in:
David 'Digit' Turner 2009-10-19 15:03:31 -07:00 committed by Android Git Automerger
commit b3cfdb6220
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
linker/debugger.c
View file

@ -32,6 +32,7 @@
#include <ctype.h>
#include <signal.h>
#include <sys/mman.h>
#include <errno.h>
#include "linker.h"
@ -40,6 +41,11 @@
void notify_gdb_of_libraries();
#define RETRY_ON_EINTR(ret,cond) \
do { \
ret = (cond); \
} while (ret < 0 && errno == EINTR)
void debugger_signal_handler(int n)
{
unsigned tid;
@ -58,10 +64,15 @@ void debugger_signal_handler(int n)
* is paranoid and will verify that we are giving a tid
* that's actually in our process
*/
write(s, &tid, sizeof(unsigned));
int ret;
read(s, &tid, 1);
notify_gdb_of_libraries();
RETRY_ON_EINTR(ret, write(s, &tid, sizeof(unsigned)));
if (ret == sizeof(unsigned)) {
/* if the write failed, there is no point to read on
* the file descriptor. */
RETRY_ON_EINTR(ret, read(s, &tid, 1));
notify_gdb_of_libraries();
}
close(s);
}