crosshatch: Reset to wahoo on master.

commit dc78ac4aaa64e427c0f5c0672dc22939a9a7b85f
Merge: 820b880 163a21c
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue Jun 27 15:12:54 2017 +0000

    Merge "Report feature android.software.midi to enable testing" into oc-dr1-dev am: 614e203677
    am: 163a21c15f

    Change-Id: I18876c0ce8e0435fdcb947d475c66fe7fae57da1

Change-Id: Id08e99f0603407199020818485eb29d92d421c43

5 files changed, 141 insertions, 48 deletions

diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk
index ee44247..6607bf8 100644
--- a/dumpstate/Android.mk
+++ b/dumpstate/Android.mk
@@ -16,8 +16,8 @@
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.dumpstate@1.0-service.crosshatch
-LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.crosshatch.rc
+LOCAL_MODULE := android.hardware.dumpstate@1.0-service.wahoo
+LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.wahoo.rc
 LOCAL_MODULE_RELATIVE_PATH := hw
 
 LOCAL_SRC_FILES := \
@@ -35,6 +35,8 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
     libutils
 
+LOCAL_CFLAGS := -Werror -Wall
+
 LOCAL_MODULE_TAGS := optional
 LOCAL_PROPRIETARY_MODULE := true
 
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index e68d7e8..63db6fc 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -19,6 +19,7 @@
 #include "DumpstateDevice.h"
 
 #include <android-base/properties.h>
+#include <android-base/unique_fd.h>
 #include <cutils/properties.h>
 #include <libgen.h>
 #include <log/log.h>
@@ -31,6 +32,9 @@
 #define MODEM_LOG_LOC_PROPERTY "ro.radio.log_loc"
 #define MODEM_LOGGING_SWITCH "persist.radio.smlog_switch"
 
+#define DIAG_MDLOG_PROPERTY "sys.modem.diag.mdlog"
+#define DIAG_MDLOG_STATUS_PROPERTY "sys.modem.diag.mdlog_on"
+
 using android::os::dumpstate::CommandOptions;
 using android::os::dumpstate::DumpFileToFd;
 using android::os::dumpstate::PropertiesHelper;
@@ -42,55 +46,115 @@ namespace dumpstate {
 namespace V1_0 {
 namespace implementation {
 
-namespace {
-
-static void getModemLogs(int fd)
+void DumpstateDevice::dumpModem(int fd, int fdModem)
 {
-    bool modemLogsEnabled = 0;
     std::string modemLogDir = android::base::GetProperty(MODEM_LOG_LOC_PROPERTY, "");
     if (modemLogDir.empty()) {
         ALOGD("No modem log place is set\n");
         return;
     }
-    /* Check if smlog_dump tool exist */
-    if (!PropertiesHelper::IsUserBuild() && !access("/system/bin/smlog_dump", X_OK)) {
-        modemLogsEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false);
-
-        /* Execute SMLOG DUMP if SMLOG is enabled */
-        if (modemLogsEnabled) {
-            CommandOptions options = CommandOptions::WithTimeout(120).Build();
-            std::string modemLogAllDir = modemLogDir + "/modem_log";
-            std::vector<std::string> rilAndNetmgrLogs
-                {
-                 "/data/misc/radio/ril_log",
-                 "/data/misc/radio/ril_log_old",
-                 "/data/misc/netmgr/netmgr_log",
-                 "/data/misc/netmgr/netmgr_log_old"
-                };
-            std::string modemLogMkDirCmd= "/system/bin/mkdir " + modemLogAllDir;
-            RunCommandToFd(fd, "MKDIR MODEM LOG", { "/system/bin/sh", "-c", modemLogMkDirCmd.c_str()}, options);
-            RunCommandToFd(fd, "SMLOG DUMP", { "smlog_dump", "-d", "-o", modemLogAllDir.c_str() }, options);
-            for (std::string logFile : rilAndNetmgrLogs)
+
+    if (!PropertiesHelper::IsUserBuild()) {
+        bool smlogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false) &&
+                !access("/vendor/bin/smlog_dump", X_OK);
+
+        bool diagLogEnabled = android::base::GetBoolProperty(DIAG_MDLOG_PROPERTY, false);
+
+        CommandOptions options = CommandOptions::WithTimeout(120).Build();
+        std::string modemLogAllDir = modemLogDir + "/modem_log";
+        std::string diagLogDir = "/data/vendor/radio/diag_logs/logs";
+        std::vector<std::string> rilAndNetmgrLogs
             {
-              std::string copyCmd= "/system/bin/cp " + logFile + " " + modemLogAllDir;
-              RunCommandToFd(fd, "MV MODEM LOG", { "/system/bin/sh", "-c", copyCmd.c_str()}, options);
+              "/data/vendor/radio/ril_log",
+              "/data/vendor/radio/ril_log_old",
+              "/data/vendor/netmgr/netmgr_log",
+              "/data/vendor/netmgr/netmgr_log_old"
+            };
+
+        std::string modemLogMkDirCmd= "/vendor/bin/mkdir -p " + modemLogAllDir;
+        RunCommandToFd(fd, "MKDIR MODEM LOG", { "/vendor/bin/sh", "-c", modemLogMkDirCmd.c_str()}, options);
+
+        if (smlogEnabled) {
+            RunCommandToFd(fd, "SMLOG DUMP", { "smlog_dump", "-d", "-o", modemLogAllDir.c_str() }, options);
+        } else if (diagLogEnabled) {
+            std::string copyCmd= "/vendor/bin/cp -rf " + diagLogDir + " " + modemLogAllDir;
+
+            android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false");
+
+            ALOGD("Waiting for diag log to exit\n");
+            for (int i = 0; i < 30; i++) {
+                if (!android::base::GetBoolProperty(DIAG_MDLOG_STATUS_PROPERTY, false)) {
+                    ALOGD("diag log exited\n");
+                    sleep(1);
+                    break;
+                }
+
+                sleep(1);
             }
-            std::string filePrefix = android::base::GetProperty(MODEM_LOG_PREFIX_PROPERTY, "");
-            if (!filePrefix.empty()) {
-                std::string modemLogCombined = modemLogDir + "/" + filePrefix + "all.tar";
-                std::string modemLogTarCmd= "/system/bin/tar cvf " + modemLogCombined + " -C " + modemLogAllDir + " .";
-                RunCommandToFd(fd, "TAR LOG", { "/system/bin/sh", "-c", modemLogTarCmd.c_str()}, options);
-                std::string modemLogPermCmd= "/system/bin/chmod a+rw " + modemLogCombined;
-                RunCommandToFd(fd, "CHG PERM", { "/system/bin/sh", "-c", modemLogPermCmd.c_str()}, options);
-                std::string modemLogClearCmd= "/system/bin/rm -r " + modemLogAllDir;
-                RunCommandToFd(fd, "RM MODEM DIR", { "/system/bin/sh", "-c", modemLogClearCmd.c_str()}, options);
+
+            RunCommandToFd(fd, "CP DIAG LOGS", { "/vendor/bin/sh", "-c", copyCmd.c_str()}, options);
+
+            android::base::SetProperty(DIAG_MDLOG_PROPERTY, "true");
+        }
+
+        for (const auto& logFile : rilAndNetmgrLogs)
+        {
+            std::string copyCmd= "/vendor/bin/cp " + logFile + " " + modemLogAllDir;
+            RunCommandToFd(fd, "CP MODEM LOG", { "/vendor/bin/sh", "-c", copyCmd.c_str()}, options);
+        }
+
+        std::string filePrefix = android::base::GetProperty(MODEM_LOG_PREFIX_PROPERTY, "");
+
+        if (!filePrefix.empty()) {
+            std::string modemLogCombined = modemLogDir + "/" + filePrefix + "all.tar";
+            std::string modemLogTarCmd= "/vendor/bin/tar cvf " + modemLogCombined + " -C " + modemLogAllDir + " .";
+            RunCommandToFd(fd, "TAR LOG", { "/vendor/bin/sh", "-c", modemLogTarCmd.c_str()}, options);
+
+            std::string modemLogPermCmd= "/vendor/bin/chmod a+rw " + modemLogCombined;
+            RunCommandToFd(fd, "CHG PERM", { "/vendor/bin/sh", "-c", modemLogPermCmd.c_str()}, options);
+
+            std::vector<uint8_t> buffer(65536);
+            android::base::unique_fd fdLog(TEMP_FAILURE_RETRY(open(modemLogCombined.c_str(), O_RDONLY | O_CLOEXEC | O_NONBLOCK)));
+
+            if (fdLog >= 0) {
+                while (1) {
+                    ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fdLog, buffer.data(), buffer.size()));
+
+                    if (bytes_read == 0) {
+                        break;
+                    } else if (bytes_read < 0) {
+                        ALOGD("read(%s): %s\n", modemLogCombined.c_str(), strerror(errno));
+                        break;
+                    }
+
+                    ssize_t result = TEMP_FAILURE_RETRY(write(fdModem, buffer.data(), bytes_read));
+
+                    if (result != bytes_read) {
+                        ALOGD("Failed to write %ld bytes, actually written: %ld", bytes_read, result);
+                        break;
+                    }
+                }
             }
+
+            std::string modemLogClearCmd= "/vendor/bin/rm -r " + modemLogAllDir;
+            RunCommandToFd(fd, "RM MODEM DIR", { "/vendor/bin/sh", "-c", modemLogClearCmd.c_str()}, options);
+            RunCommandToFd(fd, "RM LOG", { "/vendor/bin/rm", modemLogCombined.c_str()}, options);
         }
     }
 }
 
-} // unnamed namespace
-
+static void DumpTouch(int fd) {
+    if (!access("/sys/android_touch", R_OK)) {
+        DumpFileToFd(fd, "Synaptics touch firmware version",
+                     "/sys/android_touch/vendor");
+        DumpFileToFd(fd, "Synaptics touch firmware config",
+                     "/sys/android_touch/config");
+    }
+    if (!access("/sys/class/input/ftm4_touch", R_OK)) {
+        DumpFileToFd(fd, "STM touch firmware config",
+                     "/sys/class/input/ftm4_touch/version");
+    }
+}
 
 // Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.
 Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
@@ -105,24 +169,41 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
         return Void();
     }
 
-    getModemLogs(fd);
+    if (handle->numFds < 2) {
+        ALOGE("no FD for modem\n");
+    }
+    else {
+        int fdModem = handle->data[1];
+        dumpModem(fd, fdModem);
+    }
+
+    DumpFileToFd(fd, "SoC serial number", "/sys/devices/soc0/serial_number");
     DumpFileToFd(fd, "CPU present", "/sys/devices/system/cpu/present");
     DumpFileToFd(fd, "CPU online", "/sys/devices/system/cpu/online");
     DumpFileToFd(fd, "INTERRUPTS", "/proc/interrupts");
     DumpFileToFd(fd, "RPM Stats", "/d/rpm_stats");
     DumpFileToFd(fd, "Power Management Stats", "/d/rpm_master_stats");
+    DumpFileToFd(fd, "WLAN Power Stats", "/d/wlan0/power_stats");
+    DumpFileToFd(fd, "LL-Stats", "/d/wlan0/ll_stats");
+    DumpFileToFd(fd, "ICNSS Stats", "/d/icnss/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"});
+    RunCommandToFd(fd, "ION HEAPS", {"/vendor/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"});
     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"});
+    RunCommandToFd(fd, "Temperatures", {"/vendor/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"});
     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"});
+    RunCommandToFd(fd, "cpu0-1 cpuidle", {"/vendor/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"});
     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"});
-    DumpFileToFd(fd, "MDP xlogs", "/d/mdp/xlog/dump");
+    RunCommandToFd(fd, "cpu2-3 cpuidle", {"/vendor/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"});
+    DumpFileToFd(fd, "MDP xlogs", "/data/vendor/display/mdp_xlog");
+    DumpFileToFd(fd, "TCPM logs", "/d/tcpm/usbpd0");
+    DumpFileToFd(fd, "PD Engine", "/d/pd_engine/usbpd0");
+    DumpFileToFd(fd, "smblib-usb logs", "/d/ipc_logging/smblib/log");
+    DumpFileToFd(fd, "ipc-local-ports", "/d/msm_ipc_router/dump_local_ports");
+    DumpTouch(fd);
+    RunCommandToFd(fd, "USB Device Descriptors", {"/vendor/bin/sh", "-c", "cd /sys/bus/usb/devices/1-1 && cat product && cat bcdDevice; cat descriptors | od -t x1 -w16 -N96"});
 
     /* Check if qsee_logger tool exists */
-    if (!access("/system/bin/qsee_logger", X_OK)) {
+    if (!access("/vendor/bin/qsee_logger", X_OK)) {
       RunCommandToFd(fd, "FP LOGS", {"qsee_logger", "-d"});
     }
 
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index 9237b3b..650c0cd 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -38,6 +38,8 @@ using ::android::sp;
 struct DumpstateDevice : public IDumpstateDevice {
   // Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.
   Return<void> dumpstateBoard(const hidl_handle& h) override;
+
+  void dumpModem(int fd, int fdModem);
 };
 
 }  // namespace implementation
diff --git a/dumpstate/android.hardware.dumpstate@1.0-service.crosshatch.rc b/dumpstate/android.hardware.dumpstate@1.0-service.wahoo.rc
index c20657e..924782f 100644
--- a/dumpstate/android.hardware.dumpstate@1.0-service.crosshatch.rc
+++ b/dumpstate/android.hardware.dumpstate@1.0-service.wahoo.rc
@@ -1,4 +1,4 @@
-service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service.crosshatch
+service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service.wahoo
     class hal
     user system
     group system
diff --git a/dumpstate/service.cpp b/dumpstate/service.cpp
index c59e8e5..e509166 100644
--- a/dumpstate/service.cpp
+++ b/dumpstate/service.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_TAG "android.hardware.dumpstate@1.0-service.crosshatch"
+#define LOG_TAG "android.hardware.dumpstate@1.0-service.wahoo"
 
 #include <hidl/HidlSupport.h>
 #include <hidl/HidlTransportSupport.h>
@@ -30,6 +30,14 @@ using ::android::sp;
 int main(int /* argc */, char* /* argv */ []) {
   sp<IDumpstateDevice> dumpstate = new DumpstateDevice;
   configureRpcThreadpool(1, true);
-  dumpstate->registerAsService();
+
+  android::status_t status = dumpstate->registerAsService();
+
+  if (status != android::OK)
+  {
+    ALOGE("Could not register DumpstateDevice service (%d).", status);
+    return -1;
+  }
+
   joinRpcThreadpool();
 }