From f106ba87ca92b477b32a84aa246e4b4481b0980b Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Wed, 18 Sep 2013 15:55:42 +0300 Subject: Made terrain uploads thread-safe --- .../World/Estate/EstateManagementModule.cs | 47 +++++++++++++--------- .../World/Estate/EstateTerrainXferHandler.cs | 6 ++- 2 files changed, 31 insertions(+), 22 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Estate') diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 42db1cf..17387da 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -829,26 +829,23 @@ namespace OpenSim.Region.CoreModules.World.Estate private void AbortTerrainXferHandler(IClientAPI remoteClient, ulong XferID) { - if (TerrainUploader != null) + lock (this) { - lock (TerrainUploader) + if ((TerrainUploader != null) && (XferID == TerrainUploader.XferID)) { - if (XferID == TerrainUploader.XferID) - { - remoteClient.OnXferReceive -= TerrainUploader.XferReceive; - remoteClient.OnAbortXfer -= AbortTerrainXferHandler; - TerrainUploader.TerrainUploadDone -= HandleTerrainApplication; + remoteClient.OnXferReceive -= TerrainUploader.XferReceive; + remoteClient.OnAbortXfer -= AbortTerrainXferHandler; + TerrainUploader.TerrainUploadDone -= HandleTerrainApplication; - TerrainUploader = null; - remoteClient.SendAlertMessage("Terrain Upload aborted by the client"); - } + TerrainUploader = null; + remoteClient.SendAlertMessage("Terrain Upload aborted by the client"); } } - } + private void HandleTerrainApplication(string filename, byte[] terrainData, IClientAPI remoteClient) { - lock (TerrainUploader) + lock (this) { remoteClient.OnXferReceive -= TerrainUploader.XferReceive; remoteClient.OnAbortXfer -= AbortTerrainXferHandler; @@ -907,22 +904,32 @@ namespace OpenSim.Region.CoreModules.World.Estate private void handleUploadTerrain(IClientAPI remote_client, string clientFileName) { - if (TerrainUploader == null) + lock (this) { - - TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName); - lock (TerrainUploader) + if (TerrainUploader == null) { + m_log.DebugFormat("Starting to receive uploaded terrain"); + TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName); remote_client.OnXferReceive += TerrainUploader.XferReceive; remote_client.OnAbortXfer += AbortTerrainXferHandler; TerrainUploader.TerrainUploadDone += HandleTerrainApplication; + TerrainUploader.RequestStartXfer(remote_client); + } + else + { + remote_client.SendAlertMessage("Another Terrain Upload is in progress. Please wait your turn!"); } - TerrainUploader.RequestStartXfer(remote_client); - } - else + } + + public bool IsTerrainXfer(ulong xferID) + { + lock (this) { - remote_client.SendAlertMessage("Another Terrain Upload is in progress. Please wait your turn!"); + if (TerrainUploader == null) + return false; + else + return TerrainUploader.XferID == xferID; } } diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs index b8d8b10..2d74eaf 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs @@ -78,7 +78,10 @@ namespace OpenSim.Region.CoreModules.World.Estate /// public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) { - if (mXferID == xferID) + if (mXferID != xferID) + return; + + lock (this) { if (m_asset.Data.Length > 1) { @@ -99,7 +102,6 @@ namespace OpenSim.Region.CoreModules.World.Estate if ((packetID & 0x80000000) != 0) { SendCompleteMessage(remoteClient); - } } } -- cgit v1.1