openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

logwrap lib: make logwrapper less verbose when told to not log 

We don't care about exit codes if logwrap output is not requested.

Change-Id: Ibae5fe53527554a1fe865c2058deb0a128a9dde2
This commit is contained in:
JP Abgrall 2013-02-13 16:31:58 -08:00
parent 4869a68d56
commit a689d13a19
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
logwrapper/logwrap.c
View File

@ -32,7 +32,7 @@
#include "private/android_filesystem_config.h"
#include "cutils/log.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
static int signal_fd_write;
@ -144,31 +144,34 @@ static int parent(const char *tag, int parent_read, int signal_fd, pid_t pid,
}
}
// Flush remaining data
if (a != b) {
buffer[b] = '\0';
if (logwrap)
ALOG(LOG_INFO, btag, "%s", &buffer[a]);
if (chld_sts != NULL) {
*chld_sts = status;
} else {
if (WIFEXITED(status))
rc = WEXITSTATUS(status);
else
rc = -ECHILD;
}
if (WIFEXITED(status)) {
if (logwrap) {
// Flush remaining data
if (a != b) {
buffer[b] = '\0';
ALOG(LOG_INFO, btag, "%s", &buffer[a]);
}
if (WIFEXITED(status)) {
if (WEXITSTATUS(status))
ALOG(LOG_INFO, "logwrapper", "%s terminated by exit(%d)", btag,
WEXITSTATUS(status));
if (chld_sts == NULL)
rc = WEXITSTATUS(status);
} else {
if (chld_sts == NULL)
rc = -ECHILD;
ALOG(LOG_INFO, "logwrapper", "%s terminated by exit(%d)", btag,
WEXITSTATUS(status));
} else {
if (WIFSIGNALED(status))
ALOG(LOG_INFO, "logwrapper", "%s terminated by signal %d", btag,
WTERMSIG(status));
ALOG(LOG_INFO, "logwrapper", "%s terminated by signal %d", btag,
WTERMSIG(status));
else if (WIFSTOPPED(status))
ALOG(LOG_INFO, "logwrapper", "%s stopped by signal %d", btag,
WSTOPSIG(status));
ALOG(LOG_INFO, "logwrapper", "%s stopped by signal %d", btag,
WSTOPSIG(status));
}
}
if (chld_sts != NULL)
*chld_sts = status;
err_poll:
return rc;