From bf8abcce8928ae53b3e12511ef7718fe55a5d234 Mon Sep 17 00:00:00 2001
From: lightovernight <wanghongjie353@gmail.com>
Date: Tue, 8 Jul 2025 15:23:45 +0800
Subject: [PATCH] simplify the workdir process and minor optimizations

---
 src/debugger/core.c | 4 ++++
 src/debugger/dap.c  | 1 +
 src2/main.c         | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/src/debugger/core.c b/src/debugger/core.c
index 021c9a07..0a9d0df1 100644
--- a/src/debugger/core.c
+++ b/src/debugger/core.c
@@ -109,6 +109,8 @@ void c11_debugger_set_step_mode(C11_STEP_MODE mode) {
     debugger.keep_suspend = false;
 }
 
+=======
+>>>>>>> 429f2e78 (simplify the workdir process)
 int c11_debugger_setbreakpoint(const char* filename, int lineno) {
     c11_debugger_breakpoint breakpoint = {.sourcename = c11_strdup(filename), .lineno = lineno};
     c11_vector__push(c11_debugger_breakpoint, &debugger.breakpoints, breakpoint);
@@ -166,6 +168,8 @@ int c11_debugger_should_pause() {
 
 int c11_debugger_should_keep_pause(void) { return debugger.keep_suspend; }
 
+=======
+>>>>>>> 429f2e78 (simplify the workdir process)
 inline static c11_sv sv_from_cstr(const char* str) {
     c11_sv sv = {.data = str, .size = strlen(str)};
     return sv;
diff --git a/src/debugger/dap.c b/src/debugger/dap.c
index 0cb7b0f3..782b4b4c 100644
--- a/src/debugger/dap.c
+++ b/src/debugger/dap.c
@@ -285,6 +285,7 @@ void c11_dap_send_fatal_event(const char* message) {
     c11_dap_send_event("pkpy/fatalError", body);
 }
 
+>>>>>>> 429f2e78 (simplify the workdir process)
 void c11_dap_send_initialized_event() { c11_dap_send_event("initialized", "{}"); }
 
 int c11_dap_read_content_length(const char* buffer, int* header_length) {
diff --git a/src2/main.c b/src2/main.c
index 3477c4c8..ab4b74a1 100644
--- a/src2/main.c
+++ b/src2/main.c
@@ -89,9 +89,13 @@ int main(int argc, char** argv) {
             }
         }
     } else {
+<<<<<<< HEAD
         if(profile) py_profiler_begin();
         if(debug) py_debugger_waitforattach("127.0.0.1", 6110);
 
+=======
+        wait_for_debugger("127.0.0.1", 3939);
+>>>>>>> 429f2e78 (simplify the workdir process)
         char* source = read_file(filename);
         if(source) {
             if(!py_exec(source, filename, EXEC_MODE, NULL))