Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2024-09-20 00:26:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(pty): create a loop per pty

Browse source 
Prevents segmentation faults due to several threads trying to run the
same (default) loop.
This commit is contained in:
Leroy Hopson 2024-03-03 00:15:07 +13:00
parent a0c9777264
commit 481a1cb04a
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
addons/godot_xterm/native/src/pty.cpp
View file

@ -86,8 +86,9 @@ PTY::PTY() {
env["COLORTERM"] = "truecolor"; env["COLORTERM"] = "truecolor";
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
uv_async_init(uv_default_loop(), &async_handle, [](uv_async_t *handle) {}); uv_loop_init(&loop);
uv_pipe_init(uv_default_loop(), &pipe, false); uv_async_init(&loop, &async_handle, [](uv_async_t *handle) {});
uv_pipe_init(&loop, &pipe, false);
pipe.data = this; pipe.data = this;
#endif #endif
} }
@ -214,7 +215,7 @@ void PTY::write(const Variant &data) const {
uv_write_t *req = (uv_write_t *)malloc(sizeof(uv_write_t)); uv_write_t *req = (uv_write_t *)malloc(sizeof(uv_write_t));
req->data = (void *)buf.base; req->data = (void *)buf.base;
uv_write(req, (uv_stream_t *)&pipe, &buf, 1, _write_cb); uv_write(req, (uv_stream_t *)&pipe, &buf, 1, _write_cb);
uv_run(uv_default_loop(), UV_RUN_NOWAIT); uv_run((uv_loop_t*)&loop, UV_RUN_NOWAIT);
#endif #endif
} }
} }
@ -225,7 +226,7 @@ void PTY::_notification(int p_what) {
case NOTIFICATION_INTERNAL_PROCESS: case NOTIFICATION_INTERNAL_PROCESS:
{ {
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
if (!use_threads) uv_run(uv_default_loop(), UV_RUN_NOWAIT); if (!use_threads) uv_run(&loop, UV_RUN_NOWAIT);
#endif #endif
buffer_write_mutex->lock(); buffer_write_mutex->lock();
@ -248,7 +249,7 @@ void PTY::_thread_func() {
while (!stop_thread.is_set()) { while (!stop_thread.is_set()) {
if (buffer.size() < BUFFER_LIMIT) { if (buffer.size() < BUFFER_LIMIT) {
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
uv_run(uv_default_loop(), UV_RUN_ONCE); uv_run(&loop, UV_RUN_ONCE);
#endif #endif
} else { } else {
buffer_cleared->wait(); buffer_cleared->wait();
@ -276,7 +277,8 @@ void PTY::_close() {
uv_close((uv_handle_t *)&async_handle, _close_cb); uv_close((uv_handle_t *)&async_handle, _close_cb);
} }
uv_run(uv_default_loop(), UV_RUN_NOWAIT); uv_run(&loop, UV_RUN_NOWAIT);
uv_loop_close(&loop);
if (fd > 0) close(fd); if (fd > 0) close(fd);
if (pid > 0) kill(SIGNAL_SIGHUP); if (pid > 0) kill(SIGNAL_SIGHUP);

1
addons/godot_xterm/native/src/pty.h
View file

@ -100,6 +100,7 @@ namespace godot
void _thread_func(); void _thread_func();
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
uv_loop_t loop;
uv_pipe_t pipe; uv_pipe_t pipe;
Error _pipe_open(const int fd); Error _pipe_open(const int fd);
#endif #endif