Pivot source files into top-level src,include and unify test target
See discussion in go/perfetto-build-files .
This is to disambiguate things like
#include "base/logging.h"
when in the chrome tree.
Also this CL unifies the test targets into two monolithic targets:
perfetto_tests and perfetto_benchmarks. This is to avoid ending
up with confusing binary names in the chrome tree (e.g.,
ipc_unittests)
Bug: 68710794
Change-Id: I1768e15b661406052b2be060d7aab0f1e7443a98
diff --git a/.travis.yml b/.travis.yml
index 8a5efa7..85e45f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -150,6 +150,8 @@
ftrace_reader_unittests
"
+ # TODO add ipc_unittests
+
if [[ "$CFG" != android-* ]]; then
for TEST_TARGET in $TEST_TARGETS; do
"out/dist/$TEST_TARGET"
diff --git a/BUILD.gn b/BUILD.gn
index 50df164..a9f9a35 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -18,9 +18,9 @@
testonly = true # allow to build also test targets
deps = [
":tests",
- "ftrace_reader:ftrace_reader_demo",
- "ipc/src/protoc_plugin:ipc_plugin($host_toolchain)",
- "protozero/src/protoc_plugin($host_toolchain)",
+ "src/ftrace_reader:ftrace_reader_demo",
+ "src/ipc/protoc_plugin:ipc_plugin($host_toolchain)",
+ "src/protozero/protoc_plugin($host_toolchain)",
"tools/ftrace_proto_gen:ftrace_proto_gen",
]
}
@@ -28,16 +28,16 @@
group("tests") {
testonly = true
deps = [
- "ftrace_reader:ftrace_reader_integrationtests",
- "ftrace_reader:ftrace_reader_unittests",
- "ipc:ipc_unittests",
- "perfetto_base:perfetto_base_unittests",
- "protozero:protozero_unittests",
+ "src/base:perfetto_base_unittests",
+ "src/ftrace_reader:ftrace_reader_integrationtests",
+ "src/ftrace_reader:ftrace_reader_unittests",
+ "src/ipc:perfetto_ipc_unittests",
+ "src/protozero:protozero_unittests",
+ "src/tracing:tracing_unittests",
"tools/sanitizers_unittests",
- "tracing:tracing_unittests",
]
if (!build_with_chromium) {
- deps += [ "tracing:tracing_benchmarks" ]
+ deps += [ "src/tracing:tracing_benchmarks" ]
}
}
diff --git a/build/BUILD.gn b/build/BUILD.gn
index 3258166..916b448 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -53,8 +53,6 @@
ldflags = []
libs = []
- include_dirs = [ ".." ]
-
cflags_cc += [ "-std=c++11" ]
cflags += [
diff --git a/build/test_data.txt b/build/test_data.txt
index 2ceb2b5..c0692b0 100644
--- a/build/test_data.txt
+++ b/build/test_data.txt
@@ -1,3 +1,3 @@
# List of test deps that should be pushed on the device. Paths are relative
# to the root.
-ftrace_reader/test/data/
+src/ftrace_reader/test/data/
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index fb1ec3d..b7a2bab 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -12,4 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# When building perfetto in the android tree this variable becomes magically
+# true by virtue of including //build_overrides by absolute path.
+# When false, instead, the build files can assume this is a Perfetto standalone
+# build.
build_with_chromium = false
diff --git a/ftrace_reader/BUILD.gn b/ftrace_reader/BUILD.gn
deleted file mode 100644
index 3ddd116..0000000
--- a/ftrace_reader/BUILD.gn
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-config("ftrace_reader_config") {
- include_dirs = [
- "include",
- "..",
- ]
-
- if (build_with_chromium) {
- include_dirs += [ "//testing/gtest/include" ]
- }
-}
-
-executable("ftrace_reader_unittests") {
- testonly = true
- deps = [
- ":ftrace_reader",
- "../gn:default_deps",
- "../gn:gtest_deps",
- "../gn:protobuf_full_deps",
- "../protos/ftrace:full",
- ]
-
- sources = [
- "src/cpu_reader_unittest.cc",
- "src/format_parser_unittest.cc",
- "src/ftrace_controller_unittest.cc",
- "src/ftrace_to_proto_unittest.cc",
- "src/proto_translation_table_unittest.cc",
- "src/scattered_stream_delegate_for_testing.h",
- ]
-}
-
-# These tests require access to a real ftrace implementation and must
-# run with sudo.
-executable("ftrace_reader_integrationtests") {
- testonly = true
- deps = [
- ":ftrace_reader",
- "../gn:default_deps",
- "../gn:gtest_deps",
- "../perfetto_base",
- "../protos/ftrace:full",
- ]
-
- sources = [
- "src/end_to_end_integrationtest.cc",
- "src/ftrace_procfs_integrationtest.cc",
- ]
-}
-
-executable("ftrace_reader_demo") {
- testonly = true
- sources = [
- "src/main.cc",
- ]
- deps = [
- ":ftrace_reader",
- "../gn:default_deps",
- "../perfetto_base",
- ]
-}
-
-source_set("ftrace_reader") {
- all_dependent_configs = [ ":ftrace_reader_config" ]
-
- deps = [
- "../perfetto_base",
- "../protozero",
- ]
-
- if (!build_with_chromium) {
- all_dependent_configs += [ "//buildtools:googletest_prod_config" ]
- }
-
- public_deps = [
- "../protos/ftrace:zero",
- ]
- sources = [
- "include/ftrace_reader/format_parser.h",
- "include/ftrace_reader/ftrace_controller.h",
- "include/ftrace_reader/ftrace_to_proto.h",
- "src/cpu_reader.cc",
- "src/cpu_reader.h",
- "src/format_parser.cc",
- "src/ftrace_controller.cc",
- "src/ftrace_procfs.cc",
- "src/ftrace_procfs.h",
- "src/ftrace_to_proto.cc",
- "src/proto_translation_table.cc",
- "src/proto_translation_table.h",
- ]
-}
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index d6b4315..92fba54 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -14,9 +14,27 @@
import("perfetto.gni")
+# Used in production targets (i.e. testonly == false) for the FRIEND_TEST_*
+# macros.
+group("gtest_prod_config") {
+ if (!build_with_chromium) {
+ public_configs = [ "//buildtools:googletest_prod_config" ]
+ } else {
+ public_configs = [ ":gtest_config" ]
+ }
+}
+
+config("gtest_config") {
+ if (build_with_chromium) {
+ include_dirs = [ "//testing/gtest/include" ]
+ }
+}
+
group("gtest_deps") {
testonly = true
+ public_configs = [ ":gtest_config" ]
+
if (!build_with_chromium) {
public_deps = [
"//buildtools:gmock",
@@ -32,17 +50,18 @@
}
}
-group("protoc_lib_deps") {
- if (!build_with_chromium) {
- if (current_toolchain == host_toolchain) {
+# protoc compiler library, for building protoc plugins on the host.
+if (current_toolchain == host_toolchain) {
+ group("protoc_lib_deps") {
+ if (!build_with_chromium) {
public_deps = [
"//buildtools:protoc_lib",
]
+ } else {
+ public_deps = [
+ "//third_party/protobuf:protoc_lib",
+ ]
}
- } else {
- public_deps = [
- "//third_party/protobuf:protoc_lib",
- ]
}
}
@@ -58,7 +77,10 @@
}
}
+# All targets should depend on this target to inherit the right flags and
+# include directories.
group("default_deps") {
+ public_configs = [ ":default_config" ]
if (!build_with_chromium) {
public_deps = [
"//build/libc++:deps",
@@ -66,3 +88,10 @@
]
}
}
+
+config("default_config") {
+ include_dirs = [
+ "..",
+ "../include",
+ ]
+}
diff --git a/gn/proto_library.gni b/gn/proto_library.gni
new file mode 100644
index 0000000..97b95d2
--- /dev/null
+++ b/gn/proto_library.gni
@@ -0,0 +1,23 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+
+if (!build_with_chromium) {
+ # TODO(primiano): Just move //build/proto_library.gni inside this branch,
+ # there is no need to have that in //build at this point.
+ import("//build/proto_library.gni")
+} else {
+ import("//third_party/protobuf/proto_library.gni")
+}
diff --git a/include/perfetto/base/BUILD.gn b/include/perfetto/base/BUILD.gn
new file mode 100644
index 0000000..14bfc2f
--- /dev/null
+++ b/include/perfetto/base/BUILD.gn
@@ -0,0 +1,29 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("base") {
+ sources = [
+ "build_config.h",
+ "logging.h",
+ "scoped_file.h",
+ "task_runner.h",
+ "thread_checker.h",
+ "unix_task_runner.h",
+ "utils.h",
+ "weak_ptr.h",
+ ]
+ if (is_android) {
+ sources += [ "android_task_runner.h" ]
+ }
+}
diff --git a/perfetto_base/android_task_runner.h b/include/perfetto/base/android_task_runner.h
similarity index 92%
rename from perfetto_base/android_task_runner.h
rename to include/perfetto/base/android_task_runner.h
index f5f8199..37abed6 100644
--- a/perfetto_base/android_task_runner.h
+++ b/include/perfetto/base/android_task_runner.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_ANDROID_TASK_RUNNER_H_
-#define PERFETTO_PERFETTO_BASE_ANDROID_TASK_RUNNER_H_
+#ifndef INCLUDE_PERFETTO_BASE_ANDROID_TASK_RUNNER_H_
+#define INCLUDE_PERFETTO_BASE_ANDROID_TASK_RUNNER_H_
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/task_runner.h"
-#include "perfetto_base/thread_checker.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/thread_checker.h"
#include <poll.h>
#include <chrono>
@@ -116,4 +116,4 @@
} // namespace base
} // namespace perfetto
-#endif // PERFETTO_PERFETTO_BASE_ANDROID_TASK_RUNNER_H_
+#endif // INCLUDE_PERFETTO_BASE_ANDROID_TASK_RUNNER_H_
diff --git a/perfetto_base/build_config.h b/include/perfetto/base/build_config.h
similarity index 90%
rename from perfetto_base/build_config.h
rename to include/perfetto/base/build_config.h
index 213f2f5..a8b800f 100644
--- a/perfetto_base/build_config.h
+++ b/include/perfetto/base/build_config.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_BUILD_CONFIG_H_
-#define PERFETTO_PERFETTO_BASE_BUILD_CONFIG_H_
+#ifndef INCLUDE_PERFETTO_BASE_BUILD_CONFIG_H_
+#define INCLUDE_PERFETTO_BASE_BUILD_CONFIG_H_
// DO NOT include this file in public headers (include/) to avoid collisions.
@@ -41,4 +41,4 @@
#error OS not supported (see build_config.h)
#endif
-#endif // PERFETTO_PERFETTO_BASE_BUILD_CONFIG_H_
+#endif // INCLUDE_PERFETTO_BASE_BUILD_CONFIG_H_
diff --git a/perfetto_base/logging.h b/include/perfetto/base/logging.h
similarity index 92%
rename from perfetto_base/logging.h
rename to include/perfetto/base/logging.h
index ad50ce5..14460d4 100644
--- a/perfetto_base/logging.h
+++ b/include/perfetto/base/logging.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_LOGGING_H_
-#define PERFETTO_PERFETTO_BASE_LOGGING_H_
+#ifndef INCLUDE_PERFETTO_BASE_LOGGING_H_
+#define INCLUDE_PERFETTO_BASE_LOGGING_H_
#include <errno.h>
#include <stdlib.h>
@@ -29,7 +29,7 @@
#include <string.h> // For strerror.
#endif
-#include "perfetto_base/utils.h"
+#include "perfetto/base/utils.h"
#if PERFETTO_DCHECK_IS_ON()
#define PERFETTO_DLOG(fmt, ...) \
@@ -60,4 +60,4 @@
} while (0)
#endif // PERFETTO_DCHECK_IS_ON()
-#endif // PERFETTO_PERFETTO_BASE_LOGGING_H_
+#endif // INCLUDE_PERFETTO_BASE_LOGGING_H_
diff --git a/perfetto_base/scoped_file.h b/include/perfetto/base/scoped_file.h
similarity index 90%
rename from perfetto_base/scoped_file.h
rename to include/perfetto/base/scoped_file.h
index d9ba25b..2a31ae7 100644
--- a/perfetto_base/scoped_file.h
+++ b/include/perfetto/base/scoped_file.h
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_SCOPED_FILE_H_
-#define PERFETTO_PERFETTO_BASE_SCOPED_FILE_H_
+#ifndef INCLUDE_PERFETTO_BASE_SCOPED_FILE_H_
+#define INCLUDE_PERFETTO_BASE_SCOPED_FILE_H_
#include <dirent.h>
#include <unistd.h>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
namespace perfetto {
namespace base {
@@ -64,4 +64,4 @@
} // namespace base
} // namespace perfetto
-#endif // PERFETTO_PERFETTO_BASE_SCOPED_FILE_H_
+#endif // INCLUDE_PERFETTO_BASE_SCOPED_FILE_H_
diff --git a/perfetto_base/task_runner.h b/include/perfetto/base/task_runner.h
similarity index 94%
rename from perfetto_base/task_runner.h
rename to include/perfetto/base/task_runner.h
index 1ae69bb..c6017b1 100644
--- a/perfetto_base/task_runner.h
+++ b/include/perfetto/base/task_runner.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_TASK_RUNNER_H_
-#define PERFETTO_PERFETTO_BASE_TASK_RUNNER_H_
+#ifndef INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
+#define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
#include <functional>
@@ -62,4 +62,4 @@
} // namespace base
} // namespace perfetto
-#endif // PERFETTO_PERFETTO_BASE_TASK_RUNNER_H_
+#endif // INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
diff --git a/perfetto_base/thread_checker.h b/include/perfetto/base/thread_checker.h
similarity index 88%
rename from perfetto_base/thread_checker.h
rename to include/perfetto/base/thread_checker.h
index 988d3d8..a33bb3b 100644
--- a/perfetto_base/thread_checker.h
+++ b/include/perfetto/base/thread_checker.h
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_THREAD_CHECKER_H_
-#define PERFETTO_PERFETTO_BASE_THREAD_CHECKER_H_
+#ifndef INCLUDE_PERFETTO_BASE_THREAD_CHECKER_H_
+#define INCLUDE_PERFETTO_BASE_THREAD_CHECKER_H_
#include <pthread.h>
#include <atomic>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
namespace perfetto {
namespace base {
@@ -52,4 +52,4 @@
} // namespace base
} // namespace perfetto
-#endif // PERFETTO_PERFETTO_BASE_THREAD_CHECKER_H_
+#endif // INCLUDE_PERFETTO_BASE_THREAD_CHECKER_H_
diff --git a/perfetto_base/unix_task_runner.h b/include/perfetto/base/unix_task_runner.h
similarity index 89%
rename from perfetto_base/unix_task_runner.h
rename to include/perfetto/base/unix_task_runner.h
index e804308..23da0ff 100644
--- a/perfetto_base/unix_task_runner.h
+++ b/include/perfetto/base/unix_task_runner.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_UNIX_TASK_RUNNER_H_
-#define PERFETTO_PERFETTO_BASE_UNIX_TASK_RUNNER_H_
+#ifndef INCLUDE_PERFETTO_BASE_UNIX_TASK_RUNNER_H_
+#define INCLUDE_PERFETTO_BASE_UNIX_TASK_RUNNER_H_
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/task_runner.h"
-#include "perfetto_base/thread_checker.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/thread_checker.h"
#include <poll.h>
#include <chrono>
@@ -95,4 +95,4 @@
} // namespace base
} // namespace perfetto
-#endif // PERFETTO_PERFETTO_BASE_UNIX_TASK_RUNNER_H_
+#endif // INCLUDE_PERFETTO_BASE_UNIX_TASK_RUNNER_H_
diff --git a/perfetto_base/utils.h b/include/perfetto/base/utils.h
similarity index 93%
rename from perfetto_base/utils.h
rename to include/perfetto/base/utils.h
index 368c253..7a05e29 100644
--- a/perfetto_base/utils.h
+++ b/include/perfetto/base/utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_UTILS_H_
-#define PERFETTO_PERFETTO_BASE_UTILS_H_
+#ifndef INCLUDE_PERFETTO_BASE_UTILS_H_
+#define INCLUDE_PERFETTO_BASE_UTILS_H_
#include <errno.h>
#include <stddef.h>
@@ -60,4 +60,4 @@
} // namespace base
} // namespace perfetto
-#endif // PERFETTO_PERFETTO_BASE_UTILS_H_
+#endif // INCLUDE_PERFETTO_BASE_UTILS_H_
diff --git a/perfetto_base/weak_ptr.h b/include/perfetto/base/weak_ptr.h
similarity index 93%
rename from perfetto_base/weak_ptr.h
rename to include/perfetto/base/weak_ptr.h
index e18212d..f004705 100644
--- a/perfetto_base/weak_ptr.h
+++ b/include/perfetto/base/weak_ptr.h
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#ifndef PERFETTO_PERFETTO_BASE_WEAK_PTR_H_
-#define PERFETTO_PERFETTO_BASE_WEAK_PTR_H_
+#ifndef INCLUDE_PERFETTO_BASE_WEAK_PTR_H_
+#define INCLUDE_PERFETTO_BASE_WEAK_PTR_H_
-#include "perfetto_base/thread_checker.h"
+#include "perfetto/base/thread_checker.h"
#include <memory>
@@ -100,4 +100,4 @@
} // namespace base
} // namespace perfetto
-#endif // PERFETTO_PERFETTO_BASE_WEAK_PTR_H_
+#endif // INCLUDE_PERFETTO_BASE_WEAK_PTR_H_
diff --git a/include/perfetto/ftrace_reader/BUILD.gn b/include/perfetto/ftrace_reader/BUILD.gn
new file mode 100644
index 0000000..4547f2f
--- /dev/null
+++ b/include/perfetto/ftrace_reader/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("ftrace_reader") {
+ public_deps = [
+ "../base",
+ ]
+ sources = [
+ "format_parser.h",
+ "ftrace_controller.h",
+ "ftrace_to_proto.h",
+ ]
+}
diff --git a/ftrace_reader/include/ftrace_reader/format_parser.h b/include/perfetto/ftrace_reader/format_parser.h
similarity index 81%
rename from ftrace_reader/include/ftrace_reader/format_parser.h
rename to include/perfetto/ftrace_reader/format_parser.h
index 2c2bfea..d8eaf1e 100644
--- a/ftrace_reader/include/ftrace_reader/format_parser.h
+++ b/include/perfetto/ftrace_reader/format_parser.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FTRACE_READER_PROTO_GEN_FORMAT_PARSER_H_
-#define FTRACE_READER_PROTO_GEN_FORMAT_PARSER_H_
+#ifndef INCLUDE_PERFETTO_FTRACE_READER_FORMAT_PARSER_H_
+#define INCLUDE_PERFETTO_FTRACE_READER_FORMAT_PARSER_H_
#include <string>
@@ -27,4 +27,4 @@
} // namespace perfetto
-#endif // FTRACE_READER_PROTO_GEN_FORMAT_PARSER_H_
+#endif // INCLUDE_PERFETTO_FTRACE_READER_FORMAT_PARSER_H_
diff --git a/ftrace_reader/include/ftrace_reader/ftrace_controller.h b/include/perfetto/ftrace_reader/ftrace_controller.h
similarity index 92%
rename from ftrace_reader/include/ftrace_reader/ftrace_controller.h
rename to include/perfetto/ftrace_reader/ftrace_controller.h
index f5ace93..2829437 100644
--- a/ftrace_reader/include/ftrace_reader/ftrace_controller.h
+++ b/include/perfetto/ftrace_reader/ftrace_controller.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FTRACE_READER_FTRACE_CONTROLLER_H_
-#define FTRACE_READER_FTRACE_CONTROLLER_H_
+#ifndef INCLUDE_PERFETTO_FTRACE_READER_FTRACE_CONTROLLER_H_
+#define INCLUDE_PERFETTO_FTRACE_READER_FTRACE_CONTROLLER_H_
#include <unistd.h>
@@ -26,10 +26,10 @@
#include <vector>
#include "gtest/gtest_prod.h"
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/task_runner.h"
-#include "perfetto_base/weak_ptr.h"
-#include "protozero/protozero_message_handle.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/weak_ptr.h"
+#include "perfetto/protozero/protozero_message_handle.h"
namespace perfetto {
@@ -154,4 +154,4 @@
} // namespace perfetto
-#endif // FTRACE_READER_FTRACE_CONTROLLER_H_
+#endif // INCLUDE_PERFETTO_FTRACE_READER_FTRACE_CONTROLLER_H_
diff --git a/ftrace_reader/include/ftrace_reader/ftrace_to_proto.h b/include/perfetto/ftrace_reader/ftrace_to_proto.h
similarity index 90%
rename from ftrace_reader/include/ftrace_reader/ftrace_to_proto.h
rename to include/perfetto/ftrace_reader/ftrace_to_proto.h
index dbdd07f..b97803f 100644
--- a/ftrace_reader/include/ftrace_reader/ftrace_to_proto.h
+++ b/include/perfetto/ftrace_reader/ftrace_to_proto.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FTRACE_READER_PROTO_GEN_FTRACE_GEN_H_
-#define FTRACE_READER_PROTO_GEN_FTRACE_GEN_H_
+#ifndef INCLUDE_PERFETTO_FTRACE_READER_FTRACE_TO_PROTO_H_
+#define INCLUDE_PERFETTO_FTRACE_READER_FTRACE_TO_PROTO_H_
#include <stdint.h>
@@ -69,4 +69,4 @@
} // namespace perfetto
-#endif // FTRACE_READER_PROTO_GEN_FTRACE_GEN_H_
+#endif // INCLUDE_PERFETTO_FTRACE_READER_FTRACE_TO_PROTO_H_
diff --git a/include/perfetto/ipc/BUILD.gn b/include/perfetto/ipc/BUILD.gn
new file mode 100644
index 0000000..a8aa17e
--- /dev/null
+++ b/include/perfetto/ipc/BUILD.gn
@@ -0,0 +1,31 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("ipc") {
+ public_deps = [
+ "../base",
+ ]
+ sources = [
+ "async_result.h",
+ "basic_types.h",
+ "client.h",
+ "client_info.h",
+ "codegen_helpers.h",
+ "deferred.h",
+ "host.h",
+ "service.h",
+ "service_descriptor.h",
+ "service_proxy.h",
+ ]
+}
diff --git a/ipc/include/ipc/async_result.h b/include/perfetto/ipc/async_result.h
similarity index 91%
rename from ipc/include/ipc/async_result.h
rename to include/perfetto/ipc/async_result.h
index 6375c1a..e3178c3 100644
--- a/ipc/include/ipc/async_result.h
+++ b/include/perfetto/ipc/async_result.h
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_ASYNC_RESULT_H_
-#define IPC_INCLUDE_IPC_ASYNC_RESULT_H_
+#ifndef INCLUDE_PERFETTO_IPC_ASYNC_RESULT_H_
+#define INCLUDE_PERFETTO_IPC_ASYNC_RESULT_H_
#include <memory>
#include <type_traits>
#include <utility>
-#include "ipc/basic_types.h"
+#include "perfetto/ipc/basic_types.h"
namespace perfetto {
namespace ipc {
@@ -71,4 +71,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_ASYNC_RESULT_H_
+#endif // INCLUDE_PERFETTO_IPC_ASYNC_RESULT_H_
diff --git a/ipc/include/ipc/basic_types.h b/include/perfetto/ipc/basic_types.h
similarity index 87%
rename from ipc/include/ipc/basic_types.h
rename to include/perfetto/ipc/basic_types.h
index fbcaf32..1d8612f 100644
--- a/ipc/include/ipc/basic_types.h
+++ b/include/perfetto/ipc/basic_types.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_BASIC_TYPES_H_
-#define IPC_INCLUDE_IPC_BASIC_TYPES_H_
+#ifndef INCLUDE_PERFETTO_IPC_BASIC_TYPES_H_
+#define INCLUDE_PERFETTO_IPC_BASIC_TYPES_H_
#include <stdint.h>
@@ -37,4 +37,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_BASIC_TYPES_H_
+#endif // INCLUDE_PERFETTO_IPC_BASIC_TYPES_H_
diff --git a/ipc/include/ipc/client.h b/include/perfetto/ipc/client.h
similarity index 89%
rename from ipc/include/ipc/client.h
rename to include/perfetto/ipc/client.h
index b703bae..bc01bea 100644
--- a/ipc/include/ipc/client.h
+++ b/include/perfetto/ipc/client.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_CLIENT_H_
-#define IPC_INCLUDE_IPC_CLIENT_H_
+#ifndef INCLUDE_PERFETTO_IPC_CLIENT_H_
+#define INCLUDE_PERFETTO_IPC_CLIENT_H_
#include <functional>
#include <memory>
-#include "ipc/basic_types.h"
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/weak_ptr.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/base/weak_ptr.h"
+#include "perfetto/ipc/basic_types.h"
namespace perfetto {
@@ -66,4 +66,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_CLIENT_H_
+#endif // INCLUDE_PERFETTO_IPC_CLIENT_H_
diff --git a/ipc/include/ipc/client_info.h b/include/perfetto/ipc/client_info.h
similarity index 88%
rename from ipc/include/ipc/client_info.h
rename to include/perfetto/ipc/client_info.h
index 2af429b..4561f18 100644
--- a/ipc/include/ipc/client_info.h
+++ b/include/perfetto/ipc/client_info.h
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_CLIENT_INFO_H_
-#define IPC_INCLUDE_IPC_CLIENT_INFO_H_
+#ifndef INCLUDE_PERFETTO_IPC_CLIENT_INFO_H_
+#define INCLUDE_PERFETTO_IPC_CLIENT_INFO_H_
-#include "ipc/basic_types.h"
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ipc/basic_types.h"
namespace perfetto {
namespace ipc {
@@ -56,4 +56,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_CLIENT_INFO_H_
+#endif // INCLUDE_PERFETTO_IPC_CLIENT_INFO_H_
diff --git a/ipc/include/ipc/codegen_helpers.h b/include/perfetto/ipc/codegen_helpers.h
similarity index 92%
rename from ipc/include/ipc/codegen_helpers.h
rename to include/perfetto/ipc/codegen_helpers.h
index 3d4c808..e4cec82 100644
--- a/ipc/include/ipc/codegen_helpers.h
+++ b/include/perfetto/ipc/codegen_helpers.h
@@ -16,8 +16,8 @@
// This file is only meant to be included in autogenerated .cc files.
-#ifndef IPC_INCLUDE_IPC_CODEGEN_HELPERS_H_
-#define IPC_INCLUDE_IPC_CODEGEN_HELPERS_H_
+#ifndef INCLUDE_PERFETTO_IPC_CODEGEN_HELPERS_H_
+#define INCLUDE_PERFETTO_IPC_CODEGEN_HELPERS_H_
// A templated protobuf message decoder. Returns nullptr in case of failure.
template <typename T>
@@ -45,4 +45,4 @@
::perfetto::ipc::Deferred<TReply>(::std::move(reply)));
}
-#endif // IPC_INCLUDE_IPC_CODEGEN_HELPERS_H_
+#endif // INCLUDE_PERFETTO_IPC_CODEGEN_HELPERS_H_
diff --git a/ipc/include/ipc/deferred.h b/include/perfetto/ipc/deferred.h
similarity index 95%
rename from ipc/include/ipc/deferred.h
rename to include/perfetto/ipc/deferred.h
index 047d480..69abfb8 100644
--- a/ipc/include/ipc/deferred.h
+++ b/include/perfetto/ipc/deferred.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_DEFERRED_H_
-#define IPC_INCLUDE_IPC_DEFERRED_H_
+#ifndef INCLUDE_PERFETTO_IPC_DEFERRED_H_
+#define INCLUDE_PERFETTO_IPC_DEFERRED_H_
#include <functional>
#include <memory>
#include <utility>
-#include "ipc/async_result.h"
-#include "ipc/basic_types.h"
+#include "perfetto/ipc/async_result.h"
+#include "perfetto/ipc/basic_types.h"
namespace perfetto {
namespace ipc {
@@ -136,4 +136,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_DEFERRED_H_
+#endif // INCLUDE_PERFETTO_IPC_DEFERRED_H_
diff --git a/ipc/include/ipc/host.h b/include/perfetto/ipc/host.h
similarity index 92%
rename from ipc/include/ipc/host.h
rename to include/perfetto/ipc/host.h
index 96b418c..7ca6c40 100644
--- a/ipc/include/ipc/host.h
+++ b/include/perfetto/ipc/host.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_HOST_H_
-#define IPC_INCLUDE_IPC_HOST_H_
+#ifndef INCLUDE_PERFETTO_IPC_HOST_H_
+#define INCLUDE_PERFETTO_IPC_HOST_H_
#include <memory>
-#include "ipc/basic_types.h"
+#include "perfetto/ipc/basic_types.h"
namespace perfetto {
@@ -55,4 +55,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_HOST_H_
+#endif // INCLUDE_PERFETTO_IPC_HOST_H_
diff --git a/ipc/include/ipc/service.h b/include/perfetto/ipc/service.h
similarity index 88%
rename from ipc/include/ipc/service.h
rename to include/perfetto/ipc/service.h
index aebb430..c6f1144 100644
--- a/ipc/include/ipc/service.h
+++ b/include/perfetto/ipc/service.h
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_SERVICE_H_
-#define IPC_INCLUDE_IPC_SERVICE_H_
+#ifndef INCLUDE_PERFETTO_IPC_SERVICE_H_
+#define INCLUDE_PERFETTO_IPC_SERVICE_H_
-#include "ipc/client_info.h"
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/ipc/client_info.h"
namespace perfetto {
namespace ipc {
@@ -53,4 +53,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_SERVICE_H_
+#endif // INCLUDE_PERFETTO_IPC_SERVICE_H_
diff --git a/ipc/include/ipc/service_descriptor.h b/include/perfetto/ipc/service_descriptor.h
similarity index 90%
rename from ipc/include/ipc/service_descriptor.h
rename to include/perfetto/ipc/service_descriptor.h
index df75430..c4aca7e 100644
--- a/ipc/include/ipc/service_descriptor.h
+++ b/include/perfetto/ipc/service_descriptor.h
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_SERVICE_DESCRIPTOR_H_
-#define IPC_INCLUDE_IPC_SERVICE_DESCRIPTOR_H_
+#ifndef INCLUDE_PERFETTO_IPC_SERVICE_DESCRIPTOR_H_
+#define INCLUDE_PERFETTO_IPC_SERVICE_DESCRIPTOR_H_
#include <functional>
#include <string>
#include <utility>
#include <vector>
-#include "ipc/basic_types.h"
-#include "ipc/deferred.h"
+#include "perfetto/ipc/basic_types.h"
+#include "perfetto/ipc/deferred.h"
namespace perfetto {
namespace ipc {
@@ -69,4 +69,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_SERVICE_DESCRIPTOR_H_
+#endif // INCLUDE_PERFETTO_IPC_SERVICE_DESCRIPTOR_H_
diff --git a/ipc/include/ipc/service_proxy.h b/include/perfetto/ipc/service_proxy.h
similarity index 91%
rename from ipc/include/ipc/service_proxy.h
rename to include/perfetto/ipc/service_proxy.h
index b38cc47..d94799f 100644
--- a/ipc/include/ipc/service_proxy.h
+++ b/include/perfetto/ipc/service_proxy.h
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#ifndef IPC_INCLUDE_IPC_SERVICE_PROXY_H_
-#define IPC_INCLUDE_IPC_SERVICE_PROXY_H_
+#ifndef INCLUDE_PERFETTO_IPC_SERVICE_PROXY_H_
+#define INCLUDE_PERFETTO_IPC_SERVICE_PROXY_H_
-#include "ipc/basic_types.h"
+#include "perfetto/ipc/basic_types.h"
#include <assert.h>
@@ -26,8 +26,8 @@
#include <memory>
#include <string>
-#include "ipc/deferred.h"
-#include "perfetto_base/weak_ptr.h"
+#include "perfetto/base/weak_ptr.h"
+#include "perfetto/ipc/deferred.h"
namespace perfetto {
namespace ipc {
@@ -97,4 +97,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_INCLUDE_IPC_SERVICE_PROXY_H_
+#endif // INCLUDE_PERFETTO_IPC_SERVICE_PROXY_H_
diff --git a/include/perfetto/protozero/BUILD.gn b/include/perfetto/protozero/BUILD.gn
new file mode 100644
index 0000000..137a966
--- /dev/null
+++ b/include/perfetto/protozero/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("protozero") {
+ public_deps = [
+ "../base",
+ ]
+ sources = [
+ "contiguous_memory_range.h",
+ "proto_field_descriptor.h",
+ "protozero_message.h",
+ "protozero_message_handle.h",
+ "scattered_stream_writer.h",
+ ]
+}
diff --git a/protozero/include/protozero/contiguous_memory_range.h b/include/perfetto/protozero/contiguous_memory_range.h
similarity index 84%
rename from protozero/include/protozero/contiguous_memory_range.h
rename to include/perfetto/protozero/contiguous_memory_range.h
index a508e32..7089d0b 100644
--- a/protozero/include/protozero/contiguous_memory_range.h
+++ b/include/perfetto/protozero/contiguous_memory_range.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_INCLUDE_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
-#define PROTOZERO_INCLUDE_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
+#ifndef INCLUDE_PERFETTO_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
#include <assert.h>
#include <stddef.h>
@@ -35,4 +35,4 @@
} // namespace protozero
-#endif // PROTOZERO_INCLUDE_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
+#endif // INCLUDE_PERFETTO_PROTOZERO_CONTIGUOUS_MEMORY_RANGE_H_
diff --git a/protozero/include/protozero/proto_field_descriptor.h b/include/perfetto/protozero/proto_field_descriptor.h
similarity index 90%
rename from protozero/include/protozero/proto_field_descriptor.h
rename to include/perfetto/protozero/proto_field_descriptor.h
index c7eaff1..063868a 100644
--- a/protozero/include/protozero/proto_field_descriptor.h
+++ b/include/perfetto/protozero/proto_field_descriptor.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_INCLUDE_PROTOZERO_PROTO_FIELD_DESCRIPTOR_H_
-#define PROTOZERO_INCLUDE_PROTOZERO_PROTO_FIELD_DESCRIPTOR_H_
+#ifndef INCLUDE_PERFETTO_PROTOZERO_PROTO_FIELD_DESCRIPTOR_H_
+#define INCLUDE_PERFETTO_PROTOZERO_PROTO_FIELD_DESCRIPTOR_H_
#include <stdint.h>
@@ -67,4 +67,4 @@
} // namespace protozero
-#endif // PROTOZERO_INCLUDE_PROTOZERO_PROTO_FIELD_DESCRIPTOR_H_
+#endif // INCLUDE_PERFETTO_PROTOZERO_PROTO_FIELD_DESCRIPTOR_H_
diff --git a/protozero/include/protozero/proto_utils.h b/include/perfetto/protozero/proto_utils.h
similarity index 96%
rename from protozero/include/protozero/proto_utils.h
rename to include/perfetto/protozero/proto_utils.h
index 61efde3..5a8fb01 100644
--- a/protozero/include/protozero/proto_utils.h
+++ b/include/perfetto/protozero/proto_utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_INCLUDE_PROTOZERO_PROTO_UTILS_H_
-#define PROTOZERO_INCLUDE_PROTOZERO_PROTO_UTILS_H_
+#ifndef INCLUDE_PERFETTO_PROTOZERO_PROTO_UTILS_H_
+#define INCLUDE_PERFETTO_PROTOZERO_PROTO_UTILS_H_
#include <inttypes.h>
#include <stddef.h>
@@ -128,4 +128,4 @@
} // namespace proto_utils
} // namespace protozero
-#endif // PROTOZERO_INCLUDE_PROTOZERO_PROTO_UTILS_H_
+#endif // INCLUDE_PERFETTO_PROTOZERO_PROTO_UTILS_H_
diff --git a/protozero/include/protozero/protozero_message.h b/include/perfetto/protozero/protozero_message.h
similarity index 95%
rename from protozero/include/protozero/protozero_message.h
rename to include/perfetto/protozero/protozero_message.h
index 1825ead..7748f34 100644
--- a/protozero/include/protozero/protozero_message.h
+++ b/include/perfetto/protozero/protozero_message.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_INCLUDE_PROTOZERO_PROTOZERO_MESSAGE_H_
-#define PROTOZERO_INCLUDE_PROTOZERO_PROTOZERO_MESSAGE_H_
+#ifndef INCLUDE_PERFETTO_PROTOZERO_PROTOZERO_MESSAGE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_PROTOZERO_MESSAGE_H_
#include <assert.h>
#include <stdint.h>
@@ -23,10 +23,10 @@
#include <type_traits>
-#include "protozero/contiguous_memory_range.h"
-#include "protozero/proto_utils.h"
-#include "protozero/protozero_message_handle.h"
-#include "protozero/scattered_stream_writer.h"
+#include "perfetto/protozero/contiguous_memory_range.h"
+#include "perfetto/protozero/proto_utils.h"
+#include "perfetto/protozero/protozero_message_handle.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
namespace protozero {
@@ -209,4 +209,4 @@
} // namespace protozero
-#endif // PROTOZERO_INCLUDE_PROTOZERO_PROTOZERO_MESSAGE_H_
+#endif // INCLUDE_PERFETTO_PROTOZERO_PROTOZERO_MESSAGE_H_
diff --git a/protozero/include/protozero/protozero_message_handle.h b/include/perfetto/protozero/protozero_message_handle.h
similarity index 93%
rename from protozero/include/protozero/protozero_message_handle.h
rename to include/perfetto/protozero/protozero_message_handle.h
index 92c70bf..c7f737a 100644
--- a/protozero/include/protozero/protozero_message_handle.h
+++ b/include/perfetto/protozero/protozero_message_handle.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_INCLUDE_PROTOZERO_PROTOZERO_MESSAGE_HANDLE_H_
-#define PROTOZERO_INCLUDE_PROTOZERO_PROTOZERO_MESSAGE_HANDLE_H_
+#ifndef INCLUDE_PERFETTO_PROTOZERO_PROTOZERO_MESSAGE_HANDLE_H_
+#define INCLUDE_PERFETTO_PROTOZERO_PROTOZERO_MESSAGE_HANDLE_H_
#include <functional>
@@ -87,4 +87,4 @@
} // namespace protozero
-#endif // PROTOZERO_INCLUDE_PROTOZERO_PROTOZERO_MESSAGE_HANDLE_H_
+#endif // INCLUDE_PERFETTO_PROTOZERO_PROTOZERO_MESSAGE_HANDLE_H_
diff --git a/protozero/include/protozero/scattered_stream_writer.h b/include/perfetto/protozero/scattered_stream_writer.h
similarity index 94%
rename from protozero/include/protozero/scattered_stream_writer.h
rename to include/perfetto/protozero/scattered_stream_writer.h
index 0f749d5..7def807 100644
--- a/protozero/include/protozero/scattered_stream_writer.h
+++ b/include/perfetto/protozero/scattered_stream_writer.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_INCLUDE_PROTOZERO_SCATTERED_STREAM_WRITER_H_
-#define PROTOZERO_INCLUDE_PROTOZERO_SCATTERED_STREAM_WRITER_H_
+#ifndef INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_WRITER_H_
+#define INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_WRITER_H_
#include <assert.h>
#include <stddef.h>
#include <stdint.h>
#include <string.h>
-#include "protozero/contiguous_memory_range.h"
+#include "perfetto/protozero/contiguous_memory_range.h"
namespace protozero {
@@ -117,4 +117,4 @@
} // namespace protozero
-#endif // PROTOZERO_INCLUDE_PROTOZERO_SCATTERED_STREAM_WRITER_H_
+#endif // INCLUDE_PERFETTO_PROTOZERO_SCATTERED_STREAM_WRITER_H_
diff --git a/include/perfetto/tracing/core/BUILD.gn b/include/perfetto/tracing/core/BUILD.gn
new file mode 100644
index 0000000..baf138f
--- /dev/null
+++ b/include/perfetto/tracing/core/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("core") {
+ public_deps = [
+ "../../base",
+ ]
+ sources = [
+ "basic_types.h",
+ "data_source_config.h",
+ "data_source_descriptor.h",
+ "producer.h",
+ "service.h",
+ "shared_memory.h",
+ ]
+}
diff --git a/tracing/include/tracing/core/basic_types.h b/include/perfetto/tracing/core/basic_types.h
similarity index 82%
rename from tracing/include/tracing/core/basic_types.h
rename to include/perfetto/tracing/core/basic_types.h
index f91f4b8..2966d11 100644
--- a/tracing/include/tracing/core/basic_types.h
+++ b/include/perfetto/tracing/core/basic_types.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_TRACING_CORE_BASIC_TYPES_H_
-#define TRACING_INCLUDE_TRACING_CORE_BASIC_TYPES_H_
+#ifndef INCLUDE_PERFETTO_TRACING_CORE_BASIC_TYPES_H_
+#define INCLUDE_PERFETTO_TRACING_CORE_BASIC_TYPES_H_
#include <stdint.h>
@@ -27,4 +27,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_TRACING_CORE_BASIC_TYPES_H_
+#endif // INCLUDE_PERFETTO_TRACING_CORE_BASIC_TYPES_H_
diff --git a/tracing/include/tracing/core/data_source_config.h b/include/perfetto/tracing/core/data_source_config.h
similarity index 88%
rename from tracing/include/tracing/core/data_source_config.h
rename to include/perfetto/tracing/core/data_source_config.h
index 906ab62..ad818a8 100644
--- a/tracing/include/tracing/core/data_source_config.h
+++ b/include/perfetto/tracing/core/data_source_config.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_TRACING_CORE_DATA_SOURCE_CONFIG_H_
-#define TRACING_INCLUDE_TRACING_CORE_DATA_SOURCE_CONFIG_H_
+#ifndef INCLUDE_PERFETTO_TRACING_CORE_DATA_SOURCE_CONFIG_H_
+#define INCLUDE_PERFETTO_TRACING_CORE_DATA_SOURCE_CONFIG_H_
#include <string>
@@ -39,4 +39,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_TRACING_CORE_DATA_SOURCE_CONFIG_H_
+#endif // INCLUDE_PERFETTO_TRACING_CORE_DATA_SOURCE_CONFIG_H_
diff --git a/tracing/include/tracing/core/data_source_descriptor.h b/include/perfetto/tracing/core/data_source_descriptor.h
similarity index 86%
rename from tracing/include/tracing/core/data_source_descriptor.h
rename to include/perfetto/tracing/core/data_source_descriptor.h
index ebabcf1..58eb3c8 100644
--- a/tracing/include/tracing/core/data_source_descriptor.h
+++ b/include/perfetto/tracing/core/data_source_descriptor.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_TRACING_CORE_DATA_SOURCE_DESCRIPTOR_H_
-#define TRACING_INCLUDE_TRACING_CORE_DATA_SOURCE_DESCRIPTOR_H_
+#ifndef INCLUDE_PERFETTO_TRACING_CORE_DATA_SOURCE_DESCRIPTOR_H_
+#define INCLUDE_PERFETTO_TRACING_CORE_DATA_SOURCE_DESCRIPTOR_H_
#include <string>
@@ -37,4 +37,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_TRACING_CORE_DATA_SOURCE_DESCRIPTOR_H_
+#endif // INCLUDE_PERFETTO_TRACING_CORE_DATA_SOURCE_DESCRIPTOR_H_
diff --git a/tracing/include/tracing/core/producer.h b/include/perfetto/tracing/core/producer.h
similarity index 94%
rename from tracing/include/tracing/core/producer.h
rename to include/perfetto/tracing/core/producer.h
index cf1d960..c4702a2 100644
--- a/tracing/include/tracing/core/producer.h
+++ b/include/perfetto/tracing/core/producer.h
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_TRACING_CORE_PRODUCER_H_
-#define TRACING_INCLUDE_TRACING_CORE_PRODUCER_H_
+#ifndef INCLUDE_PERFETTO_TRACING_CORE_PRODUCER_H_
+#define INCLUDE_PERFETTO_TRACING_CORE_PRODUCER_H_
-#include "tracing/core/basic_types.h"
+#include "perfetto/tracing/core/basic_types.h"
namespace perfetto {
@@ -79,4 +79,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_TRACING_CORE_PRODUCER_H_
+#endif // INCLUDE_PERFETTO_TRACING_CORE_PRODUCER_H_
diff --git a/tracing/include/tracing/core/service.h b/include/perfetto/tracing/core/service.h
similarity index 94%
rename from tracing/include/tracing/core/service.h
rename to include/perfetto/tracing/core/service.h
index 0383ba1..a4603af 100644
--- a/tracing/include/tracing/core/service.h
+++ b/include/perfetto/tracing/core/service.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_TRACING_CORE_SERVICE_H_
-#define TRACING_INCLUDE_TRACING_CORE_SERVICE_H_
+#ifndef INCLUDE_PERFETTO_TRACING_CORE_SERVICE_H_
+#define INCLUDE_PERFETTO_TRACING_CORE_SERVICE_H_
#include <stdint.h>
@@ -23,8 +23,8 @@
#include <memory>
#include <vector>
-#include "tracing/core/basic_types.h"
-#include "tracing/core/shared_memory.h"
+#include "perfetto/tracing/core/basic_types.h"
+#include "perfetto/tracing/core/shared_memory.h"
namespace perfetto {
@@ -120,4 +120,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_TRACING_CORE_SERVICE_H_
+#endif // INCLUDE_PERFETTO_TRACING_CORE_SERVICE_H_
diff --git a/tracing/include/tracing/core/shared_memory.h b/include/perfetto/tracing/core/shared_memory.h
similarity index 90%
rename from tracing/include/tracing/core/shared_memory.h
rename to include/perfetto/tracing/core/shared_memory.h
index f8d4a94..6533e2b 100644
--- a/tracing/include/tracing/core/shared_memory.h
+++ b/include/perfetto/tracing/core/shared_memory.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_TRACING_CORE_SHARED_MEMORY_H_
-#define TRACING_INCLUDE_TRACING_CORE_SHARED_MEMORY_H_
+#ifndef INCLUDE_PERFETTO_TRACING_CORE_SHARED_MEMORY_H_
+#define INCLUDE_PERFETTO_TRACING_CORE_SHARED_MEMORY_H_
#include <stddef.h>
@@ -48,4 +48,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_TRACING_CORE_SHARED_MEMORY_H_
+#endif // INCLUDE_PERFETTO_TRACING_CORE_SHARED_MEMORY_H_
diff --git a/include/perfetto/tracing/ipc/BUILD.gn b/include/perfetto/tracing/ipc/BUILD.gn
new file mode 100644
index 0000000..b58d544
--- /dev/null
+++ b/include/perfetto/tracing/ipc/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("ipc") {
+ public_deps = [
+ "../../base",
+ "../core",
+ ]
+ sources = [
+ "producer_ipc_client.h",
+ "service_ipc_host.h",
+ ]
+}
diff --git a/tracing/include/tracing/ipc/producer_ipc_client.h b/include/perfetto/tracing/ipc/producer_ipc_client.h
similarity index 87%
rename from tracing/include/tracing/ipc/producer_ipc_client.h
rename to include/perfetto/tracing/ipc/producer_ipc_client.h
index ff41aed..d7cd432 100644
--- a/tracing/include/tracing/ipc/producer_ipc_client.h
+++ b/include/perfetto/tracing/ipc/producer_ipc_client.h
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_IPC_PRODUCER_IPC_CLIENT_H_
-#define TRACING_INCLUDE_IPC_PRODUCER_IPC_CLIENT_H_
+#ifndef INCLUDE_PERFETTO_TRACING_IPC_PRODUCER_IPC_CLIENT_H_
+#define INCLUDE_PERFETTO_TRACING_IPC_PRODUCER_IPC_CLIENT_H_
#include <memory>
#include <string>
-#include "tracing/core/service.h"
+#include "perfetto/tracing/core/service.h"
namespace perfetto {
@@ -50,4 +50,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_IPC_PRODUCER_IPC_CLIENT_H_
+#endif // INCLUDE_PERFETTO_TRACING_IPC_PRODUCER_IPC_CLIENT_H_
diff --git a/tracing/include/tracing/ipc/service_ipc_host.h b/include/perfetto/tracing/ipc/service_ipc_host.h
similarity index 86%
rename from tracing/include/tracing/ipc/service_ipc_host.h
rename to include/perfetto/tracing/ipc/service_ipc_host.h
index 67d160f..f6e4246 100644
--- a/tracing/include/tracing/ipc/service_ipc_host.h
+++ b/include/perfetto/tracing/ipc/service_ipc_host.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef TRACING_INCLUDE_IPC_SERVICE_IPC_HOST_H_
-#define TRACING_INCLUDE_IPC_SERVICE_IPC_HOST_H_
+#ifndef INCLUDE_PERFETTO_TRACING_IPC_SERVICE_IPC_HOST_H_
+#define INCLUDE_PERFETTO_TRACING_IPC_SERVICE_IPC_HOST_H_
#include <memory>
-#include "tracing/core/basic_types.h"
+#include "perfetto/tracing/core/basic_types.h"
namespace perfetto {
namespace base {
@@ -52,4 +52,4 @@
} // namespace perfetto
-#endif // TRACING_INCLUDE_IPC_SERVICE_IPC_HOST_H_
+#endif // INCLUDE_PERFETTO_TRACING_IPC_SERVICE_IPC_HOST_H_
diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn
deleted file mode 100644
index 854f318..0000000
--- a/ipc/BUILD.gn
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("../gn/perfetto.gni")
-import("//build_overrides/build.gni")
-import("ipc_library.gni")
-
-if (!build_with_chromium) {
- import("//build/proto_library.gni")
-} else {
- import("//third_party/protobuf/proto_library.gni")
-}
-
-config("config") {
- include_dirs = [
- perfetto_root_path + "ipc/include",
- perfetto_root_path,
- ]
-}
-
-source_set("ipc") {
- public_configs = [ ":config" ]
- deps = [
- ":wire_protocol",
- "../perfetto_base",
- ]
- sources = [
- "include/ipc/async_result.h",
- "include/ipc/basic_types.h",
- "include/ipc/client.h",
- "include/ipc/client_info.h",
- "include/ipc/codegen_helpers.h",
- "include/ipc/deferred.h",
- "include/ipc/host.h",
- "include/ipc/service.h",
- "include/ipc/service_descriptor.h",
- "include/ipc/service_proxy.h",
- "src/buffered_frame_deserializer.cc",
- "src/client_impl.cc",
- "src/deferred.cc",
- "src/host_impl.cc",
- "src/host_impl.h",
- "src/service_proxy.cc",
- "src/unix_socket.cc",
- "src/unix_socket.h",
- ]
-}
-
-executable("ipc_unittests") {
- testonly = true
- deps = [
- ":ipc",
- ":test_messages",
- ":wire_protocol",
- "../gn:default_deps",
- "../gn:gtest_deps",
- "../perfetto_base",
- "../perfetto_base:test_support",
- ]
-
- sources = [
- "src/buffered_frame_deserializer_unittest.cc",
- "src/client_impl_unittest.cc",
- "src/deferred_unittest.cc",
- "src/host_impl_unittest.cc",
- "src/test/ipc_integrationtest.cc",
- "src/unix_socket_unittest.cc",
- ]
-}
-
-proto_library("wire_protocol") {
- sources = [
- "src/wire_protocol.proto",
- ]
-
- extra_configs = [ ":config" ]
- proto_in_dir = perfetto_root_path
- proto_out_dir = "protos_lite"
-}
-
-ipc_library("test_messages") {
- sources = [
- "src/test/client_unittest_messages.proto",
- "src/test/deferred_unittest_messages.proto",
- "src/test/greeter_service.proto",
- ]
- proto_in_dir = perfetto_root_path
- extra_configs = [ ":config" ]
-}
diff --git a/protos/BUILD.gn b/protos/BUILD.gn
index c32fd78..e44311e 100644
--- a/protos/BUILD.gn
+++ b/protos/BUILD.gn
@@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("//protozero//protozero_library.gni")
-import("//build/proto_library.gni")
+import("../src/protozero/protozero_library.gni")
+import("../build/proto_library.gni")
proto_sources = [ "trace_packet.proto" ]
diff --git a/protos/ftrace/BUILD.gn b/protos/ftrace/BUILD.gn
index d7e81a1..0816b59 100644
--- a/protos/ftrace/BUILD.gn
+++ b/protos/ftrace/BUILD.gn
@@ -13,7 +13,7 @@
# limitations under the License.
import("../../gn/perfetto.gni")
-import("../../protozero/protozero_library.gni")
+import("../../src/protozero/protozero_library.gni")
import("all_protos.gni")
# Create a copy of all the protos listed in all_protos.gni with the
diff --git a/protozero/BUILD.gn b/protozero/BUILD.gn
deleted file mode 100644
index 1ebfaca..0000000
--- a/protozero/BUILD.gn
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("../gn/perfetto.gni")
-import("//build_overrides/build.gni")
-
-if (!build_with_chromium) {
- import("//build/proto_library.gni")
-} else {
- import("//third_party/protobuf/proto_library.gni")
-}
-
-import("../gn/perfetto.gni")
-import("protozero_library.gni")
-
-config("protozero_config") {
- include_dirs = [ "include" ]
-}
-
-source_set("protozero") {
- all_dependent_configs = [ ":protozero_config" ]
-
- deps = [
- "../perfetto_base",
- ]
-
- if (!build_with_chromium) {
- configs += [ "//buildtools:googletest_prod_config" ]
- }
-
- sources = [
- "include/protozero/contiguous_memory_range.h",
- "include/protozero/proto_field_descriptor.h",
- "include/protozero/protozero_message.h",
- "include/protozero/protozero_message_handle.h",
- "include/protozero/scattered_stream_writer.h",
- "src/proto_utils.cc",
- "src/protozero_message.cc",
- "src/protozero_message_handle.cc",
- "src/scattered_stream_writer.cc",
- ]
-}
-
-executable("protozero_unittests") {
- testonly = true
- deps = [
- ":protozero",
- ":testing_messages_lite",
- ":testing_messages_zero",
- "../gn:default_deps",
- "../gn:gtest_deps",
- "../perfetto_base",
- ]
-
- sources = [
- "src/proto_utils_unittest.cc",
- "src/protozero_message_unittest.cc",
- "src/scattered_stream_writer_unittest.cc",
- "src/test/fake_scattered_buffer.cc",
- "src/test/fake_scattered_buffer.h",
- "src/test/protozero_conformance_unittest.cc",
- ]
-}
-
-# Generates both xxx.pbzero.h and xxx.pb.h (official proto).
-
-testing_proto_sources = [
- "src/test/example_proto/library.proto",
- "src/test/example_proto/library_internals/galaxies.proto",
- "src/test/example_proto/test_messages.proto",
- "src/test/example_proto/upper_import.proto",
-]
-
-protozero_library("testing_messages_zero") {
- #include_dirs = [ "include" ]
- sources = testing_proto_sources
- proto_in_dir = perfetto_root_path
- proto_out_dir = "protos_zero"
- generator_plugin_options = "wrapper_namespace=pbzero"
-}
-
-proto_library("testing_messages_lite") {
- #include_dirs = [ "include" ]
- sources = testing_proto_sources
- proto_in_dir = perfetto_root_path
- proto_out_dir = "protos_lite"
-}
diff --git a/protozero/src/protoc_plugin/BUILD.gn b/protozero/src/protoc_plugin/BUILD.gn
deleted file mode 100644
index 0f8cc4d..0000000
--- a/protozero/src/protoc_plugin/BUILD.gn
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-if (current_toolchain == host_toolchain) {
- executable("protoc_plugin") {
- sources = [
- "protozero_generator.cc",
- "protozero_generator.h",
- "protozero_plugin.cc",
- ]
-
- if (!build_with_chromium) {
- deps = [
- "../../../gn:default_deps",
- "//buildtools:protoc_lib",
- ]
- } else {
- deps = [
- "//third_party/protobuf:protoc_lib",
- ]
- }
-
- if (is_clang) {
- # Internal protobuf headers hit this.
- cflags = [ "-Wno-unreachable-code" ]
- }
- }
-} # host_toolchain
diff --git a/perfetto_base/BUILD.gn b/src/base/BUILD.gn
similarity index 73%
rename from perfetto_base/BUILD.gn
rename to src/base/BUILD.gn
index acc70d1..267d4b7 100644
--- a/perfetto_base/BUILD.gn
+++ b/src/base/BUILD.gn
@@ -14,39 +14,24 @@
import("//build_overrides/build.gni")
-config("base_config") {
- include_dirs = [ ".." ]
-}
-
-source_set("perfetto_base") {
- public_configs = [ ":base_config" ]
-
- sources = [
- "build_config.h",
- "logging.h",
- "scoped_file.h",
- "task_runner.h",
- "thread_checker.cc",
- "thread_checker.h",
- "unix_task_runner.cc",
- "unix_task_runner.h",
- "utils.h",
- "weak_ptr.h",
+source_set("base") {
+ deps = [
+ "../../gn:default_deps",
]
-
- if (is_debug) {
- deps = [
- ":debug_crash_stack_trace",
- ]
- }
-
+ public_deps = [
+ "../../include/perfetto/base",
+ ]
+ sources = [
+ "thread_checker.cc",
+ "unix_task_runner.cc",
+ ]
if (is_android) {
- sources += [
- "android_task_runner.cc",
- "android_task_runner.h",
- ]
+ sources += [ "android_task_runner.cc" ]
libs = [ "android" ]
}
+ if (is_debug) {
+ deps += [ ":debug_crash_stack_trace" ]
+ }
}
if (is_debug) {
@@ -64,7 +49,8 @@
source_set("test_support") {
testonly = true
deps = [
- ":perfetto_base",
+ ":base",
+ "../../gn:default_deps",
]
sources = [
"test/test_task_runner.cc",
@@ -75,12 +61,11 @@
executable("perfetto_base_unittests") {
testonly = true
deps = [
- ":perfetto_base",
+ ":base",
":test_support",
- "../gn:default_deps",
- "../gn:gtest_deps",
+ "../../gn:default_deps",
+ "../../gn:gtest_deps",
]
-
sources = [
"scoped_file_unittest.cc",
"task_runner_unittest.cc",
diff --git a/perfetto_base/android_task_runner.cc b/src/base/android_task_runner.cc
similarity index 98%
rename from perfetto_base/android_task_runner.cc
rename to src/base/android_task_runner.cc
index c16f80f..6374369 100644
--- a/perfetto_base/android_task_runner.cc
+++ b/src/base/android_task_runner.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "perfetto_base/android_task_runner.h"
+#include "perfetto/base/android_task_runner.h"
#include <sys/eventfd.h>
#include <sys/timerfd.h>
diff --git a/perfetto_base/debug_crash_stack_trace.cc b/src/base/debug_crash_stack_trace.cc
similarity index 100%
rename from perfetto_base/debug_crash_stack_trace.cc
rename to src/base/debug_crash_stack_trace.cc
diff --git a/perfetto_base/scoped_file_unittest.cc b/src/base/scoped_file_unittest.cc
similarity index 98%
rename from perfetto_base/scoped_file_unittest.cc
rename to src/base/scoped_file_unittest.cc
index 10aa72c..bc14000 100644
--- a/perfetto_base/scoped_file_unittest.cc
+++ b/src/base/scoped_file_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "perfetto_base/scoped_file.h"
+#include "perfetto/base/scoped_file.h"
#include <fcntl.h>
#include <unistd.h>
diff --git a/perfetto_base/task_runner_unittest.cc b/src/base/task_runner_unittest.cc
similarity index 98%
rename from perfetto_base/task_runner_unittest.cc
rename to src/base/task_runner_unittest.cc
index 5a6e230..c9baac2 100644
--- a/perfetto_base/task_runner_unittest.cc
+++ b/src/base/task_runner_unittest.cc
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "perfetto_base/unix_task_runner.h"
+#include "perfetto/base/unix_task_runner.h"
#include "gtest/gtest.h"
-#include "perfetto_base/build_config.h"
-#include "perfetto_base/scoped_file.h"
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/scoped_file.h"
#if BUILDFLAG(OS_ANDROID)
-#include "perfetto_base/android_task_runner.h"
+#include "perfetto/base/android_task_runner.h"
#endif
#include <thread>
diff --git a/perfetto_base/test/test_task_runner.cc b/src/base/test/test_task_runner.cc
similarity index 97%
rename from perfetto_base/test/test_task_runner.cc
rename to src/base/test/test_task_runner.cc
index fdc3859..065f0a1 100644
--- a/perfetto_base/test/test_task_runner.cc
+++ b/src/base/test/test_task_runner.cc
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "perfetto_base/test/test_task_runner.h"
+#include "src/base/test/test_task_runner.h"
#include <stdio.h>
#include <unistd.h>
#include <chrono>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
namespace perfetto {
namespace base {
diff --git a/perfetto_base/test/test_task_runner.h b/src/base/test/test_task_runner.h
similarity index 85%
rename from perfetto_base/test/test_task_runner.h
rename to src/base/test/test_task_runner.h
index 6c56594..35d5a9b 100644
--- a/perfetto_base/test/test_task_runner.h
+++ b/src/base/test/test_task_runner.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef TRACING_SRC_TEST_TEST_TASK_RUNNER_H_
-#define TRACING_SRC_TEST_TEST_TASK_RUNNER_H_
+#ifndef SRC_BASE_TEST_TEST_TASK_RUNNER_H_
+#define SRC_BASE_TEST_TEST_TASK_RUNNER_H_
#include <sys/select.h>
@@ -24,12 +24,12 @@
#include <map>
#include <string>
-#include "perfetto_base/build_config.h"
-#include "perfetto_base/thread_checker.h"
-#include "perfetto_base/unix_task_runner.h"
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/thread_checker.h"
+#include "perfetto/base/unix_task_runner.h"
#if BUILDFLAG(OS_ANDROID)
-#include "perfetto_base/android_task_runner.h"
+#include "perfetto/base/android_task_runner.h"
#endif
namespace perfetto {
@@ -74,4 +74,4 @@
} // namespace base
} // namespace perfetto
-#endif // TRACING_SRC_TEST_TEST_TASK_RUNNER_H_
+#endif // SRC_BASE_TEST_TEST_TASK_RUNNER_H_
diff --git a/perfetto_base/thread_checker.cc b/src/base/thread_checker.cc
similarity index 96%
rename from perfetto_base/thread_checker.cc
rename to src/base/thread_checker.cc
index ab15ee8..079714c 100644
--- a/perfetto_base/thread_checker.cc
+++ b/src/base/thread_checker.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "perfetto_base/thread_checker.h"
+#include "perfetto/base/thread_checker.h"
namespace perfetto {
namespace base {
diff --git a/perfetto_base/thread_checker_unittest.cc b/src/base/thread_checker_unittest.cc
similarity index 98%
rename from perfetto_base/thread_checker_unittest.cc
rename to src/base/thread_checker_unittest.cc
index 69b65aa..b1bdc3d 100644
--- a/perfetto_base/thread_checker_unittest.cc
+++ b/src/base/thread_checker_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "perfetto_base/thread_checker.h"
+#include "perfetto/base/thread_checker.h"
#include <pthread.h>
diff --git a/perfetto_base/unix_task_runner.cc b/src/base/unix_task_runner.cc
similarity index 98%
rename from perfetto_base/unix_task_runner.cc
rename to src/base/unix_task_runner.cc
index ba162ab..cfac561 100644
--- a/perfetto_base/unix_task_runner.cc
+++ b/src/base/unix_task_runner.cc
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "perfetto_base/unix_task_runner.h"
+#include "perfetto/base/unix_task_runner.h"
-#include "perfetto_base/build_config.h"
+#include "perfetto/base/build_config.h"
#include <fcntl.h>
#include <stdlib.h>
diff --git a/perfetto_base/utils_unittest.cc b/src/base/utils_unittest.cc
similarity index 98%
rename from perfetto_base/utils_unittest.cc
rename to src/base/utils_unittest.cc
index 0848701..249d5ea 100644
--- a/perfetto_base/utils_unittest.cc
+++ b/src/base/utils_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "perfetto_base/utils.h"
+#include "perfetto/base/utils.h"
#include <fcntl.h>
#include <signal.h>
diff --git a/perfetto_base/weak_ptr_unittest.cc b/src/base/weak_ptr_unittest.cc
similarity index 97%
rename from perfetto_base/weak_ptr_unittest.cc
rename to src/base/weak_ptr_unittest.cc
index 009df4a..cce166b 100644
--- a/perfetto_base/weak_ptr_unittest.cc
+++ b/src/base/weak_ptr_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "perfetto_base/weak_ptr.h"
+#include "perfetto/base/weak_ptr.h"
#include "gtest/gtest.h"
diff --git a/src/ftrace_reader/BUILD.gn b/src/ftrace_reader/BUILD.gn
new file mode 100644
index 0000000..2cd02e0
--- /dev/null
+++ b/src/ftrace_reader/BUILD.gn
@@ -0,0 +1,86 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+executable("ftrace_reader_unittests") {
+ testonly = true
+ deps = [
+ ":ftrace_reader",
+ "../../gn:default_deps",
+ "../../gn:gtest_deps",
+ "../../gn:protobuf_full_deps",
+ "../../protos/ftrace:full",
+ ]
+ sources = [
+ "cpu_reader_unittest.cc",
+ "format_parser_unittest.cc",
+ "ftrace_controller_unittest.cc",
+ "ftrace_to_proto_unittest.cc",
+ "proto_translation_table_unittest.cc",
+ "scattered_stream_delegate_for_testing.h",
+ ]
+}
+
+# These tests require access to a real ftrace implementation and must
+# run with sudo.
+executable("ftrace_reader_integrationtests") {
+ testonly = true
+ deps = [
+ ":ftrace_reader",
+ "../../gn:default_deps",
+ "../../gn:gtest_deps",
+ "../../protos/ftrace:full",
+ "../base",
+ ]
+ sources = [
+ "end_to_end_integrationtest.cc",
+ "ftrace_procfs_integrationtest.cc",
+ ]
+}
+
+executable("ftrace_reader_demo") {
+ testonly = true
+ sources = [
+ "main.cc",
+ ]
+ deps = [
+ ":ftrace_reader",
+ "../../gn:default_deps",
+ "../../gn:gtest_prod_config",
+ "../base",
+ ]
+}
+
+source_set("ftrace_reader") {
+ public_deps = [
+ "../../include/perfetto/ftrace_reader",
+ "../../protos/ftrace:zero",
+ ]
+ deps = [
+ "../../gn:default_deps",
+ "../../gn:gtest_prod_config",
+ "../base",
+ "../protozero",
+ ]
+ sources = [
+ "cpu_reader.cc",
+ "cpu_reader.h",
+ "format_parser.cc",
+ "ftrace_controller.cc",
+ "ftrace_procfs.cc",
+ "ftrace_procfs.h",
+ "ftrace_to_proto.cc",
+ "proto_translation_table.cc",
+ "proto_translation_table.h",
+ ]
+}
diff --git a/ftrace_reader/src/cpu_reader.cc b/src/ftrace_reader/cpu_reader.cc
similarity index 99%
rename from ftrace_reader/src/cpu_reader.cc
rename to src/ftrace_reader/cpu_reader.cc
index 7626185..75e0f04 100644
--- a/ftrace_reader/src/cpu_reader.cc
+++ b/src/ftrace_reader/cpu_reader.cc
@@ -18,7 +18,7 @@
#include <utility>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
#include "proto_translation_table.h"
#include "protos/ftrace/ftrace_event.pbzero.h"
diff --git a/ftrace_reader/src/cpu_reader.h b/src/ftrace_reader/cpu_reader.h
similarity index 93%
rename from ftrace_reader/src/cpu_reader.h
rename to src/ftrace_reader/cpu_reader.h
index 3d58a00..9f6230b 100644
--- a/ftrace_reader/src/cpu_reader.h
+++ b/src/ftrace_reader/cpu_reader.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FTRACE_READER_CPU_READER_H_
-#define FTRACE_READER_CPU_READER_H_
+#ifndef SRC_FTRACE_READER_CPU_READER_H_
+#define SRC_FTRACE_READER_CPU_READER_H_
#include <stdint.h>
#include <string.h>
@@ -23,9 +23,9 @@
#include <array>
#include <memory>
-#include "ftrace_reader/ftrace_controller.h"
#include "gtest/gtest_prod.h"
-#include "perfetto_base/scoped_file.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/ftrace_reader/ftrace_controller.h"
#include "proto_translation_table.h"
namespace perfetto {
@@ -112,4 +112,4 @@
} // namespace perfetto
-#endif // FTRACE_READER_CPU_READER_H_
+#endif // SRC_FTRACE_READER_CPU_READER_H_
diff --git a/ftrace_reader/src/cpu_reader_unittest.cc b/src/ftrace_reader/cpu_reader_unittest.cc
similarity index 96%
rename from ftrace_reader/src/cpu_reader_unittest.cc
rename to src/ftrace_reader/cpu_reader_unittest.cc
index f517785..ebc9397 100644
--- a/ftrace_reader/src/cpu_reader_unittest.cc
+++ b/src/ftrace_reader/cpu_reader_unittest.cc
@@ -20,7 +20,7 @@
#include "gtest/gtest.h"
#include "proto_translation_table.h"
-#include "protozero/scattered_stream_writer.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
#include "scattered_stream_delegate_for_testing.h"
#include "protos/ftrace/ftrace_event.pb.h"
@@ -182,14 +182,14 @@
}
TEST(CpuReaderTest, ParseEmpty) {
- std::string path = "ftrace_reader/test/data/android_seed_N2F62_3.10.49/";
+ std::string path = "src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/";
FtraceProcfs ftrace_procfs(path);
auto table = ProtoTranslationTable::Create(&ftrace_procfs);
CpuReader(table.get(), 42, base::ScopedFile());
}
TEST(CpuReaderTest, ParseSimpleEvent) {
- std::string path = "ftrace_reader/test/data/android_seed_N2F62_3.10.49/";
+ std::string path = "src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/";
FtraceProcfs ftrace(path);
auto table = ProtoTranslationTable::Create(&ftrace);
diff --git a/ftrace_reader/src/end_to_end_integrationtest.cc b/src/ftrace_reader/end_to_end_integrationtest.cc
similarity index 96%
rename from ftrace_reader/src/end_to_end_integrationtest.cc
rename to src/ftrace_reader/end_to_end_integrationtest.cc
index 810c27d..53c764f 100644
--- a/ftrace_reader/src/end_to_end_integrationtest.cc
+++ b/src/ftrace_reader/end_to_end_integrationtest.cc
@@ -18,12 +18,12 @@
#include <sstream>
#include "ftrace_procfs.h"
-#include "ftrace_reader/ftrace_controller.h"
#include "gmock/gmock.h"
#include "google/protobuf/text_format.h"
#include "gtest/gtest.h"
-#include "perfetto_base/unix_task_runner.h"
-#include "protozero/scattered_stream_writer.h"
+#include "perfetto/base/unix_task_runner.h"
+#include "perfetto/ftrace_reader/ftrace_controller.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
#include "scattered_stream_delegate_for_testing.h"
#include "protos/ftrace/ftrace_event_bundle.pb.h"
diff --git a/ftrace_reader/src/format_parser.cc b/src/ftrace_reader/format_parser.cc
similarity index 95%
rename from ftrace_reader/src/format_parser.cc
rename to src/ftrace_reader/format_parser.cc
index 954ddc3..c4599e1 100644
--- a/ftrace_reader/src/format_parser.cc
+++ b/src/ftrace_reader/format_parser.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ftrace_reader/format_parser.h"
+#include "perfetto/ftrace_reader/format_parser.h"
#include <string.h>
@@ -23,8 +23,8 @@
#include <memory>
#include <vector>
-#include "ftrace_reader/ftrace_to_proto.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/utils.h"
+#include "perfetto/ftrace_reader/ftrace_to_proto.h"
namespace perfetto {
namespace {
diff --git a/ftrace_reader/src/format_parser_unittest.cc b/src/ftrace_reader/format_parser_unittest.cc
similarity index 97%
rename from ftrace_reader/src/format_parser_unittest.cc
rename to src/ftrace_reader/format_parser_unittest.cc
index 563245c..1ea34b4 100644
--- a/ftrace_reader/src/format_parser_unittest.cc
+++ b/src/ftrace_reader/format_parser_unittest.cc
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "ftrace_reader/format_parser.h"
+#include "perfetto/ftrace_reader/format_parser.h"
-#include "ftrace_reader/ftrace_to_proto.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
+#include "perfetto/ftrace_reader/ftrace_to_proto.h"
namespace perfetto {
namespace {
diff --git a/ftrace_reader/src/ftrace_controller.cc b/src/ftrace_reader/ftrace_controller.cc
similarity index 97%
rename from ftrace_reader/src/ftrace_controller.cc
rename to src/ftrace_reader/ftrace_controller.cc
index 09b22ea..81961b2 100644
--- a/ftrace_reader/src/ftrace_controller.cc
+++ b/src/ftrace_reader/ftrace_controller.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ftrace_reader/ftrace_controller.h"
+#include "perfetto/ftrace_reader/ftrace_controller.h"
#include <fcntl.h>
#include <stdint.h>
@@ -27,8 +27,8 @@
#include "cpu_reader.h"
#include "ftrace_procfs.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/utils.h"
#include "proto_translation_table.h"
#include "protos/ftrace/ftrace_event_bundle.pbzero.h"
diff --git a/ftrace_reader/src/ftrace_controller_unittest.cc b/src/ftrace_reader/ftrace_controller_unittest.cc
similarity index 98%
rename from ftrace_reader/src/ftrace_controller_unittest.cc
rename to src/ftrace_reader/ftrace_controller_unittest.cc
index bc2c0f4..9f58211 100644
--- a/ftrace_reader/src/ftrace_controller_unittest.cc
+++ b/src/ftrace_reader/ftrace_controller_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ftrace_reader/ftrace_controller.h"
+#include "perfetto/ftrace_reader/ftrace_controller.h"
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/ftrace_reader/src/ftrace_procfs.cc b/src/ftrace_reader/ftrace_procfs.cc
similarity index 98%
rename from ftrace_reader/src/ftrace_procfs.cc
rename to src/ftrace_reader/ftrace_procfs.cc
index 332d993..225aa62 100644
--- a/ftrace_reader/src/ftrace_procfs.cc
+++ b/src/ftrace_reader/ftrace_procfs.cc
@@ -24,8 +24,8 @@
#include <sstream>
#include <string>
-#include "perfetto_base/logging.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/utils.h"
namespace perfetto {
namespace {
diff --git a/ftrace_reader/src/ftrace_procfs.h b/src/ftrace_reader/ftrace_procfs.h
similarity index 92%
rename from ftrace_reader/src/ftrace_procfs.h
rename to src/ftrace_reader/ftrace_procfs.h
index bf8b2be..abd0412 100644
--- a/ftrace_reader/src/ftrace_procfs.h
+++ b/src/ftrace_reader/ftrace_procfs.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef FTRACE_READER_FTRACE_PROCFS_H_
-#define FTRACE_READER_FTRACE_PROCFS_H_
+#ifndef SRC_FTRACE_READER_FTRACE_PROCFS_H_
+#define SRC_FTRACE_READER_FTRACE_PROCFS_H_
#include <string>
-#include "perfetto_base/scoped_file.h"
+#include "perfetto/base/scoped_file.h"
namespace perfetto {
@@ -71,4 +71,4 @@
} // namespace perfetto
-#endif // FTRACE_READER_FTRACE_PROCFS_H_
+#endif // SRC_FTRACE_READER_FTRACE_PROCFS_H_
diff --git a/ftrace_reader/src/ftrace_procfs_integrationtest.cc b/src/ftrace_reader/ftrace_procfs_integrationtest.cc
similarity index 100%
rename from ftrace_reader/src/ftrace_procfs_integrationtest.cc
rename to src/ftrace_reader/ftrace_procfs_integrationtest.cc
diff --git a/ftrace_reader/src/ftrace_to_proto.cc b/src/ftrace_reader/ftrace_to_proto.cc
similarity index 98%
rename from ftrace_reader/src/ftrace_to_proto.cc
rename to src/ftrace_reader/ftrace_to_proto.cc
index 0edffa4..6428b9a 100644
--- a/ftrace_reader/src/ftrace_to_proto.cc
+++ b/src/ftrace_reader/ftrace_to_proto.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ftrace_reader/ftrace_to_proto.h"
+#include "perfetto/ftrace_reader/ftrace_to_proto.h"
#include <regex>
#include <set>
diff --git a/ftrace_reader/src/ftrace_to_proto_unittest.cc b/src/ftrace_reader/ftrace_to_proto_unittest.cc
similarity index 97%
rename from ftrace_reader/src/ftrace_to_proto_unittest.cc
rename to src/ftrace_reader/ftrace_to_proto_unittest.cc
index fe84b9c..724b028 100644
--- a/ftrace_reader/src/ftrace_to_proto_unittest.cc
+++ b/src/ftrace_reader/ftrace_to_proto_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ftrace_reader/ftrace_to_proto.h"
+#include "perfetto/ftrace_reader/ftrace_to_proto.h"
#include "gtest/gtest.h"
namespace perfetto {
diff --git a/ftrace_reader/src/main.cc b/src/ftrace_reader/main.cc
similarity index 90%
rename from ftrace_reader/src/main.cc
rename to src/ftrace_reader/main.cc
index 068c046..f0b95c7 100644
--- a/ftrace_reader/src/main.cc
+++ b/src/ftrace_reader/main.cc
@@ -24,9 +24,9 @@
#include <utility>
#include <vector>
-#include "ftrace_reader/ftrace_controller.h"
-#include "perfetto_base/unix_task_runner.h"
-#include "protozero/scattered_stream_writer.h"
+#include "perfetto/base/unix_task_runner.h"
+#include "perfetto/ftrace_reader/ftrace_controller.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
#include "scattered_stream_delegate_for_testing.h"
#include "protos/ftrace/ftrace_event_bundle.pbzero.h"
diff --git a/ftrace_reader/src/proto_translation_table.cc b/src/ftrace_reader/proto_translation_table.cc
similarity index 97%
rename from ftrace_reader/src/proto_translation_table.cc
rename to src/ftrace_reader/proto_translation_table.cc
index 56b1ca1..b5674ca 100644
--- a/ftrace_reader/src/proto_translation_table.cc
+++ b/src/ftrace_reader/proto_translation_table.cc
@@ -17,8 +17,8 @@
#include "proto_translation_table.h"
#include "ftrace_procfs.h"
-#include "ftrace_reader/format_parser.h"
-#include "ftrace_reader/ftrace_to_proto.h"
+#include "perfetto/ftrace_reader/format_parser.h"
+#include "perfetto/ftrace_reader/ftrace_to_proto.h"
#include "protos/ftrace/ftrace_event_bundle.pbzero.h"
diff --git a/ftrace_reader/src/proto_translation_table.h b/src/ftrace_reader/proto_translation_table.h
similarity index 92%
rename from ftrace_reader/src/proto_translation_table.h
rename to src/ftrace_reader/proto_translation_table.h
index 0058527..df9b9e5 100644
--- a/ftrace_reader/src/proto_translation_table.h
+++ b/src/ftrace_reader/proto_translation_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FTRACE_PROTO_TRANSLATION_TABLE_H_
-#define FTRACE_PROTO_TRANSLATION_TABLE_H_
+#ifndef SRC_FTRACE_READER_PROTO_TRANSLATION_TABLE_H_
+#define SRC_FTRACE_READER_PROTO_TRANSLATION_TABLE_H_
#include <stdint.h>
@@ -25,7 +25,7 @@
#include <string>
#include <vector>
-#include "perfetto_base/scoped_file.h"
+#include "perfetto/base/scoped_file.h"
namespace perfetto {
@@ -106,4 +106,4 @@
} // namespace perfetto
-#endif // FTRACE_PROTO_TRANSLATION_TABLE_H_
+#endif // SRC_FTRACE_READER_PROTO_TRANSLATION_TABLE_H_
diff --git a/ftrace_reader/src/proto_translation_table_unittest.cc b/src/ftrace_reader/proto_translation_table_unittest.cc
similarity index 94%
rename from ftrace_reader/src/proto_translation_table_unittest.cc
rename to src/ftrace_reader/proto_translation_table_unittest.cc
index 797e3ee..6d6cf47 100644
--- a/ftrace_reader/src/proto_translation_table_unittest.cc
+++ b/src/ftrace_reader/proto_translation_table_unittest.cc
@@ -29,7 +29,7 @@
public:
void SetUp() override {
std::string path =
- "ftrace_reader/test/data/" + std::string(GetParam()) + "/";
+ "src/ftrace_reader/test/data/" + std::string(GetParam()) + "/";
FtraceProcfs ftrace_procfs(path);
table_ = ProtoTranslationTable::Create(&ftrace_procfs);
}
@@ -47,7 +47,7 @@
INSTANTIATE_TEST_CASE_P(ByDevice, AllTranslationTableTest, ValuesIn(kDevices));
TEST(TranslationTable, Seed) {
- std::string path = "ftrace_reader/test/data/android_seed_N2F62_3.10.49/";
+ std::string path = "src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/";
FtraceProcfs ftrace_procfs(path);
auto table = ProtoTranslationTable::Create(&ftrace_procfs);
EXPECT_EQ(table->largest_id(), 744ul);
diff --git a/ftrace_reader/src/scattered_stream_delegate_for_testing.h b/src/ftrace_reader/scattered_stream_delegate_for_testing.h
similarity index 92%
rename from ftrace_reader/src/scattered_stream_delegate_for_testing.h
rename to src/ftrace_reader/scattered_stream_delegate_for_testing.h
index 5e121fc..e27b170 100644
--- a/ftrace_reader/src/scattered_stream_delegate_for_testing.h
+++ b/src/ftrace_reader/scattered_stream_delegate_for_testing.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FTRACE_READER_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
-#define FTRACE_READER_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
+#ifndef SRC_FTRACE_READER_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
+#define SRC_FTRACE_READER_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
namespace perfetto {
@@ -88,4 +88,4 @@
} // namespace perfetto
-#endif // FTRACE_READER_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
+#endif // SRC_FTRACE_READER_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
diff --git a/ftrace_reader/test/data/.gitignore b/src/ftrace_reader/test/data/.gitignore
similarity index 100%
rename from ftrace_reader/test/data/.gitignore
rename to src/ftrace_reader/test/data/.gitignore
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/available_events b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/available_events
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/available_events
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/available_events
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_bias_level_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_cache_sync/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_cache_sync/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_cache_sync/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_cache_sync/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_walk_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_walk_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_walk_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_walk_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_event_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_power/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_power/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_power/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_dapm_widget_power/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_irq/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_irq/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_irq/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_irq/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_notify/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_notify/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_notify/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_notify/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_report/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_report/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_report/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_jack_report/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_read/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_read/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_read/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_write/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_write/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_preg_write/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_read/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_read/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_read/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_write/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_write/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/asoc/snd_soc_reg_write/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_command/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_command/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_command/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_command/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_ioctl_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_lock/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_lock/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_lock/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_lock/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_locked/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_locked/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_locked/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_locked/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_read_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_read_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_read_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_read_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_return/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_return/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_return/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_return/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_alloc_buf/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_alloc_buf/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_alloc_buf/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_alloc_buf/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_buffer_release/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_buffer_release/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_buffer_release/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_buffer_release/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_failed_buffer_release/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_failed_buffer_release/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_failed_buffer_release/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_failed_buffer_release/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_fd/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_fd/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_fd/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_fd/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_node_to_ref/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_node_to_ref/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_node_to_ref/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_node_to_ref/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_received/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_received/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_received/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_received/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_node/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_node/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_node/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_node/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_ref/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_ref/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_ref/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_transaction_ref_to_ref/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_unlock/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_unlock/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_unlock/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_unlock/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_update_page_range/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_update_page_range/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_update_page_range/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_update_page_range/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_wait_for_work/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_wait_for_work/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_wait_for_work/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_wait_for_work/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_write_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_write_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_write_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/binder/binder_write_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_backmerge/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_backmerge/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_backmerge/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_backmerge/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_bounce/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_bounce/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_bounce/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_bounce/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_complete/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_complete/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_complete/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_frontmerge/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_frontmerge/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_frontmerge/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_frontmerge/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_queue/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_queue/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_queue/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_remap/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_remap/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_remap/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_bio_remap/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_getrq/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_getrq/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_getrq/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_getrq/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_plug/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_plug/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_plug/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_plug/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_abort/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_abort/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_abort/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_abort/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_complete/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_complete/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_complete/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_insert/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_insert/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_insert/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_insert/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_issue/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_issue/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_issue/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_issue/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_remap/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_remap/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_remap/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_remap/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_requeue/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_requeue/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_requeue/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_rq_requeue/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_sleeprq/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_sleeprq/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_sleeprq/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_sleeprq/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_split/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_split/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_split/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_split/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_unplug/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_unplug/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_unplug/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/block/block_unplug/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_freepages/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_freepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_freepages/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_freepages/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_migratepages/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_migratepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_migratepages/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_isolate_migratepages/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_migratepages/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_migratepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_migratepages/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/compaction/mm_compaction_migratepages/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_already/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_already/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_already/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_already/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_boost/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_boost/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_boost/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_boost/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_notyet/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_notyet/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_notyet/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_notyet/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_setspeed/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_setspeed/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_setspeed/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_setspeed/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_target/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_target/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_target/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_target/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_unboost/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_unboost/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_unboost/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/cpufreq_interactive/cpufreq_interactive_unboost/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/undef_instr/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/undef_instr/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/undef_instr/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/undef_instr/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/user_fault/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/user_fault/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/user_fault/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/exception/user_fault/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_alloc_new_reservation/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_alloc_new_reservation/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_alloc_new_reservation/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_alloc_new_reservation/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_allocate_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_direct_IO_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_reservation/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_reservation/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_reservation/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_discard_reservation/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_drop_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_drop_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_drop_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_drop_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_evict_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_evict_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_evict_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_evict_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_forget/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_forget/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_forget/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_forget/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_free_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_get_blocks_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_invalidatepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_invalidatepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_invalidatepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_invalidatepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_write_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_write_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_write_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_writepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_writepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_journalled_writepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_load_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_load_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_load_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_load_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_mark_inode_dirty/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_mark_inode_dirty/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_mark_inode_dirty/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_mark_inode_dirty/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_write_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_write_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_write_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_writepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_writepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_ordered_writepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_read_block_bitmap/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_read_block_bitmap/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_read_block_bitmap/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_read_block_bitmap/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_readpage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_readpage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_readpage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_readpage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_releasepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_releasepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_releasepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_releasepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_request_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_reserved/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_reserved/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_reserved/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_reserved/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_rsv_window_add/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_rsv_window_add/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_rsv_window_add/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_rsv_window_add/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_file_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_fs/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_fs/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_fs/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_sync_fs/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_truncate_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_unlink_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_write_begin/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_write_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_write_begin/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_write_begin/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_write_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_write_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_write_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_writepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_writepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext3/ext3_writeback_writepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_alloc_da_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_alloc_da_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_alloc_da_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_alloc_da_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_allocate_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_begin_ordered_truncate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_begin_ordered_truncate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_begin_ordered_truncate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_begin_ordered_truncate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_release_space/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_release_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_release_space/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_release_space/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_reserve_space/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_reserve_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_reserve_space/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_reserve_space/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_update_reserve_space/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_update_reserve_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_update_reserve_space/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_update_reserve_space/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_begin/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_begin/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_begin/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_pages/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_pages/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_pages/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_write_pages/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages_result/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages_result/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages_result/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_da_writepages_result/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_direct_IO_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_preallocations/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_preallocations/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_preallocations/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_discard_preallocations/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_drop_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_drop_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_drop_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_drop_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_evict_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_evict_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_evict_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_evict_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_fastpath/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_fastpath/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_fastpath/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_convert_to_initialized_fastpath/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_handle_uninitialized_extents/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_handle_uninitialized_extents/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_handle_uninitialized_extents/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_handle_uninitialized_extents/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_in_cache/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_in_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_in_cache/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_in_cache/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_load_extent/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_load_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_load_extent/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_load_extent/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_map_blocks_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_put_in_cache/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_put_in_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_put_in_cache/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_put_in_cache/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_remove_space_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_idx/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_idx/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_idx/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_idx/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_leaf/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_leaf/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_leaf/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_rm_leaf/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_show_extent/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_show_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_show_extent/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ext_show_extent/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_fallocate_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_find_delalloc_range/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_find_delalloc_range/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_find_delalloc_range/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_find_delalloc_range/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_forget/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_forget/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_forget/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_forget/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_free_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_implied_cluster_alloc_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_implied_cluster_alloc_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_implied_cluster_alloc_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_implied_cluster_alloc_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_reserved_cluster_alloc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_reserved_cluster_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_reserved_cluster_alloc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_get_reserved_cluster_alloc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ind_map_blocks_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_invalidatepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_invalidatepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_invalidatepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_invalidatepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journal_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journal_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journal_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journal_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journalled_write_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journalled_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journalled_write_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_journalled_write_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode_bitmap/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode_bitmap/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode_bitmap/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_load_inode_bitmap/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mark_inode_dirty/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mark_inode_dirty/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mark_inode_dirty/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mark_inode_dirty/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_bitmap_load/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_bitmap_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_bitmap_load/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_bitmap_load/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_buddy_bitmap_load/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_buddy_bitmap_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_buddy_bitmap_load/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_buddy_bitmap_load/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_discard_preallocations/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_discard_preallocations/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_discard_preallocations/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_discard_preallocations/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_group_pa/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_group_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_group_pa/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_group_pa/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_inode_pa/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_inode_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_inode_pa/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_new_inode_pa/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_group_pa/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_group_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_group_pa/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_group_pa/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_inode_pa/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_inode_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_inode_pa/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mb_release_inode_pa/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_alloc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_alloc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_alloc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_discard/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_discard/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_discard/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_discard/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_free/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_free/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_free/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_prealloc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_prealloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_prealloc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_mballoc_prealloc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ordered_write_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ordered_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ordered_write_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_ordered_write_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_read_block_bitmap_load/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_read_block_bitmap_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_read_block_bitmap_load/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_read_block_bitmap_load/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_readpage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_readpage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_readpage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_readpage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_releasepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_releasepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_releasepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_releasepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_remove_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_remove_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_remove_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_remove_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_blocks/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_blocks/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_blocks/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_request_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_file_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_fs/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_fs/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_fs/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_sync_fs/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_all_free/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_all_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_all_free/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_all_free/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_extent/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_extent/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_trim_extent/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_truncate_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_enter/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_enter/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_enter/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_unlink_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_write_begin/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_write_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_write_begin/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_write_begin/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writeback_write_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writeback_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writeback_write_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writeback_write_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ext4/ext4_writepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/bprint/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/bprint/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/bprint/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/bprint/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/branch/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/branch/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/branch/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/branch/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/context_switch/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/context_switch/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/context_switch/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/context_switch/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_entry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_entry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_entry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/funcgraph_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/function/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/function/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/function/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/function/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/kernel_stack/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/kernel_stack/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/kernel_stack/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/kernel_stack/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_map/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_map/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_map/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_map/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_rw/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_rw/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_rw/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/mmiotrace_rw/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/print/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/print/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/print/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/print/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/user_stack/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/user_stack/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/user_stack/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/user_stack/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/wakeup/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/wakeup/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/ftrace/wakeup/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_direction/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_direction/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_direction/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_direction/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_value/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_value/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_value/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/gpio/gpio_value/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_event b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_event
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_event
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_event
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_page b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_page
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_page
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/header_page
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_entry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_entry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_entry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/irq_handler_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_entry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_entry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_entry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_raise/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_raise/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_raise/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/irq/softirq_raise/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_checkpoint/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_checkpoint/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_checkpoint/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_checkpoint/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_cleanup_journal_tail/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_cleanup_journal_tail/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_cleanup_journal_tail/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_cleanup_journal_tail/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_flushing/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_flushing/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_flushing/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_flushing/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_locking/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_locking/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_locking/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_locking/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_logging/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_logging/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_logging/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_commit_logging/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_do_submit_data/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_do_submit_data/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_do_submit_data/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_do_submit_data/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_drop_transaction/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_drop_transaction/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_drop_transaction/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_drop_transaction/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_end_commit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_end_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_end_commit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_end_commit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_start_commit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_start_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_start_commit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_start_commit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_update_superblock_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_update_superblock_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_update_superblock_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd/jbd_update_superblock_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint_stats/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint_stats/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint_stats/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_checkpoint_stats/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_flushing/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_flushing/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_flushing/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_flushing/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_locking/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_locking/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_locking/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_locking/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_logging/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_logging/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_logging/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_commit_logging/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_drop_transaction/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_drop_transaction/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_drop_transaction/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_drop_transaction/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_end_commit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_end_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_end_commit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_end_commit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_run_stats/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_run_stats/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_run_stats/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_run_stats/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_start_commit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_start_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_start_commit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_start_commit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_submit_inode_data/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_submit_inode_data/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_submit_inode_data/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_submit_inode_data/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_update_log_tail/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_update_log_tail/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_update_log_tail/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_update_log_tail/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_write_superblock/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_write_superblock/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_write_superblock/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/jbd2/jbd2_write_superblock/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_fault/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_fault/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_fault/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_fault/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_queued/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_queued/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_queued/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_queued/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_recovery/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_recovery/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_recovery/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_recovery/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_retired/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_retired/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_retired/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_retired/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_submitted/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_submitted/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_submitted/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_cmdbatch_submitted/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_invalidate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_invalidate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_invalidate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_invalidate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_sleep/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_sleep/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_sleep/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_sleep/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_switch/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_switch/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_switch/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_switch/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wait_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wake/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wake/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wake/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_drawctxt_wake/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_gpu_fault/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_gpu_fault/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_gpu_fault/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/adreno_gpu_fault/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/dispatch_queue_context/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/dispatch_queue_context/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/dispatch_queue_context/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/dispatch_queue_context/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a2xx_irq_status/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a2xx_irq_status/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a2xx_irq_status/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a2xx_irq_status/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a3xx_irq_status/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a3xx_irq_status/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a3xx_irq_status/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_a3xx_irq_status/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_active_count/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_active_count/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_active_count/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_active_count/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_bus/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_bus/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_bus/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_bus/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_clk/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_clk/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_clk/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_clk/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_constraint/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_constraint/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_constraint/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_constraint/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_create/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_create/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_create/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_create/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_destroy/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_destroy/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_destroy/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_destroy/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_detach/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_detach/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_detach/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_context_detach/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_fire_event/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_fire_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_fire_event/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_fire_event/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_gpubusy/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_gpubusy/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_gpubusy/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_gpubusy/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_irq/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_irq/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_irq/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_irq/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_issueibcmds/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_issueibcmds/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_issueibcmds/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_issueibcmds/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_alloc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_alloc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_alloc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_free/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_free/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_free/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_map/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_map/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_map/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_map/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_mmap/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_mmap/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_mmap/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_mmap/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_cache/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_cache/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_cache/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_full_cache/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_full_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_full_cache/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_sync_full_cache/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_free/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_free/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_free/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_queue/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_queue/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_timestamp_queue/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_unmapped_area_collision/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_unmapped_area_collision/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_unmapped_area_collision/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mem_unmapped_area_collision/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mmu_pagefault/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mmu_pagefault/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mmu_pagefault/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_mmu_pagefault/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_request_state/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_request_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_request_state/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_request_state/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_set_state/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_set_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_set_state/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwr_set_state/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwrlevel/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwrlevel/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwrlevel/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_pwrlevel/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_rail/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_rail/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_rail/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_rail/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_readtimestamp/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_readtimestamp/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_readtimestamp/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_readtimestamp/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_register_event/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_register_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_register_event/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_register_event/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_regwrite/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_regwrite/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_regwrite/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_regwrite/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_user_pwrlevel_constraint/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_user_pwrlevel_constraint/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_user_pwrlevel_constraint/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_user_pwrlevel_constraint/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_entry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_entry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_entry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_waittimestamp_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_z180_irq_status/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_z180_irq_status/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_z180_irq_status/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kgsl/kgsl_z180_irq_status/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_fail/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_fail/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_fail/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_fail/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_iommu_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_fail/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_fail/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_fail/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_fail/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/alloc_pages_sys_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/dma_alloc_contiguous_retry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/dma_alloc_contiguous_retry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/dma_alloc_contiguous_retry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/dma_alloc_contiguous_retry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/iommu_map_range/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/iommu_map_range/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/iommu_map_range/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/iommu_map_range/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fail/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fail/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fail/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fail/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fallback/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fallback/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fallback/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_fallback/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_alloc_buffer_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_cp_alloc_retry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_cp_alloc_retry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_cp_alloc_retry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/ion_cp_alloc_retry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kfree/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kfree/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kfree/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kfree/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc_node/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc_node/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc_node/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmalloc_node/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc_node/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc_node/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc_node/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_alloc_node/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_free/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_free/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/kmem_cache_free/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_pages_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_retry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_retry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_retry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/migrate_retry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_extfrag/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_extfrag/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_extfrag/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_extfrag/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_zone_locked/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_zone_locked/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_zone_locked/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_alloc_zone_locked/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free_batched/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free_batched/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free_batched/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_free_batched/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_pcpu_drain/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_pcpu_drain/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_pcpu_drain/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/kmem/mm_page_pcpu_drain/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/mmc/mmc_clk/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/mmc/mmc_clk/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/mmc/mmc_clk/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/mmc/mmc_clk/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/lpm_resources/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/lpm_resources/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/lpm_resources/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/lpm_resources/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_pc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_pc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_pc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_pc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_ret/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_ret/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_ret/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_ret/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_spc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_spc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_spc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_spc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_wfi/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_wfi/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_wfi/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_enter_wfi/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_pc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_pc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_pc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_pc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_ret/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_ret/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_ret/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_ret/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_spc/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_spc/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_spc/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_spc/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_wfi/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_wfi/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_wfi/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/msm_low_power/msm_pm_exit_wfi/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/napi/napi_poll/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/napi/napi_poll/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/napi/napi_poll/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/napi/napi_poll/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_queue/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_queue/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_queue/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_xmit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_xmit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_xmit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/net_dev_xmit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_receive_skb/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_receive_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_receive_skb/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_receive_skb/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_rx/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_rx/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_rx/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/net/netif_rx/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/oom/oom_score_adj_update/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/oom/oom_score_adj_update/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/oom/oom_score_adj_update/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/oom/oom_score_adj_update/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/perf_trace_counters/sched_switch_with_ctrs/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/perf_trace_counters/sched_switch_with_ctrs/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/perf_trace_counters/sched_switch_with_ctrs/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/perf_trace_counters/sched_switch_with_ctrs/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_disable/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_disable/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_disable/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_disable/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_enable/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_enable/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_enable/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_enable/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_parent/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_parent/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_parent/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_parent/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_rate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_rate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_rate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/clock_set_rate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_frequency_switch_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_idle/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_idle/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_idle/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/cpu_idle/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/machine_suspend/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/machine_suspend/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/machine_suspend/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/machine_suspend/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_domain_target/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_domain_target/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_domain_target/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_domain_target/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_frequency/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_frequency/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_frequency/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_frequency/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/power_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_activate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_activate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_activate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_activate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_deactivate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_deactivate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_deactivate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/power/wakeup_source_deactivate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/printk/console/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/printk/console/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/printk/console/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/printk/console/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rcu/rcu_utilization/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rcu/rcu_utilization/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rcu/rcu_utilization/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rcu/rcu_utilization/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regcache_sync/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regcache_sync/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regcache_sync/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regcache_sync/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_bypass/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_bypass/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_bypass/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_bypass/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_only/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_only/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_only/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_cache_only/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_read_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_hw_write_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read_cache/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read_cache/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_read_cache/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_write/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_write/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regmap/regmap_reg_write/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable_complete/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable_complete/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_disable_complete/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_complete/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_complete/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_complete/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_delay/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_delay/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_delay/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_enable_delay/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage_complete/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage_complete/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/regulator/regulator_set_voltage_complete/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_idle/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_idle/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_idle/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_idle/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_resume/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_resume/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_resume/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_resume/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_return_int/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_return_int/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_return_int/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_return_int/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_suspend/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_suspend/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_suspend/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm/rpm_suspend/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_ack_recd/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_ack_recd/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_ack_recd/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_ack_recd/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_send_message/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_send_message/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_send_message/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/rpm_smd/rpm_send_message/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_cpu_hotplug/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_cpu_hotplug/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_cpu_hotplug/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_cpu_hotplug/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop_ret/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop_ret/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop_ret/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_kthread_stop_ret/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_migrate_task/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_migrate_task/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_migrate_task/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_migrate_task/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_pi_setprio/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_pi_setprio/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_pi_setprio/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_pi_setprio/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exec/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exec/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exec/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exec/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_fork/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_fork/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_fork/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_fork/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_free/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_free/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_free/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_wait/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_wait/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_process_wait/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_blocked/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_blocked/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_blocked/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_blocked/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_iowait/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_iowait/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_iowait/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_iowait/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_runtime/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_runtime/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_runtime/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_runtime/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_sleep/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_sleep/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_sleep/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_sleep/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_wait/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_wait/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_stat_wait/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_switch/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_switch/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_switch/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_switch/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wait_task/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wait_task/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wait_task/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wait_task/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup_new/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup_new/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup_new/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sched/sched_wakeup_new/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_done/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_done/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_done/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_error/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_error/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_error/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_error/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_timeout/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_timeout/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_timeout/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_dispatch_cmd_timeout/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_eh_wakeup/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_eh_wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_eh_wakeup/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/scsi/scsi_eh_wakeup/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_deliver/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_deliver/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_deliver/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_deliver/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_generate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_generate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_generate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/signal/signal_generate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/consume_skb/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/consume_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/consume_skb/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/consume_skb/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/kfree_skb/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/kfree_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/kfree_skb/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/kfree_skb/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/skb_copy_datagram_iovec/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/skb_copy_datagram_iovec/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/skb_copy_datagram_iovec/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/skb/skb_copy_datagram_iovec/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_exceed_buf_limit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_exceed_buf_limit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_exceed_buf_limit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_exceed_buf_limit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_rcvqueue_full/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_rcvqueue_full/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_rcvqueue_full/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sock/sock_rcvqueue_full/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_pt/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_pt/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_pt/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_pt/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_timeline/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_timeline/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_timeline/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_timeline/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_wait/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_wait/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/sync/sync_wait/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_newtask/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_newtask/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_newtask/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_newtask/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_rename/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_rename/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_rename/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/task/task_rename/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_cancel/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_cancel/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_cancel/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_cancel/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_entry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_entry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_entry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_expire_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_init/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_init/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_init/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_init/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/hrtimer_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_expire/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_expire/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_expire/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_expire/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_state/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_state/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/itimer_state/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_cancel/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_cancel/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_cancel/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_cancel/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_entry/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_entry/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_entry/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_exit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_exit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_expire_exit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_init/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_init/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_init/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_init/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/timer/timer_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/udp/udp_fail_queue_rcv_skb/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/udp/udp_fail_queue_rcv_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/udp/udp_fail_queue_rcv_skb/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/udp/udp_fail_queue_rcv_skb/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/disable_swap_token/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/disable_swap_token/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/disable_swap_token/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/disable_swap_token/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_shrink_slab_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_begin/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_begin/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_begin/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_direct_reclaim_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_sleep/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_sleep/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_sleep/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_sleep/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_wake/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_wake/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_wake/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_kswapd_wake/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_isolate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_isolate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_isolate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_isolate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_shrink_inactive/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_shrink_inactive/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_shrink_inactive/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_lru_shrink_inactive/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_isolate/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_isolate/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_isolate/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_isolate/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_begin/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_begin/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_begin/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_reclaim_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_wakeup_kswapd/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_wakeup_kswapd/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_wakeup_kswapd/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_wakeup_kswapd/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_writepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_writepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/mm_vmscan_writepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/put_swap_token/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/put_swap_token/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/put_swap_token/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/put_swap_token/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/replace_swap_token/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/replace_swap_token/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/replace_swap_token/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/replace_swap_token/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/update_swap_token_priority/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/update_swap_token_priority/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/update_swap_token_priority/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/vmscan/update_swap_token_priority/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_activate_work/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_activate_work/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_activate_work/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_activate_work/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_end/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_end/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_end/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_execute_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_queue_work/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_queue_work/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_queue_work/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/workqueue/workqueue_queue_work/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/balance_dirty_pages/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/balance_dirty_pages/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/balance_dirty_pages/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/balance_dirty_pages/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/bdi_dirty_ratelimit/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/bdi_dirty_ratelimit/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/bdi_dirty_ratelimit/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/bdi_dirty_ratelimit/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/global_dirty_state/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/global_dirty_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/global_dirty_state/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/global_dirty_state/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/wbc_writepage/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/wbc_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/wbc_writepage/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/wbc_writepage/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_register/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_register/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_register/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_register/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_unregister/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_unregister/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_unregister/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_bdi_unregister/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_congestion_wait/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_congestion_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_congestion_wait/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_congestion_wait/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_exec/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_exec/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_exec/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_exec/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nothread/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nothread/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nothread/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nothread/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nowork/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nowork/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nowork/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_nowork/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_pages_written/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_pages_written/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_pages_written/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_pages_written/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue_io/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue_io/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue_io/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_queue_io/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode_requeue/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode_requeue/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode_requeue/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_single_inode_requeue/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_start/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_start/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_start/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_stop/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_stop/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_stop/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_thread_stop/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait_iff_congested/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait_iff_congested/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait_iff_congested/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wait_iff_congested/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_background/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_background/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_background/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_background/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_forker_thread/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_forker_thread/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_forker_thread/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_forker_thread/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_thread/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_thread/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_thread/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_wake_thread/format
diff --git a/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_written/format b/src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_written/format
similarity index 100%
rename from ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_written/format
rename to src/ftrace_reader/test/data/android_hammerhead_MRA59G_3.4.0/events/writeback/writeback_written/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/available_events b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/available_events
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/available_events
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/available_events
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_bias_level_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_cache_sync/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_cache_sync/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_cache_sync/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_cache_sync/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_connected/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_connected/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_connected/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_connected/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_input_path/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_input_path/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_input_path/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_input_path/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_output_path/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_output_path/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_output_path/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_output_path/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_walk_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_walk_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_walk_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_walk_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_event_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_power/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_power/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_power/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_dapm_widget_power/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_irq/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_irq/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_irq/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_irq/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_notify/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_notify/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_notify/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_notify/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_report/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_report/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_report/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_jack_report/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_read/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_read/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_read/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_write/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_write/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_preg_write/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_read/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_read/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_read/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_write/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_write/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/asoc/snd_soc_reg_write/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_command/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_command/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_command/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_command/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_ioctl_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_lock/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_lock/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_lock/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_lock/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_locked/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_locked/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_locked/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_locked/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_read_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_read_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_read_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_read_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_return/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_return/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_return/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_return/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_alloc_buf/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_alloc_buf/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_alloc_buf/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_alloc_buf/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_buffer_release/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_buffer_release/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_buffer_release/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_buffer_release/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_failed_buffer_release/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_failed_buffer_release/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_failed_buffer_release/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_failed_buffer_release/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_fd/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_fd/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_fd/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_fd/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_node_to_ref/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_node_to_ref/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_node_to_ref/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_node_to_ref/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_received/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_received/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_received/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_received/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_node/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_node/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_node/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_node/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_ref/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_ref/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_ref/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_transaction_ref_to_ref/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_unlock/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_unlock/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_unlock/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_unlock/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_update_page_range/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_update_page_range/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_update_page_range/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_update_page_range/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_wait_for_work/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_wait_for_work/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_wait_for_work/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_wait_for_work/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_write_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_write_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_write_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/binder/binder_write_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_backmerge/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_backmerge/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_backmerge/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_backmerge/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_bounce/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_bounce/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_bounce/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_bounce/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_complete/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_complete/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_complete/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_frontmerge/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_frontmerge/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_frontmerge/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_frontmerge/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_queue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_queue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_queue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_remap/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_remap/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_remap/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_bio_remap/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_dirty_buffer/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_dirty_buffer/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_dirty_buffer/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_dirty_buffer/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_getrq/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_getrq/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_getrq/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_getrq/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_plug/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_plug/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_plug/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_plug/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_abort/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_abort/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_abort/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_abort/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_complete/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_complete/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_complete/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_insert/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_insert/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_insert/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_insert/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_issue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_issue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_issue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_issue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_remap/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_remap/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_remap/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_remap/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_requeue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_requeue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_requeue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_rq_requeue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_sleeprq/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_sleeprq/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_sleeprq/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_sleeprq/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_split/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_split/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_split/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_split/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_touch_buffer/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_touch_buffer/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_touch_buffer/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_touch_buffer/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_unplug/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_unplug/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_unplug/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/block/block_unplug/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_deauth/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_deauth/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_deauth/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_deauth/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_disassoc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_disassoc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_disassoc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/__cfg80211_send_disassoc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_authorization_event/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_authorization_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_authorization_event/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_authorization_event/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cac_event/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cac_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cac_event/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cac_event/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ch_switch_notify/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ch_switch_notify/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ch_switch_notify/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ch_switch_notify/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_chandef_dfs_required/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_chandef_dfs_required/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_chandef_dfs_required/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_chandef_dfs_required/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_pktloss_notify/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_pktloss_notify/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_pktloss_notify/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_pktloss_notify/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_rssi_notify/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_rssi_notify/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_rssi_notify/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_cqm_rssi_notify/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_del_sta/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_del_sta/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_del_sta/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_del_sta/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ft_event/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ft_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ft_event/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ft_event/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_get_bss/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_get_bss/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_get_bss/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_get_bss/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_gtk_rekey_notify/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_gtk_rekey_notify/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_gtk_rekey_notify/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_gtk_rekey_notify/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ibss_joined/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ibss_joined/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ibss_joined/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ibss_joined/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_inform_bss_frame/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_inform_bss_frame/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_inform_bss_frame/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_inform_bss_frame/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_mgmt_tx_status/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_mgmt_tx_status/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_mgmt_tx_status/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_mgmt_tx_status/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_michael_mic_failure/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_michael_mic_failure/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_michael_mic_failure/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_michael_mic_failure/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_new_sta/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_new_sta/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_new_sta/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_new_sta/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_notify_new_peer_candidate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_notify_new_peer_candidate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_notify_new_peer_candidate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_notify_new_peer_candidate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_pmksa_candidate_notify/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_pmksa_candidate_notify/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_pmksa_candidate_notify/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_pmksa_candidate_notify/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_probe_status/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_probe_status/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_probe_status/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_probe_status/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_radar_event/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_radar_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_radar_event/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_radar_event/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel_expired/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel_expired/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel_expired/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_ready_on_channel_expired/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_reg_can_beacon/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_reg_can_beacon/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_reg_can_beacon/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_reg_can_beacon/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_obss_beacon/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_obss_beacon/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_obss_beacon/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_obss_beacon/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_wowlan_wakeup/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_wowlan_wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_wowlan_wakeup/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_report_wowlan_wakeup/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bool/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bool/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bool/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bool/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bss/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bss/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bss/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_bss/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_u32/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_u32/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_u32/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_u32/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_uint/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_uint/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_uint/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_return_uint/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_mgmt/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_mgmt/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_mgmt/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_mgmt/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_spurious_frame/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_spurious_frame/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_spurious_frame/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_spurious_frame/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_unexpected_4addr_frame/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_unexpected_4addr_frame/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_unexpected_4addr_frame/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_rx_unexpected_4addr_frame/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_scan_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_scan_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_scan_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_scan_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_results/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_results/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_results/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_results/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_stopped/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_stopped/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_stopped/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_sched_scan_stopped/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_assoc_timeout/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_assoc_timeout/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_assoc_timeout/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_assoc_timeout/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_auth_timeout/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_auth_timeout/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_auth_timeout/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_auth_timeout/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_assoc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_assoc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_assoc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_assoc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_auth/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_auth/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_auth/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_rx_auth/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_deauth/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_deauth/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_deauth/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_deauth/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_disassoc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_disassoc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_disassoc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_send_unprot_disassoc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_tdls_oper_request/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_tdls_oper_request/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_tdls_oper_request/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/cfg80211_tdls_oper_request/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_key/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_key/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_key/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_key/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_mpath/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_mpath/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_mpath/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_mpath/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_station/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_station/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_station/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_station/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_virtual_intf/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_virtual_intf/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_virtual_intf/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_add_virtual_intf/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_assoc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_assoc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_assoc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_assoc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_auth/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_auth/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_auth/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_auth/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_cancel_remain_on_channel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_cancel_remain_on_channel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_cancel_remain_on_channel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_cancel_remain_on_channel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_beacon/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_beacon/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_beacon/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_beacon/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_bss/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_bss/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_bss/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_bss/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_mpath/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_mpath/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_mpath/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_mpath/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_station/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_station/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_station/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_station/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_virtual_intf/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_virtual_intf/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_virtual_intf/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_change_virtual_intf/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_connect/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_connect/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_connect/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_connect/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_stop/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_stop/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_stop/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_crit_proto_stop/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_deauth/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_deauth/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_deauth/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_deauth/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_key/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_key/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_key/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_key/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_mpath/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_mpath/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_mpath/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_mpath/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_pmksa/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_pmksa/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_pmksa/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_pmksa/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_station/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_station/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_station/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_station/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_virtual_intf/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_virtual_intf/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_virtual_intf/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_del_virtual_intf/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disassoc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disassoc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disassoc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disassoc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disconnect/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disconnect/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disconnect/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_disconnect/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_mpath/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_mpath/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_mpath/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_mpath/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_station/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_station/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_station/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_station/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_survey/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_survey/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_survey/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_dump_survey/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_flush_pmksa/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_flush_pmksa/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_flush_pmksa/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_flush_pmksa/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_antenna/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_antenna/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_antenna/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_antenna/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_channel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_channel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_channel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_channel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_sset_count/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_sset_count/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_sset_count/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_sset_count/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_stats/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_stats/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_stats/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_stats/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_strings/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_strings/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_strings/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_et_strings/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_key/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_key/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_key/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_key/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mesh_config/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mesh_config/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mesh_config/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mesh_config/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mpath/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mpath/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mpath/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_mpath/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_ringparam/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_ringparam/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_ringparam/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_ringparam/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_station/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_station/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_station/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_station/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_tx_power/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_tx_power/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_tx_power/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_get_tx_power/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_ibss/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_ibss/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_ibss/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_ibss/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_mesh/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_mesh/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_mesh/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_join_mesh/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_key_mgmt_set_pmk/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_key_mgmt_set_pmk/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_key_mgmt_set_pmk/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_key_mgmt_set_pmk/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_ibss/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_ibss/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_ibss/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_ibss/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_mesh/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_mesh/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_mesh/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_leave_mesh/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_libertas_set_mesh_channel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_libertas_set_mesh_channel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_libertas_set_mesh_channel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_libertas_set_mesh_channel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_frame_register/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_frame_register/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_frame_register/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_frame_register/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx_cancel_wait/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx_cancel_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx_cancel_wait/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_mgmt_tx_cancel_wait/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_probe_client/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_probe_client/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_probe_client/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_probe_client/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_remain_on_channel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_remain_on_channel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_remain_on_channel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_remain_on_channel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_resume/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_resume/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_resume/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_resume/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_chandef/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_chandef/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_chandef/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_chandef/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_cookie/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_cookie/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_cookie/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_cookie/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_int/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_int/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_int/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_int/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mesh_config/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mesh_config/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mesh_config/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mesh_config/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mpath_info/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mpath_info/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mpath_info/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_mpath_info/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_station_info/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_station_info/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_station_info/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_station_info/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_survey_info/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_survey_info/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_survey_info/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_survey_info/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_tx_rx/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_tx_rx/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_tx_rx/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_int_tx_rx/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void_tx_rx/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void_tx_rx/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void_tx_rx/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_void_tx_rx/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_wdev/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_wdev/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_wdev/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_return_wdev/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_rfkill_poll/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_rfkill_poll/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_rfkill_poll/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_rfkill_poll/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_scan/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_scan/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_scan/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_scan/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_stop/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_stop/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_stop/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_sched_scan_stop/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_antenna/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_antenna/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_antenna/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_antenna/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ap_chanwidth/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ap_chanwidth/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ap_chanwidth/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ap_chanwidth/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_bitrate_mask/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_bitrate_mask/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_bitrate_mask/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_bitrate_mask/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_rssi_config/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_rssi_config/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_rssi_config/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_rssi_config/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_txe_config/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_txe_config/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_txe_config/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_cqm_txe_config/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_key/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_key/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_key/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_key/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_mgmt_key/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_mgmt_key/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_mgmt_key/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_default_mgmt_key/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_mac_acl/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_mac_acl/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_mac_acl/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_mac_acl/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_monitor_channel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_monitor_channel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_monitor_channel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_monitor_channel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_noack_map/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_noack_map/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_noack_map/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_noack_map/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_pmksa/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_pmksa/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_pmksa/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_pmksa/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_power_mgmt/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_power_mgmt/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_power_mgmt/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_power_mgmt/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_qos_map/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_qos_map/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_qos_map/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_qos_map/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_rekey_data/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_rekey_data/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_rekey_data/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_rekey_data/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ringparam/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ringparam/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ringparam/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_ringparam/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_tx_power/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_tx_power/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_tx_power/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_tx_power/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_txq_params/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_txq_params/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_txq_params/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_txq_params/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wakeup/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wakeup/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wakeup/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wds_peer/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wds_peer/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wds_peer/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wds_peer/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wiphy_params/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wiphy_params/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wiphy_params/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_set_wiphy_params/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_ap/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_ap/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_ap/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_ap/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_p2p_device/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_p2p_device/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_p2p_device/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_start_p2p_device/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_ap/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_ap/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_ap/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_ap/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_p2p_device/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_p2p_device/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_p2p_device/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_stop_p2p_device/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_suspend/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_suspend/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_suspend/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_suspend/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_mgmt/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_mgmt/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_mgmt/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_mgmt/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_oper/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_oper/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_oper/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_tdls_oper/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_cmd/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_cmd/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_cmd/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_cmd/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_dump/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_dump/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_dump/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_testmode_dump/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_ft_ies/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_ft_ies/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_ft_ies/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_ft_ies/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_mesh_config/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_mesh_config/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_mesh_config/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cfg80211/rdev_update_mesh_config/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_freepages/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_freepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_freepages/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_freepages/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_migratepages/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_migratepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_migratepages/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_isolate_migratepages/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_migratepages/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_migratepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_migratepages/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/compaction/mm_compaction_migratepages/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_already/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_already/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_already/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_already/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_boost/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_boost/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_boost/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_boost/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_load_change/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_load_change/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_load_change/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_load_change/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_notyet/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_notyet/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_notyet/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_notyet/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_setspeed/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_setspeed/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_setspeed/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_setspeed/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_target/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_target/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_target/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_target/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_unboost/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_unboost/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_unboost/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/cpufreq_interactive/cpufreq_interactive_unboost/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/devfreq/devfreq_msg/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/devfreq/devfreq_msg/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/devfreq/devfreq_msg/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/devfreq/devfreq_msg/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic_late/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic_late/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic_late/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/kernel_panic_late/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/undef_instr/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/undef_instr/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/undef_instr/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/undef_instr/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/unhandled_abort/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/unhandled_abort/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/unhandled_abort/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/unhandled_abort/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/user_fault/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/user_fault/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/user_fault/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/exception/user_fault/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_alloc_new_reservation/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_alloc_new_reservation/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_alloc_new_reservation/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_alloc_new_reservation/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_allocate_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_direct_IO_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_reservation/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_reservation/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_reservation/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_discard_reservation/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_drop_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_drop_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_drop_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_drop_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_evict_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_evict_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_evict_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_evict_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_forget/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_forget/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_forget/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_forget/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_free_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_get_blocks_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_invalidatepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_invalidatepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_invalidatepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_invalidatepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_write_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_write_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_write_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_writepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_writepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_journalled_writepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_load_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_load_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_load_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_load_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_mark_inode_dirty/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_mark_inode_dirty/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_mark_inode_dirty/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_mark_inode_dirty/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_write_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_write_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_write_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_writepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_writepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_ordered_writepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_read_block_bitmap/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_read_block_bitmap/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_read_block_bitmap/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_read_block_bitmap/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_readpage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_readpage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_readpage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_readpage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_releasepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_releasepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_releasepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_releasepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_request_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_reserved/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_reserved/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_reserved/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_reserved/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_rsv_window_add/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_rsv_window_add/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_rsv_window_add/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_rsv_window_add/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_file_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_fs/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_fs/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_fs/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_sync_fs/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_truncate_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_unlink_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_write_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_write_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_write_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_write_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_write_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_write_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_write_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_writepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_writepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext3/ext3_writeback_writepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_alloc_da_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_alloc_da_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_alloc_da_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_alloc_da_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_allocate_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_begin_ordered_truncate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_begin_ordered_truncate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_begin_ordered_truncate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_begin_ordered_truncate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_release_space/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_release_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_release_space/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_release_space/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_reserve_space/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_reserve_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_reserve_space/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_reserve_space/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_update_reserve_space/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_update_reserve_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_update_reserve_space/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_update_reserve_space/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_pages/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_pages/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_pages/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_write_pages/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages_result/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages_result/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages_result/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_da_writepages_result/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_direct_IO_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_preallocations/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_preallocations/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_preallocations/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_discard_preallocations/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_drop_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_drop_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_drop_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_drop_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_find_delayed_extent_range_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_insert_extent/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_insert_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_insert_extent/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_insert_extent/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_lookup_extent_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_remove_extent/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_remove_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_remove_extent/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_remove_extent/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_es_shrink_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_evict_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_evict_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_evict_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_evict_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_fastpath/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_fastpath/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_fastpath/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_convert_to_initialized_fastpath/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_handle_uninitialized_extents/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_handle_uninitialized_extents/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_handle_uninitialized_extents/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_handle_uninitialized_extents/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_in_cache/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_in_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_in_cache/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_in_cache/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_load_extent/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_load_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_load_extent/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_load_extent/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_map_blocks_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_put_in_cache/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_put_in_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_put_in_cache/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_put_in_cache/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_remove_space_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_idx/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_idx/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_idx/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_idx/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_leaf/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_leaf/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_leaf/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_rm_leaf/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_show_extent/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_show_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_show_extent/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ext_show_extent/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_fallocate_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_find_delalloc_range/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_find_delalloc_range/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_find_delalloc_range/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_find_delalloc_range/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_forget/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_forget/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_forget/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_forget/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_free_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_implied_cluster_alloc_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_implied_cluster_alloc_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_implied_cluster_alloc_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_implied_cluster_alloc_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_reserved_cluster_alloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_reserved_cluster_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_reserved_cluster_alloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_get_reserved_cluster_alloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_ind_map_blocks_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_invalidatepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_invalidatepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_invalidatepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_invalidatepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journal_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journal_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journal_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journal_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_invalidatepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_invalidatepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_invalidatepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_invalidatepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_write_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_write_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_journalled_write_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode_bitmap/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode_bitmap/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode_bitmap/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_load_inode_bitmap/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mark_inode_dirty/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mark_inode_dirty/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mark_inode_dirty/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mark_inode_dirty/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_bitmap_load/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_bitmap_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_bitmap_load/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_bitmap_load/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_buddy_bitmap_load/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_buddy_bitmap_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_buddy_bitmap_load/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_buddy_bitmap_load/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_discard_preallocations/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_discard_preallocations/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_discard_preallocations/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_discard_preallocations/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_group_pa/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_group_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_group_pa/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_group_pa/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_inode_pa/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_inode_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_inode_pa/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_new_inode_pa/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_group_pa/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_group_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_group_pa/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_group_pa/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_inode_pa/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_inode_pa/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_inode_pa/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mb_release_inode_pa/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_alloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_alloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_alloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_discard/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_discard/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_discard/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_discard/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_free/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_free/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_free/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_prealloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_prealloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_prealloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_mballoc_prealloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_punch_hole/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_punch_hole/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_punch_hole/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_punch_hole/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_read_block_bitmap_load/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_read_block_bitmap_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_read_block_bitmap_load/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_read_block_bitmap_load/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_readpage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_readpage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_readpage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_readpage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_releasepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_releasepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_releasepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_releasepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_remove_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_remove_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_remove_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_remove_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_blocks/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_blocks/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_blocks/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_blocks/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_request_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_file_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_fs/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_fs/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_fs/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_sync_fs/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_all_free/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_all_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_all_free/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_all_free/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_extent/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_extent/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_extent/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_trim_extent/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_truncate_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_unlink_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_write_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_writepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_writepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ext4/ext4_writepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_add_to_page_cache/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_add_to_page_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_add_to_page_cache/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_add_to_page_cache/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_delete_from_page_cache/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_delete_from_page_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_delete_from_page_cache/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/filemap/mm_filemap_delete_from_page_cache/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bprint/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bprint/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bprint/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bprint/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bputs/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bputs/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bputs/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/bputs/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/branch/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/branch/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/branch/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/branch/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/context_switch/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/context_switch/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/context_switch/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/context_switch/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_entry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_entry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_entry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/funcgraph_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/function/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/function/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/function/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/function/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/kernel_stack/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/kernel_stack/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/kernel_stack/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/kernel_stack/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_map/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_map/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_map/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_map/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_rw/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_rw/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_rw/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/mmiotrace_rw/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/print/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/print/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/print/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/print/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/user_stack/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/user_stack/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/user_stack/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/user_stack/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/wakeup/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/wakeup/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ftrace/wakeup/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_direction/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_direction/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_direction/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_direction/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_value/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_value/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_value/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/gpio/gpio_value/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_resume/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_resume/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_resume/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_resume/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_suspend/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_suspend/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_suspend/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_bus_suspend/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_ep0/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_ep0/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_ep0/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_ep0/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_hub_control/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_hub_control/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_hub_control/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_hub_control/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_in/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_in/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_in/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_in/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_out/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_out/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_out/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_out/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_read/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_read/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_read/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_write/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_write/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_reg_write/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_setup/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_setup/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_setup/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_setup/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_dequeue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_dequeue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_dequeue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_dequeue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_enqueue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_enqueue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_enqueue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/ice40/ice40_urb_enqueue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_entry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_entry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_entry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/irq_handler_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_entry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_entry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_entry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_raise/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_raise/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_raise/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/irq/softirq_raise/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_checkpoint/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_checkpoint/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_checkpoint/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_checkpoint/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_cleanup_journal_tail/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_cleanup_journal_tail/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_cleanup_journal_tail/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_cleanup_journal_tail/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_flushing/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_flushing/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_flushing/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_flushing/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_locking/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_locking/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_locking/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_locking/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_logging/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_logging/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_logging/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_commit_logging/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_do_submit_data/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_do_submit_data/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_do_submit_data/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_do_submit_data/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_drop_transaction/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_drop_transaction/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_drop_transaction/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_drop_transaction/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_end_commit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_end_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_end_commit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_end_commit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_start_commit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_start_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_start_commit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/jbd_start_commit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/journal_write_superblock/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/journal_write_superblock/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/journal_write_superblock/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd/journal_write_superblock/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint_stats/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint_stats/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint_stats/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_checkpoint_stats/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_flushing/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_flushing/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_flushing/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_flushing/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_locking/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_locking/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_locking/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_locking/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_logging/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_logging/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_logging/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_commit_logging/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_drop_transaction/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_drop_transaction/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_drop_transaction/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_drop_transaction/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_end_commit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_end_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_end_commit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_end_commit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_extend/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_extend/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_extend/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_extend/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_stats/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_stats/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_stats/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_handle_stats/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_lock_buffer_stall/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_lock_buffer_stall/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_lock_buffer_stall/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_lock_buffer_stall/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_run_stats/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_run_stats/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_run_stats/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_run_stats/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_start_commit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_start_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_start_commit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_start_commit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_submit_inode_data/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_submit_inode_data/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_submit_inode_data/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_submit_inode_data/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_update_log_tail/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_update_log_tail/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_update_log_tail/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_update_log_tail/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_write_superblock/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_write_superblock/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_write_superblock/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/jbd2/jbd2_write_superblock/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_fault/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_fault/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_fault/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_fault/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_queued/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_queued/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_queued/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_queued/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_recovery/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_recovery/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_recovery/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_recovery/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_retired/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_retired/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_retired/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_retired/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_submitted/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_submitted/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_submitted/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_cmdbatch_submitted/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_invalidate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_invalidate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_invalidate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_invalidate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_sleep/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_sleep/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_sleep/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_sleep/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_switch/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_switch/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_switch/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_switch/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wait_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wake/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wake/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wake/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_drawctxt_wake/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_gpu_fault/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_gpu_fault/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_gpu_fault/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_gpu_fault/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_sp_tp/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_sp_tp/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_sp_tp/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/adreno_sp_tp/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/dispatch_queue_context/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/dispatch_queue_context/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/dispatch_queue_context/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/dispatch_queue_context/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a3xx_irq_status/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a3xx_irq_status/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a3xx_irq_status/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a3xx_irq_status/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a4xx_irq_status/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a4xx_irq_status/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a4xx_irq_status/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_a4xx_irq_status/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_active_count/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_active_count/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_active_count/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_active_count/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_bus/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_bus/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_bus/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_bus/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_buslevel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_buslevel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_buslevel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_buslevel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_clk/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_clk/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_clk/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_clk/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_constraint/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_constraint/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_constraint/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_constraint/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_create/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_create/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_create/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_create/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_destroy/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_destroy/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_destroy/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_destroy/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_detach/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_detach/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_detach/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_context_detach/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_fire_event/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_fire_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_fire_event/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_fire_event/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_gpubusy/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_gpubusy/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_gpubusy/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_gpubusy/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_irq/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_irq/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_irq/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_irq/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_issueibcmds/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_issueibcmds/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_issueibcmds/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_issueibcmds/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_alloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_alloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_alloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_free/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_free/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_free/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_map/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_map/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_map/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_map/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_mmap/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_mmap/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_mmap/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_mmap/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_cache/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_cache/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_cache/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_full_cache/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_full_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_full_cache/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_sync_full_cache/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_free/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_free/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_free/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_queue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_queue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_timestamp_queue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_unmapped_area_collision/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_unmapped_area_collision/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_unmapped_area_collision/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mem_unmapped_area_collision/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mmu_pagefault/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mmu_pagefault/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mmu_pagefault/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_mmu_pagefault/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_msg/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_msg/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_msg/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_msg/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_alloc_pages_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_page_pool_zero_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pagetable_destroy/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pagetable_destroy/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pagetable_destroy/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pagetable_destroy/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_request_state/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_request_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_request_state/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_request_state/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_set_state/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_set_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_set_state/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwr_set_state/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrlevel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrlevel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrlevel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrlevel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrstats/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrstats/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrstats/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_pwrstats/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_rail/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_rail/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_rail/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_rail/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_readtimestamp/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_readtimestamp/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_readtimestamp/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_readtimestamp/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_register_event/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_register_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_register_event/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_register_event/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_regwrite/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_regwrite/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_regwrite/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_regwrite/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_sharedmem_page_alloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_sharedmem_page_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_sharedmem_page_alloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_sharedmem_page_alloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_user_pwrlevel_constraint/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_user_pwrlevel_constraint/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_user_pwrlevel_constraint/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_user_pwrlevel_constraint/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_entry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_entry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_entry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/kgsl_waittimestamp_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence_expire/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence_expire/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence_expire/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_fence_expire/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp_expire/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp_expire/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp_expire/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kgsl/syncpoint_timestamp_expire/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_fail/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_fail/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_fail/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_fail/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_iommu_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_fail/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_fail/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_fail/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_fail/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/alloc_pages_sys_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/dma_alloc_contiguous_retry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/dma_alloc_contiguous_retry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/dma_alloc_contiguous_retry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/dma_alloc_contiguous_retry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_map_range/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_map_range/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_map_range/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_map_range/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/iommu_sec_ptbl_map_range_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fail/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fail/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fail/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fail/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fallback/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fallback/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fallback/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_fallback/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_alloc_buffer_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_alloc_retry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_alloc_retry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_alloc_retry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_alloc_retry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_cp_secure_buffer_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_prefetching/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_prefetching/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_prefetching/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_prefetching/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_add_to_pool_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_allocate_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/ion_secure_cma_shrink_pool_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kfree/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kfree/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kfree/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kfree/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc_node/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc_node/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc_node/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmalloc_node/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc_node/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc_node/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc_node/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_alloc_node/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_free/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_free/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/kmem_cache_free/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_pages_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_retry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_retry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_retry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/migrate_retry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_extfrag/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_extfrag/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_extfrag/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_extfrag/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_zone_locked/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_zone_locked/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_zone_locked/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_alloc_zone_locked/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free_batched/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free_batched/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free_batched/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_free_batched/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_pcpu_drain/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_pcpu_drain/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_pcpu_drain/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/kmem/mm_page_pcpu_drain/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/lowmemorykiller/lowmemory_kill/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/lowmemorykiller/lowmemory_kill/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/lowmemorykiller/lowmemory_kill/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/lowmemorykiller/lowmemory_kill/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_kickoff/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_kickoff/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_kickoff/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_kickoff/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_pingpong_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_pingpong_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_pingpong_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_pingpong_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_release_bw/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_release_bw/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_release_bw/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_release_bw/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_wait_pingpong/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_wait_pingpong/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_wait_pingpong/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_cmd_wait_pingpong/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_commit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_commit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_commit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_commit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_mixer_update/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_mixer_update/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_mixer_update/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_mixer_update/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_prefill_calc/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_prefill_calc/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_prefill_calc/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_prefill_calc/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_set_wm_levels/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_set_wm_levels/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_set_wm_levels/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_set_wm_levels/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_update_bus/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_update_bus/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_update_bus/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_perf_update_bus/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_change/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_change/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_change/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_change/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_set/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_set/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_set/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_sspp_set/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_trace_counter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_trace_counter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_trace_counter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_trace_counter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_video_underrun_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_video_underrun_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_video_underrun_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/mdp_video_underrun_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/tracing_mark_write/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/tracing_mark_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/tracing_mark_write/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mdss/tracing_mark_write/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/migrate/mm_migrate_pages/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/migrate/mm_migrate_pages/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/migrate/mm_migrate_pages/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/migrate/mm_migrate_pages/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_post/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_post/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_post/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_post/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_pre/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_pre/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_pre/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_adma_table_pre/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_erase_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_blk_rw_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_clk/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_clk/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_clk/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_clk/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_cmd_rw_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_data_rw_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_data_rw_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_data_rw_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_data_rw_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_resume_host/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_resume_host/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_resume_host/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_resume_host/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_suspend_host/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_suspend_host/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_suspend_host/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/mmc/mmc_suspend_host/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_bw/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_bw/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_bw/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_bw/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_clk/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_clk/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_clk/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_agg_clk/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_avail_bw/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_avail_bw/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_avail_bw/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_avail_bw/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bimc_config_limiter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bimc_config_limiter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bimc_config_limiter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bimc_config_limiter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bke_params/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bke_params/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bke_params/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_bke_params/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_noc_set_qos_mode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_noc_set_qos_mode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_noc_set_qos_mode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_noc_set_qos_mode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_apply/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_apply/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_apply/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_apply/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_matches/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_matches/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_matches/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_rules_matches/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_bus/bus_update_request_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cluster_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/cpu_idle_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/pre_pc_cb/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/pre_pc_cb/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/pre_pc_cb/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_low_power/pre_pc_cb/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_iommu_op_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_smem_buffer_ion_op_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_buffer_event_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_close_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_fw_load_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_v4l2_vidc_open_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_vidc_common_state_change/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_vidc_common_state_change/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_vidc_common_state_change/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/msm_vidc_common_state_change/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/venus_hfi_var_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/venus_hfi_var_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/venus_hfi_var_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/msm_vidc/venus_hfi_var_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/napi/napi_poll/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/napi/napi_poll/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/napi/napi_poll/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/napi/napi_poll/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_queue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_queue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_queue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_xmit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_xmit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_xmit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/net_dev_xmit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_receive_skb/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_receive_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_receive_skb/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_receive_skb/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_rx/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_rx/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_rx/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/net/netif_rx/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/oom/oom_score_adj_update/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/oom/oom_score_adj_update/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/oom/oom_score_adj_update/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/oom/oom_score_adj_update/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/perf_trace_counters/sched_switch_with_ctrs/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/perf_trace_counters/sched_switch_with_ctrs/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/perf_trace_counters/sched_switch_with_ctrs/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/perf_trace_counters/sched_switch_with_ctrs/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_disable/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_disable/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_disable/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_disable/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_enable/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_enable/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_enable/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_enable/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_parent/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_parent/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_parent/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_parent/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_rate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_rate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_rate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/clock_set_rate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_frequency_switch_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_idle/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_idle/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_idle/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpu_idle/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_freq_synced/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_freq_synced/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_freq_synced/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_freq_synced/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_sampling_event/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_sampling_event/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_sampling_event/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/cpufreq_sampling_event/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/machine_suspend/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/machine_suspend/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/machine_suspend/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/machine_suspend/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/power_domain_target/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/power_domain_target/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/power_domain_target/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/power_domain_target/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/reevaluate_hotplug/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/reevaluate_hotplug/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/reevaluate_hotplug/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/reevaluate_hotplug/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/set_max_cpus/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/set_max_cpus/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/set_max_cpus/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/set_max_cpus/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_activate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_activate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_activate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_activate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_deactivate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_deactivate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_deactivate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/power/wakeup_source_deactivate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/printk/console/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/printk/console/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/printk/console/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/printk/console/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim_eff/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim_eff/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim_eff/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/process_reclaim/process_reclaim_eff/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/credit_entropy_bits/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/credit_entropy_bits/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/credit_entropy_bits/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/credit_entropy_bits/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy_user/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy_user/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy_user/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/extract_entropy_user/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/get_random_bytes/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/get_random_bytes/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/get_random_bytes/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/get_random_bytes/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes_nolock/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes_nolock/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes_nolock/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/random/mix_pool_bytes_nolock/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_enter/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_enter/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_enter/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_enter/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/raw_syscalls/sys_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rcu/rcu_utilization/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rcu/rcu_utilization/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rcu/rcu_utilization/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rcu/rcu_utilization/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regcache_sync/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regcache_sync/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regcache_sync/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regcache_sync/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_complete_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_io_complete/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_io_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_io_complete/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_io_complete/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_write_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_write_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_write_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_async_write_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_bypass/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_bypass/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_bypass/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_bypass/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_only/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_only/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_only/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_cache_only/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_read_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_hw_write_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read_cache/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read_cache/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read_cache/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_read_cache/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_write/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_write/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_write/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regmap/regmap_reg_write/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable_complete/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable_complete/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_disable_complete/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_complete/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_complete/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_complete/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_delay/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_delay/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_delay/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_enable_delay/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage_complete/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage_complete/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage_complete/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/regulator/regulator_set_voltage_complete/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/__rmnet_deliver_skb/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/__rmnet_deliver_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/__rmnet_deliver_skb/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/__rmnet_deliver_skb/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_egress_handler/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_egress_handler/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_egress_handler/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_egress_handler/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_end_deaggregation/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_end_deaggregation/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_end_deaggregation/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_end_deaggregation/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_map/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_map/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_map/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_map/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_qmi/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_qmi/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_qmi/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_fc_qmi/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_ingress_handler/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_ingress_handler/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_ingress_handler/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_ingress_handler/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_aggregate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_aggregate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_aggregate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_aggregate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_checksum_downlink_packet/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_checksum_downlink_packet/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_checksum_downlink_packet/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_checksum_downlink_packet/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_flush_packet_queue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_flush_packet_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_flush_packet_queue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_map_flush_packet_queue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_aggregation/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_aggregation/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_aggregation/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_aggregation/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_deaggregation/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_deaggregation/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_deaggregation/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_start_deaggregation/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_vnd_start_xmit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_vnd_start_xmit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_vnd_start_xmit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rmnet_data/rmnet_vnd_start_xmit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_idle/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_idle/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_idle/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_idle/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_resume/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_resume/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_resume/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_resume/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_return_int/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_return_int/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_return_int/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_return_int/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_suspend/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_suspend/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_suspend/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm/rpm_suspend/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_ack_recd/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_ack_recd/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_ack_recd/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_ack_recd/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_send_message/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_send_message/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_send_message/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/rpm_smd/rpm_send_message/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_blocked_reason/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_blocked_reason/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_blocked_reason/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_blocked_reason/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_hotplug/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_hotplug/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_hotplug/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_hotplug/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_load/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_load/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_cpu_load/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_enq_deq_task/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_enq_deq_task/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_enq_deq_task/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_enq_deq_task/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop_ret/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop_ret/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop_ret/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_kthread_stop_ret/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_load_balance/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_load_balance/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_load_balance/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_load_balance/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_migrate_task/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_migrate_task/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_migrate_task/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_migrate_task/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_pi_setprio/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_pi_setprio/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_pi_setprio/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_pi_setprio/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exec/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exec/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exec/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exec/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_fork/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_fork/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_fork/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_fork/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_free/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_free/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_free/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_free/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_wait/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_wait/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_process_wait/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_reset_all_window_stats/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_reset_all_window_stats/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_reset_all_window_stats/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_reset_all_window_stats/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_set_boost/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_set_boost/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_set_boost/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_set_boost/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_blocked/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_blocked/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_blocked/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_blocked/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_iowait/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_iowait/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_iowait/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_iowait/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_runtime/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_runtime/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_runtime/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_runtime/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_sleep/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_sleep/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_sleep/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_sleep/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_wait/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_wait/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_stat_wait/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_switch/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_switch/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_switch/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_switch/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_task_load/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_task_load/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_task_load/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_task_load/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_history/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_history/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_history/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_history/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_task_ravg/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_task_ravg/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_task_ravg/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_update_task_ravg/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wait_task/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wait_task/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wait_task/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wait_task/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup_new/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup_new/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup_new/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sched/sched_wakeup_new/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_done/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_done/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_done/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_done/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_error/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_error/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_error/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_error/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_timeout/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_timeout/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_timeout/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_dispatch_cmd_timeout/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_eh_wakeup/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_eh_wakeup/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_eh_wakeup/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/scsi/scsi_eh_wakeup/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_deliver/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_deliver/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_deliver/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_deliver/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_generate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_generate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_generate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/signal/signal_generate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/consume_skb/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/consume_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/consume_skb/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/consume_skb/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/kfree_skb/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/kfree_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/kfree_skb/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/kfree_skb/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/skb_copy_datagram_iovec/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/skb_copy_datagram_iovec/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/skb_copy_datagram_iovec/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/skb/skb_copy_datagram_iovec/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_exceed_buf_limit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_exceed_buf_limit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_exceed_buf_limit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_exceed_buf_limit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_rcvqueue_full/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_rcvqueue_full/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_rcvqueue_full/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sock/sock_rcvqueue_full/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_pt/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_pt/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_pt/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_pt/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_timeline/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_timeline/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_timeline/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_timeline/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_wait/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_wait/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/sync/sync_wait/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_newtask/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_newtask/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_newtask/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_newtask/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_rename/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_rename/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_rename/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/task/task_rename/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_offline/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_offline/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_offline/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_offline/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_online/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_online/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_online/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_core_online/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_frequency_mit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_frequency_mit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_frequency_mit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_post_frequency_mit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_offline/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_offline/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_offline/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_offline/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_online/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_online/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_online/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_core_online/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_frequency_mit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_frequency_mit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_frequency_mit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/thermal_pre_frequency_mit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_read/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_read/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_read/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_read/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_clear/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_clear/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_clear/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_clear/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_hit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_hit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_hit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/thermal/tsens_threshold_hit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_cancel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_cancel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_cancel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_cancel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_entry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_entry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_entry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_expire_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_init/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_init/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_init/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_init/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/hrtimer_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_expire/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_expire/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_expire/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_expire/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_state/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_state/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/itimer_state/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/tick_stop/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/tick_stop/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/tick_stop/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/tick_stop/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_cancel/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_cancel/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_cancel/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_cancel/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_entry/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_entry/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_entry/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_entry/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_exit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_exit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_exit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_expire_exit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_init/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_init/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_init/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_init/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/timer/timer_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/udp/udp_fail_queue_rcv_skb/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/udp/udp_fail_queue_rcv_skb/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/udp/udp_fail_queue_rcv_skb/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/udp/udp_fail_queue_rcv_skb/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_shrink_slab_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_direct_reclaim_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_sleep/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_sleep/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_sleep/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_sleep/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_wake/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_wake/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_wake/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_kswapd_wake/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_isolate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_isolate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_isolate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_isolate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_shrink_inactive/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_shrink_inactive/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_shrink_inactive/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_lru_shrink_inactive/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_isolate/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_isolate/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_isolate/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_isolate/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_reclaim_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_writepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_writepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/vmscan/mm_vmscan_writepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_activate_work/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_activate_work/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_activate_work/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_activate_work/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_end/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_end/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_end/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_end/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_execute_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_queue_work/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_queue_work/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_queue_work/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/workqueue/workqueue_queue_work/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/balance_dirty_pages/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/balance_dirty_pages/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/balance_dirty_pages/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/balance_dirty_pages/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/bdi_dirty_ratelimit/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/bdi_dirty_ratelimit/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/bdi_dirty_ratelimit/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/bdi_dirty_ratelimit/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/global_dirty_state/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/global_dirty_state/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/global_dirty_state/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/global_dirty_state/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/wbc_writepage/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/wbc_writepage/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/wbc_writepage/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/wbc_writepage/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_register/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_register/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_register/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_register/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_unregister/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_unregister/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_unregister/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_bdi_unregister/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_congestion_wait/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_congestion_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_congestion_wait/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_congestion_wait/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_inode_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_page/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_page/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_page/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_dirty_page/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_exec/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_exec/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_exec/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_exec/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_nowork/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_nowork/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_nowork/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_nowork/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_pages_written/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_pages_written/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_pages_written/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_pages_written/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue_io/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue_io/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue_io/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_queue_io/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_sb_inodes_requeue/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_sb_inodes_requeue/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_sb_inodes_requeue/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_sb_inodes_requeue/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_single_inode_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait_iff_congested/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait_iff_congested/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait_iff_congested/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wait_iff_congested/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wake_background/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wake_background/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wake_background/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_wake_background/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode_start/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode_start/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode_start/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_write_inode_start/format
diff --git a/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_written/format b/src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_written/format
similarity index 100%
rename from ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_written/format
rename to src/ftrace_reader/test/data/android_seed_N2F62_3.10.49/events/writeback/writeback_written/format
diff --git a/ftrace_reader/test/explorer.html b/src/ftrace_reader/test/explorer.html
similarity index 100%
rename from ftrace_reader/test/explorer.html
rename to src/ftrace_reader/test/explorer.html
diff --git a/ftrace_reader/test/test_proto_gen.py b/src/ftrace_reader/test/test_proto_gen.py
similarity index 100%
rename from ftrace_reader/test/test_proto_gen.py
rename to src/ftrace_reader/test/test_proto_gen.py
diff --git a/src/ipc/BUILD.gn b/src/ipc/BUILD.gn
new file mode 100644
index 0000000..a42e2fe
--- /dev/null
+++ b/src/ipc/BUILD.gn
@@ -0,0 +1,77 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../gn/perfetto.gni")
+import("../../gn/proto_library.gni")
+import("ipc_library.gni")
+
+source_set("ipc") {
+ public_configs = [ "../../gn:default_config" ]
+ public_deps = [
+ "../../include/perfetto/ipc",
+ ]
+ deps = [
+ ":wire_protocol",
+ "../../gn:default_deps",
+ "../base",
+ ]
+ sources = [
+ "buffered_frame_deserializer.cc",
+ "client_impl.cc",
+ "deferred.cc",
+ "host_impl.cc",
+ "host_impl.h",
+ "service_proxy.cc",
+ "unix_socket.cc",
+ "unix_socket.h",
+ ]
+}
+
+executable("perfetto_ipc_unittests") {
+ testonly = true
+ deps = [
+ ":ipc",
+ ":test_messages",
+ ":wire_protocol",
+ "../../gn:default_deps",
+ "../../gn:gtest_deps",
+ "../base",
+ "../base:test_support",
+ ]
+ sources = [
+ "buffered_frame_deserializer_unittest.cc",
+ "client_impl_unittest.cc",
+ "deferred_unittest.cc",
+ "host_impl_unittest.cc",
+ "test/ipc_integrationtest.cc",
+ "unix_socket_unittest.cc",
+ ]
+}
+
+proto_library("wire_protocol") {
+ sources = [
+ "wire_protocol.proto",
+ ]
+ proto_in_dir = perfetto_root_path
+ proto_out_dir = "protos_lite"
+}
+
+ipc_library("test_messages") {
+ sources = [
+ "test/client_unittest_messages.proto",
+ "test/deferred_unittest_messages.proto",
+ "test/greeter_service.proto",
+ ]
+ proto_in_dir = perfetto_root_path
+}
diff --git a/ipc/src/buffered_frame_deserializer.cc b/src/ipc/buffered_frame_deserializer.cc
similarity index 97%
rename from ipc/src/buffered_frame_deserializer.cc
rename to src/ipc/buffered_frame_deserializer.cc
index ab8dca5..0f40186 100644
--- a/ipc/src/buffered_frame_deserializer.cc
+++ b/src/ipc/buffered_frame_deserializer.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ipc/src/buffered_frame_deserializer.h"
+#include "src/ipc/buffered_frame_deserializer.h"
#include <inttypes.h>
#include <sys/mman.h>
@@ -24,10 +24,10 @@
#include <utility>
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/utils.h"
-#include "ipc/src/wire_protocol.pb.h"
+#include "src/ipc/wire_protocol.pb.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/src/buffered_frame_deserializer.h b/src/ipc/buffered_frame_deserializer.h
similarity index 95%
rename from ipc/src/buffered_frame_deserializer.h
rename to src/ipc/buffered_frame_deserializer.h
index 17a43dc..874a7a2 100644
--- a/ipc/src/buffered_frame_deserializer.h
+++ b/src/ipc/buffered_frame_deserializer.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef IPC_SRC_BUFFERED_FRAME_DESERIALIZER_H_
-#define IPC_SRC_BUFFERED_FRAME_DESERIALIZER_H_
+#ifndef SRC_IPC_BUFFERED_FRAME_DESERIALIZER_H_
+#define SRC_IPC_BUFFERED_FRAME_DESERIALIZER_H_
#include <stddef.h>
#include <list>
#include <memory>
-#include "perfetto_base/utils.h"
+#include "perfetto/base/utils.h"
namespace perfetto {
namespace ipc {
@@ -126,4 +126,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_SRC_BUFFERED_FRAME_DESERIALIZER_H_
+#endif // SRC_IPC_BUFFERED_FRAME_DESERIALIZER_H_
diff --git a/ipc/src/buffered_frame_deserializer_unittest.cc b/src/ipc/buffered_frame_deserializer_unittest.cc
similarity index 98%
rename from ipc/src/buffered_frame_deserializer_unittest.cc
rename to src/ipc/buffered_frame_deserializer_unittest.cc
index f459b61..3058da0 100644
--- a/ipc/src/buffered_frame_deserializer_unittest.cc
+++ b/src/ipc/buffered_frame_deserializer_unittest.cc
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#include "ipc/src/buffered_frame_deserializer.h"
+#include "src/ipc/buffered_frame_deserializer.h"
#include <algorithm>
#include <string>
#include "gtest/gtest.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/utils.h"
-#include "ipc/src/wire_protocol.pb.h"
+#include "src/ipc/wire_protocol.pb.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/src/client_impl.cc b/src/ipc/client_impl.cc
similarity index 97%
rename from ipc/src/client_impl.cc
rename to src/ipc/client_impl.cc
index 229056b..e1c4a7c 100644
--- a/ipc/src/client_impl.cc
+++ b/src/ipc/client_impl.cc
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "ipc/src/client_impl.h"
+#include "src/ipc/client_impl.h"
#include <inttypes.h>
-#include "ipc/service_descriptor.h"
-#include "ipc/service_proxy.h"
-#include "perfetto_base/task_runner.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/utils.h"
+#include "perfetto/ipc/service_descriptor.h"
+#include "perfetto/ipc/service_proxy.h"
// TODO(primiano): Add ThreadChecker everywhere.
diff --git a/ipc/src/client_impl.h b/src/ipc/client_impl.h
similarity index 88%
rename from ipc/src/client_impl.h
rename to src/ipc/client_impl.h
index f2762ca..71934ed 100644
--- a/ipc/src/client_impl.h
+++ b/src/ipc/client_impl.h
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#ifndef IPC_SRC_CLIENT_IMPL_H_
-#define IPC_SRC_CLIENT_IMPL_H_
+#ifndef SRC_IPC_CLIENT_IMPL_H_
+#define SRC_IPC_CLIENT_IMPL_H_
-#include "ipc/client.h"
-#include "ipc/src/buffered_frame_deserializer.h"
-#include "ipc/src/unix_socket.h"
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/task_runner.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/ipc/client.h"
+#include "src/ipc/buffered_frame_deserializer.h"
+#include "src/ipc/unix_socket.h"
-#include "ipc/src/wire_protocol.pb.h"
+#include "src/ipc/wire_protocol.pb.h"
#include <list>
#include <map>
@@ -95,4 +95,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_SRC_CLIENT_IMPL_H_
+#endif // SRC_IPC_CLIENT_IMPL_H_
diff --git a/ipc/src/client_impl_unittest.cc b/src/ipc/client_impl_unittest.cc
similarity index 97%
rename from ipc/src/client_impl_unittest.cc
rename to src/ipc/client_impl_unittest.cc
index 4645443..769ee47 100644
--- a/ipc/src/client_impl_unittest.cc
+++ b/src/ipc/client_impl_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ipc/src/client_impl.h"
+#include "src/ipc/client_impl.h"
#include <stdio.h>
#include <unistd.h>
@@ -23,14 +23,14 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "ipc/service_descriptor.h"
-#include "ipc/service_proxy.h"
-#include "ipc/src/buffered_frame_deserializer.h"
-#include "ipc/src/unix_socket.h"
-#include "perfetto_base/test/test_task_runner.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/utils.h"
+#include "perfetto/ipc/service_descriptor.h"
+#include "perfetto/ipc/service_proxy.h"
+#include "src/base/test/test_task_runner.h"
+#include "src/ipc/buffered_frame_deserializer.h"
+#include "src/ipc/unix_socket.h"
-#include "ipc/src/test/client_unittest_messages.pb.h"
+#include "src/ipc/test/client_unittest_messages.pb.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/src/deferred.cc b/src/ipc/deferred.cc
similarity index 96%
rename from ipc/src/deferred.cc
rename to src/ipc/deferred.cc
index 3862115..bed3cc2 100644
--- a/ipc/src/deferred.cc
+++ b/src/ipc/deferred.cc
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "ipc/deferred.h"
+#include "perfetto/ipc/deferred.h"
#include "google/protobuf/message_lite.h"
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/src/deferred_unittest.cc b/src/ipc/deferred_unittest.cc
similarity index 98%
rename from ipc/src/deferred_unittest.cc
rename to src/ipc/deferred_unittest.cc
index 51472ed..076cce6 100644
--- a/ipc/src/deferred_unittest.cc
+++ b/src/ipc/deferred_unittest.cc
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#include "ipc/deferred.h"
+#include "perfetto/ipc/deferred.h"
#include "gtest/gtest.h"
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
-#include "ipc/src/test/deferred_unittest_messages.pb.h"
+#include "src/ipc/test/deferred_unittest_messages.pb.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/src/host_impl.cc b/src/ipc/host_impl.cc
similarity index 97%
rename from ipc/src/host_impl.cc
rename to src/ipc/host_impl.cc
index 2c15519..7707825 100644
--- a/ipc/src/host_impl.cc
+++ b/src/ipc/host_impl.cc
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-#include "ipc/src/host_impl.h"
+#include "src/ipc/host_impl.h"
#include <inttypes.h>
#include <algorithm>
#include <utility>
-#include "ipc/service.h"
-#include "ipc/service_descriptor.h"
-#include "perfetto_base/task_runner.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/utils.h"
+#include "perfetto/ipc/service.h"
+#include "perfetto/ipc/service_descriptor.h"
-#include "ipc/src/wire_protocol.pb.h"
+#include "src/ipc/wire_protocol.pb.h"
// TODO(primiano): put limits on #connections/uid and req. queue (b/69093705).
diff --git a/ipc/src/host_impl.h b/src/ipc/host_impl.h
similarity index 89%
rename from ipc/src/host_impl.h
rename to src/ipc/host_impl.h
index bbb6a33..f09b32d 100644
--- a/ipc/src/host_impl.h
+++ b/src/ipc/host_impl.h
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-#ifndef IPC_SRC_HOST_IMPL_H_
-#define IPC_SRC_HOST_IMPL_H_
+#ifndef SRC_IPC_HOST_IMPL_H_
+#define SRC_IPC_HOST_IMPL_H_
#include <map>
#include <set>
#include <string>
#include <vector>
-#include "ipc/deferred.h"
-#include "ipc/host.h"
-#include "ipc/src/buffered_frame_deserializer.h"
-#include "ipc/src/unix_socket.h"
-#include "perfetto_base/task_runner.h"
-#include "perfetto_base/thread_checker.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/thread_checker.h"
+#include "perfetto/ipc/deferred.h"
+#include "perfetto/ipc/host.h"
+#include "src/ipc/buffered_frame_deserializer.h"
+#include "src/ipc/unix_socket.h"
namespace perfetto {
namespace ipc {
@@ -95,4 +95,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_SRC_HOST_IMPL_H_
+#endif // SRC_IPC_HOST_IMPL_H_
diff --git a/ipc/src/host_impl_unittest.cc b/src/ipc/host_impl_unittest.cc
similarity index 97%
rename from ipc/src/host_impl_unittest.cc
rename to src/ipc/host_impl_unittest.cc
index a98efb7..72ab226 100644
--- a/ipc/src/host_impl_unittest.cc
+++ b/src/ipc/host_impl_unittest.cc
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-#include "ipc/src/host_impl.h"
+#include "src/ipc/host_impl.h"
#include <memory>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "ipc/service.h"
-#include "ipc/service_descriptor.h"
-#include "ipc/src/buffered_frame_deserializer.h"
-#include "ipc/src/unix_socket.h"
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/test/test_task_runner.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/ipc/service.h"
+#include "perfetto/ipc/service_descriptor.h"
+#include "src/base/test/test_task_runner.h"
+#include "src/ipc/buffered_frame_deserializer.h"
+#include "src/ipc/unix_socket.h"
-#include "ipc/src/test/client_unittest_messages.pb.h"
-#include "ipc/src/wire_protocol.pb.h"
+#include "src/ipc/test/client_unittest_messages.pb.h"
+#include "src/ipc/wire_protocol.pb.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/ipc_library.gni b/src/ipc/ipc_library.gni
similarity index 89%
rename from ipc/ipc_library.gni
rename to src/ipc/ipc_library.gni
index 7f61f23..3a31c73 100644
--- a/ipc/ipc_library.gni
+++ b/src/ipc/ipc_library.gni
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("../gn/perfetto.gni")
+import("../../gn/perfetto.gni")
import("//build_overrides/build.gni")
if (!build_with_chromium) {
@@ -27,12 +27,11 @@
perfetto_root_path = invoker.perfetto_root_path
generator_plugin_label =
- perfetto_root_path + "ipc/src/protoc_plugin:ipc_plugin"
+ perfetto_root_path + "src/ipc/protoc_plugin:ipc_plugin"
generator_plugin_suffix = ".ipc"
- #public_configs = [ rebase_path("ipc:config", perfetto_root_path) ]
deps = [
- "//ipc",
+ "${perfetto_root_path}src/ipc",
]
proto_out_dir = "protos_lite"
forward_variables_from(invoker,
diff --git a/ipc/src/protoc_plugin/BUILD.gn b/src/ipc/protoc_plugin/BUILD.gn
similarity index 90%
rename from ipc/src/protoc_plugin/BUILD.gn
rename to src/ipc/protoc_plugin/BUILD.gn
index 6350637..0530f40 100644
--- a/ipc/src/protoc_plugin/BUILD.gn
+++ b/src/ipc/protoc_plugin/BUILD.gn
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("//build_overrides/build.gni")
-
if (current_toolchain == host_toolchain) {
executable("ipc_plugin") {
sources = [
@@ -21,13 +19,10 @@
"ipc_generator.h",
"ipc_plugin.cc",
]
-
deps = [
"../../../gn:default_deps",
"../../../gn:protoc_lib_deps",
]
- public_configs = [ "../../../perfetto_base:base_config" ]
-
if (is_clang) {
# Internal protobuf headers hit this.
cflags = [ "-Wno-unreachable-code" ]
diff --git a/ipc/src/protoc_plugin/ipc_generator.cc b/src/ipc/protoc_plugin/ipc_generator.cc
similarity index 95%
rename from ipc/src/protoc_plugin/ipc_generator.cc
rename to src/ipc/protoc_plugin/ipc_generator.cc
index 80a2e00..b34bcfe 100644
--- a/ipc/src/protoc_plugin/ipc_generator.cc
+++ b/src/ipc/protoc_plugin/ipc_generator.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ipc/src/protoc_plugin/ipc_generator.h"
+#include "src/ipc/protoc_plugin/ipc_generator.h"
#include <functional>
#include <memory>
@@ -249,14 +249,14 @@
h_printer.Print(kBanner);
h_printer.Print("#ifndef $guard$\n#define $guard$\n\n", "guard", guard);
h_printer.Print("#include \"$h$\"\n", "h", StripName(*file) + ".pb.h");
- h_printer.Print("#include \"ipc/deferred.h\"\n");
- h_printer.Print("#include \"ipc/service.h\"\n");
- h_printer.Print("#include \"ipc/service_descriptor.h\"\n");
- h_printer.Print("#include \"ipc/service_proxy.h\"\n\n");
+ h_printer.Print("#include \"perfetto/ipc/deferred.h\"\n");
+ h_printer.Print("#include \"perfetto/ipc/service.h\"\n");
+ h_printer.Print("#include \"perfetto/ipc/service_descriptor.h\"\n");
+ h_printer.Print("#include \"perfetto/ipc/service_proxy.h\"\n\n");
cc_printer.Print(kBanner);
cc_printer.Print("#include \"$h$\"\n", "h", GetStubName(*file) + ".h");
- cc_printer.Print("#include \"ipc/codegen_helpers.h\"\n\n");
+ cc_printer.Print("#include \"perfetto/ipc/codegen_helpers.h\"\n\n");
cc_printer.Print("#include <memory>\n");
for (int i = 0; i < file->service_count(); i++) {
diff --git a/ipc/src/protoc_plugin/ipc_generator.h b/src/ipc/protoc_plugin/ipc_generator.h
similarity index 88%
rename from ipc/src/protoc_plugin/ipc_generator.h
rename to src/ipc/protoc_plugin/ipc_generator.h
index 117a6ae..bdd4d12 100644
--- a/ipc/src/protoc_plugin/ipc_generator.h
+++ b/src/ipc/protoc_plugin/ipc_generator.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef IPC_SRC_PROTOC_PLUGIN_IPC_GENERATOR_H_
-#define IPC_SRC_PROTOC_PLUGIN_IPC_GENERATOR_H_
+#ifndef SRC_IPC_PROTOC_PLUGIN_IPC_GENERATOR_H_
+#define SRC_IPC_PROTOC_PLUGIN_IPC_GENERATOR_H_
#include <string>
@@ -39,4 +39,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_SRC_PROTOC_PLUGIN_IPC_GENERATOR_H_
+#endif // SRC_IPC_PROTOC_PLUGIN_IPC_GENERATOR_H_
diff --git a/ipc/src/protoc_plugin/ipc_plugin.cc b/src/ipc/protoc_plugin/ipc_plugin.cc
similarity index 94%
rename from ipc/src/protoc_plugin/ipc_plugin.cc
rename to src/ipc/protoc_plugin/ipc_plugin.cc
index f8acde3..82d45a4 100644
--- a/ipc/src/protoc_plugin/ipc_plugin.cc
+++ b/src/ipc/protoc_plugin/ipc_plugin.cc
@@ -15,7 +15,7 @@
*/
#include "google/protobuf/compiler/plugin.h"
-#include "ipc/src/protoc_plugin/ipc_generator.h"
+#include "src/ipc/protoc_plugin/ipc_generator.h"
int main(int argc, char* argv[]) {
::perfetto::ipc::IPCGenerator generator;
diff --git a/ipc/src/service_proxy.cc b/src/ipc/service_proxy.cc
similarity index 94%
rename from ipc/src/service_proxy.cc
rename to src/ipc/service_proxy.cc
index bce6bfc..8cdb545 100644
--- a/ipc/src/service_proxy.cc
+++ b/src/ipc/service_proxy.cc
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#include "ipc/service_proxy.h"
+#include "perfetto/ipc/service_proxy.h"
#include <utility>
#include "google/protobuf/message_lite.h"
-#include "ipc/service_descriptor.h"
-#include "ipc/src/client_impl.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/weak_ptr.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/weak_ptr.h"
+#include "perfetto/ipc/service_descriptor.h"
+#include "src/ipc/client_impl.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/src/test/client_unittest_messages.proto b/src/ipc/test/client_unittest_messages.proto
similarity index 100%
rename from ipc/src/test/client_unittest_messages.proto
rename to src/ipc/test/client_unittest_messages.proto
diff --git a/ipc/src/test/deferred_unittest_messages.proto b/src/ipc/test/deferred_unittest_messages.proto
similarity index 100%
rename from ipc/src/test/deferred_unittest_messages.proto
rename to src/ipc/test/deferred_unittest_messages.proto
diff --git a/ipc/src/test/greeter_service.proto b/src/ipc/test/greeter_service.proto
similarity index 100%
rename from ipc/src/test/greeter_service.proto
rename to src/ipc/test/greeter_service.proto
diff --git a/ipc/src/test/ipc_integrationtest.cc b/src/ipc/test/ipc_integrationtest.cc
similarity index 95%
rename from ipc/src/test/ipc_integrationtest.cc
rename to src/ipc/test/ipc_integrationtest.cc
index 815bf35..6addb28 100644
--- a/ipc/src/test/ipc_integrationtest.cc
+++ b/src/ipc/test/ipc_integrationtest.cc
@@ -16,12 +16,12 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "ipc/client.h"
-#include "ipc/host.h"
-#include "perfetto_base/test/test_task_runner.h"
+#include "perfetto/ipc/client.h"
+#include "perfetto/ipc/host.h"
+#include "src/base/test/test_task_runner.h"
-#include "ipc/src/test/greeter_service.ipc.h"
-#include "ipc/src/test/greeter_service.pb.h"
+#include "src/ipc/test/greeter_service.ipc.h"
+#include "src/ipc/test/greeter_service.pb.h"
namespace ipc_test {
namespace {
diff --git a/ipc/src/unix_socket.cc b/src/ipc/unix_socket.cc
similarity index 98%
rename from ipc/src/unix_socket.cc
rename to src/ipc/unix_socket.cc
index 54e3a40..e28f3dc 100644
--- a/ipc/src/unix_socket.cc
+++ b/src/ipc/unix_socket.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ipc/src/unix_socket.h"
+#include "src/ipc/unix_socket.h"
#include <errno.h>
#include <fcntl.h>
@@ -29,10 +29,10 @@
#include <algorithm>
#include <memory>
-#include "perfetto_base/build_config.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/task_runner.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/base/utils.h"
#if BUILDFLAG(OS_MACOSX)
#include <sys/ucred.h>
diff --git a/ipc/src/unix_socket.h b/src/ipc/unix_socket.h
similarity index 96%
rename from ipc/src/unix_socket.h
rename to src/ipc/unix_socket.h
index b192381..807101f 100644
--- a/ipc/src/unix_socket.h
+++ b/src/ipc/unix_socket.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef IPC_SRC_UNIX_SOCKET_H_
-#define IPC_SRC_UNIX_SOCKET_H_
+#ifndef SRC_IPC_UNIX_SOCKET_H_
+#define SRC_IPC_UNIX_SOCKET_H_
#include <stdint.h>
#include <sys/types.h>
@@ -23,9 +23,9 @@
#include <memory>
#include <string>
-#include "perfetto_base/logging.h"
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/weak_ptr.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/base/weak_ptr.h"
namespace perfetto {
@@ -193,4 +193,4 @@
} // namespace ipc
} // namespace perfetto
-#endif // IPC_SRC_UNIX_SOCKET_H_
+#endif // SRC_IPC_UNIX_SOCKET_H_
diff --git a/ipc/src/unix_socket_unittest.cc b/src/ipc/unix_socket_unittest.cc
similarity index 98%
rename from ipc/src/unix_socket_unittest.cc
rename to src/ipc/unix_socket_unittest.cc
index ec18ea9..e5586a8 100644
--- a/ipc/src/unix_socket_unittest.cc
+++ b/src/ipc/unix_socket_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "ipc/src/unix_socket.h"
+#include "src/ipc/unix_socket.h"
#include <sys/mman.h>
@@ -22,10 +22,10 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "perfetto_base/build_config.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/test/test_task_runner.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/utils.h"
+#include "src/base/test/test_task_runner.h"
namespace perfetto {
namespace ipc {
diff --git a/ipc/src/wire_protocol.proto b/src/ipc/wire_protocol.proto
similarity index 100%
rename from ipc/src/wire_protocol.proto
rename to src/ipc/wire_protocol.proto
diff --git a/src/protozero/BUILD.gn b/src/protozero/BUILD.gn
new file mode 100644
index 0000000..885d934
--- /dev/null
+++ b/src/protozero/BUILD.gn
@@ -0,0 +1,77 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../gn/perfetto.gni")
+import("../../gn/proto_library.gni")
+import("protozero_library.gni")
+
+source_set("protozero") {
+ public_configs = [ "../../gn:default_config" ]
+ public_deps = [
+ "../../include/perfetto/protozero",
+ ]
+ deps = [
+ "../../gn:default_deps",
+ "../../gn:gtest_prod_config",
+ "../base",
+ ]
+ sources = [
+ "proto_utils.cc",
+ "protozero_message.cc",
+ "protozero_message_handle.cc",
+ "scattered_stream_writer.cc",
+ ]
+}
+
+executable("protozero_unittests") {
+ testonly = true
+ deps = [
+ ":protozero",
+ ":testing_messages_lite",
+ ":testing_messages_zero",
+ "../../gn:default_deps",
+ "../../gn:gtest_deps",
+ "../base",
+ ]
+ sources = [
+ "proto_utils_unittest.cc",
+ "protozero_message_unittest.cc",
+ "scattered_stream_writer_unittest.cc",
+ "test/fake_scattered_buffer.cc",
+ "test/fake_scattered_buffer.h",
+ "test/protozero_conformance_unittest.cc",
+ ]
+}
+
+# Generates both xxx.pbzero.h and xxx.pb.h (official proto).
+
+testing_proto_sources = [
+ "test/example_proto/library.proto",
+ "test/example_proto/library_internals/galaxies.proto",
+ "test/example_proto/test_messages.proto",
+ "test/example_proto/upper_import.proto",
+]
+
+protozero_library("testing_messages_zero") {
+ sources = testing_proto_sources
+ proto_in_dir = perfetto_root_path
+ proto_out_dir = "protos_zero"
+ generator_plugin_options = "wrapper_namespace=pbzero"
+}
+
+proto_library("testing_messages_lite") {
+ sources = testing_proto_sources
+ proto_in_dir = perfetto_root_path
+ proto_out_dir = "protos_lite"
+}
diff --git a/protozero/README.md b/src/protozero/README.md
similarity index 100%
rename from protozero/README.md
rename to src/protozero/README.md
diff --git a/protozero/src/proto_utils.cc b/src/protozero/proto_utils.cc
similarity index 97%
rename from protozero/src/proto_utils.cc
rename to src/protozero/proto_utils.cc
index 833dfdd..8d1254a 100644
--- a/protozero/src/proto_utils.cc
+++ b/src/protozero/proto_utils.cc
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#include "protozero/proto_utils.h"
+#include "perfetto/protozero/proto_utils.h"
#include <string.h>
#include <limits>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
#define PERFETTO_CHECK_PTR_LE(a, b) \
PERFETTO_CHECK(reinterpret_cast<uintptr_t>(a) <= \
diff --git a/protozero/src/proto_utils_unittest.cc b/src/protozero/proto_utils_unittest.cc
similarity index 98%
rename from protozero/src/proto_utils_unittest.cc
rename to src/protozero/proto_utils_unittest.cc
index 2d8f3fc..2ad6677 100644
--- a/protozero/src/proto_utils_unittest.cc
+++ b/src/protozero/proto_utils_unittest.cc
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#include "protozero/proto_utils.h"
+#include "perfetto/protozero/proto_utils.h"
#include <limits>
#include "gtest/gtest.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/utils.h"
namespace protozero {
namespace proto_utils {
diff --git a/ipc/src/protoc_plugin/BUILD.gn b/src/protozero/protoc_plugin/BUILD.gn
similarity index 81%
copy from ipc/src/protoc_plugin/BUILD.gn
copy to src/protozero/protoc_plugin/BUILD.gn
index 6350637..ca56cea 100644
--- a/ipc/src/protoc_plugin/BUILD.gn
+++ b/src/protozero/protoc_plugin/BUILD.gn
@@ -12,22 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("//build_overrides/build.gni")
-
if (current_toolchain == host_toolchain) {
- executable("ipc_plugin") {
+ executable("protoc_plugin") {
sources = [
- "ipc_generator.cc",
- "ipc_generator.h",
- "ipc_plugin.cc",
+ "protozero_generator.cc",
+ "protozero_generator.h",
+ "protozero_plugin.cc",
]
-
deps = [
"../../../gn:default_deps",
"../../../gn:protoc_lib_deps",
]
- public_configs = [ "../../../perfetto_base:base_config" ]
-
if (is_clang) {
# Internal protobuf headers hit this.
cflags = [ "-Wno-unreachable-code" ]
diff --git a/protozero/src/protoc_plugin/protozero_generator.cc b/src/protozero/protoc_plugin/protozero_generator.cc
similarity index 98%
rename from protozero/src/protoc_plugin/protozero_generator.cc
rename to src/protozero/protoc_plugin/protozero_generator.cc
index a3f4766..9a3ead9 100644
--- a/protozero/src/protoc_plugin/protozero_generator.cc
+++ b/src/protozero/protoc_plugin/protozero_generator.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "protozero_generator.h"
+#include "src/protozero/protoc_plugin/protozero_generator.h"
#include <map>
#include <memory>
@@ -246,8 +246,8 @@
"#define $guard$\n\n"
"#include <stddef.h>\n"
"#include <stdint.h>\n\n"
- "#include \"protozero/proto_field_descriptor.h\"\n"
- "#include \"protozero/protozero_message.h\"\n",
+ "#include \"perfetto/protozero/proto_field_descriptor.h\"\n"
+ "#include \"perfetto/protozero/protozero_message.h\"\n",
"greeting", greeting, "guard", guard);
stub_cc_->Print(
"$greeting$\n"
diff --git a/protozero/src/protoc_plugin/protozero_generator.h b/src/protozero/protoc_plugin/protozero_generator.h
similarity index 86%
rename from protozero/src/protoc_plugin/protozero_generator.h
rename to src/protozero/protoc_plugin/protozero_generator.h
index 72aefac..a9f7a70 100644
--- a/protozero/src/protoc_plugin/protozero_generator.h
+++ b/src/protozero/protoc_plugin/protozero_generator.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_SRC_PROTOC_PLUGIN_PROTOZERO_GENERATOR_H_
-#define PROTOZERO_SRC_PROTOC_PLUGIN_PROTOZERO_GENERATOR_H_
+#ifndef SRC_PROTOZERO_PROTOC_PLUGIN_PROTOZERO_GENERATOR_H_
+#define SRC_PROTOZERO_PROTOC_PLUGIN_PROTOZERO_GENERATOR_H_
#include <string>
@@ -37,4 +37,4 @@
} // namespace protozero
-#endif // PROTOZERO_SRC_PROTOC_PLUGIN_PROTOZERO_GENERATOR_H_
+#endif // SRC_PROTOZERO_PROTOC_PLUGIN_PROTOZERO_GENERATOR_H_
diff --git a/protozero/src/protoc_plugin/protozero_plugin.cc b/src/protozero/protoc_plugin/protozero_plugin.cc
similarity index 92%
rename from protozero/src/protoc_plugin/protozero_plugin.cc
rename to src/protozero/protoc_plugin/protozero_plugin.cc
index ec06508..7d9d6a3 100644
--- a/protozero/src/protoc_plugin/protozero_plugin.cc
+++ b/src/protozero/protoc_plugin/protozero_plugin.cc
@@ -15,7 +15,7 @@
*/
#include "google/protobuf/compiler/plugin.h"
-#include "protozero_generator.h"
+#include "src/protozero/protoc_plugin/protozero_generator.h"
int main(int argc, char* argv[]) {
::protozero::ProtoZeroGenerator generator;
diff --git a/protozero/protozero_library.gni b/src/protozero/protozero_library.gni
similarity index 87%
rename from protozero/protozero_library.gni
rename to src/protozero/protozero_library.gni
index 8698052..ffaedca 100644
--- a/protozero/protozero_library.gni
+++ b/src/protozero/protozero_library.gni
@@ -29,22 +29,16 @@
perfetto_root_path = invoker.perfetto_root_path
generate_cc = false
- generator_plugin_label = perfetto_root_path + "protozero/src/protoc_plugin"
+ generator_plugin_label = perfetto_root_path + "src/protozero/protoc_plugin"
generator_plugin_suffix = ".pbzero"
- if (!defined(invoker.public_configs)) {
- public_configs = []
- }
-
if (defined(invoker.deps)) {
deps = invoker.deps
} else {
deps = []
}
- deps += [ perfetto_root_path + "protozero" ]
-
- public_configs += [ "//protozero:protozero_config" ]
+ deps += [ perfetto_root_path + "src/protozero" ]
forward_variables_from(invoker,
[
diff --git a/protozero/src/protozero_message.cc b/src/protozero/protozero_message.cc
similarity index 97%
rename from protozero/src/protozero_message.cc
rename to src/protozero/protozero_message.cc
index c88cb8c..195b5c2 100644
--- a/protozero/src/protozero_message.cc
+++ b/src/protozero/protozero_message.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "protozero/protozero_message.h"
+#include "perfetto/protozero/protozero_message.h"
#include <type_traits>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
// The memcpy() for float and double below needs to be adjusted if we want to
diff --git a/protozero/src/protozero_message_handle.cc b/src/protozero/protozero_message_handle.cc
similarity index 93%
rename from protozero/src/protozero_message_handle.cc
rename to src/protozero/protozero_message_handle.cc
index 5c4b838..3e2b4e7 100644
--- a/protozero/src/protozero_message_handle.cc
+++ b/src/protozero/protozero_message_handle.cc
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#include "protozero/protozero_message_handle.h"
+#include "perfetto/protozero/protozero_message_handle.h"
#include <utility>
-#include "perfetto_base/logging.h"
-#include "protozero/protozero_message.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/protozero/protozero_message.h"
namespace protozero {
diff --git a/protozero/src/protozero_message_unittest.cc b/src/protozero/protozero_message_unittest.cc
similarity index 98%
rename from protozero/src/protozero_message_unittest.cc
rename to src/protozero/protozero_message_unittest.cc
index ffad3c7..076612b 100644
--- a/protozero/src/protozero_message_unittest.cc
+++ b/src/protozero/protozero_message_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "protozero/protozero_message.h"
+#include "perfetto/protozero/protozero_message.h"
#include <limits>
#include <memory>
@@ -22,8 +22,8 @@
#include <vector>
#include "gtest/gtest.h"
-#include "perfetto_base/logging.h"
-#include "protozero/src/test/fake_scattered_buffer.h"
+#include "perfetto/base/logging.h"
+#include "src/protozero/test/fake_scattered_buffer.h"
namespace protozero {
diff --git a/protozero/src/scattered_stream_writer.cc b/src/protozero/scattered_stream_writer.cc
similarity index 95%
rename from protozero/src/scattered_stream_writer.cc
rename to src/protozero/scattered_stream_writer.cc
index 292c461..23fb12c 100644
--- a/protozero/src/scattered_stream_writer.cc
+++ b/src/protozero/scattered_stream_writer.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "protozero/scattered_stream_writer.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
#include <algorithm>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
namespace protozero {
diff --git a/protozero/src/scattered_stream_writer_unittest.cc b/src/protozero/scattered_stream_writer_unittest.cc
similarity index 96%
rename from protozero/src/scattered_stream_writer_unittest.cc
rename to src/protozero/scattered_stream_writer_unittest.cc
index 65951b5..3dc38fb 100644
--- a/protozero/src/scattered_stream_writer_unittest.cc
+++ b/src/protozero/scattered_stream_writer_unittest.cc
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#include "protozero/scattered_stream_writer.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
#include <string.h>
#include <memory>
#include "gtest/gtest.h"
-#include "perfetto_base/logging.h"
-#include "protozero/src/test/fake_scattered_buffer.h"
+#include "perfetto/base/logging.h"
+#include "src/protozero/test/fake_scattered_buffer.h"
namespace protozero {
namespace {
diff --git a/protozero/src/test/example_proto/library.proto b/src/protozero/test/example_proto/library.proto
similarity index 93%
rename from protozero/src/test/example_proto/library.proto
rename to src/protozero/test/example_proto/library.proto
index d9cf632..4ff8fee 100644
--- a/protozero/src/test/example_proto/library.proto
+++ b/src/protozero/test/example_proto/library.proto
@@ -19,7 +19,7 @@
package foo.bar;
-import public "protozero/src/test/example_proto/library_internals/galaxies.proto";
+import public "src/protozero/test/example_proto/library_internals/galaxies.proto";
message TransgalacticMessage {
optional Galaxy origin_galaxy = 1;
diff --git a/protozero/src/test/example_proto/library_internals/galaxies.proto b/src/protozero/test/example_proto/library_internals/galaxies.proto
similarity index 92%
rename from protozero/src/test/example_proto/library_internals/galaxies.proto
rename to src/protozero/test/example_proto/library_internals/galaxies.proto
index 19bc6fd..0b1c1c5 100644
--- a/protozero/src/test/example_proto/library_internals/galaxies.proto
+++ b/src/protozero/test/example_proto/library_internals/galaxies.proto
@@ -19,7 +19,7 @@
package foo.bar;
-import public "protozero/src/test/example_proto/upper_import.proto";
+import public "src/protozero/test/example_proto/upper_import.proto";
enum Galaxy {
MILKY_WAY = 1;
diff --git a/protozero/src/test/example_proto/test_messages.proto b/src/protozero/test/example_proto/test_messages.proto
similarity index 97%
rename from protozero/src/test/example_proto/test_messages.proto
rename to src/protozero/test/example_proto/test_messages.proto
index 837eed2..077b088 100644
--- a/protozero/src/test/example_proto/test_messages.proto
+++ b/src/protozero/test/example_proto/test_messages.proto
@@ -19,7 +19,7 @@
package foo.bar;
-import "protozero/src/test/example_proto/library.proto";
+import "src/protozero/test/example_proto/library.proto";
// This file contains comprehensive set of supported message structures and
// data types. Unit tests depends on the plugin-processed version of this file.
diff --git a/protozero/src/test/example_proto/upper_import.proto b/src/protozero/test/example_proto/upper_import.proto
similarity index 100%
rename from protozero/src/test/example_proto/upper_import.proto
rename to src/protozero/test/example_proto/upper_import.proto
diff --git a/protozero/src/test/fake_scattered_buffer.cc b/src/protozero/test/fake_scattered_buffer.cc
similarity index 97%
rename from protozero/src/test/fake_scattered_buffer.cc
rename to src/protozero/test/fake_scattered_buffer.cc
index 16ff519..3c48f48 100644
--- a/protozero/src/test/fake_scattered_buffer.cc
+++ b/src/protozero/test/fake_scattered_buffer.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "protozero/src/test/fake_scattered_buffer.h"
+#include "src/protozero/test/fake_scattered_buffer.h"
#include <sstream>
#include <utility>
diff --git a/protozero/src/test/fake_scattered_buffer.h b/src/protozero/test/fake_scattered_buffer.h
similarity index 86%
rename from protozero/src/test/fake_scattered_buffer.h
rename to src/protozero/test/fake_scattered_buffer.h
index 8a84528..2ccfb81 100644
--- a/protozero/src/test/fake_scattered_buffer.h
+++ b/src/protozero/test/fake_scattered_buffer.h
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#ifndef PROTOZERO_SRC_TEST_FAKE_SCATTERED_BUFFER_H_
-#define PROTOZERO_SRC_TEST_FAKE_SCATTERED_BUFFER_H_
+#ifndef SRC_PROTOZERO_TEST_FAKE_SCATTERED_BUFFER_H_
+#define SRC_PROTOZERO_TEST_FAKE_SCATTERED_BUFFER_H_
#include <memory>
#include <string>
#include <vector>
-#include "protozero/scattered_stream_writer.h"
+#include "perfetto/protozero/scattered_stream_writer.h"
namespace protozero {
@@ -51,4 +51,4 @@
} // namespace protozero
-#endif // PROTOZERO_SRC_TEST_FAKE_SCATTERED_BUFFER_H_
+#endif // SRC_PROTOZERO_TEST_FAKE_SCATTERED_BUFFER_H_
diff --git a/protozero/src/test/protozero_conformance_unittest.cc b/src/protozero/test/protozero_conformance_unittest.cc
similarity index 95%
rename from protozero/src/test/protozero_conformance_unittest.cc
rename to src/protozero/test/protozero_conformance_unittest.cc
index 8dc4c1d..bb60620 100644
--- a/protozero/src/test/protozero_conformance_unittest.cc
+++ b/src/protozero/test/protozero_conformance_unittest.cc
@@ -19,13 +19,13 @@
#include <vector>
#include "gtest/gtest.h"
-#include "protozero/protozero_message_handle.h"
-#include "protozero/src/test/fake_scattered_buffer.h"
+#include "perfetto/protozero/protozero_message_handle.h"
+#include "src/protozero/test/fake_scattered_buffer.h"
// Autogenerated headers in out/*/gen/
-#include "protozero/src/test/example_proto/library.pbzero.h"
-#include "protozero/src/test/example_proto/test_messages.pb.h"
-#include "protozero/src/test/example_proto/test_messages.pbzero.h"
+#include "src/protozero/test/example_proto/library.pbzero.h"
+#include "src/protozero/test/example_proto/test_messages.pb.h"
+#include "src/protozero/test/example_proto/test_messages.pbzero.h"
namespace pbtest = foo::bar::pbzero; // Generated by the protozero plugin.
namespace pbgold = foo::bar; // Generated by the official protobuf compiler.
diff --git a/src/tracing/BUILD.gn b/src/tracing/BUILD.gn
new file mode 100644
index 0000000..4723c4e
--- /dev/null
+++ b/src/tracing/BUILD.gn
@@ -0,0 +1,116 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../gn/perfetto.gni")
+import("//build_overrides/build.gni")
+import("../ipc/ipc_library.gni")
+
+# Core tracing library, platform independent, no transport layer.
+source_set("tracing") {
+ public_deps = [
+ "../../include/perfetto/tracing/core",
+ ]
+ deps = [
+ "../../gn:default_deps",
+ "../base",
+ ]
+ sources = [
+ "core/service_impl.cc",
+ "core/service_impl.h",
+ ]
+}
+
+# IPC service definitions.
+ipc_library("ipc_protos") {
+ proto_in_dir = perfetto_root_path
+ sources = [
+ "ipc/data_source_config.proto",
+ "ipc/data_source_descriptor.proto",
+ "ipc/producer_port.proto",
+ ]
+}
+
+# Posix specialization of the tracing library for Linux/Android/Mac. Provides
+# an IPC transport over a UNIX domain socket.
+source_set("ipc") {
+ public_deps = [
+ "../../include/perfetto/tracing/core",
+ "../../include/perfetto/tracing/ipc",
+ ]
+ sources = [
+ "ipc/posix_shared_memory.cc",
+ "ipc/posix_shared_memory.h",
+ "ipc/producer/producer_ipc_client_impl.cc",
+ "ipc/producer/producer_ipc_client_impl.h",
+ "ipc/service/producer_ipc_service.cc",
+ "ipc/service/producer_ipc_service.h",
+ "ipc/service/service_ipc_host_impl.cc",
+ "ipc/service/service_ipc_host_impl.h",
+ ]
+ deps = [
+ ":ipc_protos",
+ ":tracing",
+ "../../gn:default_deps",
+ "../base",
+ "../ipc",
+ ]
+}
+
+executable("tracing_unittests") {
+ testonly = true
+ deps = [
+ ":ipc",
+ ":tracing",
+ "../../gn:default_deps",
+ "../../gn:gtest_deps",
+ "../base",
+ "../base:test_support",
+ ]
+
+ sources = [
+ "core/service_impl_unittest.cc",
+ "ipc/posix_shared_memory_unittest.cc",
+ "test/test_shared_memory.cc",
+ "test/test_shared_memory.h",
+ ]
+}
+
+executable("tracing_test") {
+ testonly = true
+ deps = [
+ ":ipc",
+ ":ipc_protos",
+ ":tracing",
+ "../../gn:default_deps",
+ "../base",
+ "../base:test_support",
+ "../ipc",
+ ]
+ sources = [
+ "test/ipc_test.cc",
+ ]
+}
+
+if (!build_with_chromium) {
+ executable("tracing_benchmarks") {
+ testonly = true
+ deps = [
+ "../../gn:default_deps",
+ "//buildtools:benchmark",
+ ]
+ sources = [
+ "test/hello_world_benchmark.cc",
+ ]
+ }
+}
diff --git a/tracing/README.md b/src/tracing/README.md
similarity index 100%
rename from tracing/README.md
rename to src/tracing/README.md
diff --git a/tracing/src/core/service_impl.cc b/src/tracing/core/service_impl.cc
similarity index 94%
rename from tracing/src/core/service_impl.cc
rename to src/tracing/core/service_impl.cc
index 9a56e62..08ae8fe 100644
--- a/tracing/src/core/service_impl.cc
+++ b/src/tracing/core/service_impl.cc
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-#include "tracing/src/core/service_impl.h"
+#include "src/tracing/core/service_impl.h"
#include <inttypes.h>
#include <algorithm>
-#include "perfetto_base/logging.h"
-#include "perfetto_base/task_runner.h"
-#include "tracing/core/data_source_config.h"
-#include "tracing/core/producer.h"
-#include "tracing/core/shared_memory.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/tracing/core/data_source_config.h"
+#include "perfetto/tracing/core/producer.h"
+#include "perfetto/tracing/core/shared_memory.h"
namespace perfetto {
diff --git a/tracing/src/core/service_impl.h b/src/tracing/core/service_impl.h
similarity index 93%
rename from tracing/src/core/service_impl.h
rename to src/tracing/core/service_impl.h
index 8b7f467..2e0a6f4 100644
--- a/tracing/src/core/service_impl.h
+++ b/src/tracing/core/service_impl.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef TRACING_SRC_CORE_SERVICE_IMPL_H_
-#define TRACING_SRC_CORE_SERVICE_IMPL_H_
+#ifndef SRC_TRACING_CORE_SERVICE_IMPL_H_
+#define SRC_TRACING_CORE_SERVICE_IMPL_H_
#include <functional>
#include <map>
#include <memory>
-#include "tracing/core/basic_types.h"
-#include "tracing/core/service.h"
+#include "perfetto/tracing/core/basic_types.h"
+#include "perfetto/tracing/core/service.h"
namespace perfetto {
@@ -101,4 +101,4 @@
} // namespace perfetto
-#endif // TRACING_SRC_CORE_SERVICE_IMPL_H_
+#endif // SRC_TRACING_CORE_SERVICE_IMPL_H_
diff --git a/tracing/src/core/service_impl_unittest.cc b/src/tracing/core/service_impl_unittest.cc
similarity index 90%
rename from tracing/src/core/service_impl_unittest.cc
rename to src/tracing/core/service_impl_unittest.cc
index 804bbf6..83e5b95 100644
--- a/tracing/src/core/service_impl_unittest.cc
+++ b/src/tracing/core/service_impl_unittest.cc
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-#include "tracing/src/core/service_impl.h"
+#include "src/tracing/core/service_impl.h"
#include <string.h>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "perfetto_base/test/test_task_runner.h"
-#include "tracing/core/data_source_config.h"
-#include "tracing/core/data_source_descriptor.h"
-#include "tracing/core/producer.h"
-#include "tracing/core/shared_memory.h"
-#include "tracing/src/test/test_shared_memory.h"
+#include "perfetto/tracing/core/data_source_config.h"
+#include "perfetto/tracing/core/data_source_descriptor.h"
+#include "perfetto/tracing/core/producer.h"
+#include "perfetto/tracing/core/shared_memory.h"
+#include "src/base/test/test_task_runner.h"
+#include "src/tracing/test/test_shared_memory.h"
namespace perfetto {
namespace {
diff --git a/tracing/src/ipc/data_source_config.proto b/src/tracing/ipc/data_source_config.proto
similarity index 100%
rename from tracing/src/ipc/data_source_config.proto
rename to src/tracing/ipc/data_source_config.proto
diff --git a/tracing/src/ipc/data_source_descriptor.proto b/src/tracing/ipc/data_source_descriptor.proto
similarity index 100%
rename from tracing/src/ipc/data_source_descriptor.proto
rename to src/tracing/ipc/data_source_descriptor.proto
diff --git a/tracing/src/ipc/posix_shared_memory.cc b/src/tracing/ipc/posix_shared_memory.cc
similarity index 96%
rename from tracing/src/ipc/posix_shared_memory.cc
rename to src/tracing/ipc/posix_shared_memory.cc
index 6d22600..5040f03 100644
--- a/tracing/src/ipc/posix_shared_memory.cc
+++ b/src/tracing/ipc/posix_shared_memory.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "tracing/src/ipc/posix_shared_memory.h"
+#include "src/tracing/ipc/posix_shared_memory.h"
#include <fcntl.h>
#include <stdint.h>
@@ -27,7 +27,7 @@
#include <memory>
#include <utility>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
namespace perfetto {
diff --git a/tracing/src/ipc/posix_shared_memory.h b/src/tracing/ipc/posix_shared_memory.h
similarity index 88%
rename from tracing/src/ipc/posix_shared_memory.h
rename to src/tracing/ipc/posix_shared_memory.h
index 89c5eb8..88f410c 100644
--- a/tracing/src/ipc/posix_shared_memory.h
+++ b/src/tracing/ipc/posix_shared_memory.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef TRACING_SRC_IPC_POSIX_SHARED_MEMORY_H_
-#define TRACING_SRC_IPC_POSIX_SHARED_MEMORY_H_
+#ifndef SRC_TRACING_IPC_POSIX_SHARED_MEMORY_H_
+#define SRC_TRACING_IPC_POSIX_SHARED_MEMORY_H_
#include <stddef.h>
#include <memory>
-#include "perfetto_base/scoped_file.h"
-#include "tracing/core/shared_memory.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/tracing/core/shared_memory.h"
namespace perfetto {
@@ -63,4 +63,4 @@
} // namespace perfetto
-#endif // TRACING_SRC_IPC_POSIX_SHARED_MEMORY_H_
+#endif // SRC_TRACING_IPC_POSIX_SHARED_MEMORY_H_
diff --git a/tracing/src/ipc/posix_shared_memory_unittest.cc b/src/tracing/ipc/posix_shared_memory_unittest.cc
similarity index 93%
rename from tracing/src/ipc/posix_shared_memory_unittest.cc
rename to src/tracing/ipc/posix_shared_memory_unittest.cc
index 016014a..5073f5a 100644
--- a/tracing/src/ipc/posix_shared_memory_unittest.cc
+++ b/src/tracing/ipc/posix_shared_memory_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "tracing/src/ipc/posix_shared_memory.h"
+#include "src/tracing/ipc/posix_shared_memory.h"
#include <errno.h>
#include <fcntl.h>
@@ -25,10 +25,10 @@
#include <unistd.h>
#include "gtest/gtest.h"
-#include "perfetto_base/build_config.h"
-#include "perfetto_base/scoped_file.h"
-#include "perfetto_base/test/test_task_runner.h"
-#include "perfetto_base/utils.h"
+#include "perfetto/base/build_config.h"
+#include "perfetto/base/scoped_file.h"
+#include "perfetto/base/utils.h"
+#include "src/base/test/test_task_runner.h"
namespace perfetto {
namespace {
diff --git a/tracing/src/ipc/producer/producer_ipc_client_impl.cc b/src/tracing/ipc/producer/producer_ipc_client_impl.cc
similarity index 94%
rename from tracing/src/ipc/producer/producer_ipc_client_impl.cc
rename to src/tracing/ipc/producer/producer_ipc_client_impl.cc
index fd5814f..57fd2c8 100644
--- a/tracing/src/ipc/producer/producer_ipc_client_impl.cc
+++ b/src/tracing/ipc/producer/producer_ipc_client_impl.cc
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-#include "tracing/src/ipc/producer/producer_ipc_client_impl.h"
+#include "src/tracing/ipc/producer/producer_ipc_client_impl.h"
#include <inttypes.h>
#include <string.h>
-#include "ipc/client.h"
-#include "perfetto_base/task_runner.h"
-#include "tracing/core/data_source_config.h"
-#include "tracing/core/data_source_descriptor.h"
-#include "tracing/core/producer.h"
-#include "tracing/src/ipc/posix_shared_memory.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/ipc/client.h"
+#include "perfetto/tracing/core/data_source_config.h"
+#include "perfetto/tracing/core/data_source_descriptor.h"
+#include "perfetto/tracing/core/producer.h"
+#include "src/tracing/ipc/posix_shared_memory.h"
// TODO think to what happens when ProducerIPCClientImpl gets destroyed
// w.r.t. the Producer pointer. Also think to lifetime of the Producer* during
diff --git a/tracing/src/ipc/producer/producer_ipc_client_impl.h b/src/tracing/ipc/producer/producer_ipc_client_impl.h
similarity index 87%
rename from tracing/src/ipc/producer/producer_ipc_client_impl.h
rename to src/tracing/ipc/producer/producer_ipc_client_impl.h
index 732062e..3f1f736 100644
--- a/tracing/src/ipc/producer/producer_ipc_client_impl.h
+++ b/src/tracing/ipc/producer/producer_ipc_client_impl.h
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-#ifndef TRACING_SRC_IPC_PRODUCER_IPC_PROXY_H_
-#define TRACING_SRC_IPC_PRODUCER_IPC_PROXY_H_
+#ifndef SRC_TRACING_IPC_PRODUCER_PRODUCER_IPC_CLIENT_IMPL_H_
+#define SRC_TRACING_IPC_PRODUCER_PRODUCER_IPC_CLIENT_IMPL_H_
#include <stdint.h>
#include <vector>
-#include "ipc/service_proxy.h"
-#include "tracing/core/basic_types.h"
-#include "tracing/core/service.h"
+#include "perfetto/ipc/service_proxy.h"
+#include "perfetto/tracing/core/basic_types.h"
+#include "perfetto/tracing/core/service.h"
-#include "tracing/ipc/producer_ipc_client.h"
-#include "tracing/src/ipc/producer_port.ipc.h" // From producer_port.proto.
+#include "perfetto/tracing/ipc/producer_ipc_client.h"
+#include "src/tracing/ipc/producer_port.ipc.h" // From producer_port.proto.
namespace perfetto {
@@ -94,4 +94,4 @@
} // namespace perfetto
-#endif // TRACING_SRC_IPC_PRODUCER_IPC_PROXY_H_
+#endif // SRC_TRACING_IPC_PRODUCER_PRODUCER_IPC_CLIENT_IMPL_H_
diff --git a/tracing/src/ipc/producer_port.proto b/src/tracing/ipc/producer_port.proto
similarity index 96%
rename from tracing/src/ipc/producer_port.proto
rename to src/tracing/ipc/producer_port.proto
index c6d5e4f..0215627 100644
--- a/tracing/src/ipc/producer_port.proto
+++ b/src/tracing/ipc/producer_port.proto
@@ -17,8 +17,8 @@
syntax = "proto3";
option optimize_for = LITE_RUNTIME;
-import "tracing/src/ipc/data_source_config.proto";
-import "tracing/src/ipc/data_source_descriptor.proto";
+import "src/tracing/ipc/data_source_config.proto";
+import "src/tracing/ipc/data_source_descriptor.proto";
package perfetto;
diff --git a/tracing/src/ipc/service/producer_ipc_service.cc b/src/tracing/ipc/service/producer_ipc_service.cc
similarity index 96%
rename from tracing/src/ipc/service/producer_ipc_service.cc
rename to src/tracing/ipc/service/producer_ipc_service.cc
index f4e8d4e..e4c0e69 100644
--- a/tracing/src/ipc/service/producer_ipc_service.cc
+++ b/src/tracing/ipc/service/producer_ipc_service.cc
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-#include "tracing/src/ipc/service/producer_ipc_service.h"
+#include "src/tracing/ipc/service/producer_ipc_service.h"
#include <inttypes.h>
-#include "ipc/host.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/task_runner.h"
-#include "tracing/core/data_source_config.h"
-#include "tracing/core/data_source_descriptor.h"
-#include "tracing/core/service.h"
-#include "tracing/src/ipc/posix_shared_memory.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/ipc/host.h"
+#include "perfetto/tracing/core/data_source_config.h"
+#include "perfetto/tracing/core/data_source_descriptor.h"
+#include "perfetto/tracing/core/service.h"
+#include "src/tracing/ipc/posix_shared_memory.h"
// The remote Producer(s) are not trusted. All the methods from the ProducerPort
// IPC layer (e.g. RegisterDataSource()) must assume that the remote Producer is
diff --git a/tracing/src/ipc/service/producer_ipc_service.h b/src/tracing/ipc/service/producer_ipc_service.h
similarity index 91%
rename from tracing/src/ipc/service/producer_ipc_service.h
rename to src/tracing/ipc/service/producer_ipc_service.h
index 4bd4c0f..7dc7651 100644
--- a/tracing/src/ipc/service/producer_ipc_service.h
+++ b/src/tracing/ipc/service/producer_ipc_service.h
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-#ifndef TRACING_SRC_IPC_SERVICE_PRODUCER_IPC_SERVICE_H_
-#define TRACING_SRC_IPC_SERVICE_PRODUCER_IPC_SERVICE_H_
+#ifndef SRC_TRACING_IPC_SERVICE_PRODUCER_IPC_SERVICE_H_
+#define SRC_TRACING_IPC_SERVICE_PRODUCER_IPC_SERVICE_H_
#include <map>
#include <memory>
#include <string>
-#include "ipc/basic_types.h"
-#include "perfetto_base/weak_ptr.h"
-#include "tracing/core/producer.h"
-#include "tracing/core/service.h"
+#include "perfetto/base/weak_ptr.h"
+#include "perfetto/ipc/basic_types.h"
+#include "perfetto/tracing/core/producer.h"
+#include "perfetto/tracing/core/service.h"
-#include "tracing/src/ipc/producer_port.ipc.h" // From producer_port.proto.
+#include "src/tracing/ipc/producer_port.ipc.h" // From producer_port.proto.
namespace perfetto {
@@ -110,4 +110,4 @@
} // namespace perfetto
-#endif // TRACING_SRC_IPC_SERVICE_PRODUCER_IPC_SERVICE_H_
+#endif // SRC_TRACING_IPC_SERVICE_PRODUCER_IPC_SERVICE_H_
diff --git a/tracing/src/ipc/service/service_ipc_host_impl.cc b/src/tracing/ipc/service/service_ipc_host_impl.cc
similarity index 87%
rename from tracing/src/ipc/service/service_ipc_host_impl.cc
rename to src/tracing/ipc/service/service_ipc_host_impl.cc
index 3f19347..218bb4d 100644
--- a/tracing/src/ipc/service/service_ipc_host_impl.cc
+++ b/src/tracing/ipc/service/service_ipc_host_impl.cc
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "tracing/src/ipc/service/service_ipc_host_impl.h"
+#include "src/tracing/ipc/service/service_ipc_host_impl.h"
-#include "ipc/host.h"
-#include "perfetto_base/logging.h"
-#include "perfetto_base/task_runner.h"
-#include "tracing/core/service.h"
-#include "tracing/src/ipc/posix_shared_memory.h"
-#include "tracing/src/ipc/service/producer_ipc_service.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/base/task_runner.h"
+#include "perfetto/ipc/host.h"
+#include "perfetto/tracing/core/service.h"
+#include "src/tracing/ipc/posix_shared_memory.h"
+#include "src/tracing/ipc/service/producer_ipc_service.h"
namespace perfetto {
diff --git a/tracing/src/ipc/service/service_ipc_host_impl.h b/src/tracing/ipc/service/service_ipc_host_impl.h
similarity index 87%
rename from tracing/src/ipc/service/service_ipc_host_impl.h
rename to src/tracing/ipc/service/service_ipc_host_impl.h
index f76ea4f..6dfc551 100644
--- a/tracing/src/ipc/service/service_ipc_host_impl.h
+++ b/src/tracing/ipc/service/service_ipc_host_impl.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef TRACING_SRC_IPC_IPC_SERVICE_HOST_IMPL_H_
-#define TRACING_SRC_IPC_IPC_SERVICE_HOST_IMPL_H_
+#ifndef SRC_TRACING_IPC_SERVICE_SERVICE_IPC_HOST_IMPL_H_
+#define SRC_TRACING_IPC_SERVICE_SERVICE_IPC_HOST_IMPL_H_
#include <memory>
-#include "tracing/ipc/service_ipc_host.h"
+#include "perfetto/tracing/ipc/service_ipc_host.h"
namespace perfetto {
@@ -52,4 +52,4 @@
} // namespace perfetto
-#endif // TRACING_SRC_IPC_IPC_SERVICE_HOST_IMPL_H_
+#endif // SRC_TRACING_IPC_SERVICE_SERVICE_IPC_HOST_IMPL_H_
diff --git a/tracing/src/test/hello_world_benchmark.cc b/src/tracing/test/hello_world_benchmark.cc
similarity index 100%
rename from tracing/src/test/hello_world_benchmark.cc
rename to src/tracing/test/hello_world_benchmark.cc
diff --git a/tracing/src/test/ipc_test.cc b/src/tracing/test/ipc_test.cc
similarity index 88%
rename from tracing/src/test/ipc_test.cc
rename to src/tracing/test/ipc_test.cc
index 8bda6b2..09e4a0a 100644
--- a/tracing/src/test/ipc_test.cc
+++ b/src/tracing/test/ipc_test.cc
@@ -19,18 +19,18 @@
#include <string.h>
#include <unistd.h>
-#include "perfetto_base/logging.h"
-#include "perfetto_base/test/test_task_runner.h"
-#include "tracing/core/data_source_config.h"
-#include "tracing/core/data_source_descriptor.h"
-#include "tracing/core/producer.h"
-#include "tracing/core/service.h"
-#include "tracing/ipc/producer_ipc_client.h"
-#include "tracing/ipc/service_ipc_host.h"
-#include "tracing/src/core/service_impl.h"
-#include "tracing/src/ipc/posix_shared_memory.h"
-#include "tracing/src/ipc/producer/producer_ipc_client_impl.h"
-#include "tracing/src/ipc/service/service_ipc_host_impl.h"
+#include "perfetto/base/logging.h"
+#include "perfetto/tracing/core/data_source_config.h"
+#include "perfetto/tracing/core/data_source_descriptor.h"
+#include "perfetto/tracing/core/producer.h"
+#include "perfetto/tracing/core/service.h"
+#include "perfetto/tracing/ipc/producer_ipc_client.h"
+#include "perfetto/tracing/ipc/service_ipc_host.h"
+#include "src/base/test/test_task_runner.h"
+#include "src/tracing/core/service_impl.h"
+#include "src/tracing/ipc/posix_shared_memory.h"
+#include "src/tracing/ipc/producer/producer_ipc_client_impl.h"
+#include "src/tracing/ipc/service/service_ipc_host_impl.h"
namespace perfetto {
diff --git a/tracing/src/test/test_shared_memory.cc b/src/tracing/test/test_shared_memory.cc
similarity index 92%
rename from tracing/src/test/test_shared_memory.cc
rename to src/tracing/test/test_shared_memory.cc
index d71de52..dc5756b 100644
--- a/tracing/src/test/test_shared_memory.cc
+++ b/src/tracing/test/test_shared_memory.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "tracing/src/test/test_shared_memory.h"
+#include "src/tracing/test/test_shared_memory.h"
#include <string.h>
-#include "perfetto_base/logging.h"
+#include "perfetto/base/logging.h"
namespace perfetto {
diff --git a/tracing/src/test/test_shared_memory.h b/src/tracing/test/test_shared_memory.h
similarity index 86%
rename from tracing/src/test/test_shared_memory.h
rename to src/tracing/test/test_shared_memory.h
index f1f0178..7abfb3e 100644
--- a/tracing/src/test/test_shared_memory.h
+++ b/src/tracing/test/test_shared_memory.h
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#ifndef TRACING_SRC_TEST_TEST_SHARED_MEMORY_H_
-#define TRACING_SRC_TEST_TEST_SHARED_MEMORY_H_
+#ifndef SRC_TRACING_TEST_TEST_SHARED_MEMORY_H_
+#define SRC_TRACING_TEST_TEST_SHARED_MEMORY_H_
#include <stddef.h>
#include <memory>
-#include "tracing/core/shared_memory.h"
+#include "perfetto/tracing/core/shared_memory.h"
namespace perfetto {
@@ -47,4 +47,4 @@
} // namespace perfetto
-#endif // TRACING_SRC_TEST_TEST_SHARED_MEMORY_H_
+#endif // SRC_TRACING_TEST_TEST_SHARED_MEMORY_H_
diff --git a/tools/fix_include_guards.py b/tools/fix_include_guards.py
new file mode 100755
index 0000000..80b59a6
--- /dev/null
+++ b/tools/fix_include_guards.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import re
+import sys
+
+def fix_guards(fpath):
+ with open(fpath) as f:
+ lines = [l.strip('\n') for l in f.readlines()]
+ res = []
+ guard = re.sub(r'[^a-zA-Z0-9_-]', '_', fpath.upper()) + '_'
+ replacements = 0
+
+ endif_line_idx = -1
+ for line_idx in xrange(len(lines) - 1, -1, -1):
+ if lines[line_idx].startswith('#endif'):
+ endif_line_idx = line_idx
+ break
+ assert(endif_line_idx > 0)
+
+ line_idx = 0
+ for line in lines:
+ if replacements == 0 and line.startswith('#ifndef '):
+ line = '#ifndef ' + guard
+ replacements = 1
+ elif replacements == 1 and line.startswith('#define '):
+ line = '#define ' + guard
+ replacements = 2
+ elif line_idx == endif_line_idx and replacements == 2:
+ assert(line.startswith('#endif'))
+ line = '#endif // ' + guard + '\n'
+ res.append(line)
+ line_idx += 1
+ if res == lines:
+ return 0
+ with open(fpath, 'w') as f:
+ f.write('\n'.join(res))
+ return 1
+
+def main():
+ if len(sys.argv) < 2:
+ print('Usage: %s src include' % sys.argv[0])
+ return 1
+
+ num_files_changed = 0
+ for topdir in sys.argv[1:]:
+ for root, dirs, files in os.walk(topdir):
+ for name in files:
+ if not name.endswith('.h'):
+ continue
+ fpath = os.path.join(root, name)
+ num_files_changed += fix_guards(fpath)
+ print '%d files changed' % num_files_changed
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/tools/ftrace_proto_gen/BUILD.gn b/tools/ftrace_proto_gen/BUILD.gn
index 87b89ec..49d50b7 100644
--- a/tools/ftrace_proto_gen/BUILD.gn
+++ b/tools/ftrace_proto_gen/BUILD.gn
@@ -17,8 +17,8 @@
"main.cc",
]
deps = [
- "../../ftrace_reader",
"../../gn:default_deps",
- "../../perfetto_base",
+ "../../src/base",
+ "../../src/ftrace_reader",
]
}
diff --git a/tools/ftrace_proto_gen/main.cc b/tools/ftrace_proto_gen/main.cc
index 3998c32..506160c 100644
--- a/tools/ftrace_proto_gen/main.cc
+++ b/tools/ftrace_proto_gen/main.cc
@@ -19,8 +19,8 @@
#include <sstream>
#include <string>
-#include "ftrace_reader/format_parser.h"
-#include "ftrace_reader/ftrace_to_proto.h"
+#include "perfetto/ftrace_reader/format_parser.h"
+#include "perfetto/ftrace_reader/ftrace_to_proto.h"
int main(int argc, const char** argv) {
if (argc != 3) {
diff --git a/tools/sanitizers_unittests/BUILD.gn b/tools/sanitizers_unittests/BUILD.gn
index 9053395..02de5df 100644
--- a/tools/sanitizers_unittests/BUILD.gn
+++ b/tools/sanitizers_unittests/BUILD.gn
@@ -14,12 +14,10 @@
executable("sanitizers_unittests") {
testonly = true
-
deps = [
"../../gn:default_deps",
"../../gn:gtest_deps",
]
-
sources = [
"sanitizers_unittest.cc",
]
diff --git a/tracing/BUILD.gn b/tracing/BUILD.gn
deleted file mode 100644
index f25c654..0000000
--- a/tracing/BUILD.gn
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("../gn/perfetto.gni")
-import("//build_overrides/build.gni")
-import("../ipc//ipc_library.gni")
-
-config("tracing_config") {
- include_dirs = [
- "include",
- perfetto_root_path,
- ]
-}
-
-# Core tracing library, platform independent, no transport layer.
-source_set("tracing") {
- all_dependent_configs = [ ":tracing_config" ]
- deps = [
- "../perfetto_base",
- ]
- sources = [
- "include/tracing/core/basic_types.h",
- "include/tracing/core/data_source_config.h",
- "include/tracing/core/data_source_descriptor.h",
- "include/tracing/core/producer.h",
- "include/tracing/core/service.h",
- "include/tracing/core/shared_memory.h",
- "src/core/service_impl.cc",
- "src/core/service_impl.h",
- ]
-}
-
-# IPC service definitions.
-ipc_library("ipc_protos") {
- proto_in_dir = perfetto_root_path
- extra_configs = [ "../ipc:config" ]
- sources = [
- "src/ipc/data_source_config.proto",
- "src/ipc/data_source_descriptor.proto",
- "src/ipc/producer_port.proto",
- ]
-}
-
-# Posix specialization of the tracing library for Linux/Android/Mac. Provides
-# an IPC transport over a UNIX domain socket.
-source_set("ipc") {
- sources = [
- "include/tracing/ipc/producer_ipc_client.h",
- "include/tracing/ipc/service_ipc_host.h",
- "src/ipc/posix_shared_memory.cc",
- "src/ipc/posix_shared_memory.h",
- "src/ipc/producer/producer_ipc_client_impl.cc",
- "src/ipc/producer/producer_ipc_client_impl.h",
- "src/ipc/service/producer_ipc_service.cc",
- "src/ipc/service/producer_ipc_service.h",
- "src/ipc/service/service_ipc_host_impl.cc",
- "src/ipc/service/service_ipc_host_impl.h",
- ]
- deps = [
- ":ipc_protos",
- ":tracing",
- "../ipc",
- "../perfetto_base",
- ]
-}
-
-executable("tracing_unittests") {
- testonly = true
- deps = [
- ":ipc",
- ":tracing",
- "../gn:default_deps",
- "../gn:gtest_deps",
- "../perfetto_base",
- "../perfetto_base:test_support",
- ]
-
- sources = [
- "src/core/service_impl_unittest.cc",
- "src/ipc/posix_shared_memory_unittest.cc",
- "src/test/test_shared_memory.cc",
- "src/test/test_shared_memory.h",
- ]
-}
-
-executable("tracing_test") {
- testonly = true
- deps = [
- ":ipc",
- ":ipc_protos",
- ":tracing",
- "../gn:default_deps",
- "../ipc",
- "../perfetto_base",
- "../perfetto_base:test_support",
- ]
- sources = [
- "src/test/ipc_test.cc",
- ]
-}
-
-if (!build_with_chromium) {
- executable("tracing_benchmarks") {
- testonly = true
-
- deps = [
- "../gn:default_deps",
- "//buildtools:benchmark",
- ]
-
- sources = [
- "src/test/hello_world_benchmark.cc",
- ]
- }
-}
