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

am eaf04aa0: am 3b94cef1: Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"

Browse source 
* commit 'eaf04aa0986e069a2ccffb69b94f1e4d6ad6726c':
  Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h
This commit is contained in:
Yusuke Sato 2015-08-22 02:40:51 +00:00 • committed by Android Git Automerger
commit ae0b28f569
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
logwrapper/Android.mk
View file

@ -11,7 +11,7 @@ LOCAL_SRC_FILES := logwrap.c
LOCAL_SHARED_LIBRARIES := libcutils liblog LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror -std=gnu99
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# ======================================================== # ========================================================
@ -23,7 +23,7 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_WHOLE_STATIC_LIBRARIES := liblogwrap LOCAL_WHOLE_STATIC_LIBRARIES := liblogwrap
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror -std=gnu99
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
# ======================================================== # ========================================================
@ -33,5 +33,5 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= logwrapper.c LOCAL_SRC_FILES:= logwrapper.c
LOCAL_MODULE := logwrapper LOCAL_MODULE := logwrapper
LOCAL_STATIC_LIBRARIES := liblog liblogwrap libcutils LOCAL_STATIC_LIBRARIES := liblog liblogwrap libcutils
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror -std=gnu99
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

10
logwrapper/include/logwrap/logwrap.h
View file

@ -73,7 +73,9 @@ __BEGIN_DECLS
#define LOG_FILE 4 #define LOG_FILE 4
/* Write data to child's stdin. */ /* Write data to child's stdin. */
#define FORK_EXECVP_OPTION_INPUT 0 #define FORK_EXECVP_OPTION_INPUT 0
/* Capture data from child's stdout and stderr. */
#define FORK_EXECVP_OPTION_CAPTURE_OUTPUT 1
struct AndroidForkExecvpOption { struct AndroidForkExecvpOption {
int opt_type; int opt_type;
@ -82,6 +84,12 @@ struct AndroidForkExecvpOption {
const uint8_t* input; const uint8_t* input;
size_t input_len; size_t input_len;
} opt_input; } opt_input;
struct {
void (*on_output)(const uint8_t* /*output*/,
size_t /*output_len*/,
void* /* user_pointer */);
void* user_pointer;
} opt_capture_output;
}; };
}; };

17
logwrapper/logwrap.c
View file

@ -291,7 +291,8 @@ static void print_abbr_buf(struct log_info *log_info) {
} }
static int parent(const char *tag, int parent_read, pid_t pid, static int parent(const char *tag, int parent_read, pid_t pid,
int *chld_sts, int log_target, bool abbreviated, char *file_path) { int *chld_sts, int log_target, bool abbreviated, char *file_path,
const struct AndroidForkExecvpOption* opts, size_t opts_len) {
int status = 0; int status = 0;
char buffer[4096]; char buffer[4096];
struct pollfd poll_fds[] = { struct pollfd poll_fds[] = {
@ -358,6 +359,13 @@ static int parent(const char *tag, int parent_read, pid_t pid,
sz = TEMP_FAILURE_RETRY( sz = TEMP_FAILURE_RETRY(
read(parent_read, &buffer[b], sizeof(buffer) - 1 - b)); read(parent_read, &buffer[b], sizeof(buffer) - 1 - b));
for (size_t i = 0; sz > 0 && i < opts_len; ++i) {
if (opts[i].opt_type == FORK_EXECVP_OPTION_CAPTURE_OUTPUT) {
opts[i].opt_capture_output.on_output(
(uint8_t*)&buffer[b], sz, opts[i].opt_capture_output.user_pointer);
}
}
sz += b; sz += b;
// Log one line at a time // Log one line at a time
for (b = 0; b < sz; b++) { for (b = 0; b < sz; b++) {
@ -484,7 +492,6 @@ int android_fork_execvp_ext(int argc, char* argv[], int *status, bool ignore_int
sigset_t blockset; sigset_t blockset;
sigset_t oldset; sigset_t oldset;
int rc = 0; int rc = 0;
size_t i;
rc = pthread_mutex_lock(&fd_mutex); rc = pthread_mutex_lock(&fd_mutex);
if (rc) { if (rc) {
@ -532,7 +539,7 @@ int android_fork_execvp_ext(int argc, char* argv[], int *status, bool ignore_int
close(parent_ptty); close(parent_ptty);
// redirect stdin, stdout and stderr // redirect stdin, stdout and stderr
for (i = 0; i < opts_len; ++i) { for (size_t i = 0; i < opts_len; ++i) {
if (opts[i].opt_type == FORK_EXECVP_OPTION_INPUT) { if (opts[i].opt_type == FORK_EXECVP_OPTION_INPUT) {
dup2(child_ptty, 0); dup2(child_ptty, 0);
break; break;
@ -554,7 +561,7 @@ int android_fork_execvp_ext(int argc, char* argv[], int *status, bool ignore_int
sigaction(SIGQUIT, &ignact, &quitact); sigaction(SIGQUIT, &ignact, &quitact);
} }
for (i = 0; i < opts_len; ++i) { for (size_t i = 0; i < opts_len; ++i) {
if (opts[i].opt_type == FORK_EXECVP_OPTION_INPUT) { if (opts[i].opt_type == FORK_EXECVP_OPTION_INPUT) {
size_t left = opts[i].opt_input.input_len; size_t left = opts[i].opt_input.input_len;
const uint8_t* input = opts[i].opt_input.input; const uint8_t* input = opts[i].opt_input.input;
@ -571,7 +578,7 @@ int android_fork_execvp_ext(int argc, char* argv[], int *status, bool ignore_int
} }
rc = parent(argv[0], parent_ptty, pid, status, log_target, rc = parent(argv[0], parent_ptty, pid, status, log_target,
abbreviated, file_path); abbreviated, file_path, opts, opts_len);
} }
if (ignore_int_quit) { if (ignore_int_quit) {