diff options
author | Mike Lockwood <lockwood@android.com> | 2009-09-03 16:12:09 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2009-09-03 16:12:09 -0400 |
commit | 308f31d8e208891df283e90e0400f899b6c598a8 (patch) | |
tree | b093e3585fe3108e47ee947aca6e4fac48994290 | |
parent | d42685d5de1dbd6d75b48d42418f370adaa4daef (diff) | |
download | frameworks_base-308f31d8e208891df283e90e0400f899b6c598a8.zip frameworks_base-308f31d8e208891df283e90e0400f899b6c598a8.tar.gz frameworks_base-308f31d8e208891df283e90e0400f899b6c598a8.tar.bz2 |
Replace the bugreport symlink with a tool that starts the new dumpstate service.
Change-Id: I57acae2344a264751f38b910e1e2bc750a1f1d24
Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r-- | cmds/bugreport/Android.mk | 14 | ||||
-rw-r--r-- | cmds/bugreport/bugreport.c | 56 | ||||
-rw-r--r-- | cmds/dumpstate/Android.mk | 2 |
3 files changed, 71 insertions, 1 deletions
diff --git a/cmds/bugreport/Android.mk b/cmds/bugreport/Android.mk new file mode 100644 index 0000000..631c219 --- /dev/null +++ b/cmds/bugreport/Android.mk @@ -0,0 +1,14 @@ +ifneq ($(TARGET_SIMULATOR),true) + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= bugreport.c + +LOCAL_MODULE:= bugreport + +LOCAL_SHARED_LIBRARIES := libcutils + +include $(BUILD_EXECUTABLE) + +endif diff --git a/cmds/bugreport/bugreport.c b/cmds/bugreport/bugreport.c new file mode 100644 index 0000000..4a0b511 --- /dev/null +++ b/cmds/bugreport/bugreport.c @@ -0,0 +1,56 @@ +/* + * 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 <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +#include <cutils/properties.h> +#include <cutils/sockets.h> + +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 < 10; 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/dumpstate/Android.mk b/cmds/dumpstate/Android.mk index f61d7ec..f8b37a8 100644 --- a/cmds/dumpstate/Android.mk +++ b/cmds/dumpstate/Android.mk @@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := libcutils include $(BUILD_EXECUTABLE) -COMMANDS = dumpcrash bugreport +COMMANDS = dumpcrash SYMLINKS := $(addprefix $(TARGET_OUT_EXECUTABLES)/,$(COMMANDS)) $(SYMLINKS): DUMPSTATE_BINARY := dumpstate $(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk |