ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 3fbced6a: am 9794f903: Merge "atrace: fix tracing on user builds" into jb-mr2-dev

Browse Source 
* commit '3fbced6acea98a87f15896b32e8433442d05de86':
  atrace: fix tracing on user builds
This commit is contained in:
Jamie Gennis 2013-03-28 11:19:42 -07:00 committed by Android Git Automerger
commit 4e13d03b25
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/atrace/atrace.cpp
View File

@ -433,8 +433,10 @@ static bool setKernelTraceFuncs(const char* funcs)
if (funcs == NULL || funcs[0] == '\0') { if (funcs == NULL || funcs[0] == '\0') {
// Disable kernel function tracing. // Disable kernel function tracing.
ok &= writeStr(k_currentTracerPath, "nop"); if (fileIsWritable(k_currentTracerPath)) {
if (fileExists(k_ftraceFilterPath)) { ok &= writeStr(k_currentTracerPath, "nop");
}
if (fileIsWritable(k_ftraceFilterPath)) {
ok &= truncateFile(k_ftraceFilterPath); ok &= truncateFile(k_ftraceFilterPath);
} }
} else { } else {
@ -761,11 +763,11 @@ int main(int argc, char **argv)
case 'k': case 'k':
g_kernelTraceFuncs = optarg; g_kernelTraceFuncs = optarg;
break; break;
case 'n': case 'n':
g_nohup = true; g_nohup = true;
break; break;
case 's': case 's':
g_initialSleepSecs = atoi(optarg); g_initialSleepSecs = atoi(optarg);
@ -796,7 +798,7 @@ int main(int argc, char **argv)
listSupportedCategories(); listSupportedCategories();
exit(0); exit(0);
} }
break; break;
default: default:
fprintf(stderr, "\n"); fprintf(stderr, "\n");