diff options
author | Justin Clarke Casey | 2009-03-06 20:12:08 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-06 20:12:08 +0000 |
commit | 85774de2310141f4311bc3df1946d44df9ddde59 (patch) | |
tree | e86febe5873121d9a529f6d77a2a7ee929030425 /OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs | |
parent | * Protects RestClient from crashing with dictionary exception, which leads to... (diff) | |
download | opensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.zip opensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.tar.gz opensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.tar.bz2 opensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.tar.xz |
* Improve memory usage when writing OARs
* This should make saving large OARs a somewhat better experience
* However, the problem where saving an archive pulls large numbers of assets into the asset cache isn't yet resolved
* This patch also removes lots of archive writing spam that crept in
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs index 19d2629..070f597 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
38 | /// </summary> | 38 | /// </summary> |
39 | public class TarArchiveReader | 39 | public class TarArchiveReader |
40 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | public enum TarEntryType | 43 | public enum TarEntryType |
44 | { | 44 | { |
@@ -113,14 +113,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
113 | { | 113 | { |
114 | int longNameLength = ConvertOctalBytesToDecimal(header, 124, 11); | 114 | int longNameLength = ConvertOctalBytesToDecimal(header, 124, 11); |
115 | tarHeader.FilePath = m_asciiEncoding.GetString(ReadData(longNameLength)); | 115 | tarHeader.FilePath = m_asciiEncoding.GetString(ReadData(longNameLength)); |
116 | m_log.DebugFormat("[TAR ARCHIVE READER]: Got long file name {0}", tarHeader.FilePath); | 116 | //m_log.DebugFormat("[TAR ARCHIVE READER]: Got long file name {0}", tarHeader.FilePath); |
117 | header = m_br.ReadBytes(512); | 117 | header = m_br.ReadBytes(512); |
118 | } | 118 | } |
119 | else | 119 | else |
120 | { | 120 | { |
121 | tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100); | 121 | tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100); |
122 | tarHeader.FilePath = tarHeader.FilePath.Trim(m_nullCharArray); | 122 | tarHeader.FilePath = tarHeader.FilePath.Trim(m_nullCharArray); |
123 | m_log.DebugFormat("[TAR ARCHIVE READER]: Got short file name {0}", tarHeader.FilePath); | 123 | //m_log.DebugFormat("[TAR ARCHIVE READER]: Got short file name {0}", tarHeader.FilePath); |
124 | } | 124 | } |
125 | 125 | ||
126 | tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11); | 126 | tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11); |
@@ -168,14 +168,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
168 | { | 168 | { |
169 | byte[] data = m_br.ReadBytes(fileSize); | 169 | byte[] data = m_br.ReadBytes(fileSize); |
170 | 170 | ||
171 | m_log.DebugFormat("[TAR ARCHIVE READER]: fileSize {0}", fileSize); | 171 | //m_log.DebugFormat("[TAR ARCHIVE READER]: fileSize {0}", fileSize); |
172 | 172 | ||
173 | // Read the rest of the empty padding in the 512 byte block | 173 | // Read the rest of the empty padding in the 512 byte block |
174 | if (fileSize % 512 != 0) | 174 | if (fileSize % 512 != 0) |
175 | { | 175 | { |
176 | int paddingLeft = 512 - (fileSize % 512); | 176 | int paddingLeft = 512 - (fileSize % 512); |
177 | 177 | ||
178 | m_log.DebugFormat("[TAR ARCHIVE READER]: Reading {0} padding bytes", paddingLeft); | 178 | //m_log.DebugFormat("[TAR ARCHIVE READER]: Reading {0} padding bytes", paddingLeft); |
179 | 179 | ||
180 | m_br.ReadBytes(paddingLeft); | 180 | m_br.ReadBytes(paddingLeft); |
181 | } | 181 | } |