test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve lldb timeout

Browse Source
This commit is contained in:
lixianjing 2024-03-16 12:48:11 +08:00
parent 962e9c6ba8
commit 87896acf1b
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/debugger/debugger_lldb.c
View File

@ -28,10 +28,6 @@
#include "streams/inet/iostream_tcp.h"
#include "tkc/object_array.h"
#ifndef LLDB_REQUEST_TIMEOUT
#define LLDB_REQUEST_TIMEOUT 3000
#endif/*LLDB_REQUEST_TIMEOUT*/
#define STR_CONTENT_LENGTH "Content-Length:"
#define LLDB_CMD_NEXT "next"
@ -108,6 +104,15 @@ static tk_object_t* debugger_lldb_get_callstack_impl(debugger_t* debugger, uint3
static tk_object_t* object_find_variable_value(tk_object_t* obj, const char* name,
const char* full_name);
static uint32_t debugger_lldb_get_timeout(debugger_t* debugger) {
debugger_lldb_t* lldb = DEBUGGER_LLDB(debugger);
return_value_if_fail(lldb != NULL, 3000);
return lldb->timeout;
}
#define LLDB_REQUEST_TIMEOUT debugger_lldb_get_timeout(debugger)
static ret_t debugger_lldb_load_init_commands(debugger_lldb_t* lldb, conf_node_t* node) {
conf_node_t* iter = conf_node_get_first_child(node);
object_array_clear_props(lldb->init_commands);
@ -1500,13 +1505,14 @@ static const object_vtable_t s_object_debugger_lldb_vtable = {
.is_collection = FALSE,
.on_destroy = debugger_lldb_on_destroy};
debugger_t* debugger_lldb_create_impl(tk_iostream_t* io) {
debugger_t* debugger_lldb_create_impl(tk_iostream_t* io, uint32_t timeout) {
debugger_lldb_t* debugger = NULL;
return_value_if_fail(io != NULL, NULL);
debugger = (debugger_lldb_t*)tk_object_create(&s_object_debugger_lldb_vtable);
return_value_if_fail(debugger != NULL, NULL);
debugger->io = io;
debugger->timeout = timeout;
TK_OBJECT_REF(debugger->io);
debugger->debugger.vt = &s_debugger_lldb_vtable;
str_init(&(debugger->body), 10000);
@ -1522,7 +1528,7 @@ debugger_t* debugger_lldb_create_impl(tk_iostream_t* io) {
return (debugger_t*)debugger;
}
debugger_t* debugger_lldb_create(const char* host, uint32_t port) {
debugger_t* debugger_lldb_create_ex(const char* host, uint32_t port, uint32_t timeout) {
int32_t sock = 0;
tk_iostream_t* io = NULL;
debugger_t* debugger = NULL;
@ -1533,7 +1539,7 @@ debugger_t* debugger_lldb_create(const char* host, uint32_t port) {
io = tk_iostream_tcp_create(sock);
if (io != NULL) {
debugger = debugger_lldb_create_impl(io);
debugger = debugger_lldb_create_impl(io, timeout);
TK_OBJECT_UNREF(io);
debugger_lldb_init(debugger);
} else {
@ -1542,3 +1548,7 @@ debugger_t* debugger_lldb_create(const char* host, uint32_t port) {
return debugger;
}
debugger_t* debugger_lldb_create(const char* host, uint32_t port) {
return debugger_lldb_create_ex(host, port, 3000);
}

12
src/debugger/debugger_lldb.h
View File

@ -70,6 +70,7 @@ typedef struct _debugger_lldb_t {
/*源代码行号断点*/
tk_object_t* source_break_points;
tk_object_t* init_commands;
uint32_t timeout;
} debugger_lldb_t;
/**
@ -82,6 +83,17 @@ typedef struct _debugger_lldb_t {
*/
debugger_t* debugger_lldb_create(const char* host, uint32_t port);
/**
* @method debugger_lldb_create_ex
* 创建调试器TCP客户端对象。
* @param {const char*} host 目标主机。
* @param {uint32_t} port 目标端口。
* @param {uint32_t} timeout 超时时间。
*
* @return {debugger_t*} 返回debugger对象。
*/
debugger_t* debugger_lldb_create_ex(const char* host, uint32_t port, uint32_t timeout);
#define STR_SCHEMA_PID "pid://"
#define STR_SCHEMA_WASM "wasm://"

2
tools/fdb/fdb.cpp
View File

@ -315,7 +315,7 @@ static ret_t func_target(app_info_t* app, tokenizer_t* tokenizer) {
TK_OBJECT_UNREF(app->debugger);
if (tk_str_eq(target, "lldb")) {
debugger = debugger_lldb_create(host, DEBUGGER_TCP_PORT);
debugger = debugger_lldb_create_ex(host, DEBUGGER_TCP_PORT, 5000);
} else {
const char* code_id = DEBUGGER_DEFAULT_CODE_ID;