added breakpoints

Author: kr-2003

CMakeLists.txt

@@ -180,9 +180,7 @@ else()
     configure_native_kernel("/share/jupyter/kernels/xcpp17/")
     configure_native_kernel("/share/jupyter/kernels/xcpp20/")
     configure_native_kernel("/share/jupyter/kernels/xcpp23/")
-    if(XEUS_CPP_USE_DEBUGGER)
-        configure_native_kernel("/share/jupyter/kernels/xcpp17-debugger/")
-    endif()
+    configure_native_kernel("/share/jupyter/kernels/xcpp17-debugger/")
 endif()
 
 # Source files
@@ -199,17 +197,12 @@ set(XEUS_CPP_HEADERS
     include/xeus-cpp/xmagics.hpp
     include/xeus-cpp/xoptions.hpp
     include/xeus-cpp/xpreamble.hpp
+    include/xeus-cpp/xdebugger.hpp
     #src/xinspect.hpp
     #src/xsystem.hpp
     #src/xparser.hpp
 )
 
-if(XEUS_CPP_USE_DEBUGGER)
-    list(APPEND XEUS_CPP_HEADERS
-        include/xeus-cpp/xdebugger.hpp
-    )
-endif()
-
 set(XEUS_CPP_SRC
     src/xholder.cpp
     src/xinput.cpp
@@ -219,6 +212,9 @@ set(XEUS_CPP_SRC
     src/xparser.cpp
     src/xutils.cpp
     src/xmagics/os.cpp
+    src/xdebugger.cpp
+    src/xdebuglldb_client.cpp
+    src/xinternal_utils.cpp
 )
 
 if(NOT EMSCRIPTEN)
@@ -227,14 +223,6 @@ if(NOT EMSCRIPTEN)
     )
 endif()
 
-if(XEUS_CPP_USE_DEBUGGER)
-    list(APPEND XEUS_CPP_SRC
-        src/xdebugger.cpp
-        src/xdebuglldb_client.cpp
-        src/xinternal_utils.cpp
-    )
-endif()
-
 if(EMSCRIPTEN)
     list(APPEND XEUS_CPP_SRC src/xinterpreter_wasm.cpp)
 endif()
@@ -564,9 +552,3 @@ if(EMSCRIPTEN)
             "$<TARGET_FILE_DIR:xcpp>/xcpp.data"
             DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif ()
-
-if(XEUS_CPP_USE_DEBUGGER)
-    add_definitions(
-        -DXEUS_CPP_USE_DEBUGGER
-    )
-endif()

include/xeus-cpp/xdebugger.hpp

@@ -23,6 +23,7 @@
 #include "nlohmann/json.hpp"
 #include "xeus-zmq/xdebugger_base.hpp"
 #include "xeus_cpp_config.hpp"
+#include "xeus-cpp/xinterpreter.hpp"
 
 namespace xcpp
 {
@@ -48,14 +49,16 @@ namespace xcpp
         nl::json stack_trace_request(const nl::json& message);
         nl::json attach_request(const nl::json& message);
         nl::json configuration_done_request(const nl::json& message);
+        nl::json set_breakpoints_request(const nl::json& message);
+        nl::json dump_cell_request(const nl::json& message);
 
         nl::json variables_request_impl(const nl::json& message) override;
 
         bool start_lldb();
         bool start() override;
         void stop() override;
         xeus::xdebugger_info get_debugger_info() const override;
-        std::string get_cell_temporary_file(const std::string& code) const override;
+        virtual std::string get_cell_temporary_file(const std::string& code) const override;
 
         bool connect_to_lldb_tcp();
         std::string send_dap_message(const nl::json& message);
@@ -64,12 +67,19 @@ namespace xcpp
         xdebuglldb_client* p_debuglldb_client;
         std::string m_lldb_host;
         std::string m_lldb_port;
-        std::string m_lldbdap_port;
         nl::json m_debugger_config;
         bool m_is_running;
         int m_tcp_socket;
         bool m_tcp_connected;
         pid_t jit_process_pid;
+
+        using breakpoint_list_t = std::map<std::string, std::vector<nl::json>>;
+        breakpoint_list_t m_breakpoint_list;
+
+        xcpp::interpreter* m_interpreter;
+
+        std::unordered_map<std::string, std::vector<std::string>> m_hash_to_sequential;
+        std::unordered_map<std::string, std::string> m_sequential_to_hash;
     };
 
     XEUS_CPP_API

include/xeus-cpp/xinterpreter.hpp

@@ -42,6 +42,16 @@ namespace xcpp
 
         static pid_t get_current_pid();
 
+        std::vector<int> get_execution_count(const std::string& code) const
+        {
+            auto it = m_code_to_execution_count_map.find(code);
+            if (it != m_code_to_execution_count_map.end())
+            {
+                return it->second;
+            }
+            return {};
+        }
+
     private:
 
         void configure_impl() override;
@@ -64,8 +74,6 @@ namespace xcpp
 
         void shutdown_request_impl() override;
 
-        nl::json internal_request_impl(const nl::json& content) override;
-
         nl::json get_error_reply(
             const std::string& ename,
             const std::string& evalue,
@@ -89,6 +97,8 @@ namespace xcpp
 
         xoutput_buffer m_cout_buffer;
         xoutput_buffer m_cerr_buffer;
+
+        std::map<std::string, std::vector<int>> m_code_to_execution_count_map;
     };
 }
 

share/jupyter/kernels/xcpp17-debugger/kernel.json.in

@@ -8,7 +8,7 @@
       "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
       "-f",
       "{connection_file}",
-      "-gdwarf-4",
+      "-g",
       "-O0",
       "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
       "-I", "@XEUS_CPP_INCLUDE_DIR@",

src/main.cpp

@@ -60,16 +60,15 @@ int main(int argc, char* argv[])
 #endif
     signal(SIGINT, xcpp::stop_handler);
 
-#ifdef XEUS_CPP_USE_DEBUGGER
+    std::string file_name = xeus::extract_filename(argc, argv);
+    auto interpreter = std::make_unique<xcpp::interpreter>(argc, argv);
+    std::unique_ptr<xeus::xcontext> context = xeus::make_zmq_context();
+
     nl::json debugger_config;
     debugger_config["lldb"]["initCommands"] = {
         "settings set plugin.jit-loader.gdb.enable on"
     };
-#endif
-
-    std::string file_name = xeus::extract_filename(argc, argv);
-    auto interpreter = std::make_unique<xcpp::interpreter>(argc, argv);
-    std::unique_ptr<xeus::xcontext> context = xeus::make_zmq_context();
+    debugger_config["interpreter_ptr"] = reinterpret_cast<std::uintptr_t>(interpreter.get());
 
     if (!file_name.empty())
     {
@@ -86,13 +85,9 @@ int main(int argc, char* argv[])
             xeus::make_console_logger(
                 xeus::xlogger::msg_type,
                 xeus::make_file_logger(xeus::xlogger::content, "xeus.log")
-#ifdef XEUS_CPP_USE_DEBUGGER
             ),
             xcpp::make_cpp_debugger,
             debugger_config
-#else
-            )
-#endif
         );
 
         std::clog << "Starting xcpp kernel...\n\n"
@@ -113,13 +108,9 @@ int main(int argc, char* argv[])
             xeus::make_console_logger(
                 xeus::xlogger::msg_type,
                 xeus::make_file_logger(xeus::xlogger::content, "xeus.log")
-#ifdef XEUS_CPP_USE_DEBUGGER
             ),
             xcpp::make_cpp_debugger,
             debugger_config
-#else
-            )
-#endif
         );
 
         std::cout << "Getting config" << std::endl;