From 9b73bf07d73dbab5b792632e1e233edbad77f5fd Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Tue, 20 Jan 2015 19:18:59 -0800 Subject: [PATCH] Refactor of the bugreport code. Implemented these changes: - Make this code C++. - Avoid hangs by adding a timeout. - Add the necessary TEMP_FAILURE_RETRY calls. - Restructure the code a bit. Bug: 18800936 Change-Id: Iba9f86a4c7beee4f0f36e51234855f4c0834db47 --- cmds/bugreport/Android.mk | 4 +- cmds/bugreport/bugreport.c | 56 ---------------------- cmds/bugreport/bugreport.cpp | 91 ++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 57 deletions(-) delete mode 100644 cmds/bugreport/bugreport.c create mode 100644 cmds/bugreport/bugreport.cpp diff --git a/cmds/bugreport/Android.mk b/cmds/bugreport/Android.mk index f476f5e4c..ced5d3037 100644 --- a/cmds/bugreport/Android.mk +++ b/cmds/bugreport/Android.mk @@ -1,10 +1,12 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES:= bugreport.c +LOCAL_SRC_FILES:= bugreport.cpp LOCAL_MODULE:= bugreport +LOCAL_CFLAGS := -Wall + LOCAL_SHARED_LIBRARIES := libcutils include $(BUILD_EXECUTABLE) diff --git a/cmds/bugreport/bugreport.c b/cmds/bugreport/bugreport.c deleted file mode 100644 index 11e9057fe..000000000 --- a/cmds/bugreport/bugreport.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -#include -#include - -int main(int argc, char *argv[]) { - char buffer[65536]; - int i, s; - - /* start the dumpstate service */ - property_set("ctl.start", "dumpstate"); - - /* socket will not be available until service starts */ - for (i = 0; i < 20; i++) { - s = socket_local_client("dumpstate", - ANDROID_SOCKET_NAMESPACE_RESERVED, - SOCK_STREAM); - if (s >= 0) - break; - /* try again in 1 second */ - sleep(1); - } - - if (s < 0) { - fprintf(stderr, "Failed to connect to dumpstate service\n"); - exit(1); - } - - while (1) { - int length = read(s, buffer, sizeof(buffer)); - if (length <= 0) - break; - fwrite(buffer, 1, length, stdout); - } - - close(s); - return 0; -} diff --git a/cmds/bugreport/bugreport.cpp b/cmds/bugreport/bugreport.cpp new file mode 100644 index 000000000..b606406df --- /dev/null +++ b/cmds/bugreport/bugreport.cpp @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include + +#include +#include + +// This program will trigger the dumpstate service to start a call to +// dumpstate, then connect to the dumpstate local client to read the +// output. All of the dumpstate output is written to stdout, including +// any errors encountered while reading/writing the output. +int main() { + // Start the dumpstate service. + property_set("ctl.start", "dumpstate"); + + // Socket will not be available until service starts. + int s; + for (int i = 0; i < 20; i++) { + s = socket_local_client("dumpstate", ANDROID_SOCKET_NAMESPACE_RESERVED, + SOCK_STREAM); + if (s >= 0) + break; + // Try again in 1 second. + sleep(1); + } + + if (s == -1) { + printf("Failed to connect to dumpstate service: %s\n", strerror(errno)); + return 1; + } + + // Set a timeout so that if nothing is read in 3 minutes, we'll stop + // reading and quit. No timeout in dumpstate is longer than 60 seconds, + // so this gives lots of leeway in case of unforeseen time outs. + struct timeval tv; + tv.tv_sec = 3 * 60; + tv.tv_usec = 0; + if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) == -1) { + printf("WARNING: Cannot set socket timeout: %s\n", strerror(errno)); + } + + while (1) { + char buffer[65536]; + ssize_t bytes_read = TEMP_FAILURE_RETRY(read(s, buffer, sizeof(buffer))); + if (bytes_read == 0) { + break; + } else if (bytes_read == -1) { + // EAGAIN really means time out, so change the errno. + if (errno == EAGAIN) { + errno = ETIMEDOUT; + } + printf("\nBugreport read terminated abnormally (%s).\n", strerror(errno)); + break; + } + + ssize_t bytes_to_send = bytes_read; + ssize_t bytes_written; + do { + bytes_written = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, + buffer + bytes_read - bytes_to_send, + bytes_to_send)); + if (bytes_written == -1) { + printf("Failed to write data to stdout: read %zd, trying to send %zd (%s)\n", + bytes_read, bytes_to_send, strerror(errno)); + return 1; + } + bytes_to_send -= bytes_written; + } while (bytes_written != 0 && bytes_to_send > 0); + } + + TEMP_FAILURE_RETRY(close(s)); + return 0; +}