chore(profiling): remove where from echion

KowalskiThomas · KowalskiThomas · commit 317b10aacb21 · 2025-11-10T14:28:42.000+01:00
diff --git a/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/config.h b/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/config.h
@@ -7,8 +7,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
-#include <string>
-
 // Sampling interval
 inline unsigned int interval = 1000;
 
@@ -22,15 +20,9 @@ inline bool ignore_non_running_threads = true;
 // Native stack sampling
 inline int native = 0;
 
-// Where mode
-inline int where = 0;
-
 // Maximum number of frames to unwind
 inline unsigned int max_frames = 2048;
 
-// Pipe name (where mode IPC)
-inline std::string pipe_name;
-
 // ----------------------------------------------------------------------------
 static PyObject* set_interval(PyObject* Py_UNUSED(m), PyObject* args)
 {
@@ -85,30 +77,6 @@ static PyObject* set_native(PyObject* Py_UNUSED(m), PyObject* Py_UNUSED(args))
     Py_RETURN_NONE;
 }
 
-// ----------------------------------------------------------------------------
-static PyObject* set_where(PyObject* Py_UNUSED(m), PyObject* args)
-{
-    int value;
-    if (!PyArg_ParseTuple(args, "p", &value))
-        return NULL;
-
-    where = value;
-
-    Py_RETURN_NONE;
-}
-
-// ----------------------------------------------------------------------------
-static PyObject* set_pipe_name(PyObject* Py_UNUSED(m), PyObject* args)
-{
-    const char* name;
-    if (!PyArg_ParseTuple(args, "s", &name))
-        return NULL;
-
-    pipe_name = name;
-
-    Py_RETURN_NONE;
-}
-
 // ----------------------------------------------------------------------------
 static PyObject* set_max_frames(PyObject* Py_UNUSED(m), PyObject* args)
 {
diff --git a/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/render.h b/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/render.h
@@ -63,80 +63,6 @@ class RendererInterface
     virtual ~RendererInterface() = default;
 };
 
-class WhereRenderer : public RendererInterface
-{
-private:
-    std::ostream* output;
-    std::ofstream file_stream;
-
-    WhereRenderer() {}
-    ~WhereRenderer() {}
-
-public:
-    static WhereRenderer& get()
-    {
-        static WhereRenderer instance;
-        return instance;
-    }
-
-    WhereRenderer(WhereRenderer&) = delete;
-    WhereRenderer(WhereRenderer&&) = delete;
-    void operator=(const WhereRenderer&) = delete;
-
-    bool set_output(std::string_view file_name)
-    {
-        file_stream.close();
-        file_stream.open(file_name.data(), std::ios::out);
-        if (file_stream.is_open())
-        {
-            output = &file_stream;
-            return true;
-        }
-        return false;
-    }
-
-    bool set_output(std::ostream& new_output)
-    {
-        file_stream.close();
-        output = &new_output;
-        return true;
-    }
-
-    [[nodiscard]] Result<void> open() override
-    {
-        return Result<void>::ok();
-    };
-    void close() override {};
-    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_thread_begin(PyThreadState*, std::string_view name, microsecond_t, uintptr_t,
-                             unsigned long) override
-    {
-        *output << "    🧵 " << name << ":" << std::endl;
-    }
-    void render_task_begin(std::string, bool) override {}
-    void render_stack_begin(long long, long long, const std::string&) override {}
-    void render_message(std::string_view msg) override
-    {
-        *output << msg << std::endl;
-    }
-    void render_frame(Frame&) override;
-    void render_stack_end(MetricType, uint64_t) override {}
-    void render_cpu_time(uint64_t) override {}
-
-    bool is_valid() override
-    {
-        return true;
-    }
-};
-
 class MojoRenderer : public RendererInterface
 {
     std::ofstream output;
diff --git a/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/signals.h b/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/signals.h
@@ -29,19 +29,9 @@ inline void sigprof_handler([[maybe_unused]] int signum)
     sigprof_handler_lock.unlock();
 }
 
-// ----------------------------------------------------------------------------
-inline void sigquit_handler([[maybe_unused]] int signum)
-{
-    // Wake up the where thread
-    std::lock_guard<std::mutex> lock(where_lock);
-    where_cv.notify_one();
-}
-
 // ----------------------------------------------------------------------------
 inline void install_signals()
 {
-    signal(SIGQUIT, sigquit_handler);
-
     if (native)
         signal(SIGPROF, sigprof_handler);
 }
diff --git a/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/stacks.h b/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/stacks.h
@@ -58,20 +58,6 @@ class FrameStack : public std::deque<Frame::Ref>
         }
     }
 
-    // ------------------------------------------------------------------------
-    void render_where()
-    {
-        for (auto it = this->rbegin(); it != this->rend(); ++it)
-        {
-#if PY_VERSION_HEX >= 0x030c0000
-            if ((*it).get().is_entry)
-                // This is a shim frame so we skip it.
-                continue;
-#endif
-            WhereRenderer::get().render_frame((*it).get());
-        }
-    }
-
 private:
     // ------------------------------------------------------------------------
     static inline Frame::Key rotl(Key key)
diff --git a/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/state.h b/ddtrace/internal/datadog/profiling/stack_v2/echion/echion/state.h
@@ -18,8 +18,6 @@
 #define Py_BUILD_CORE
 #include <internal/pycore_pystate.h>
 
-#include <condition_variable>
-#include <mutex>
 #include <thread>
 
 inline _PyRuntimeState* runtime = &_PyRuntime;
@@ -29,10 +27,6 @@ inline std::thread* sampler_thread = nullptr;
 
 inline int running = 0;
 
-inline std::thread* where_thread = nullptr;
-inline std::condition_variable where_cv;
-inline std::mutex where_lock;
-
 inline PyObject* asyncio_current_tasks = NULL;
 inline PyObject* asyncio_scheduled_tasks = NULL;  // WeakSet
 inline PyObject* asyncio_eager_tasks = NULL;      // set
diff --git a/ddtrace/internal/datadog/profiling/stack_v2/src/echion/coremodule.cc b/ddtrace/internal/datadog/profiling/stack_v2/src/echion/coremodule.cc
@@ -35,74 +35,6 @@
 #include <echion/threads.h>
 #include <echion/timing.h>
 
-// ----------------------------------------------------------------------------
-static void do_where(std::ostream& stream)
-{
-    WhereRenderer::get().set_output(stream);
-    WhereRenderer::get().render_message("\r🐴 Echion reporting for duty");
-    WhereRenderer::get().render_message("");
-
-    for_each_interp([](InterpreterInfo& interp) -> void {
-        for_each_thread(interp, [](PyThreadState* tstate, ThreadInfo& thread) -> void {
-            thread.unwind(tstate);
-            WhereRenderer::get().render_thread_begin(tstate, thread.name, /*cpu_time*/ 0,
-                                                     tstate->thread_id, thread.native_id);
-
-            if (native)
-            {
-                auto interleave_success = interleave_stacks();
-                if (!interleave_success)
-                {
-                    std::cerr << "could not interleave stacks" << std::endl;
-                    return;
-                }
-
-                interleaved_stack.render_where();
-            }
-            else
-                python_stack.render_where();
-            WhereRenderer::get().render_message("");
-        });
-    });
-}
-
-// ----------------------------------------------------------------------------
-static void where_listener()
-{
-    for (;;)
-    {
-        std::unique_lock<std::mutex> lock(where_lock);
-        where_cv.wait(lock);
-
-        if (!running)
-            break;
-
-        do_where(std::cerr);
-    }
-}
-
-// ----------------------------------------------------------------------------
-static void setup_where()
-{
-    where_thread = new std::thread(where_listener);
-}
-
-static void teardown_where()
-{
-    if (where_thread != nullptr)
-    {
-        {
-            std::lock_guard<std::mutex> lock(where_lock);
-
-            where_cv.notify_one();
-        }
-
-        where_thread->join();
-
-        where_thread = nullptr;
-    }
-}
-
 // ----------------------------------------------------------------------------
 static inline void _start()
 {
@@ -122,23 +54,6 @@ static inline void _start()
     host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
 #endif
 
-    if (where)
-    {
-        std::ofstream pipe(pipe_name, std::ios::out);
-
-        if (pipe)
-            do_where(pipe);
-
-        else
-            std::cerr << "Failed to open pipe " << pipe_name << std::endl;
-
-        running = 0;
-
-        return;
-    }
-
-    setup_where();
-
     Renderer::get().header();
 
     Renderer::get().metadata("mode", (cpu ? "cpu" : "wall"));
@@ -167,8 +82,6 @@ static inline void _stop()
         string_table.clear();
     }
 
-    teardown_where();
-
 #if defined PL_DARWIN
     mach_port_deallocate(mach_task_self(), cclock);
 #endif
@@ -506,8 +419,6 @@ static PyMethodDef echion_core_methods[] = {
     {"set_interval", set_interval, METH_VARARGS, "Set the sampling interval"},
     {"set_cpu", set_cpu, METH_VARARGS, "Set whether to use CPU time instead of wall time"},
     {"set_native", set_native, METH_VARARGS, "Set whether to sample the native stacks"},
-    {"set_where", set_where, METH_VARARGS, "Set whether to use where mode"},
-    {"set_pipe_name", set_pipe_name, METH_VARARGS, "Set the pipe name"},
     {"set_max_frames", set_max_frames, METH_VARARGS, "Set the max number of frames to unwind"},
     // Sentinel
     {NULL, NULL, 0, NULL}};
diff --git a/ddtrace/internal/datadog/profiling/stack_v2/src/echion/render.cc b/ddtrace/internal/datadog/profiling/stack_v2/src/echion/render.cc
@@ -1,42 +1,6 @@
 #include <echion/frame.h>
 #include <echion/render.h>
 
-// ------------------------------------------------------------------------
-void WhereRenderer::render_frame(Frame& frame)
-{
-    auto maybe_name_str = string_table.lookup(frame.name);
-    if (!maybe_name_str)
-    {
-        std::cerr << "could not get name for render_frame" << std::endl;
-        return;
-    }
-    const auto& name_str = maybe_name_str->get();
-
-
-    auto maybe_filename_str = string_table.lookup(frame.filename);
-    if (!maybe_filename_str)
-    {
-        std::cerr << "could not get filename for render_frame" << std::endl;
-        return;
-    }
-    const auto& filename_str = maybe_filename_str->get();
-
-    auto line = frame.location.line;
-
-    if (filename_str.rfind("native@", 0) == 0)
-    {
-        WhereRenderer::get().render_message(
-            "\033[38;5;248;1m" + name_str + "\033[0m \033[38;5;246m(" + filename_str +
-            "\033[0m:\033[38;5;246m" + std::to_string(line) + ")\033[0m");
-    }
-    else
-    {
-        WhereRenderer::get().render_message("\033[33;1m" + name_str + "\033[0m (\033[36m" +
-                                            filename_str + "\033[0m:\033[32m" +
-                                            std::to_string(line) + "\033[0m)");
-    }
-}
-
 // ------------------------------------------------------------------------
 void MojoRenderer::render_frame(Frame& frame)
 {

Original file line number	Diff line number	Diff line change
`@@ -29,19 +29,9 @@ inline void sigprof_handler([[maybe_unused]] int signum)`
`29`	`29`	`sigprof_handler_lock.unlock();`
`30`	`30`	`}`
`31`	`31`
`32`		`-// ----------------------------------------------------------------------------`
`33`		`-inline void sigquit_handler([[maybe_unused]] int signum)`
`34`		`-{`
`35`		`- // Wake up the where thread`
`36`		`- std::lock_guard<std::mutex> lock(where_lock);`
`37`		`- where_cv.notify_one();`
`38`		`-}`
`39`		`-`
`40`	`32`	`// ----------------------------------------------------------------------------`
`41`	`33`	`inline void install_signals()`
`42`	`34`	`{`
`43`		`- signal(SIGQUIT, sigquit_handler);`
`44`		`-`
`45`	`35`	`if (native)`
`46`	`36`	`signal(SIGPROF, sigprof_handler);`
`47`	`37`	`}`