Menu
▾
▴
[Csp-commits] svn:csp r1327 - in trunk/CSP: . IndexServer
|
From: <sv...@ww...> - 2004-11-21 19:51:02
|
Author: mkrose Date: 2004-11-21 11:49:35 -0800 (Sun, 21 Nov 2004) New Revision: 1327 Added: trunk/CSP/IndexServer/ trunk/CSP/IndexServer/Config.cpp trunk/CSP/IndexServer/Config.h trunk/CSP/IndexServer/IndexServer.cpp trunk/CSP/IndexServer/IndexServer.h trunk/CSP/IndexServer/IndexServer.ini trunk/CSP/IndexServer/SConscript Log: Initial index server implementation (thin wrapper around GlobalBattlefield). Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1327 Added: trunk/CSP/IndexServer/Config.cpp =================================================================== --- trunk/CSP/IndexServer/Config.cpp 2004-11-21 19:28:59 UTC (rev 1326) +++ trunk/CSP/IndexServer/Config.cpp 2004-11-21 19:49:35 UTC (rev 1327) @@ -0,0 +1,42 @@ +// Combat Simulator Project +// Copyright (C) 2004 The Combat Simulator Project +// http://csp.sourceforge.net +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +/** + * @file Config.cpp + * + **/ + + +#include "Config.h" +#include <SimData/FileUtility.h> + + +SimpleConfig g_Config; + + +bool openConfig(std::string path) { + path = simdata::ospath::filter(path); + bool success = false; + try { + success = g_Config.open(path); + } catch (ConfigError &) { + return false; + } + return success; +} Added: trunk/CSP/IndexServer/Config.h =================================================================== --- trunk/CSP/IndexServer/Config.h 2004-11-21 19:28:59 UTC (rev 1326) +++ trunk/CSP/IndexServer/Config.h 2004-11-21 19:49:35 UTC (rev 1327) @@ -0,0 +1,36 @@ +// Combat Simulator Project +// Copyright (C) 2004 The Combat Simulator Project +// http://csp.sourceforge.net +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +/** + * @file Config.h + * + **/ + +#ifndef __INDEXSERVER_CONFIG_H__ +#define __INDEXSERVER_CONFIG_H__ + +#include <string> +#include <SimCore/Util/SimpleConfig.h> + + +extern SimpleConfig g_Config; +extern bool openConfig(std::string path); + + +#endif // __INDEXSERVER_CONFIG_H__ Added: trunk/CSP/IndexServer/IndexServer.cpp =================================================================== --- trunk/CSP/IndexServer/IndexServer.cpp 2004-11-21 19:28:59 UTC (rev 1326) +++ trunk/CSP/IndexServer/IndexServer.cpp 2004-11-21 19:49:35 UTC (rev 1327) @@ -0,0 +1,96 @@ +// Combat Simulator Project - FlightSim Demo +// Copyright (C) 2004 The Combat Simulator Project +// http://csp.sourceforge.net +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +/** + * @file IndexServer.cpp + * + **/ + +#include "IndexServer.h" +#include "Config.h" + +#include <SimCore/Util/Log.h> +#include <SimCore/Util/SimpleConfig.h> +#include <SimCore/Battlefield/GlobalBattlefield.h> +#include <SimData/Thread.h> +#include <SimData/Trace.h> +#include <SimNet/ClientServer.h> + + +IndexServer::IndexServer() { + CSP_LOG(APP, INFO, "IndexServer()"); +} + +IndexServer::~IndexServer() { +} + +void IndexServer::initPrimaryInterface() { + assert(m_NetworkServer.isNull()); + const std::string interface = g_Config.getString("Network", "Bind", "127.0.0.1:4999", true); + const std::string::size_type colon = interface.find(':'); + std::string address; + simnet::Port port = 0; + if (colon != std::string::npos) { + port = atoi(interface.substr(colon + 1).c_str()); + address = interface.substr(0, colon); + } + if (address.size() == 0 || port == 0) { + std::cerr << "Invalid value for Network.Bind in .ini file: " << interface << "\n"; + std::cerr << "Should be of the form www.xxx.yyy.zzz:port\n"; + ::exit(1); + } + CSP_LOG(APP, INFO, "binding to interface " << address << ":" << port); + simnet::NetworkNode local(address, port); + m_NetworkServer = new simnet::Server(local, 100000, 100000); // TODO real bw? +} + +void IndexServer::initialize() { + initPrimaryInterface(); + m_Battlefield = new GlobalBattlefield(); + m_Battlefield->setNetworkServer(m_NetworkServer); +} + +void IndexServer::run() { + initialize(); + CSP_LOG(APP, INFO, "starting network loop"); + simdata::Timer timer; + timer.start(); + while (1) { + m_NetworkServer->processAndWait(0.01, 0.01, 0.10); + m_Battlefield->update(timer.incremental()); + } +} + + +int main() { + simdata::Trace::install(); + + if (!openConfig("IndexServer.ini")) { + std::cerr << "Unable to open config file 'IndexServer.ini'\n"; + return 1; + } + + simnet::netlog().setLogPriority(simdata::LOG_INFO); + csplog().setOutput("IndexServer.log"); + csplog().setLogPriority(simdata::LOG_INFO); + csplog().setLogCategory(simdata::LOG_ALL); + + IndexServer server; + server.run(); +} Added: trunk/CSP/IndexServer/IndexServer.h =================================================================== --- trunk/CSP/IndexServer/IndexServer.h 2004-11-21 19:28:59 UTC (rev 1326) +++ trunk/CSP/IndexServer/IndexServer.h 2004-11-21 19:49:35 UTC (rev 1327) @@ -0,0 +1,52 @@ +// Combat Simulator Project +// Copyright (C) 2004 The Combat Simulator Project +// http://csp.sourceforge.net +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +/** + * @file IndexServer.h + * + **/ + +#ifndef __INDEXSERVER_H__ +#define __INDEXSERVER_H__ + +#include <SimData/Ref.h> + +namespace simnet { + class Server; +} + +class GlobalBattlefield; + + +class IndexServer { +public: + IndexServer(); + ~IndexServer(); + void run(); + +private: + void initialize(); + void initPrimaryInterface(); + + simdata::Ref<simnet::Server> m_NetworkServer; + simdata::Ref<GlobalBattlefield> m_Battlefield; +}; + + +#endif // __INDEXSERVER_H__ Added: trunk/CSP/IndexServer/IndexServer.ini =================================================================== --- trunk/CSP/IndexServer/IndexServer.ini 2004-11-21 19:28:59 UTC (rev 1326) +++ trunk/CSP/IndexServer/IndexServer.ini 2004-11-21 19:49:35 UTC (rev 1327) @@ -0,0 +1,2 @@ +[Network] +Bind = 127.0.0.1:3160 Added: trunk/CSP/IndexServer/SConscript =================================================================== --- trunk/CSP/IndexServer/SConscript 2004-11-21 19:28:59 UTC (rev 1326) +++ trunk/CSP/IndexServer/SConscript 2004-11-21 19:49:35 UTC (rev 1327) @@ -0,0 +1,44 @@ +# -*- python -*- +# +# Copyright 2004 Mark Rose <mk...@us...> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Import('env build') + + +env = env.Copy() +env.Append(CPPPATH='#/IndexServer/.bin') + +env.Append(LIBS=['simcore'], LIBPATH=['#/SimCore/.bin']) +env.Append(LIBS=['simnet'], LIBPATH=['#/SimNet/.bin']) +env.Append(LIBS=['SimData'], LIBPATH=['#/SimData/SimData']) +env.Append(LIBS=['spatialindex'], LIBPATH=['#/SpatialIndex/.bin']) +env.Append(LIBS=['pthread']) +env.ParseConfig('ccgnu2-config --flags --libs') + +#env.Documentation('#/IndexServer/.dox', '#/IndexServer/Doxyfile', '#/IndexServer/*.{h,cpp}') + + +SOURCES = [ + 'Config.cpp', + 'IndexServer.cpp', +] + +server = env.Program('IndexServer', SOURCES) +server = env.CopyFile('#/IndexServer/IndexServer', server) +Alias(['all', 'indexserver'], [server]) + + |
