From ab9c60957f485d8167e0e0d5b5cfcf237ea52d6a Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 27 Oct 2015 21:09:06 -0500 Subject: [PATCH 1/3] partial revert --- .../shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp | 2 +- .../shared/library/sharedDebug/src/shared/RemoteDebug_inner.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp index 3da8b8be..39aa3a54 100644 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp @@ -92,7 +92,7 @@ RemoteDebug::Variable::Variable(const std::string& name, void *memLoc, VARIABLE_ break; case CSTRING: - m_value.stringValue = s; + m_value.stringValue = &s; break; case BOOL: diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h index fb97c980..d3dd088a 100644 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h @@ -45,7 +45,7 @@ class RemoteDebug::Variable int32 intValue; float floatValue; int32 boolValue; - char stringValue; + char* stringValue; }; Variable(const std::string& name, void *memLoc, VARIABLE_TYPES type); From bd4f3699c2704db31fa6cf3e36369f17abc9445b Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 27 Oct 2015 21:19:20 -0500 Subject: [PATCH 2/3] squash bugs --- .../ConnectionServer/src/shared/ClientConnection.cpp | 2 +- engine/server/library/serverScript/src/shared/JavaLibrary.cpp | 1 - engine/shared/library/sharedFile/src/shared/FileStreamer.cpp | 2 +- .../shared/library/sharedFile/src/shared/FileStreamerThread.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp index 50f2ee0f..f7b3020b 100644 --- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp @@ -1006,7 +1006,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) else { //Forward on to Game Server - DEBUG_REPORT_LOG(!m_client || !m_client->getGameConnection()), ("Warn, received game message with no game connection. This may happen for a short time after a GameServer crashes. If it continues to happen, it indicates a bug.\n"); + DEBUG_REPORT_LOG((!m_client || !m_client->getGameConnection()), ("Warn, received game message with no game connection. This may happen for a short time after a GameServer crashes. If it continues to happen, it indicates a bug.\n")); if (m_client && m_client->getGameConnection()) { diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index 24c28a00..2ae597df 100644 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -1283,7 +1283,6 @@ void JavaLibrary::initializeJavaThread() strcpy(profileBuffer,"-Xrunhprof:cpu=times"); tempOption.optionString = profileBuffer; options.push_back(tempOption); - delete [] profileBuffer; } else { diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp index 18f57271..6c47b26c 100644 --- a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp @@ -229,7 +229,7 @@ int FileStreamer::File::read(int offset, void *destinationBuffer, int numberOfBy newRequest->bytesRead = 0; newRequest->gate = gate; newRequest->priority = priority; - newRequest->returnValue = returnValue; + newRequest->returnValue = &returnValue; // submit the request FileStreamerThread::submitRequest(newRequest); diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamerThread.h b/engine/shared/library/sharedFile/src/shared/FileStreamerThread.h index 1431c78a..1d9787b7 100644 --- a/engine/shared/library/sharedFile/src/shared/FileStreamerThread.h +++ b/engine/shared/library/sharedFile/src/shared/FileStreamerThread.h @@ -115,7 +115,7 @@ public: AbstractFile::PriorityType priority; // storage held by game thread used to pass back return value - int returnValue; + int *returnValue; public: From 1221a0c0ffc05a8f867024c7ba67a8443181212e Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 27 Oct 2015 21:28:31 -0500 Subject: [PATCH 3/3] fix a bug i made --- .../application/CentralServer/src/shared/CentralServer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp index f7110e13..35d9e51c 100644 --- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -1177,6 +1177,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons else if(message.isType("DatabaseConsoleReplyMessage")) { Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); + ri = static_cast(message).getByteStream().begin(); GenericValueTypeMessage > msg(ri); IGNORE_RETURN(sendToRandomGameServer(msg)); @@ -2656,6 +2657,7 @@ void CentralServer::run(void) setup.port = ConfigCentralServer::getConnectionServicePort(); setup.bindInterface = ConfigCentralServer::getConnectionServiceBindInterface(); Service * cons = new Service(ConnectionAllocator(), setup); + NOT_NULL(cons); cserver.m_connService = cons; setup.port = ConfigCentralServer::getConsoleServicePort(); @@ -2741,7 +2743,7 @@ void CentralServer::run(void) Os::sleep(1); } - } while (!cserver.m_done); + } while (!barrierReached && !cserver.m_done); //@todo Central needs to run a clock so we can schedule re-tries with the login server. {