Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved the thread out of the NetworkQueue class

Browse Source
This commit is contained in:
Kayne Ruse
2013-11-09 20:04:06 +11:00
parent bf15a5d957
commit c2941cd3e8
4 changed files with 115 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server_application.cpp
+82 -49
View File
@@ -28,7 +28,38 @@
#include <string>
#include <fstream>
int ClientEntry::indexCounter = 0;
using namespace std;
//-------------------------
//Declarations
//-------------------------
int ServerApplication::ClientEntry::indexCounter = 0;
//-------------------------
//Define the network thread
//-------------------------
int networkQueueThread(void* ptr) {
ServerApplication* app = reinterpret_cast<ServerApplication*>(ptr);
NetworkPacket packet;
while(app->running) {
//suck in the waiting packets
while(app->networkUtil.Receive()) {
memcpy(&packet, app->networkUtil.GetInData(), sizeof(NetworkPacket));
//this is important: keep track of the source address
packet.meta.srcAddress = app->networkUtil.GetInPacket()->address;
app->networkQueue.Push(packet);
}
SDL_Delay(10);
}
return 0;
}
//-------------------------
//Define the ServerApplication
//-------------------------
ServerApplication::ServerApplication() {
//
@@ -41,68 +72,62 @@ ServerApplication::~ServerApplication() {
void ServerApplication::Init(int argc, char** argv) {
//TODO: proper command line option parsing
//Check thread safety
//Check prerequisites
if (!sqlite3_threadsafe()) {
throw(std::runtime_error("Cannot run without thread safety"));
throw(runtime_error("Cannot run without thread safety"));
}
else {
std::cout << "Thread safety confirmed" << std::endl;
cout << "Thread safety confirmed" << endl;
if (running) {
throw(std::runtime_error("Multiple calls to ServerApplication::Init() is not allowed"));
}
running = true;
//Init SDL
if (SDL_Init(0)) {
throw(std::runtime_error("Failed to initialize SDL"));
}
else {
std::cout << "SDL initialized" << std::endl;
throw(runtime_error("Failed to initialize SDL"));
}
cout << "initialized SDL" << endl;
//Init SDL_net
if (SDLNet_Init()) {
throw(std::runtime_error("Failed to init SDL_net"));
throw(runtime_error("Failed to init SDL_net"));
}
else {
std::cout << "SDL_net initialized" << std::endl;
}
networkUtil.Open(21795, 1024);
networkQueue.Init(&networkUtil);
networkUtil.Open(21795, sizeof(NetworkPacket));
cout << "initialized SDL_net" << endl;
//Init SQL
std::string dbname = (argc > 1) ? argv[1] : argv[0];
string dbname = (argc > 1) ? argv[1] : argv[0]; //fancy and unnecessary
int ret = sqlite3_open_v2((dbname + ".db").c_str(), &database, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_FULLMUTEX, nullptr);
if (ret != SQLITE_OK || !database) {
throw(std::runtime_error("Failed to open the server database"));
}
else {
std::cout << "Database filename: \"" << dbname << ".db\"" << std::endl;
throw(runtime_error("Failed to open the server database"));
}
cout << "initialized SQL" << endl;
cout << "Database filename: \"" << dbname << ".db\"" << endl;
//TODO: move this into a function?
//Run setup scripts
std::ifstream is("rsc\\scripts\\setup_server.sql");
ifstream is("rsc\\scripts\\setup_server.sql");
if (!is.is_open()) {
throw(std::runtime_error("Failed to run database setup script"));
throw(runtime_error("Failed to run database setup script"));
}
else {
std::cout << "Running the database script" << std::endl;
}
std::string script;
string script;
getline(is, script, '\0');
is.close();
sqlite3_exec(database, script.c_str(), nullptr, nullptr, nullptr);
//debugging
//create the debug packets
NetworkPacket packet;
//setup the threads
networkQueueThread = SDL_CreateThread(&::networkQueueThread, this);
if (!networkQueueThread) {
throw(runtime_error("Failed to create the networkQueueThread"));
}
cout << "initialized networkQueueThread" << endl;
//debugging
NetworkPacket packet;
packet.meta.type = NetworkPacket::Type::PING;
strcpy(packet.serverInfo.name,"Foo");
networkUtil.Send("127.0.0.1", 21795, reinterpret_cast<void*>(&packet), sizeof(NetworkPacket));
strcpy(packet.serverInfo.name,"Bar");
networkUtil.Send("127.0.0.1", 21795, reinterpret_cast<void*>(&packet), sizeof(NetworkPacket));
strcpy(packet.serverInfo.name,"World");
networkUtil.Send("127.0.0.1", 21795, reinterpret_cast<void*>(&packet), sizeof(NetworkPacket));
strcpy(packet.serverInfo.name, "foo");
networkUtil.Send("127.0.0.1", 21795, &packet, sizeof(NetworkPacket));
}
void ServerApplication::Loop() {
@@ -113,16 +138,22 @@ void ServerApplication::Loop() {
try {
HandlePacket(networkQueue.Pop());
}
catch(std::exception& e) {
std::cerr << "Network Error: " << e.what() << std::endl;
catch(exception& e) {
cerr << "Network Error: " << e.what() << endl;
}
};
}
void ServerApplication::Quit() {
sqlite3_close_v2(database);
networkQueue.Quit();
//catch all signal
running = false;
//members
SDL_WaitThread(networkQueueThread, nullptr);
networkUtil.Close();
//APIs
sqlite3_close_v2(database);
SDLNet_Quit();
SDL_Quit();
}
@@ -131,6 +162,8 @@ void ServerApplication::HandlePacket(NetworkPacket packet) {
switch(packet.meta.type) {
case NetworkPacket::Type::PING:
//NOT USED
//debugging
cout << packet.serverInfo.name << endl;
break;
case NetworkPacket::Type::PONG:
//NOT USED
@@ -138,15 +171,15 @@ void ServerApplication::HandlePacket(NetworkPacket packet) {
case NetworkPacket::Type::BROADCAST_REQUEST:
//
break;
// case NetworkPacket::Type::BROADCAST_RESPONSE:
// //
// break;
case NetworkPacket::Type::BROADCAST_RESPONSE:
//
break;
case NetworkPacket::Type::JOIN_REQUEST:
//
break;
// case NetworkPacket::Type::JOIN_RESPONSE:
// //
// break;
case NetworkPacket::Type::JOIN_RESPONSE:
//
break;
case NetworkPacket::Type::DISCONNECT:
//
break;
@@ -156,10 +189,10 @@ void ServerApplication::HandlePacket(NetworkPacket packet) {
//handle errors
case NetworkPacket::Type::NONE:
throw(std::runtime_error("NetworkPacket::Type::NONE encountered"));
throw(runtime_error("NetworkPacket::Type::NONE encountered"));
break;
default:
throw(std::runtime_error("Unknown NetworkPacket::Type encountered"));
throw(runtime_error("Unknown NetworkPacket::Type encountered"));
break;
}
}