Refactor tracing

src/libspdl/core/detail/logging.cpp → src/libspdl/common/logging.cpp

@@ -6,11 +6,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/core.h>
 
-namespace spdl::core::detail {
+namespace spdl::common {
 
 // TODO: Add stacktrace
 std::string get_err_str(
@@ -29,4 +29,4 @@ std::string get_internal_err_str(
       location.line());
 }
 
-} // namespace spdl::core::detail
+} // namespace spdl::common

src/libspdl/core/detail/logging.h → src/libspdl/common/logging.h

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <libspdl/core/types.h>
+#include <glog/logging.h>
 
-#include <exception>
+#include <stdexcept>
 #include <string_view>
 #include <version>
 
@@ -27,7 +27,7 @@
     "Neither <source_location> or <experimental/source_location> is available."
 #endif
 
-namespace spdl::core::detail {
+namespace spdl::common {
 
 #if defined SPDL_USE_CUDA && __has_include(<experimental/source_location>)
 using std::experimental::source_location;
@@ -45,20 +45,23 @@ std::string get_internal_err_str(
     const std::string_view msg,
     const source_location& location);
 
-} // namespace spdl::core::detail
+/// Exception thrown when unexpected internal error occurs.
+class InternalError : public std::logic_error {
+  using std::logic_error::logic_error;
+};
 
-#define SPDL_FAIL(msg)                 \
-  throw std::runtime_error(            \
-      spdl::core::detail::get_err_str( \
-          msg, spdl::core::detail::source_location::current()))
+} // namespace spdl::common
 
-#define SPDL_FAIL_INTERNAL(msg)                 \
-  throw spdl::core::InternalError(              \
-      spdl::core::detail::get_internal_err_str( \
-          msg, spdl::core::detail::source_location::current()))
+#define SPDL_FAIL(msg)           \
+  throw std::runtime_error(      \
+      spdl::common::get_err_str( \
+          msg, spdl::common::source_location::current()))
 
-#include <glog/logging.h>
+#define SPDL_FAIL_INTERNAL(msg)           \
+  throw spdl::common::InternalError(      \
+      spdl::common::get_internal_err_str( \
+          msg, spdl::common::source_location::current()))
 
-#define SPDL_WARN(msg)                              \
-  LOG(WARNING) << (spdl::core::detail::get_err_str( \
-      msg, spdl::core::detail::source_location::current()))
+#define SPDL_WARN(msg)                        \
+  LOG(WARNING) << (spdl::common::get_err_str( \
+      msg, spdl::common::source_location::current()))

src/libspdl/common/tracing.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#ifndef SPDL_USE_TRACING
+
+#define TRACE_COUNTER(...)
+#define TRACE_EVENT(...)
+#define TRACE_EVENT_BEGIN(...)
+#define TRACE_EVENT_END(...)
+#define TRACE_EVENT_INSTANT(...)
+
+#else
+
+#include <libspdl/common/tracing/perfetto.h>
+
+#endif

src/libspdl/core/detail/tracing.cpp → src/libspdl/common/tracing/perfetto.cpp

@@ -6,9 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "libspdl/core/detail/tracing.h"
-
-#ifdef SPDL_USE_TRACING
+#include "libspdl/common/tracing/perfetto.h"
 
 #include <glog/logging.h>
 
@@ -56,5 +54,3 @@ void stop_tracing_session(std::unique_ptr<perfetto::TracingSession> session) {
 }
 
 } // namespace spdl::core::detail
-
-#endif

src/libspdl/core/detail/tracing.h → src/libspdl/common/tracing/perfetto.h

@@ -8,16 +8,6 @@
 
 #pragma once
 
-#ifndef SPDL_USE_TRACING
-
-#define TRACE_COUNTER(...)
-#define TRACE_EVENT(...)
-#define TRACE_EVENT_BEGIN(...)
-#define TRACE_EVENT_END(...)
-#define TRACE_EVENT_INSTANT(...)
-
-#else
-
 #include <perfetto.h>
 
 PERFETTO_DEFINE_CATEGORIES(
@@ -37,5 +27,3 @@ std::unique_ptr<perfetto::TracingSession> start_tracing_session(
 void stop_tracing_session(std::unique_ptr<perfetto::TracingSession> sess);
 
 } // namespace spdl::core::detail
-
-#endif

src/libspdl/core/buffer.cpp

@@ -8,7 +8,7 @@
 
 #include <libspdl/core/buffer.h>
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>

src/libspdl/core/codec.cpp

@@ -8,9 +8,9 @@
 
 #include <libspdl/core/codec.h>
 
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 #include <fmt/format.h>

src/libspdl/core/decoder.cpp

@@ -8,11 +8,11 @@
 
 #include <libspdl/core/decoder.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/decoder.h"
 #include "libspdl/core/detail/ffmpeg/filter_graph.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 namespace spdl::core {
 ////////////////////////////////////////////////////////////////////////////////

src/libspdl/core/demuxing.cpp

@@ -8,9 +8,9 @@
 
 #include <libspdl/core/demuxing.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/demuxer.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 namespace spdl::core {
 namespace detail {

src/libspdl/core/detail/ffmpeg/bsf.cpp

@@ -9,8 +9,8 @@
 #include "libspdl/core/detail/ffmpeg/bsf.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 
 namespace spdl::core::detail {
 namespace {

src/libspdl/core/detail/ffmpeg/conversion.cpp

@@ -8,11 +8,11 @@
 
 #include <libspdl/core/conversion.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>

src/libspdl/core/detail/ffmpeg/ctx_utils.cpp

@@ -8,9 +8,9 @@
 
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>

src/libspdl/core/detail/ffmpeg/decoder.cpp

@@ -11,9 +11,9 @@
 #include <libspdl/core/rational_utils.h>
 #include <libspdl/core/utils.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <glog/logging.h>
 

src/libspdl/core/detail/ffmpeg/demuxer.cpp

@@ -10,9 +10,9 @@
 
 #include <libspdl/core/rational_utils.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 

src/libspdl/core/detail/ffmpeg/encoder.cpp

@@ -9,10 +9,10 @@
 #include "libspdl/core/detail/ffmpeg/encoder.h"
 
 #include <libspdl/core/generator.h>
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 #include <fmt/format.h>

src/libspdl/core/detail/ffmpeg/filter_graph.cpp

@@ -8,9 +8,9 @@
 
 #include "libspdl/core/detail/ffmpeg/filter_graph.h"
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>

src/libspdl/core/detail/ffmpeg/logging.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/core.h>
 

src/libspdl/core/detail/ffmpeg/muxer.cpp

@@ -8,11 +8,11 @@
 
 #include "libspdl/core/detail/ffmpeg/muxer.h"
 
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 #include <fmt/format.h>

src/libspdl/core/detail/ffmpeg/wrappers.cpp

@@ -8,8 +8,8 @@
 
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 namespace spdl::core::detail {
 

src/libspdl/core/frames.cpp

@@ -12,10 +12,10 @@
 #include <libspdl/core/types.h>
 #include <libspdl/core/utils.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <algorithm>
 #include <cassert>

src/libspdl/core/muxer.cpp

@@ -8,8 +8,8 @@
 
 #include <libspdl/core/muxer.h>
 
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/muxer.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 

src/libspdl/core/packets.cpp

@@ -10,8 +10,8 @@
 
 #include <libspdl/core/rational_utils.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/core.h>
 

src/libspdl/core/storage.cpp

@@ -8,8 +8,8 @@
 
 #include <libspdl/core/storage.h>
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 
 #include <utility>
 

src/libspdl/core/types.h

@@ -11,7 +11,6 @@
 #include <cstdint>
 #include <map>
 #include <optional>
-#include <stdexcept>
 #include <string>
 
 #define SPDL_DEFAULT_BUFFER_SIZE 8096
@@ -177,9 +176,4 @@ using VideoEncodeConfig = EncodeConfigBase<MediaType::Video>;
 /// Audio encoding configuration type alias.
 using AudioEncodeConfig = EncodeConfigBase<MediaType::Audio>;
 
-/// Exception thrown when unexpected internal error occurs.
-class InternalError : public std::logic_error {
-  using std::logic_error::logic_error;
-};
-
 } // namespace spdl::core

src/libspdl/core/utils.cpp

@@ -8,10 +8,10 @@
 
 #include <libspdl/core/utils.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/filter_graph.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/core.h>
 #include <glog/logging.h>

src/libspdl/cuda/color_conversion.cpp

@@ -10,7 +10,7 @@
 #include <libspdl/cuda/buffer.h>
 #include <libspdl/cuda/color_conversion.h>
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 #include "libspdl/cuda/detail/color_conversion.h"
 
 #include <fmt/core.h>

src/libspdl/cuda/detail/color_conversion.cu

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/cuda/detail/color_conversion.h"
 #include "libspdl/cuda/detail/utils.h"