0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused threads arguments from wesnothd.

Browse source 
Also remove an old environment variable from SDL 1.2.
This commit is contained in:
Pentarctagon 2023-08-06 00:15:42 -05:00
parent 8708a222f2
commit bf1a7c18e3
3 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game_launcher.cpp
View file

@ -832,15 +832,10 @@ void game_launcher::start_wesnothd()
}
#ifndef _WIN32
std::string command = "\"" + wesnothd_program +"\" -c \"" + config + "\" -d -t 2 -T 5";
std::string command = "\"" + wesnothd_program +"\" -c \"" + config + "\" -d";
#else
// start wesnoth as background job
std::string command = "cmd /C start \"wesnoth server\" /B \"" + wesnothd_program + "\" -c \"" + config + "\" -t 2 -T 5";
// Make sure wesnothd's console output is visible on the console window by
// disabling SDL's stdio redirection code for this and future child
// processes. No need to bother cleaning this up because it's only
// meaningful to SDL applications during pre-main initialization.
SetEnvironmentVariableA("SDL_STDIO_REDIRECT", "0");
std::string command = "cmd /C start \"wesnoth server\" /B \"" + wesnothd_program + "\" -c \"" + config + "\"";
#endif
LOG_GENERAL << "Starting wesnothd: "<< command;
if (std::system(command.c_str()) == 0) {

16
src/server/wesnothd/server.cpp
View file

@ -209,9 +209,7 @@ const std::string help_msg =
server::server(int port,
bool keep_alive,
const std::string& config_file,
std::size_t /*min_threads*/,
std::size_t /*max_threads*/)
const std::string& config_file)
: server_base(port, keep_alive)
, ban_manager_()
, ip_log_()
@ -2991,8 +2989,6 @@ int main(int argc, char** argv)
{
int port = 15000;
bool keep_alive = false;
std::size_t min_threads = 5;
std::size_t max_threads = 0;
srand(static_cast<unsigned>(std::time(nullptr)));
@ -3067,7 +3063,6 @@ int main(int argc, char** argv)
<< " Available levels: error, warning, info, debug.\n"
<< " -p, --port <port> Binds the server to the specified port.\n"
<< " --keepalive Enable TCP keepalive.\n"
<< " -t, --threads <n> Uses n worker threads for network I/O (default: 5).\n"
<< " -v --verbose Turns on more verbose logging.\n"
<< " -V, --version Returns the server version.\n"
<< " -w, --dump-wml Print all WML sent to clients to stdout.\n";
@ -3091,13 +3086,6 @@ int main(int argc, char** argv)
setsid();
#endif
} else if((val == "--threads" || val == "-t") && arg + 1 != argc) {
min_threads = atoi(argv[++arg]);
if(min_threads > 30) {
min_threads = 30;
}
} else if((val == "--max-threads" || val == "-T") && arg + 1 != argc) {
max_threads = atoi(argv[++arg]);
} else if(val == "--request_sample_frequency" && arg + 1 != argc) {
wesnothd::request_sample_frequency = atoi(argv[++arg]);
} else {
@ -3106,5 +3094,5 @@ int main(int argc, char** argv)
}
}
return wesnothd::server(port, keep_alive, config_file, min_threads, max_threads).run();
return wesnothd::server(port, keep_alive, config_file).run();
}

2
src/server/wesnothd/server.hpp
View file

@ -35,7 +35,7 @@ namespace wesnothd
class server : public server_base
{
public:
server(int port, bool keep_alive, const std::string& config_file, std::size_t, std::size_t);
server(int port, bool keep_alive, const std::string& config_file);
// We keep this flag for coroutines. Since they get their stack unwinding done after player_connections_
// is already destroyed they need to know to avoid calling remove_player() on invalid iterators.