From 3a4ad818997c148f7fd557eca1ea2f347b57e69f Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 3 Dec 2010 15:18:39 +0100 Subject: [PATCH] Changed: #1016 entities_game_service segfault in ubuntu 64biten --- code/ryzom/common/src/game_share/server_edition_module.cpp | 2 +- code/ryzom/server/src/ai_service/ai_script_data_manager.cpp | 5 +++-- code/ryzom/server/src/backup_service/web_connection.cpp | 3 ++- .../entities_game_service/modules/shard_unifier_client.cpp | 2 +- code/ryzom/server/src/frontend_service/fe_receive_sub.cpp | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index 0062b80f9..6e1a5b0f1 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -96,7 +96,7 @@ CVariable TimeBeforeCloseHibernatingEditionSession("DSS", "TimeBeforeClo CVariable TimeBeforeAutoCloseAnimationSessionWithNoPlayer("DSS", "TimeBeforeAutoCloseAnimationSessionWithNoPlayer", "Delay in secondes before a empty animation session is closed", 15*60, 0, true); CVariable DefaultCharRingAccess( "DSS", "DefaultCharRingAccess", "Default Access Ring for player eg 'f1:j1:l1:d1:p1:g1:a1:'", "a1", 0, true ); -CVariable DontUseSU( "DSS", "DontUseSU", "Simulate the SU", false, 0, true ); +CVariable DontUseSU( "DSS", "DontUseSU", "If 1, allow running a shard with no Shard Unifier Service", false, 0, true ); CVariable AcceptScenarioWithoutHeader("DSS", "AcceptScenarioWithoutHeader", "AcceptScenarioWithoutHeader", false, 0, true); CVariable MustVerifyRingAccessWhileLoadingAnimation("DSS", "MustVerifyRingAccessWhileLoadingAnimation", "MustVerifyRingAccessWhileLoadingAnimation", false, 0, true); diff --git a/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp b/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp index 6591dc3fe..f9c8a1854 100644 --- a/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp +++ b/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp @@ -97,7 +97,8 @@ void cbOnSaveShardRootModified( NLMISC::IVariable& var ) } -CVariable SaveShardRoot2("variables", "SaveShardRoot2", "Root directory of all saved data by any shard", "/home/nevrax/save_shard", 0, true, cbOnSaveShardRootModified); // (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because nothing is used from that file) +// (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because nothing is used from that file) +extern NLMISC::CVariable SaveShardRoot; CVariable PdrFilename("ai", "PdrFilename", "Pdr file containing AIScript variables", string("ai_persistent_var.pdr"), 0, true); @@ -173,7 +174,7 @@ CAIScriptDataManager::~CAIScriptDataManager() std::string CAIScriptDataManager::dirname() { - return SaveShardRoot2.get()+"/"+IService::getInstance()->SaveFilesDirectory.toString()+"/ai_script_data"; + return SaveShardRoot.get()+"/"+IService::getInstance()->SaveFilesDirectory.toString()+"/ai_script_data"; } //CConfigFile* CAIScriptDataManager::createFile(string name) diff --git a/code/ryzom/server/src/backup_service/web_connection.cpp b/code/ryzom/server/src/backup_service/web_connection.cpp index b7a50d445..d7d2c0b7c 100644 --- a/code/ryzom/server/src/backup_service/web_connection.cpp +++ b/code/ryzom/server/src/backup_service/web_connection.cpp @@ -169,7 +169,8 @@ void cbOnSaveShardRootModified( NLMISC::IVariable& var ) } CVariable IncrementalBackupDirectory("backup", "IncrementalBackupDirectory", "Directory to find incremental backuped archives", "", 0, true); -CVariable SaveShardRoot("backup", "SaveShardRoot", "Root directory of all saved data by BS", "/home/nevrax/save_shard", 0, true, cbOnSaveShardRootModified); // (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because the nothing is used from that file) +// (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because the nothing is used from that file) +extern CVariable SaveShardRoot; CVariable SaveTemplatePath("backup", "SaveTemplatePath", "Directory to find saves (with shard and account replacement strings)", "$shard/characters/account_$userid_$charid$ext", 0, true); CVariable SaveExtList("backup", "SaveExtList", "List of possible extensions for save files (space separated)", "_pdr.bin _pdr.xml .bin", 0, true); diff --git a/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp b/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp index 3ccfe72f0..d64c097ea 100644 --- a/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp +++ b/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp @@ -54,7 +54,7 @@ using namespace ENTITYLOC; extern NLMISC::CVariable FixedSessionId; -CVariable DontUseSU( "su", "DontUseSU", "If 1, allow running a shard with no Shard Unifier Service", 0, 0, 1 ); +extern CVariable DontUseSU; CVariable SimulateCharacterHasEditSession( "su", "SimulateCharacterHasEditSession", "If 1 simulate that character have alreay an edition sessiion", 0, 0, 1 ); diff --git a/code/ryzom/server/src/frontend_service/fe_receive_sub.cpp b/code/ryzom/server/src/frontend_service/fe_receive_sub.cpp index 52e0503cb..5a61c9868 100644 --- a/code/ryzom/server/src/frontend_service/fe_receive_sub.cpp +++ b/code/ryzom/server/src/frontend_service/fe_receive_sub.cpp @@ -75,8 +75,8 @@ extern void flushMessagesToSend(); void cbGwTrDisconnection ( TClientId clientId ); -CVariable SaveShardRoot("variables", "SaveShardRoot", "Root directory of all files saved by any shard", "", 0, true, NULL, false); -extern CVariable VerboseFEStatsTime; +extern CVariable SaveShardRoot; +extern CVariable VerboseFEStatsTime; /*