Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-07 04:21:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only start the server thread when it's actually needed.

Browse Source
This commit is contained in:
Relintai 2022-07-24 14:15:00 +02:00
parent 057d937d8f
commit d55b66b7ff
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/web/http_server_simple/web_server_simple.cpp
View File

@ -96,7 +96,13 @@ void WebServerSimple::set_worker_thread_count(const int val) {
_worker_thread_count = val; _worker_thread_count = val;
} }
bool WebServerSimple::is_running() const {
return _is_running;
}
void WebServerSimple::_start() { void WebServerSimple::_start() {
ERR_FAIL_COND(_running);
WebServer::_start(); WebServer::_start();
if (!OS::get_singleton()->can_use_threads()) { if (!OS::get_singleton()->can_use_threads()) {
@ -137,15 +143,31 @@ void WebServerSimple::_start() {
server->stop(); server->stop();
err = server->listen(bind_port, bind_ip, use_ssl, ssl_key, ssl_cert); err = server->listen(bind_port, bind_ip, use_ssl, ssl_key, ssl_cert);
} }
ERR_FAIL_COND_MSG(err != OK, "Error starting HTTP server:\n" + itos(err)); ERR_FAIL_COND_MSG(err != OK, "Error starting HTTP server:\n" + itos(err));
_running = true;
if (!server_thread) {
server_thread = memnew(Thread);
server_thread->start(_server_thread_poll, this);
}
} }
void WebServerSimple::_stop() { void WebServerSimple::_stop() {
ERR_FAIL_COND(!_running);
WebServer::_stop(); WebServer::_stop();
MutexLock lock(server_lock); MutexLock lock(server_lock);
server->stop(); server->stop();
if (server_thread) {
server_thread->wait_to_finish();
memdelete(server_thread);
server_thread = nullptr;
}
_running = false;
} }
WebServerSimple::WebServerSimple() { WebServerSimple::WebServerSimple() {
@ -159,17 +181,23 @@ WebServerSimple::WebServerSimple() {
_poll_thread_count = 1; _poll_thread_count = 1;
_worker_thread_count = 4; _worker_thread_count = 4;
_running = false;
server_quit = false; server_quit = false;
server.instance(); server.instance();
server->_web_server = this; server->_web_server = this;
server_thread.start(_server_thread_poll, this); server_thread = nullptr;
} }
WebServerSimple::~WebServerSimple() { WebServerSimple::~WebServerSimple() {
server->stop(); server->stop();
server_quit = true; server_quit = true;
server_thread.wait_to_finish();
if (server_thread) {
server_thread->wait_to_finish();
memdelete(server_thread);
}
} }
void WebServerSimple::_bind_methods() { void WebServerSimple::_bind_methods() {
@ -208,6 +236,8 @@ void WebServerSimple::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_worker_thread_count"), &WebServerSimple::get_worker_thread_count); ClassDB::bind_method(D_METHOD("get_worker_thread_count"), &WebServerSimple::get_worker_thread_count);
ClassDB::bind_method(D_METHOD("set_worker_thread_count", "val"), &WebServerSimple::set_worker_thread_count); ClassDB::bind_method(D_METHOD("set_worker_thread_count", "val"), &WebServerSimple::set_worker_thread_count);
ADD_PROPERTY(PropertyInfo(Variant::INT, "worker_thread_count"), "set_worker_thread_count", "get_worker_thread_count"); ADD_PROPERTY(PropertyInfo(Variant::INT, "worker_thread_count"), "set_worker_thread_count", "get_worker_thread_count");
ClassDB::bind_method(D_METHOD("is_running"), &WebServerSimple::is_running);
} }
void WebServerSimple::_server_thread_poll(void *data) { void WebServerSimple::_server_thread_poll(void *data) {

5
modules/web/http_server_simple/web_server_simple.h
View File

@ -73,6 +73,8 @@ public:
int get_worker_thread_count(); int get_worker_thread_count();
void set_worker_thread_count(const int val); void set_worker_thread_count(const int val);
bool is_running() const;
void _start(); void _start();
void _stop(); void _stop();
@ -98,7 +100,8 @@ protected:
Ref<HTTPServerSimple> server; Ref<HTTPServerSimple> server;
bool server_quit; bool server_quit;
Mutex server_lock; Mutex server_lock;
Thread server_thread; Thread *server_thread;
bool _running;
static void _server_thread_poll(void *data); static void _server_thread_poll(void *data);
}; };