ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use stat structure to keep oldest mtime."

Browse source
This commit is contained in:
Christopher Ferris 2014-02-08 02:13:58 +00:00 • committed by Gerrit Code Review
commit 4207df11c5
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
debuggerd/tombstone.cpp
View file

@ -55,11 +55,6 @@
// Must match the path defined in NativeCrashListener.java // Must match the path defined in NativeCrashListener.java
#define NCRASH_SOCKET_PATH "/data/system/ndebugsocket" #define NCRASH_SOCKET_PATH "/data/system/ndebugsocket"
#define typecheck(x,y) { \
typeof(x) __dummy1; \
typeof(y) __dummy2; \
(void)(&__dummy1 == &__dummy2); }
static bool signal_has_address(int sig) { static bool signal_has_address(int sig) {
switch (sig) { switch (sig) {
case SIGILL: case SIGILL:
@ -653,28 +648,19 @@ static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, uintptr_t a
// //
// Returns the path of the tombstone file, allocated using malloc(). Caller must free() it. // Returns the path of the tombstone file, allocated using malloc(). Caller must free() it.
static char* find_and_open_tombstone(int* fd) { static char* find_and_open_tombstone(int* fd) {
#ifdef __aarch64__ // In a single pass, find an available slot and, in case none
long mtime = LONG_MAX;
#else
unsigned long mtime = ULONG_MAX;
#endif
struct stat sb;
// XXX: Our stat.st_mtime isn't time_t. If it changes, as it probably ought
// to, our logic breaks. This check will generate a warning if that happens.
typecheck(mtime, sb.st_mtime);
// In a single wolf-like pass, find an available slot and, in case none
// exist, find and record the least-recently-modified file. // exist, find and record the least-recently-modified file.
char path[128]; char path[128];
int oldest = 0; int oldest = -1;
struct stat oldest_sb;
for (int i = 0; i < MAX_TOMBSTONES; i++) { for (int i = 0; i < MAX_TOMBSTONES; i++) {
snprintf(path, sizeof(path), TOMBSTONE_TEMPLATE, i); snprintf(path, sizeof(path), TOMBSTONE_TEMPLATE, i);
struct stat sb;
if (!stat(path, &sb)) { if (!stat(path, &sb)) {
if (sb.st_mtime < mtime) { if (oldest < 0 || sb.st_mtime < oldest_sb.st_mtime) {
oldest = i; oldest = i;
mtime = sb.st_mtime; oldest_sb.st_mtime = sb.st_mtime;
} }
continue; continue;
} }
@ -689,6 +675,11 @@ static char* find_and_open_tombstone(int* fd) {
return strdup(path); return strdup(path);
} }
if (oldest < 0) {
LOG("Failed to find a valid tombstone, default to using tombstone 0.\n");
oldest = 0;
}
// we didn't find an available file, so we clobber the oldest one // we didn't find an available file, so we clobber the oldest one
snprintf(path, sizeof(path), TOMBSTONE_TEMPLATE, oldest); snprintf(path, sizeof(path), TOMBSTONE_TEMPLATE, oldest);
*fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600); *fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);