upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 12:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

campaignd : make number of thread used a CLI parameter

Browse Source
This commit is contained in:
Jérémy Rosen 2006-12-19 22:59:29 +00:00
parent 62f403173b
commit 5ef251961b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -123,6 +123,8 @@ Version 1.3-svn:
* --validcache runtime switch to force assumption that cache is valid
* add two new debug command set_var and show_var to check variables within
the game easily
* Campaignd
* first argument is number of threads to use, defaults to 5
* Python AI
* Added various input validations
* Set Python errors upon error

15
src/campaign_server/campaign_server.cpp
View File

@ -46,7 +46,7 @@ namespace {
class campaign_server
{
public:
explicit campaign_server(const std::string& cfgfile);
explicit campaign_server(const std::string& cfgfile,unsigned int nthread = 10);
void run();
private:
int load_config(); // return the server port
@ -66,8 +66,8 @@ namespace {
return lexical_cast_default<int>(cfg_["port"], 15003);
}
campaign_server::campaign_server(const std::string& cfgfile)
: file_(cfgfile), net_manager_(5), server_manager_(load_config())
campaign_server::campaign_server(const std::string& cfgfile,unsigned int nthread)
: file_(cfgfile), net_manager_(nthread), server_manager_(load_config())
{
if(cfg_.child("campaigns") == NULL) {
cfg_.add_child("campaigns");
@ -407,11 +407,16 @@ namespace {
}
int main(int, char**)
int main(int argc, char**argv)
{
lg::timestamps(true);
try {
campaign_server("server.cfg").run();
printf("argc %d argv[0] %s 1 %s\n",argc,argv[0],argv[1]);
if(argc >= 2 && atoi(argv[1])){
campaign_server("server.cfg",atoi(argv[1])).run();
}else {
campaign_server("server.cfg").run();
}
} catch(config::error& e) {
std::cerr << "Could not parse config file\n";
} catch(io_exception& e) {