chore(profiling): remove unused MojoRenderer

Author: KowalskiThomas

ddtrace/internal/datadog/profiling/stack_v2/CMakeLists.txt

@@ -55,15 +55,8 @@ if(NOT Threads_FOUND OR NOT CMAKE_USE_PTHREADS_INIT)
 endif()
 
 # Specify the target C-extension that we want to build
-add_library(
-    ${EXTENSION_NAME} SHARED
-    src/echion/danger.cc
-    src/echion/frame.cc
-    src/echion/render.cc
-    src/sampler.cpp
-    src/stack_renderer.cpp
-    src/stack_v2.cpp
-    src/thread_span_links.cpp)
+add_library(${EXTENSION_NAME} SHARED src/echion/danger.cc src/echion/frame.cc src/sampler.cpp src/stack_renderer.cpp
+                                     src/stack_v2.cpp src/thread_span_links.cpp)
 
 # Add common config
 add_ddup_config(${EXTENSION_NAME})

ddtrace/internal/datadog/profiling/stack_v2/echion/echion/render.h

@@ -4,11 +4,8 @@
 
 #pragma once
 
-#include <fstream>
-#include <iostream>
 #include <memory>
-#include <mutex>
-#include <ostream>
+#include <string>
 #include <string_view>
 
 #include <echion/config.h>
@@ -63,219 +60,34 @@ class RendererInterface
     virtual ~RendererInterface() = default;
 };
 
-class MojoRenderer : public RendererInterface
+class NullRenderer : public RendererInterface
 {
-    std::ofstream output;
-    std::mutex lock;
-    uint64_t metric = 0;
-
-    void inline event(MojoEvent event)
-    {
-        output.put(static_cast<char>(event));
-    }
-    void inline string(const std::string& string)
-    {
-        output << string << '\0';
-    }
-    void inline string(const char* string)
-    {
-        output << string << '\0';
-    }
-    void inline ref(mojo_ref_t value)
-    {
-        integer(value);
-    }
-    void inline integer(mojo_int_t n)
-    {
-        mojo_uint_t integer = n < 0 ? -n : n;
-        bool sign = n < 0;
-
-        unsigned char byte = integer & 0x3f;
-        if (sign)
-            byte |= 0x40;
-
-        integer >>= 6;
-        if (integer)
-            byte |= 0x80;
-
-        output.put(byte);
-
-        while (integer)
-        {
-            byte = integer & 0x7f;
-            integer >>= 7;
-            if (integer)
-                byte |= 0x80;
-            output.put(byte);
-        }
-    }
-
 public:
-    MojoRenderer() = default;
-
-    [[nodiscard]] Result<void> open() override
-    {
-        output.open(std::getenv("ECHION_OUTPUT"));
-        if (!output.is_open())
-        {
-            std::cerr << "Failed to open output file " << std::getenv("ECHION_OUTPUT") << std::endl;
-            return ErrorKind::RendererError;
-        }
-
-        return Result<void>::ok();
-    }
-
-    // ------------------------------------------------------------------------
-    void close() override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        output.flush();
-        output.close();
-    }
-
-    // ------------------------------------------------------------------------
-    void inline header() override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        output << "MOJ";
-        integer(MOJO_VERSION);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline metadata(const std::string& label, const std::string& value) override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_METADATA);
-        string(label);
-        string(value);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline stack(mojo_int_t pid, mojo_int_t iid, const std::string& thread_name)
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_STACK);
-        integer(pid);
-        integer(iid);
-        string(thread_name);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline frame(mojo_ref_t key, mojo_ref_t filename, mojo_ref_t name, mojo_int_t line,
-                      mojo_int_t line_end, mojo_int_t column, mojo_int_t column_end) override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_FRAME);
-        ref(key);
-        ref(filename);
-        ref(name);
-        integer(line);
-        integer(line_end);
-        integer(column);
-        integer(column_end);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline frame_ref(mojo_ref_t key) override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        if (key == 0)
-        {
-            event(MOJO_FRAME_INVALID);
-        }
-        else
-        {
-            event(MOJO_FRAME_REF);
-            ref(key);
-        }
-    }
-
-    // ------------------------------------------------------------------------
-    void inline frame_kernel(const std::string& scope) override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_FRAME_KERNEL);
-        string(scope);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline metric_time(mojo_int_t value)
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_METRIC_TIME);
-        integer(value);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline metric_memory(mojo_int_t value)
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_METRIC_MEMORY);
-        integer(value);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline string(mojo_ref_t key, const std::string& value) override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_STRING);
-        ref(key);
-        string(value);
-    }
-
-    // ------------------------------------------------------------------------
-    void inline string_ref(mojo_ref_t key) override
-    {
-        std::lock_guard<std::mutex> guard(lock);
-
-        event(MOJO_STRING_REF);
-        ref(key);
-    }
-
-    void render_message(std::string_view) override{};
-    void render_thread_begin(PyThreadState*, std::string_view, microsecond_t, uintptr_t,
-                             unsigned long) override {};
-    void render_task_begin(std::string, bool) override {};
-    void render_stack_begin(long long pid, long long iid, const std::string& name) override
-    {
-        stack(pid, iid, name);
-    };
-    void render_frame(Frame& frame) override;
-    void render_cpu_time(uint64_t cpu_time) override
-    {
-        metric = cpu_time;
-    };
-    void render_stack_end(MetricType metric_type, uint64_t delta) override
-    {
-        if (metric_type == MetricType::Time)
-        {
-            metric_time(cpu ? metric : delta);
-        }
-        else if (metric_type == MetricType::Memory)
-        {
-            metric_memory(delta);
-        }
-    };
-    bool is_valid() override
-    {
-        return true;
-    }
+    bool is_valid() override { return true; }
+    void header() override {}
+    void metadata(const std::string&, const std::string&) override {}
+    void frame(mojo_ref_t, mojo_ref_t, mojo_ref_t, mojo_int_t, mojo_int_t, mojo_int_t, mojo_int_t) override {}
+    void frame_ref(mojo_ref_t) override {}
+    void frame_kernel(const std::string&) override {}
+
+    void string(mojo_ref_t, const std::string&) override {}
+    void string_ref(mojo_ref_t) override {}
+    void render_message(std::string_view) override {}
+    void render_thread_begin(PyThreadState*, std::string_view, microsecond_t, uintptr_t, unsigned long) override {}
+    void render_task_begin(std::string, bool) override {}
+    void render_stack_begin(long long, long long, const std::string&) override {}
+    void render_frame(Frame&) override {}
+    void render_cpu_time(uint64_t) override {}
+    void render_stack_end(MetricType, uint64_t) override {}
+
+    Result<void> open() override { return Result<void>::ok(); }
+    void close() override {}
 };
 
 class Renderer
 {
 private:
-    std::shared_ptr<RendererInterface> default_renderer = std::make_shared<MojoRenderer>();
+    std::shared_ptr<RendererInterface> defaultRenderer = std::make_shared<NullRenderer>();
     std::weak_ptr<RendererInterface> currentRenderer;
 
     std::shared_ptr<RendererInterface> getActiveRenderer()
@@ -287,7 +99,8 @@ class Renderer
                 return renderer;
             }
         }
-        return default_renderer;
+
+        return defaultRenderer;
     }
 
     Renderer() = default;

ddtrace/internal/datadog/profiling/stack_v2/echion/echion/strings.h

@@ -10,6 +10,7 @@
 
 #include <cstdint>
 #include <string>
+#include <mutex>
 
 #include <echion/long.h>
 #include <echion/render.h>