diff options
| author | Eunji, Lee <eunjieji.lee@samsung.com> | 2016-05-24 18:11:41 +0900 |
|---|---|---|
| committer | Eunji, Lee <eunjieji.lee@samsung.com> | 2016-05-24 18:11:41 +0900 |
| commit | 174bca5b104a0865a5c5f3b3cef05a97e298126d (patch) | |
| tree | 3b7574cf6e06c8784bd73b26fdf7a3849c73ed31 | |
| parent | 80c3e381d0426061593066be200a3c0d747c1065 (diff) | |
| parent | 071e56e56ab683d3dac2164f6ef9df4ae9570fab (diff) | |
| download | ttrace-174bca5b104a0865a5c5f3b3cef05a97e298126d.tar.gz ttrace-174bca5b104a0865a5c5f3b3cef05a97e298126d.tar.bz2 ttrace-174bca5b104a0865a5c5f3b3cef05a97e298126d.zip | |
Merge branch 'master' into tizensubmit/tizen/20160524.091253accepted/tizen/wearable/20160602.020635accepted/tizen/tv/20160602.020612accepted/tizen/mobile/20160602.020600accepted/tizen/ivi/20160602.020647accepted/tizen/common/20160526.145909
| -rwxr-xr-x | packaging/atrace-bootup.sh | 2 | ||||
| -rwxr-xr-x | src/atrace/atrace.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packaging/atrace-bootup.sh b/packaging/atrace-bootup.sh index a9acea7..7f07a3d 100755 --- a/packaging/atrace-bootup.sh +++ b/packaging/atrace-bootup.sh @@ -33,6 +33,6 @@ echo "$COMMAND" > "$CONF" sync sleep 1 -reboot +reboot -f exit 0 diff --git a/src/atrace/atrace.cpp b/src/atrace/atrace.cpp index fb2ec1f..05e1506 100755 --- a/src/atrace/atrace.cpp +++ b/src/atrace/atrace.cpp @@ -569,7 +569,8 @@ static bool setTagsProperty(uint64_t tags) close(fd); return false; } - + //for auto-mounting tracingfs (>= linux 4.1.x) + system("ls -al /sys/kernel/debug/tracing > /dev/null 2>&1"); if(!initSysfsPermission()) { fprintf(stderr, "Fail to init sysfs permisions: %s(%d)\n", strerror_r(errno, str_error, sizeof(str_error)), errno); munmap(sm_for_enabled_tag, sizeof(uint64_t)); |