swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-01-17 00:04:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'testing' into clang-profile-build

Browse Source
This commit is contained in:
DarthArgus
2016-12-14 15:47:50 +00:00
parent 0ba0e141ec 5633f4be85
commit 392964fb38
2 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/shared/library/sharedNetwork/src/linux/TcpClient.cpp
View File

@@ -373,7 +373,7 @@ void TcpClient::queryConnect ()
pfd.fd = m_socket;
pfd.events = POLLOUT;
pfd.revents = 0;
int pollResult = poll(&pfd, 1, 0);
int pollResult = poll(&pfd, 1, 3000);
if(pollResult > 0)
{
if (pfd.revents & POLLERR)
@@ -483,7 +483,7 @@ void TcpClient::update()
pfd.fd = m_socket;
pfd.events = POLLIN|POLLHUP;
pfd.revents = 0;
int pollResult = poll (&pfd, 1, 0);
int pollResult = poll (&pfd, 1, 3000);
// POLLERR is mutually exclusive with POLLIN and POLLHUP.
// POLLIN and POLLHUP are not consistent cross-platform. Additionally,
// a POLLHUP doesn't mean that there's not data available. The best,

136
game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp
View File

@@ -172,40 +172,40 @@ void
SwgSnapshot::handleDeleteMessage(const NetworkId &objectId, int reasonCode, bool immediate, bool demandLoadedContainer, bool cascadeReason) {
m_objectTableBuffer.handleDeleteMessage(objectId, reasonCode, demandLoadedContainer, cascadeReason);
m_battlefieldMarkerObjectBuffer->removeObject(objectId);
m_battlefieldParticipantBuffer->removeObject(objectId);
m_buildingObjectBuffer->removeObject(objectId);
m_bountyHunterTargetBuffer->removeObject(objectId);
m_cellObjectBuffer->removeObject(objectId);
m_cityObjectBuffer->removeObject(objectId);
m_creatureObjectBuffer->removeObject(objectId);
m_experienceBuffer->removeObject(objectId);
m_factoryObjectBuffer->removeObject(objectId);
m_guildObjectBuffer->removeObject(objectId);
m_harvesterInstallationObjectBuffer->removeObject(objectId);
m_installationObjectBuffer->removeObject(objectId);
m_intangibleObjectBuffer->removeObject(objectId);
m_locationBuffer->removeObject(objectId);
m_manufactureInstallationObjectBuffer->removeObject(objectId);
m_manufactureSchematicAttributeBuffer->removeObject(objectId);
m_manufactureSchematicObjectBuffer->removeObject(objectId);
m_messageBuffer->removeObject(objectId);
m_missionObjectBuffer->removeObject(objectId);
m_objvarBuffer->removeObject(objectId);
m_planetObjectBuffer->removeObject(objectId);
m_playerObjectBuffer->removeObject(objectId);
m_playerQuestObjectBuffer->removeObject(objectId);
m_propertyListBuffer->removeObject(objectId);
m_resourceContainerObjectBuffer->removeObject(objectId);
m_resourceTypeBuffer->removeObject(objectId);
m_scriptBuffer->removeObject(objectId);
m_shipObjectBuffer->removeObject(objectId);
m_staticObjectBuffer->removeObject(objectId);
m_tangibleObjectBuffer->removeObject(objectId);
m_universeObjectBuffer->removeObject(objectId);
m_vehicleObjectBuffer->removeObject(objectId);
m_waypointBuffer->removeObject(objectId);
m_weaponObjectBuffer->removeObject(objectId);
m_battlefieldMarkerObjectBuffer.removeObject(objectId);
m_battlefieldParticipantBuffer.removeObject(objectId);
m_buildingObjectBuffer.removeObject(objectId);
m_bountyHunterTargetBuffer.removeObject(objectId);
m_cellObjectBuffer.removeObject(objectId);
m_cityObjectBuffer.removeObject(objectId);
m_creatureObjectBuffer.removeObject(objectId);
m_experienceBuffer.removeObject(objectId);
m_factoryObjectBuffer.removeObject(objectId);
m_guildObjectBuffer.removeObject(objectId);
m_harvesterInstallationObjectBuffer.removeObject(objectId);
m_installationObjectBuffer.removeObject(objectId);
m_intangibleObjectBuffer.removeObject(objectId);
m_locationBuffer.removeObject(objectId);
m_manufactureInstallationObjectBuffer.removeObject(objectId);
m_manufactureSchematicAttributeBuffer.removeObject(objectId);
m_manufactureSchematicObjectBuffer.removeObject(objectId);
m_messageBuffer.removeObject(objectId);
m_missionObjectBuffer.removeObject(objectId);
m_objvarBuffer.removeObject(objectId);
m_planetObjectBuffer.removeObject(objectId);
m_playerObjectBuffer.removeObject(objectId);
m_playerQuestObjectBuffer.removeObject(objectId);
m_propertyListBuffer.removeObject(objectId);
m_resourceContainerObjectBuffer.removeObject(objectId);
m_resourceTypeBuffer.removeObject(objectId);
m_scriptBuffer.removeObject(objectId);
m_shipObjectBuffer.removeObject(objectId);
m_staticObjectBuffer.removeObject(objectId);
m_tangibleObjectBuffer.removeObject(objectId);
m_universeObjectBuffer.removeObject(objectId);
m_vehicleObjectBuffer.removeObject(objectId);
m_waypointBuffer.removeObject(objectId);
m_weaponObjectBuffer.removeObject(objectId);
if (immediate && (getMode() != DB::ModeQuery::mode_INSERT)) {
if (!m_immediateDeleteStep) {
@@ -466,40 +466,40 @@ bool SwgSnapshot::load(DB::Session *session) {
m_objectTableBuffer.getTags(tags);
// the buffer list was fucked so we'll do this the old fashioned way
if (!((m_battlefieldMarkerObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_battlefieldParticipantBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_buildingObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_bountyHunterTargetBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_cellObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_cityObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_creatureObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_experienceBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_factoryObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_guildObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_harvesterInstallationObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_installationObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_intangibleObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_locationBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_manufactureInstallationObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_manufactureSchematicAttributeBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_manufactureSchematicObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_messageBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_missionObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_objvarBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_planetObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_playerObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_playerQuestObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_propertyListBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_resourceContainerObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_resourceTypeBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_scriptBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_shipObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_staticObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_tangibleObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_universeObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_vehicleObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_waypointBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_weaponObjectBuffer)->load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_battlefieldMarkerObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_battlefieldParticipantBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_buildingObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_bountyHunterTargetBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_cellObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_cityObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_creatureObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_experienceBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_factoryObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_guildObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_harvesterInstallationObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_installationObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_intangibleObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_locationBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_manufactureInstallationObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_manufactureSchematicAttributeBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_manufactureSchematicObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_messageBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_missionObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_objvarBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_planetObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_playerObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_playerQuestObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_propertyListBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_resourceContainerObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_resourceTypeBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_scriptBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_shipObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_staticObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_tangibleObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_universeObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_vehicleObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_waypointBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
if (!((m_weaponObjectBuffer).load(session, tags, schema, getUseGoldDatabase()))) { return false; }
DEBUG_REPORT_LOG(ConfigServerDatabase::getLogObjectLoading(), ("Load end.\n"));
} else {