From 255b87464ae1676cfab5c0a34274de253c864eb2 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 17 Jun 2008 08:14:58 +0000
Subject: Update svn properties.
---
.../World/Archiver/ArchiveWriteRequestExecution.cs | 146 ++++++-------
.../Modules/World/Archiver/AssetsRequest.cs | 228 ++++++++++-----------
2 files changed, 187 insertions(+), 187 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/World/Archiver')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
index 4164cea..3d7273e 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -1,73 +1,73 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using System.Reflection;
-using libsecondlife;
-using log4net;
-using OpenSim.Framework;
-
-namespace OpenSim.Region.Environment.Modules.World.Archiver
-{
- ///
- /// Method called when all the necessary assets for an archive request have been received.
- ///
- public delegate void AssetsRequestCallback(IDictionary assets);
-
- ///
- /// Execute the write of an archive once we have received all the necessary data
- ///
- public class ArchiveWriteRequestExecution
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- protected string m_savePath;
- protected string m_serializedEntities;
-
- public ArchiveWriteRequestExecution(string serializedEntities, string savePath)
- {
- m_serializedEntities = serializedEntities;
- m_savePath = savePath;
- }
-
- protected internal void ReceivedAllAssets(IDictionary assets)
- {
- m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count);
-
- TarArchiveWriter archive = new TarArchiveWriter();
-
- archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
-
- AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
- assetsArchiver.Archive(archive);
-
- archive.WriteTar(m_savePath);
-
- m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
- }
- }
-}
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using System.Reflection;
+using libsecondlife;
+using log4net;
+using OpenSim.Framework;
+
+namespace OpenSim.Region.Environment.Modules.World.Archiver
+{
+ ///
+ /// Method called when all the necessary assets for an archive request have been received.
+ ///
+ public delegate void AssetsRequestCallback(IDictionary assets);
+
+ ///
+ /// Execute the write of an archive once we have received all the necessary data
+ ///
+ public class ArchiveWriteRequestExecution
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ protected string m_savePath;
+ protected string m_serializedEntities;
+
+ public ArchiveWriteRequestExecution(string serializedEntities, string savePath)
+ {
+ m_serializedEntities = serializedEntities;
+ m_savePath = savePath;
+ }
+
+ protected internal void ReceivedAllAssets(IDictionary assets)
+ {
+ m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count);
+
+ TarArchiveWriter archive = new TarArchiveWriter();
+
+ archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
+
+ AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
+ assetsArchiver.Archive(archive);
+
+ archive.WriteTar(m_savePath);
+
+ m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
+ }
+ }
+}
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index f41be49..ebcbcc7 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -1,114 +1,114 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
-using System.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Modules.World.Archiver
-{
- ///
- /// Encapsulate the asynchronous requests for the assets required for an archive operation
- ///
- class AssetsRequest
- {
- ///
- /// uuids to request
- ///
- protected ICollection m_uuids;
-
- ///
- /// Callback used when all the assets requested have been received.
- ///
- protected AssetsRequestCallback m_assetsRequestCallback;
-
- ///
- /// Assets retrieved in this request
- ///
- protected Dictionary m_assets = new Dictionary();
-
- ///
- /// Record the number of asset replies required so we know when we've finished
- ///
- private int m_repliesRequired;
-
- ///
- /// Asset cache used to request the assets
- ///
- protected AssetCache m_assetCache;
-
- protected internal AssetsRequest(ICollection uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)
- {
- m_uuids = uuids;
- m_assetsRequestCallback = assetsRequestCallback;
- m_assetCache = assetCache;
- m_repliesRequired = uuids.Count;
- }
-
- protected internal void Execute()
- {
- // We can stop here if there are no assets to fetch
- if (m_repliesRequired == 0)
- m_assetsRequestCallback(m_assets);
-
- foreach (LLUUID uuid in m_uuids)
- {
- m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
- }
- }
-
- ///
- /// Called back by the asset cache when it has the asset
- ///
- ///
- ///
- public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
- {
- m_assets[assetID] = asset;
-
- if (m_assets.Count == m_repliesRequired)
- {
- // We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive
- Thread newThread = new Thread(PerformAssetsRequestCallback);
- newThread.Name = "OpenSimulator archiving thread post assets receipt";
- newThread.Start();
- }
- }
-
- ///
- /// Perform the callback on the original requester of the assets
- ///
- protected void PerformAssetsRequestCallback()
- {
- m_assetsRequestCallback(m_assets);
- }
- }
-}
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Scenes;
+using System.Collections.Generic;
+using System.Threading;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Modules.World.Archiver
+{
+ ///
+ /// Encapsulate the asynchronous requests for the assets required for an archive operation
+ ///
+ class AssetsRequest
+ {
+ ///
+ /// uuids to request
+ ///
+ protected ICollection m_uuids;
+
+ ///
+ /// Callback used when all the assets requested have been received.
+ ///
+ protected AssetsRequestCallback m_assetsRequestCallback;
+
+ ///
+ /// Assets retrieved in this request
+ ///
+ protected Dictionary m_assets = new Dictionary();
+
+ ///
+ /// Record the number of asset replies required so we know when we've finished
+ ///
+ private int m_repliesRequired;
+
+ ///
+ /// Asset cache used to request the assets
+ ///
+ protected AssetCache m_assetCache;
+
+ protected internal AssetsRequest(ICollection uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)
+ {
+ m_uuids = uuids;
+ m_assetsRequestCallback = assetsRequestCallback;
+ m_assetCache = assetCache;
+ m_repliesRequired = uuids.Count;
+ }
+
+ protected internal void Execute()
+ {
+ // We can stop here if there are no assets to fetch
+ if (m_repliesRequired == 0)
+ m_assetsRequestCallback(m_assets);
+
+ foreach (LLUUID uuid in m_uuids)
+ {
+ m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
+ }
+ }
+
+ ///
+ /// Called back by the asset cache when it has the asset
+ ///
+ ///
+ ///
+ public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
+ {
+ m_assets[assetID] = asset;
+
+ if (m_assets.Count == m_repliesRequired)
+ {
+ // We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive
+ Thread newThread = new Thread(PerformAssetsRequestCallback);
+ newThread.Name = "OpenSimulator archiving thread post assets receipt";
+ newThread.Start();
+ }
+ }
+
+ ///
+ /// Perform the callback on the original requester of the assets
+ ///
+ protected void PerformAssetsRequestCallback()
+ {
+ m_assetsRequestCallback(m_assets);
+ }
+ }
+}
--
cgit v1.1