commit 47935ac8e3dd619f758abd576605a564e33bb59c
author Tobias Grosser <grosser@google.com> Mon Jun 17 11:47:26 2013 -0700
committer Tobias Grosser <grosser@google.com> Mon Jun 17 18:34:34 2013 -0700
tree 2a0fb70e3b246e16e6df9a8f252f17cb6b6c9713
parent 095623bbf9d7b85d182944bb7b0f6430a30bbae0

Add the name of the forEach functions to the tracing output

Instead of showing up as 'runForEach', kernels are now e.g. printed as
'runForEach_createAntLookup'.

The String8 is carefully constructed here, such that we only pay
the string processing overhead in case tracing is actually enabled.

Change-Id: Id18319e271a02cbe888bcb9fe806794007d00fca

cpu_ref/rsCpuScript.cpp

diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index 4ba60d3..6f605c2 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -493,6 +493,7 @@
     // Copy info over to runtime
     script->mHal.info.exportedFunctionCount = info->getExportFuncNames().size();
     script->mHal.info.exportedVariableCount = info->getExportVarNames().size();
+    script->mHal.info.exportedForeachFuncList = info->getExportForeachFuncs().array();
     script->mHal.info.exportedPragmaCount = info->getPragmas().size();
     script->mHal.info.exportedPragmaKeyList =
         const_cast<const char**>(mExecutable->getPragmaKeys().array());

rsScript.h

diff --git a/rsScript.h b/rsScript.h
index a1360b5..c868aaa 100644
--- a/rsScript.h
+++ b/rsScript.h
@@ -19,6 +19,7 @@
 
 #include "rsAllocation.h"
 
+#include <utility>
 
 // ---------------------------------------------------------------------------
 namespace android {
@@ -72,6 +73,7 @@
             size_t exportedPragmaCount;
             char const **exportedPragmaKeyList;
             char const **exportedPragmaValueList;
+            const std::pair<const char *, uint32_t> *exportedForeachFuncList;
 
             int (* root)();
         };

rsScriptC.cpp

diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 3d9cd11..632dca8 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -29,6 +29,8 @@
 #include "utils/StopWatch.h"
 #endif
 
+#include "cutils/trace.h"
+
 #include <sys/stat.h>
 
 using namespace android;
@@ -167,14 +169,27 @@
                          const void * usr,
                          size_t usrBytes,
                          const RsScriptCall *sc) {
-
-    ATRACE_CALL();
+    // Trace this function call.
+    // To avoid overhead, we only build the string, if tracing is actually
+    // enabled.
+    String8 *AString = NULL;
+    const char *String = "";
+    if (ATRACE_ENABLED()) {
+        AString = new String8("runForEach_");
+        AString->append(mHal.info.exportedForeachFuncList[slot].first);
+        String = AString->string();
+    }
+    ATRACE_NAME(String);
+    (void)String;
 
     Context::PushState ps(rsc);
 
     setupGLState(rsc);
     setupScript(rsc);
     rsc->mHal.funcs.script.invokeForEach(rsc, this, slot, ain, aout, usr, usrBytes, sc);
+
+    if (AString)
+        delete AString;
 }
 
 void ScriptC::Invoke(Context *rsc, uint32_t slot, const void *data, size_t len) {