Dumpstate: convert to hidl implementation.
Bug: 31982882
Test: wip
Change-Id: I3137445b1f0a7408bc8095be120b176388374fab
diff --git a/device-common.mk b/device-common.mk
index 916b27e..e856185 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -169,6 +169,10 @@
frameworks/native/data/etc/android.hardware.camera.full.xml:system/etc/permissions/android.hardware.camera.full.xml \
frameworks/native/data/etc/android.hardware.camera.raw.xml:system/etc/permissions/android.hardware.camera.raw.xml
+# Dumpstate HAL
+PRODUCT_PACKAGES += \
+ android.hardware.dumpstate@1.0-service.marlin
+
# Wi-Fi
PRODUCT_PACKAGES += \
libwpa_client \
diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk
index 0413310..596ac90 100644
--- a/dumpstate/Android.mk
+++ b/dumpstate/Android.mk
@@ -16,13 +16,26 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.dumpstate@1.0-service.marlin
+LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.marlin.rc
+LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_STATIC_LIBRARIES := libdumpstateheaders
+LOCAL_SRC_FILES := \
+ DumpstateDevice.cpp \
+ service.cpp
-LOCAL_SRC_FILES := dumpstate.cpp
-
-LOCAL_MODULE := libdumpstate.$(TARGET_DEVICE)
+LOCAL_SHARED_LIBRARIES := \
+ android.hardware.dumpstate@1.0 \
+ libbase \
+ libcutils \
+ libdumpstateutil \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libutils
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_EXECUTABLE)
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
new file mode 100755
index 0000000..b3323a7
--- /dev/null
+++ b/dumpstate/DumpstateDevice.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2016 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.
+ */
+
+#define LOG_TAG "dumpstate"
+
+#include "DumpstateDevice.h"
+
+#include <android-base/properties.h>
+#include <cutils/properties.h>
+#include <libgen.h>
+#include <log/log.h>
+#include <stdlib.h>
+#include <string>
+
+#include "DumpstateUtil.h"
+
+#define MODEM_LOG_PREFIX_PROPERTY "ro.radio.log_prefix"
+#define MODEM_LOGGING_SWITCH "persist.radio.smlog_switch"
+
+using android::os::dumpstate::CommandOptions;
+using android::os::dumpstate::DumpFileToFd;
+using android::os::dumpstate::PropertiesHelper;
+using android::os::dumpstate::RunCommandToFd;
+
+namespace android {
+namespace hardware {
+namespace dumpstate {
+namespace V1_0 {
+namespace implementation {
+
+namespace {
+
+static void getModemLogs(int fd)
+{
+ bool modemLogsEnabled = 0;
+
+ /* Check if smlog_dump tool exist */
+ if (!PropertiesHelper::IsUserBuild() && !access("/system/bin/smlog_dump", F_OK)) {
+ modemLogsEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false);
+
+ /* Execute SMLOG DUMP if SMLOG is enabled */
+ if (modemLogsEnabled) {
+ // TODO: uses a temporary path instead
+ std::string bugreportDir = "/bugreports";
+ CommandOptions options = CommandOptions::WithTimeout(120).AsRoot().Build();
+ RunCommandToFd(fd, "SMLOG DUMP", { "smlog_dump", "-d", "-o", bugreportDir.c_str() }, options);
+
+ // Remove smlog folders older than 10 days.
+ std::string filePrefix = android::base::GetProperty(MODEM_LOG_PREFIX_PROPERTY, "");
+ if (!filePrefix.empty()) {
+
+ std::string removeCommand = "/system/bin/find " +
+ bugreportDir + "/" + filePrefix + "* -mtime +10 -delete";
+
+ RunCommandToFd(fd, "RM OLD SMLOG",
+ { "/system/bin/sh", "-c", removeCommand.c_str()},
+ CommandOptions::AS_ROOT);
+ }
+ }
+ RunCommandToFd(fd, "RM OLD SMLOG",
+ { "/system/bin/sh", "-c", "/system/bin/find /data/smlog_* -delete" },
+ CommandOptions::AS_ROOT);
+ }
+}
+
+} // unnamed namespace
+
+
+// Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.
+Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
+ if (handle->numFds < 1) {
+ ALOGE("no FDs\n");
+ return Void();
+ }
+
+ int fd = handle->data[0];
+ if (fd < 0) {
+ ALOGE("invalid FD: %d\n", handle->data[0]);
+ return Void();
+ }
+
+ getModemLogs(fd);
+ DumpFileToFd(fd, "CPU present", "/sys/devices/system/cpu/present");
+ DumpFileToFd(fd, "CPU online", "/sys/devices/system/cpu/online");
+ DumpFileToFd(fd, "RPM Stats", "/d/rpm_stats");
+ DumpFileToFd(fd, "Power Management Stats", "/d/rpm_master_stats");
+ DumpFileToFd(fd, "SMD Log", "/d/ipc_logging/smd/log");
+ RunCommandToFd(fd, "ION HEAPS", {"/system/bin/sh", "-c", "for d in $(ls -d /d/ion/*); do for f in $(ls $d); do echo --- $d/$f; cat $d/$f; done; done"}, CommandOptions::AS_ROOT);
+ DumpFileToFd(fd, "dmabuf info", "/d/dma_buf/bufinfo");
+ RunCommandToFd(fd, "Temperatures", {"/system/bin/sh", "-c", "for f in `ls /sys/class/thermal` ; do type=`cat /sys/class/thermal/$f/type` ; temp=`cat /sys/class/thermal/$f/temp` ; echo \"$type: $temp\" ; done"}, CommandOptions::AS_ROOT);
+ DumpFileToFd(fd, "cpu0-1 time-in-state", "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");
+ RunCommandToFd(fd, "cpu0-1 cpuidle", {"/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu0/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done"}, CommandOptions::AS_ROOT);
+ DumpFileToFd(fd, "cpu2-3 time-in-state", "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state");
+ RunCommandToFd(fd, "cpu2-3 cpuidle", {"/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu2/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done"}, CommandOptions::AS_ROOT);
+ DumpFileToFd(fd, "MDP xlogs", "/d/mdp/xlog/dump");
+ RunCommandToFd(fd, "RAMDUMP LIST", {"/system/bin/sh", "-c", "cat /data/data/com.android.ramdump/files/RAMDUMP_LIST"}, CommandOptions::AS_ROOT);
+
+ /* Check if qsee_logger tool exists */
+ if (!access("/system/bin/qsee_logger", F_OK)) {
+ RunCommandToFd(fd, "FP LOGS", {"qsee_logger", "-d"});
+ }
+
+ return Void();
+};
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace dumpstate
+} // namespace hardware
+} // namespace android
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
new file mode 100644
index 0000000..9237b3b
--- /dev/null
+++ b/dumpstate/DumpstateDevice.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+#ifndef ANDROID_HARDWARE_DUMPSTATE_V1_0_DUMPSTATEDEVICE_H
+#define ANDROID_HARDWARE_DUMPSTATE_V1_0_DUMPSTATEDEVICE_H
+
+#include <android/hardware/dumpstate/1.0/IDumpstateDevice.h>
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+
+namespace android {
+namespace hardware {
+namespace dumpstate {
+namespace V1_0 {
+namespace implementation {
+
+using ::android::hardware::dumpstate::V1_0::IDumpstateDevice;
+using ::android::hardware::hidl_array;
+using ::android::hardware::hidl_handle;
+using ::android::hardware::hidl_string;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+struct DumpstateDevice : public IDumpstateDevice {
+ // Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.
+ Return<void> dumpstateBoard(const hidl_handle& h) override;
+};
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace dumpstate
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_DUMPSTATE_V1_0_DUMPSTATEDEVICE_H
diff --git a/dumpstate/android.hardware.dumpstate@1.0-service.marlin.rc b/dumpstate/android.hardware.dumpstate@1.0-service.marlin.rc
new file mode 100644
index 0000000..7ef863e
--- /dev/null
+++ b/dumpstate/android.hardware.dumpstate@1.0-service.marlin.rc
@@ -0,0 +1,4 @@
+service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service.marlin
+ class hal
+ user system
+ group system
diff --git a/dumpstate/dumpstate.cpp b/dumpstate/dumpstate.cpp
deleted file mode 100755
index f9570ee..0000000
--- a/dumpstate/dumpstate.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2016 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.
- */
-
-#define LOG_TAG "dumpstate"
-
-#include <dumpstate.h>
-#include <cutils/properties.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <string>
-#include <android-base/properties.h>
-
-#include <cutils/log.h>
-
-#define MODEM_LOG_PREFIX_PROPERTY "ro.radio.log_prefix"
-#define MODEM_LOGGING_SWITCH "persist.radio.smlog_switch"
-
-static void getModemLogs(Dumpstate &ds)
-{
- bool modemLogsEnabled = 0;
-
- /* Check if smlog_dump tool exist */
- if (!ds.IsUserBuild() && !access("/system/bin/smlog_dump", F_OK)) {
- modemLogsEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false);
-
- /* Execute SMLOG DUMP if SMLOG is enabled */
- if (modemLogsEnabled && !ds.GetPath("").empty()) {
- std::string bugreportDir = dirname(ds.GetPath("").c_str());
- CommandOptions options = CommandOptions::WithTimeout(120).AsRoot().Build();
- ds.RunCommand("SMLOG DUMP", { "smlog_dump", "-d", "-o", bugreportDir.c_str() }, options);
-
- // Remove smlog folders older than 10 days.
- std::string filePrefix = android::base::GetProperty(MODEM_LOG_PREFIX_PROPERTY, "");
- if (!filePrefix.empty()) {
-
- std::string removeCommand = "/system/bin/find " +
- bugreportDir + "/" + filePrefix + "* -mtime +10 -delete";
-
- ds.RunCommand("RM OLD SMLOG",
- { "/system/bin/sh", "-c", removeCommand.c_str()},
- CommandOptions::AS_ROOT_5);
- }
- }
- ds.RunCommand("RM OLD SMLOG",
- { "/system/bin/sh", "-c", "/system/bin/find /data/smlog_* -delete" },
- CommandOptions::AS_ROOT_5);
- }
-}
-
-
-void dumpstate_board()
-{
- Dumpstate& ds = Dumpstate::GetInstance();
-
- getModemLogs(ds);
- ds.DumpFile("CPU present", "/sys/devices/system/cpu/present");
- ds.DumpFile("CPU online", "/sys/devices/system/cpu/online");
- ds.DumpFile("RPM Stats", "/d/rpm_stats");
- ds.DumpFile("Power Management Stats", "/d/rpm_master_stats");
- ds.DumpFile("SMD Log", "/d/ipc_logging/smd/log");
- ds.RunCommand("ION HEAPS", {"/system/bin/sh", "-c", "for d in $(ls -d /d/ion/*); do for f in $(ls $d); do echo --- $d/$f; cat $d/$f; done; done"}, CommandOptions::AS_ROOT_5);
- ds.DumpFile("dmabuf info", "/d/dma_buf/bufinfo");
- ds.RunCommand("Temperatures", {"/system/bin/sh", "-c", "for f in `ls /sys/class/thermal` ; do type=`cat /sys/class/thermal/$f/type` ; temp=`cat /sys/class/thermal/$f/temp` ; echo \"$type: $temp\" ; done"}, CommandOptions::AS_ROOT_5);
- ds.DumpFile("cpu0-1 time-in-state", "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");
- ds.RunCommand("cpu0-1 cpuidle", {"/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu0/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done"}, CommandOptions::AS_ROOT_5);
- ds.DumpFile("cpu2-3 time-in-state", "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state");
- ds.RunCommand("cpu2-3 cpuidle", {"/system/bin/sh", "-c", "for d in $(ls -d /sys/devices/system/cpu/cpu2/cpuidle/state*); do echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done"}, CommandOptions::AS_ROOT_5);
- ds.DumpFile("MDP xlogs", "/d/mdp/xlog/dump");
- ds.RunCommand("RAMDUMP LIST", {"/system/bin/sh", "-c", "cat /data/data/com.android.ramdump/files/RAMDUMP_LIST"}, CommandOptions::AS_ROOT_5);
-
- /* Check if qsee_logger tool exists */
- if (!access("/system/bin/qsee_logger", F_OK)) {
- ds.RunCommand("FP LOGS", {"qsee_logger", "-d"});
- }
-};
diff --git a/dumpstate/service.cpp b/dumpstate/service.cpp
new file mode 100644
index 0000000..93aa1a1
--- /dev/null
+++ b/dumpstate/service.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+#define LOG_TAG "android.hardware.dumpstate@1.0-service.marlin"
+
+#include <hidl/HidlSupport.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include "DumpstateDevice.h"
+
+using ::android::hardware::configureRpcThreadpool;
+using ::android::hardware::dumpstate::V1_0::IDumpstateDevice;
+using ::android::hardware::dumpstate::V1_0::implementation::DumpstateDevice;
+using ::android::hardware::joinRpcThreadpool;
+using ::android::sp;
+
+
+int main(int /* argc */, char* /* argv */ []) {
+ sp<IDumpstateDevice> dumpstate = new DumpstateDevice;
+ configureRpcThreadpool(1, true);
+ dumpstate->registerAsService("dumpstate");
+ joinRpcThreadpool();
+}
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 2b80170..cdaac1a 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -55,8 +55,6 @@
-include $(QCPATH)/common/msm8996/BoardConfigVendor.mk
-BOARD_HAL_STATIC_LIBRARIES := libdumpstate.marlin
-
TARGET_AUX_OS_VARIANT_LIST := marlin
# Some framework code requires this to enable BT
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index ec74b99..09c6642 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -54,8 +54,6 @@
-include $(QCPATH)/common/msm8996/BoardConfigVendor.mk
-BOARD_HAL_STATIC_LIBRARIES := libdumpstate.sailfish
-
TARGET_AUX_OS_VARIANT_LIST := sailfish
# Some framework code requires this to enable BT
diff --git a/sepolicy/dumpstate.te b/sepolicy/dumpstate.te
deleted file mode 100644
index 2301e0b..0000000
--- a/sepolicy/dumpstate.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# supress audit messages for attempting access to /firmware
-dontaudit dumpstate firmware_file:dir search;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 15e6a0d..a922690 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -118,10 +118,11 @@
/system/bin/preloads_copy\.sh u:object_r:preloads_copy_exec:s0
# files in /vendor
-/vendor/bin/thermal-engine u:object_r:thermal-engine_exec:s0
-/vendor/bin/perfd u:object_r:perfd_exec:s0
-/vendor/bin/nanohub_slpi u:object_r:nanohub_slpi_exec:s0
+/vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service.marlin u:object_r:hal_dumpstate_impl_exec:s0
/vendor/bin/msm_irqbalance u:object_r:irqbalance_exec:s0
+/vendor/bin/nanohub_slpi u:object_r:nanohub_slpi_exec:s0
+/vendor/bin/perfd u:object_r:perfd_exec:s0
+/vendor/bin/thermal-engine u:object_r:thermal-engine_exec:s0
# /sys
/sys/devices/virtual/nanohub/nanohub(/.*)? u:object_r:sysfs_nanoapp_cmd:s0
diff --git a/sepolicy/hal_dumpstate_impl.te b/sepolicy/hal_dumpstate_impl.te
new file mode 100644
index 0000000..88fc272
--- /dev/null
+++ b/sepolicy/hal_dumpstate_impl.te
@@ -0,0 +1,7 @@
+type hal_dumpstate_impl, domain, hal_dumpstate;
+type hal_dumpstate_impl_exec, exec_type, file_type;
+
+init_daemon_domain(hal_dumpstate_impl)
+
+# supress audit messages for attempting access to /firmware
+dontaudit dumpstate firmware_file:dir search;
\ No newline at end of file
