trace: Move the rest of common to lib/trace.

Renaming the library to something else is left to another change, as
there's already a trace lib in the wrappers dir.

40 files changed, 3 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 571c164e..8f0154a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -526,13 +526,12 @@ endmacro ()
 # Common libraries / utilities
 
 include_directories (
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/trace
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/os
-    ${CMAKE_CURRENT_SOURCE_DIR}/common
     ${CMAKE_CURRENT_SOURCE_DIR}/compat
 )
 
 add_subdirectory (lib)
-add_subdirectory (common)
 add_subdirectory (dispatch)
 add_subdirectory (helpers)
 add_subdirectory (wrappers)
diff --git a/docs/FORMAT.markdown b/docs/FORMAT.markdown
index 08288a7c..f23323aa 100644
--- a/docs/FORMAT.markdown
+++ b/docs/FORMAT.markdown
@@ -3,7 +3,7 @@
 This document specifies the binary format of trace streams.
 
 Trace streams are not written verbatim to file, but compressed, nowadays with
-snappy (see `common/trace_file_snappy.cpp` for details).  Previously they used
+snappy (see `lib/trace/trace_file_snappy.cpp` for details).  Previously they used
 to be compressed with gzip.
 
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 23be7605..be8a4454 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -2,3 +2,4 @@ add_subdirectory (os)
 add_subdirectory (highlight)
 add_subdirectory (guids)
 add_subdirectory (image)
+add_subdirectory (trace)
diff --git a/common/CMakeLists.txt b/lib/trace/CMakeLists.txt
index a3615616..a3615616 100644
--- a/common/CMakeLists.txt
+++ b/lib/trace/CMakeLists.txt
diff --git a/common/trace_api.hpp b/lib/trace/trace_api.hpp
index 3b119f8e..3b119f8e 100644
--- a/common/trace_api.hpp
+++ b/lib/trace/trace_api.hpp
diff --git a/common/trace_callset.cpp b/lib/trace/trace_callset.cpp
index 28cbf24c..28cbf24c 100644
--- a/common/trace_callset.cpp
+++ b/lib/trace/trace_callset.cpp
diff --git a/common/trace_callset.hpp b/lib/trace/trace_callset.hpp
index 4070a4b8..4070a4b8 100644
--- a/common/trace_callset.hpp
+++ b/lib/trace/trace_callset.hpp
diff --git a/common/trace_dump.cpp b/lib/trace/trace_dump.cpp
index 6b73c930..6b73c930 100644
--- a/common/trace_dump.cpp
+++ b/lib/trace/trace_dump.cpp
diff --git a/common/trace_dump.hpp b/lib/trace/trace_dump.hpp
index 4c756ca4..4c756ca4 100644
--- a/common/trace_dump.hpp
+++ b/lib/trace/trace_dump.hpp
diff --git a/common/trace_dump_internal.hpp b/lib/trace/trace_dump_internal.hpp
index 26ce10a9..26ce10a9 100644
--- a/common/trace_dump_internal.hpp
+++ b/lib/trace/trace_dump_internal.hpp
diff --git a/common/trace_fast_callset.cpp b/lib/trace/trace_fast_callset.cpp
index 2ac5343a..2ac5343a 100644
--- a/common/trace_fast_callset.cpp
+++ b/lib/trace/trace_fast_callset.cpp
diff --git a/common/trace_fast_callset.hpp b/lib/trace/trace_fast_callset.hpp
index 55d507df..55d507df 100644
--- a/common/trace_fast_callset.hpp
+++ b/lib/trace/trace_fast_callset.hpp
diff --git a/common/trace_file.cpp b/lib/trace/trace_file.cpp
index ffe4983d..ffe4983d 100644
--- a/common/trace_file.cpp
+++ b/lib/trace/trace_file.cpp
diff --git a/common/trace_file.hpp b/lib/trace/trace_file.hpp
index 26b525c3..26b525c3 100644
--- a/common/trace_file.hpp
+++ b/lib/trace/trace_file.hpp
diff --git a/common/trace_file_brotli.cpp b/lib/trace/trace_file_brotli.cpp
index e99b010e..e99b010e 100644
--- a/common/trace_file_brotli.cpp
+++ b/lib/trace/trace_file_brotli.cpp
diff --git a/common/trace_file_read.cpp b/lib/trace/trace_file_read.cpp
index fb303aa8..fb303aa8 100644
--- a/common/trace_file_read.cpp
+++ b/lib/trace/trace_file_read.cpp
diff --git a/common/trace_file_snappy.cpp b/lib/trace/trace_file_snappy.cpp
index 119e4147..119e4147 100644
--- a/common/trace_file_snappy.cpp
+++ b/lib/trace/trace_file_snappy.cpp
diff --git a/common/trace_file_zlib.cpp b/lib/trace/trace_file_zlib.cpp
index f0dd4560..f0dd4560 100644
--- a/common/trace_file_zlib.cpp
+++ b/lib/trace/trace_file_zlib.cpp
diff --git a/common/trace_format.hpp b/lib/trace/trace_format.hpp
index 4c6d821e..4c6d821e 100644
--- a/common/trace_format.hpp
+++ b/lib/trace/trace_format.hpp
diff --git a/common/trace_lookup.hpp b/lib/trace/trace_lookup.hpp
index 55655027..55655027 100644
--- a/common/trace_lookup.hpp
+++ b/lib/trace/trace_lookup.hpp
diff --git a/common/trace_model.cpp b/lib/trace/trace_model.cpp
index fbf3bdaa..fbf3bdaa 100644
--- a/common/trace_model.cpp
+++ b/lib/trace/trace_model.cpp
diff --git a/common/trace_model.hpp b/lib/trace/trace_model.hpp
index 6b224e76..6b224e76 100644
--- a/common/trace_model.hpp
+++ b/lib/trace/trace_model.hpp
diff --git a/common/trace_option.cpp b/lib/trace/trace_option.cpp
index feae1496..feae1496 100644
--- a/common/trace_option.cpp
+++ b/lib/trace/trace_option.cpp
diff --git a/common/trace_option.hpp b/lib/trace/trace_option.hpp
index f11d4658..f11d4658 100644
--- a/common/trace_option.hpp
+++ b/lib/trace/trace_option.hpp
diff --git a/common/trace_ostream.hpp b/lib/trace/trace_ostream.hpp
index 502905b4..502905b4 100644
--- a/common/trace_ostream.hpp
+++ b/lib/trace/trace_ostream.hpp
diff --git a/common/trace_ostream_snappy.cpp b/lib/trace/trace_ostream_snappy.cpp
index 219e0934..219e0934 100644
--- a/common/trace_ostream_snappy.cpp
+++ b/lib/trace/trace_ostream_snappy.cpp
diff --git a/common/trace_ostream_zlib.cpp b/lib/trace/trace_ostream_zlib.cpp
index a5bf04fd..a5bf04fd 100644
--- a/common/trace_ostream_zlib.cpp
+++ b/lib/trace/trace_ostream_zlib.cpp
diff --git a/common/trace_parser.cpp b/lib/trace/trace_parser.cpp
index 7816aeb3..7816aeb3 100644
--- a/common/trace_parser.cpp
+++ b/lib/trace/trace_parser.cpp
diff --git a/common/trace_parser.hpp b/lib/trace/trace_parser.hpp
index dad9f9cf..dad9f9cf 100644
--- a/common/trace_parser.hpp
+++ b/lib/trace/trace_parser.hpp
diff --git a/common/trace_parser_flags.cpp b/lib/trace/trace_parser_flags.cpp
index 69bd8376..69bd8376 100644
--- a/common/trace_parser_flags.cpp
+++ b/lib/trace/trace_parser_flags.cpp
diff --git a/common/trace_parser_flags_test.cpp b/lib/trace/trace_parser_flags_test.cpp
index 731dce1f..731dce1f 100644
--- a/common/trace_parser_flags_test.cpp
+++ b/lib/trace/trace_parser_flags_test.cpp
diff --git a/common/trace_parser_loop.cpp b/lib/trace/trace_parser_loop.cpp
index 04fbc135..04fbc135 100644
--- a/common/trace_parser_loop.cpp
+++ b/lib/trace/trace_parser_loop.cpp
diff --git a/common/trace_profiler.cpp b/lib/trace/trace_profiler.cpp
index 65c91aad..65c91aad 100644
--- a/common/trace_profiler.cpp
+++ b/lib/trace/trace_profiler.cpp
diff --git a/common/trace_profiler.hpp b/lib/trace/trace_profiler.hpp
index ebe28b46..ebe28b46 100644
--- a/common/trace_profiler.hpp
+++ b/lib/trace/trace_profiler.hpp
diff --git a/common/trace_snappy.hpp b/lib/trace/trace_snappy.hpp
index 5d82c746..5d82c746 100644
--- a/common/trace_snappy.hpp
+++ b/lib/trace/trace_snappy.hpp
diff --git a/common/trace_writer.cpp b/lib/trace/trace_writer.cpp
index 3ad06e4f..3ad06e4f 100644
--- a/common/trace_writer.cpp
+++ b/lib/trace/trace_writer.cpp
diff --git a/common/trace_writer.hpp b/lib/trace/trace_writer.hpp
index e293a938..e293a938 100644
--- a/common/trace_writer.hpp
+++ b/lib/trace/trace_writer.hpp
diff --git a/common/trace_writer_local.cpp b/lib/trace/trace_writer_local.cpp
index 79ff962b..79ff962b 100644
--- a/common/trace_writer_local.cpp
+++ b/lib/trace/trace_writer_local.cpp
diff --git a/common/trace_writer_local.hpp b/lib/trace/trace_writer_local.hpp
index 5d55bd9d..5d55bd9d 100644
--- a/common/trace_writer_local.hpp
+++ b/lib/trace/trace_writer_local.hpp
diff --git a/common/trace_writer_model.cpp b/lib/trace/trace_writer_model.cpp
index d497e5b9..d497e5b9 100644
--- a/common/trace_writer_model.cpp
+++ b/lib/trace/trace_writer_model.cpp