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

BUGFIX: Solved server failure

Browse Source 
Cause:

server/server_application.cpp: line 93

The last argument to std::pair was simply a call to WorldRoom's
contructor. This created a temporary object that fufilled this line, but
after the new std::pair object was added to worldRoomMap, this WorldRoom
object went out of scope.

server/server_application.cpp: line 96

When OpenRoom() was called using an object that was out of scope, the
entire server simply failed.

Solution:

Changed worldRoomMap to hold a pointer to a WorldRoom object, rather than the
object itself. The new and delete operators should be used to create and
delete WorldRoom objects respectfully.
This commit is contained in:
Kayne Ruse
2013-12-14 00:23:20 +11:00
parent 9df16fede0
commit baadf554cd
4 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/world_room.cpp
-11
View File
@@ -27,22 +27,16 @@
using namespace std;
int worldRoomThread(void* arg) {
cout << "DEBUG: in room thread" << endl;
WorldRoom* room = reinterpret_cast<WorldRoom*>(arg);
cout << "DEBUG: Beginning try block" << endl;
try {
cout << "DEBUG: Init" << endl;
room->Init();
cout << "DEBUG: Loop" << endl;
room->Loop();
cout << "DEBUG: Quit" << endl;
room->Quit();
}
catch(exception& e) {
cerr << "Fatal room error: " << e.what() << endl;
return 1;
}
cout << "DEBUG: Successfully ending room thread" << endl;
return 0;
}
@@ -57,18 +51,15 @@ WorldRoom::~WorldRoom() {
}
void WorldRoom::OpenRoom() {
cout << "DEBUG: In OpenRoom" << endl;
if (running) {
throw(std::runtime_error("Cannot open a room that is already running"));
}
running = true;
cout << "DEBUG: Attempting to create thread" << endl;
if (!(thread = SDL_CreateThread(worldRoomThread, this))) {
throw(std::runtime_error("Failed to open the room thread"));
}
cout << "DEBUG: End of thread call" << endl;
}
void WorldRoom::CloseRoom() {
@@ -86,9 +77,7 @@ void WorldRoom::Init() {
}
void WorldRoom::Loop() {
cout << "DEBUG: In Loop" << endl;
while(running) {
cout << "DEBUG: Top of loop" << endl;
while(networkInQueue.Size() > 0) {
HandlePacket(networkInQueue.PopFront());
}