commit d24276d39911a0024e747e41bea278515dae5bdd
author Jesse Hall <jessehall@google.com> Mon Nov 12 09:58:12 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 12 09:58:12 2012 -0800
tree 82f37a33bab421a005a70d96c6eaa93d24f7ca5f
parent 2bdd8fd65a8fa4b48db26d3873010608d154666f
parent 692c723e84e6f2747447d871d468ff50e5c73f19

Merge "Create builtin display tokens on demand"

cmds/dumpstate/dumpstate.c

diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 1aae99e..dcd7671 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -188,6 +188,12 @@
     run_command("WIFI NETWORKS", 20,
             SU_PATH, "root", "wpa_cli", "list_networks", NULL);
 
+#ifdef FWDUMP_bcmdhd
+    run_command("DUMP WIFI INTERNAL COUNTERS", 20,
+            SU_PATH, "root", "wlutil", "counters", NULL);
+#endif
+    dump_file("INTERRUPTS (1)", "/proc/interrupts");
+
     property_get("dhcp.wlan0.gateway", network, "");
     if (network[0])
         run_command("PING GATEWAY", 10, SU_PATH, "root", "ping", "-c", "3", "-i", ".5", network, NULL);
@@ -197,12 +203,13 @@
     property_get("dhcp.wlan0.dns2", network, "");
     if (network[0])
         run_command("PING DNS2", 10, SU_PATH, "root", "ping", "-c", "3", "-i", ".5", network, NULL);
-#ifdef FWDUMP_bcm4329
+#ifdef FWDUMP_bcmdhd
     run_command("DUMP WIFI STATUS", 20,
             SU_PATH, "root", "dhdutil", "-i", "wlan0", "dump", NULL);
     run_command("DUMP WIFI INTERNAL COUNTERS", 20,
             SU_PATH, "root", "wlutil", "counters", NULL);
 #endif
+    dump_file("INTERRUPTS (2)", "/proc/interrupts");
 
     print_properties();
 

include/utils/Trace.h

diff --git a/include/utils/Trace.h b/include/utils/Trace.h
index 93e2285..41bce00 100644
--- a/include/utils/Trace.h
+++ b/include/utils/Trace.h
@@ -54,6 +54,8 @@
 #define ATRACE_TAG_CAMERA           (1<<10)
 #define ATRACE_TAG_LAST             ATRACE_TAG_CAMERA
 
+#define ATRACE_TAG_NOT_READY        (1LL<<63)   // Reserved for use during init
+
 #define ATRACE_TAG_VALID_MASK ((ATRACE_TAG_LAST - 1) | ATRACE_TAG_LAST)
 
 #ifndef ATRACE_TAG

libs/utils/Trace.cpp

diff --git a/libs/utils/Trace.cpp b/libs/utils/Trace.cpp
index 5cd5731..f5aaea3 100644
--- a/libs/utils/Trace.cpp
+++ b/libs/utils/Trace.cpp
@@ -25,7 +25,7 @@
 
 volatile int32_t Tracer::sIsReady = 0;
 int Tracer::sTraceFD = -1;
-uint64_t Tracer::sEnabledTags = 0;
+uint64_t Tracer::sEnabledTags = ATRACE_TAG_NOT_READY;
 Mutex Tracer::sMutex;
 
 void Tracer::changeCallback() {
@@ -46,7 +46,7 @@
         sTraceFD = open(traceFileName, O_WRONLY);
         if (sTraceFD == -1) {
             ALOGE("error opening trace file: %s (%d)", strerror(errno), errno);
-            // sEnabledTags remains zero indicating that no tracing can occur
+            sEnabledTags = 0;   // no tracing can occur
         } else {
             loadSystemProperty();
         }