am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd." (a7952c5c) · Commits · e / os / android_system_core

debuggerd/crasher.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,9 @@ static int do_action(const char* arg)
		close(pipe_fds[0]);
		write(pipe_fds[1], "oops", 4);
		return EXIT_SUCCESS;
		} else if (!strcmp(arg, "SIGTRAP")) {
		raise(SIGTRAP);
		return EXIT_SUCCESS;
		} else if (!strcmp(arg, "heap-usage")) {
		abuse_heap();
		}
		@@ -164,6 +167,7 @@ static int do_action(const char* arg)
		fprintf(stderr, " LOG_ALWAYS_FATAL_IF call LOG_ALWAYS_FATAL\n");
		fprintf(stderr, " SIGPIPE cause a SIGPIPE\n");
		fprintf(stderr, " SIGSEGV cause a SIGSEGV (synonym: crash)\n");
		fprintf(stderr, " SIGTRAP cause a SIGTRAP\n");
		fprintf(stderr, "prefix any of the above with 'thread-' to not run\n");
		fprintf(stderr, "on the process' main thread.\n");
		return EXIT_SUCCESS;

+3 −2

Original line number	Diff line number	Diff line
		@@ -322,15 +322,16 @@ static void handle_request(int fd) {
		}
		break;

		case SIGILL:
		case SIGABRT:
		case SIGBUS:
		case SIGFPE:
		case SIGSEGV:
		case SIGILL:
		case SIGPIPE:
		case SIGSEGV:
		#ifdef SIGSTKFLT
		case SIGSTKFLT:
		#endif
		case SIGTRAP:
		XLOG("stopped -- fatal signal\n");
		// Send a SIGSTOP to the process to make all of
		// the non-signaled threads stop moving. Without