zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added run debug command, and various fixes including more thread safe debug commands

merge-requests/365/head
eidheim 10 years ago
parent
9b5c5baa2d
commit
e941b563d9
6 changed files with 188 additions and 141 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 255
      src/debug.cc
  2. 19
      src/debug.h
  3. 3
      src/files.h
  4. 6
      src/menu.cc
  5. 39
      src/window.cc
  6. 1
      src/window.h

255
src/debug.cc
Unescape View File

@ -1,15 +1,16 @@
#include "debug.h" #include "debug.h"
#include <thread> #include <lldb/API/SBTarget.h>
#include <lldb/API/SBProcess.h>
#include "lldb/API/SBTarget.h" #include <lldb/API/SBEvent.h>
#include "lldb/API/SBProcess.h" #include <lldb/API/SBBreakpoint.h>
#include "lldb/API/SBListener.h" #include <lldb/API/SBThread.h>
#include "lldb/API/SBEvent.h" #include <lldb/API/SBStream.h>
#include "lldb/API/SBBreakpoint.h" #include <lldb/API/SBDeclaration.h>
#include "lldb/API/SBThread.h" #include <lldb/API/SBCommandInterpreter.h>
#include "lldb/API/SBStream.h" #include <lldb/API/SBCommandReturnObject.h>
#include "lldb/API/SBDeclaration.h"
#include "terminal.h"
#include <iostream> //TODO: remove #include <iostream> //TODO: remove
using namespace std; using namespace std;
@ -18,7 +19,7 @@ void log(const char *msg, void *) {
cout << "debugger log: " << msg << endl; cout << "debugger log: " << msg << endl;
} }
Debug::Debug(): stopped(false) { Debug::Debug(): listener("juCi++ lldb listener"), state(lldb::StateType::eStateInvalid), buffer_size(131072) {
lldb::SBDebugger::Initialize(); lldb::SBDebugger::Initialize();
debugger=lldb::SBDebugger::Create(true, log, nullptr); debugger=lldb::SBDebugger::Create(true, log, nullptr);
@ -27,157 +28,167 @@ Debug::Debug(): stopped(false) {
void Debug::start(std::shared_ptr<std::vector<std::pair<boost::filesystem::path, int> > > breakpoints, const boost::filesystem::path &executable, void Debug::start(std::shared_ptr<std::vector<std::pair<boost::filesystem::path, int> > > breakpoints, const boost::filesystem::path &executable,
const boost::filesystem::path &path, std::function<void(int exit_status)> callback, const boost::filesystem::path &path, std::function<void(int exit_status)> callback,
std::function<void(const std::string &status)> status_callback, std::function<void(const std::string &status)> status_callback,
std::function<void(const boost::filesystem::path &file, int line)> stop_callback) { std::function<void(const boost::filesystem::path &file_path, int line_nr)> stop_callback) {
std::thread debug_thread([this, breakpoints, executable, path, callback, status_callback, stop_callback]() { auto target=debugger.CreateTarget(executable.string().c_str());
auto target=debugger.CreateTarget(executable.string().c_str());
auto listener=lldb::SBListener("juCi++ lldb listener");
if(!target.IsValid()) {
cerr << "Error: Could not create debug target to: " << executable << endl; //TODO: output to terminal instead
return;
}
for(auto &breakpoint: *breakpoints) { if(!target.IsValid()) {
if(!(target.BreakpointCreateByLocation(breakpoint.first.string().c_str(), breakpoint.second)).IsValid()) { Terminal::get().async_print("Error (debug): Could not create debug target to: "+executable.string()+'\n', true);
cerr << "Error: Could not create breakpoint at: " << breakpoint.first << ":" << breakpoint.second << endl; //TODO: output to terminal instead return;
return; }
}
}
lldb::SBError error;
process = std::unique_ptr<lldb::SBProcess>(new lldb::SBProcess(target.Launch(listener, nullptr, nullptr, nullptr, nullptr, nullptr, path.string().c_str(), lldb::eLaunchFlagNone, false, error)));
if(error.Fail()) { for(auto &breakpoint: *breakpoints) {
cerr << "Error (debug): " << error.GetCString() << endl; //TODO: output to terminal instead if(!(target.BreakpointCreateByLocation(breakpoint.first.string().c_str(), breakpoint.second)).IsValid()) {
Terminal::get().async_print("Error (debug): Could not create breakpoint at: "+breakpoint.first.string()+":"+std::to_string(breakpoint.second)+'\n', true);
return; return;
} }
}
lldb::SBError error;
process = std::unique_ptr<lldb::SBProcess>(new lldb::SBProcess(target.Launch(listener, nullptr, nullptr, nullptr, nullptr, nullptr, path.string().c_str(), lldb::eLaunchFlagNone, false, error)));
if(error.Fail()) {
Terminal::get().async_print(std::string("Error (debug): ")+error.GetCString()+'\n', true);
return;
}
if(debug_thread.joinable())
debug_thread.join();
debug_thread=std::thread([this, breakpoints, executable, path, callback, status_callback, stop_callback]() {
lldb::SBEvent event; lldb::SBEvent event;
while(true) { while(true) {
if(listener.WaitForEvent(3, event)) { event_mutex.lock();
auto state=process->GetStateFromEvent(event); if(listener.WaitForEvent(1, event)) {
if((event.GetType() & lldb::SBProcess::eBroadcastBitStateChanged)>0) {
//Update debug status auto state=process->GetStateFromEvent(event);
lldb::SBStream stream; this->state=state;
event.GetDescription(stream);
std::string event_desc=stream.GetData(); //Update debug status
event_desc.pop_back(); lldb::SBStream stream;
auto pos=event_desc.rfind(" = "); event.GetDescription(stream);
if(status_callback && pos!=std::string::npos) std::string event_desc=stream.GetData();
status_callback(event_desc.substr(pos+3)); event_desc.pop_back();
auto pos=event_desc.rfind(" = ");
bool expected=false; if(status_callback && pos!=std::string::npos)
if(state==lldb::StateType::eStateStopped && stopped.compare_exchange_strong(expected, true)) { status_callback(event_desc.substr(pos+3));
auto line_entry=process->GetSelectedThread().GetSelectedFrame().GetLineEntry();
if(stop_callback) { if(state==lldb::StateType::eStateStopped) {
lldb::SBStream stream; auto line_entry=process->GetSelectedThread().GetSelectedFrame().GetLineEntry();
line_entry.GetFileSpec().GetDescription(stream); if(stop_callback) {
stop_callback(stream.GetData(), line_entry.GetLine()); lldb::SBStream stream;
line_entry.GetFileSpec().GetDescription(stream);
stop_callback(stream.GetData(), line_entry.GetLine());
}
} }
/*lldb::SBStream stream; else if(state==lldb::StateType::eStateExited) {
process->GetSelectedThread().GetDescription(stream); auto exit_status=process->GetExitStatus();
cout << stream.GetData() << endl;*/ if(callback)
for(uint32_t thread_index=0;thread_index<process->GetNumThreads();thread_index++) { callback(exit_status);
auto thread=process->GetThreadAtIndex(thread_index); if(status_callback)
for(uint32_t frame_index=0;frame_index<thread.GetNumFrames();frame_index++) { status_callback("");
auto frame=thread.GetFrameAtIndex(frame_index); if(stop_callback)
auto values=frame.GetVariables(false, true, true, false); stop_callback("", 0);
for(uint32_t value_index=0;value_index<values.GetSize();value_index++) { process.reset();
/*cout << thread_index << ", " << frame_index << endl; this->state=lldb::StateType::eStateInvalid;
lldb::SBStream stream; event_mutex.unlock();
process->GetDescription(stream); return;
cout << stream.GetData() << endl;
stream.Clear();
process->GetSelectedThread().GetSelectedFrame().GetLineEntry().GetDescription(stream);
cout << stream.GetData() << endl;*/
/*lldb::SBStream stream;
auto value=values.GetValueAtIndex(value_index);
cout << value.GetFrame().GetSymbol().GetName() << endl;
auto declaration = value.GetDeclaration();
if(declaration.IsValid())
cout << declaration.GetFileSpec().GetFilename() << ":" << declaration.GetLine() << ":" << declaration.GetColumn() << endl;
value.GetDescription(stream);
cout << " " << stream.GetData() << endl;
stream.Clear();
value.GetData().GetDescription(stream);
cout << " " << stream.GetData() << endl;*/
}
}
} }
}
else if(state==lldb::StateType::eStateExited) { else if(state==lldb::StateType::eStateCrashed) {
auto exit_status=process->GetExitStatus(); if(callback)
if(callback) callback(-1);
callback(exit_status); if(status_callback)
if(status_callback) status_callback("");
status_callback(""); if(stop_callback)
if(stop_callback) stop_callback("", 0);
stop_callback("", 0); process.reset();
process.reset(); this->state=lldb::StateType::eStateInvalid;
stopped=false; event_mutex.unlock();
return; return;
}
} }
if((event.GetType() & lldb::SBProcess::eBroadcastBitSTDOUT)>0) {
else if(state==lldb::StateType::eStateCrashed) { char buffer[buffer_size];
if(callback) size_t n;
callback(-1); while((n=process->GetSTDOUT(buffer, buffer_size))!=0)
if(status_callback) Terminal::get().async_print(std::string(buffer, n));
status_callback(""); }
if(stop_callback) //TODO: for some reason stderr is redirected to stdout
stop_callback("", 0); if((event.GetType() & lldb::SBProcess::eBroadcastBitSTDERR)>0) {
process.reset(); char buffer[buffer_size];
stopped=false; size_t n;
return; while((n=process->GetSTDERR(buffer, buffer_size))!=0)
Terminal::get().async_print(std::string(buffer, n), true);
} }
} }
event_mutex.unlock();
this_thread::sleep_for(std::chrono::milliseconds(200)); this_thread::sleep_for(std::chrono::milliseconds(200));
} }
}); });
debug_thread.detach();
} }
void Debug::continue_debug() { void Debug::continue_debug() {
bool expected=true; event_mutex.lock();
if(stopped.compare_exchange_strong(expected, false)) if(state==lldb::StateType::eStateStopped)
process->Continue(); process->Continue();
event_mutex.unlock();
} }
void Debug::stop() { void Debug::stop() {
auto error=process->Stop(); event_mutex.lock();
if(error.Fail()) { if(state==lldb::StateType::eStateRunning) {
cerr << "Error (debug): " << error.GetCString() << endl; //TODO: output to terminal instead auto error=process->Stop();
return; if(error.Fail())
Terminal::get().async_print(std::string("Error (debug): ")+error.GetCString()+'\n', true);
} }
event_mutex.unlock();
} }
void Debug::kill() { void Debug::kill() {
auto error=process->Kill(); event_mutex.lock();
if(error.Fail()) { if(process) {
cerr << "Error (debug): " << error.GetCString() << endl; //TODO: output to terminal instead auto error=process->Kill();
return; if(error.Fail())
Terminal::get().async_print(std::string("Error (debug): ")+error.GetCString()+'\n', true);
} }
event_mutex.unlock();
}
std::pair<std::string, std::string> Debug::run_command(const std::string &command) {
std::pair<std::string, std::string> command_return;
event_mutex.lock();
if(state==lldb::StateType::eStateStopped) {
lldb::SBCommandReturnObject command_return_object;
debugger.GetCommandInterpreter().HandleCommand(command.c_str(), command_return_object, true);
command_return.first=command_return_object.GetOutput();
command_return.second=command_return_object.GetError();
}
event_mutex.unlock();
return command_return;
}
void Debug::delete_debug() {
kill();
if(debug_thread.joinable())
debug_thread.join();
} }
std::string Debug::get_value(const std::string &variable) { std::string Debug::get_value(const std::string &variable) {
if(stopped) { std::string variable_value;
event_mutex.lock();
if(state==lldb::StateType::eStateStopped) {
auto frame=process->GetSelectedThread().GetSelectedFrame(); auto frame=process->GetSelectedThread().GetSelectedFrame();
auto values=frame.GetVariables(false, true, false, false); auto values=frame.GetVariables(true, true, true, true);
for(uint32_t value_index=0;value_index<values.GetSize();value_index++) { for(uint32_t value_index=0;value_index<values.GetSize();value_index++) {
lldb::SBStream stream; lldb::SBStream stream;
auto value=values.GetValueAtIndex(value_index); auto value=values.GetValueAtIndex(value_index);
if(value.GetName()==variable) { if(value.GetName()==variable) {
value.GetDescription(stream); value.GetDescription(stream);
return stream.GetData(); variable_value=stream.GetData();
break;
} }
} }
} }
return std::string(); event_mutex.unlock();
return variable_value;
} }

19
src/debug.h
Unescape View File

@ -3,8 +3,10 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <unordered_map> #include <unordered_map>
#include "lldb/API/SBDebugger.h" #include <lldb/API/SBDebugger.h>
#include "lldb/API/SBProcess.h" #include <lldb/API/SBListener.h>
#include <lldb/API/SBProcess.h>
#include <thread>
class Debug { class Debug {
private: private:
@ -19,17 +21,26 @@ public:
const boost::filesystem::path &executable, const boost::filesystem::path &path="", const boost::filesystem::path &executable, const boost::filesystem::path &path="",
std::function<void(int exit_status)> callback=nullptr, std::function<void(int exit_status)> callback=nullptr,
std::function<void(const std::string &status)> status_callback=nullptr, std::function<void(const std::string &status)> status_callback=nullptr,
std::function<void(const boost::filesystem::path &file, int line)> stop_callback=nullptr); std::function<void(const boost::filesystem::path &file_path, int line_nr)> stop_callback=nullptr);
void continue_debug(); //can't use continue as function name void continue_debug(); //can't use continue as function name
void stop(); void stop();
void kill(); void kill();
std::pair<std::string, std::string> run_command(const std::string &command);
void delete_debug(); //can't use delete as function name
std::string get_value(const std::string &variable); std::string get_value(const std::string &variable);
private: private:
lldb::SBDebugger debugger; lldb::SBDebugger debugger;
lldb::SBListener listener;
std::unique_ptr<lldb::SBProcess> process; std::unique_ptr<lldb::SBProcess> process;
std::atomic<bool> stopped; std::thread debug_thread;
lldb::StateType state;
std::mutex event_mutex;
size_t buffer_size;
}; };
#endif #endif

3
src/files.h
Unescape View File

@ -100,7 +100,8 @@ const std::string configjson =
" \"force_kill_last_running\": \"<primary><shift>Escape\",\n" " \"force_kill_last_running\": \"<primary><shift>Escape\",\n"
" \"debug_start_continue\": \"<primary>y\",\n" " \"debug_start_continue\": \"<primary>y\",\n"
" \"debug_stop\": \"<primary><shift>y\",\n" " \"debug_stop\": \"<primary><shift>y\",\n"
" \"debug_kill\": \"<primary>k\",\n" " \"debug_kill\": \"<primary><shift>k\",\n"
" \"debug_run_command\": \"<alt><shift>Return\",\n"
" \"debug_toggle_breakpoint\": \"<primary>b\",\n" " \"debug_toggle_breakpoint\": \"<primary>b\",\n"
#ifdef __linux #ifdef __linux
" \"next_tab\": \"<primary>Tab\",\n" " \"next_tab\": \"<primary>Tab\",\n"

6
src/menu.cc
Unescape View File

@ -289,9 +289,9 @@ Menu::Menu() {
" </section>" " </section>"
" <section>" " <section>"
" <item>" " <item>"
" <attribute name='label' translatable='yes'>_Continue</attribute>" " <attribute name='label' translatable='yes'>_Run Command</attribute>"
" <attribute name='action'>app.debug_continue</attribute>" " <attribute name='action'>app.debug_run_command</attribute>"
+accels["debug_continue"]+ //For Ubuntu... +accels["debug_run_command"]+ //For Ubuntu...
" </item>" " </item>"
" </section>" " </section>"
" <section>" " <section>"

39
src/window.cc
Unescape View File

@ -658,14 +658,16 @@ void Window::set_menu_actions() {
if(project_path==view->project_path) { if(project_path==view->project_path) {
auto iter=view->get_buffer()->begin(); auto iter=view->get_buffer()->begin();
if(view->get_source_buffer()->get_source_marks_at_iter(iter, "debug_breakpoint").size()>0) if(view->get_source_buffer()->get_source_marks_at_iter(iter, "debug_breakpoint").size()>0)
breakpoints->emplace_back(view->file_path.filename(), iter.get_line()+1); breakpoints->emplace_back(view->file_path, iter.get_line()+1);
while(view->get_source_buffer()->forward_iter_to_source_mark(iter, "debug_breakpoint")) while(view->get_source_buffer()->forward_iter_to_source_mark(iter, "debug_breakpoint"))
breakpoints->emplace_back(view->file_path.filename(), iter.get_line()+1); breakpoints->emplace_back(view->file_path, iter.get_line()+1);
} }
} }
Terminal::get().print("Compiling and running "+executable_path.string()+"\n"); Terminal::get().print("Compiling and debugging "+executable_path.string()+"\n");
Terminal::get().async_process(Config::get().terminal.make_command, debug_build_path, [this, breakpoints, executable_path, debug_build_path](int exit_status){ Terminal::get().async_process(Config::get().terminal.make_command, debug_build_path, [this, breakpoints, executable_path, debug_build_path](int exit_status){
if(exit_status==EXIT_SUCCESS) { if(exit_status!=EXIT_SUCCESS)
debugging=false;
else {
auto executable_path_spaces_fixed=executable_path.string(); auto executable_path_spaces_fixed=executable_path.string();
char last_char=0; char last_char=0;
for(size_t c=0;c<executable_path_spaces_fixed.size();c++) { for(size_t c=0;c<executable_path_spaces_fixed.size();c++) {
@ -685,7 +687,7 @@ void Window::set_menu_actions() {
debug_status.set_text(""); debug_status.set_text("");
else else
debug_status.set_text("debug: "+status); debug_status.set_text("debug: "+status);
}, [this](const boost::filesystem::path &file, int line) { }, [this](const boost::filesystem::path &file_path, int line_nr) {
//TODO: move to main thread //TODO: move to main thread
//Remove debug stop source mark //Remove debug stop source mark
for(int c=0;c<notebook.size();c++) { for(int c=0;c<notebook.size();c++) {
@ -701,9 +703,9 @@ void Window::set_menu_actions() {
//Add debug stop source mark //Add debug stop source mark
for(int c=0;c<notebook.size();c++) { for(int c=0;c<notebook.size();c++) {
auto view=notebook.get_view(c); auto view=notebook.get_view(c);
if(view->file_path==file) { if(view->file_path==file_path) {
view->get_source_buffer()->create_source_mark("debug_stop", view->get_buffer()->get_iter_at_line(line-1)); view->get_source_buffer()->create_source_mark("debug_stop", view->get_buffer()->get_iter_at_line(line_nr-1));
debug_last_stop_line={file, line}; debug_last_stop_line={file_path, line_nr};
} }
} }
}); });
@ -726,6 +728,26 @@ void Window::set_menu_actions() {
Debug::get().kill(); Debug::get().kill();
} }
}); });
menu.add_action("debug_run_command", [this]() {
entry_box.clear();
entry_box.entries.emplace_back(last_run_debug_command, [this](const std::string& content){
if(content!="") {
if(debugging) {
auto command_return=Debug::get().run_command(content);
Terminal::get().async_print(command_return.first);
Terminal::get().async_print(command_return.second, true);
}
last_run_debug_command=content;
}
entry_box.hide();
}, 30);
auto entry_it=entry_box.entries.begin();
entry_it->set_placeholder_text("Debug Command");
entry_box.buttons.emplace_back("Run debug command", [this, entry_it](){
entry_it->activate();
});
entry_box.show();
});
menu.add_action("debug_toggle_breakpoint", [this](){ menu.add_action("debug_toggle_breakpoint", [this](){
if(notebook.get_current_page()!=-1) { if(notebook.get_current_page()!=-1) {
auto view=notebook.get_current_view(); auto view=notebook.get_current_view();
@ -824,6 +846,7 @@ bool Window::on_delete_event(GdkEventAny *event) {
return true; return true;
} }
Terminal::get().kill_async_processes(); Terminal::get().kill_async_processes();
Debug::get().delete_debug();
return false; return false;
} }

1
src/window.h
Unescape View File

@ -47,6 +47,7 @@ private:
std::string last_search; std::string last_search;
std::string last_replace; std::string last_replace;
std::string last_run_command; std::string last_run_command;
std::string last_run_debug_command;
bool case_sensitive_search=true; bool case_sensitive_search=true;
bool regex_search=false; bool regex_search=false;
bool search_entry_shown=false; bool search_entry_shown=false;

Write Preview
Loading…
Cancel
Save