forked from mirrors/NBTExplorer
Added file locks to allow parallel access to chunks.
This allows a multi-threaded reading of chunks.
This commit is contained in:
Fredrik Blom
parent
a002336603
commit
6326bdac82
1 changed files with 168 additions and 143 deletions
|
|
@ -21,6 +21,14 @@ namespace Substrate.Core
|
|||
|
||||
private string fileName;
|
||||
private FileStream file;
|
||||
|
||||
/// <summary>
|
||||
/// The file lock used so that we do not seek in different areas
|
||||
/// of the same file at the same time. All file access should lock this
|
||||
/// object before moving the file pointer.
|
||||
/// </summary>
|
||||
private object fileLock = new object();
|
||||
|
||||
private int[] offsets;
|
||||
private int[] chunkTimestamps;
|
||||
private List<Boolean> sectorFree;
|
||||
|
|
@ -62,8 +70,10 @@ namespace Substrate.Core
|
|||
|
||||
// Cleanup unmanaged resources
|
||||
if (file != null) {
|
||||
file.Close();
|
||||
file = null;
|
||||
lock (this.fileLock) {
|
||||
file.Close();
|
||||
file = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
_disposed = true;
|
||||
|
|
@ -93,75 +103,76 @@ namespace Substrate.Core
|
|||
}
|
||||
|
||||
try {
|
||||
file = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite);
|
||||
lock (this.fileLock) {
|
||||
file = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite);
|
||||
|
||||
//using (file) {
|
||||
if (file.Length < SectorBytes) {
|
||||
byte[] int0 = BitConverter.GetBytes((int)0);
|
||||
//using (file) {
|
||||
if (file.Length < SectorBytes) {
|
||||
byte[] int0 = BitConverter.GetBytes((int)0);
|
||||
|
||||
/* we need to write the chunk offset table */
|
||||
/* we need to write the chunk offset table */
|
||||
for (int i = 0; i < SectorInts; ++i) {
|
||||
file.Write(int0, 0, 4);
|
||||
}
|
||||
// write another sector for the timestamp info
|
||||
for (int i = 0; i < SectorInts; ++i) {
|
||||
file.Write(int0, 0, 4);
|
||||
}
|
||||
|
||||
file.Flush();
|
||||
|
||||
sizeDelta += SectorBytes * 2;
|
||||
}
|
||||
|
||||
if ((file.Length & 0xfff) != 0) {
|
||||
/* the file size is not a multiple of 4KB, grow it */
|
||||
for (int i = 0; i < (file.Length & 0xfff); ++i) {
|
||||
file.WriteByte(0);
|
||||
}
|
||||
|
||||
file.Flush();
|
||||
}
|
||||
|
||||
/* set up the available sector map */
|
||||
int nSectors = (int)file.Length / SectorBytes;
|
||||
sectorFree = new List<Boolean>(nSectors);
|
||||
|
||||
for (int i = 0; i < nSectors; ++i) {
|
||||
sectorFree.Add(true);
|
||||
}
|
||||
|
||||
sectorFree[0] = false; // chunk offset table
|
||||
sectorFree[1] = false; // for the last modified info
|
||||
|
||||
file.Seek(0, SeekOrigin.Begin);
|
||||
for (int i = 0; i < SectorInts; ++i) {
|
||||
file.Write(int0, 0, 4);
|
||||
}
|
||||
// write another sector for the timestamp info
|
||||
for (int i = 0; i < SectorInts; ++i) {
|
||||
file.Write(int0, 0, 4);
|
||||
}
|
||||
byte[] offsetBytes = new byte[4];
|
||||
file.Read(offsetBytes, 0, 4);
|
||||
|
||||
file.Flush();
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
Array.Reverse(offsetBytes);
|
||||
}
|
||||
int offset = BitConverter.ToInt32(offsetBytes, 0);
|
||||
|
||||
sizeDelta += SectorBytes * 2;
|
||||
}
|
||||
|
||||
if ((file.Length & 0xfff) != 0) {
|
||||
/* the file size is not a multiple of 4KB, grow it */
|
||||
for (int i = 0; i < (file.Length & 0xfff); ++i) {
|
||||
file.WriteByte(0);
|
||||
}
|
||||
|
||||
file.Flush();
|
||||
}
|
||||
|
||||
/* set up the available sector map */
|
||||
int nSectors = (int)file.Length / SectorBytes;
|
||||
sectorFree = new List<Boolean>(nSectors);
|
||||
|
||||
for (int i = 0; i < nSectors; ++i) {
|
||||
sectorFree.Add(true);
|
||||
}
|
||||
|
||||
sectorFree[0] = false; // chunk offset table
|
||||
sectorFree[1] = false; // for the last modified info
|
||||
|
||||
file.Seek(0, SeekOrigin.Begin);
|
||||
for (int i = 0; i < SectorInts; ++i) {
|
||||
byte[] offsetBytes = new byte[4];
|
||||
file.Read(offsetBytes, 0, 4);
|
||||
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
Array.Reverse(offsetBytes);
|
||||
}
|
||||
int offset = BitConverter.ToInt32(offsetBytes, 0);
|
||||
|
||||
offsets[i] = offset;
|
||||
if (offset != 0 && (offset >> 8) + (offset & 0xFF) <= sectorFree.Count) {
|
||||
for (int sectorNum = 0; sectorNum < (offset & 0xFF); ++sectorNum) {
|
||||
sectorFree[(offset >> 8) + sectorNum] = false;
|
||||
offsets[i] = offset;
|
||||
if (offset != 0 && (offset >> 8) + (offset & 0xFF) <= sectorFree.Count) {
|
||||
for (int sectorNum = 0; sectorNum < (offset & 0xFF); ++sectorNum) {
|
||||
sectorFree[(offset >> 8) + sectorNum] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < SectorInts; ++i) {
|
||||
byte[] modBytes = new byte[4];
|
||||
file.Read(modBytes, 0, 4);
|
||||
for (int i = 0; i < SectorInts; ++i) {
|
||||
byte[] modBytes = new byte[4];
|
||||
file.Read(modBytes, 0, 4);
|
||||
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
Array.Reverse(modBytes);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
Array.Reverse(modBytes);
|
||||
}
|
||||
int lastModValue = BitConverter.ToInt32(modBytes, 0);
|
||||
|
||||
chunkTimestamps[i] = lastModValue;
|
||||
}
|
||||
int lastModValue = BitConverter.ToInt32(modBytes, 0);
|
||||
|
||||
chunkTimestamps[i] = lastModValue;
|
||||
}
|
||||
//}
|
||||
}
|
||||
catch (IOException e) {
|
||||
System.Console.WriteLine(e.Message);
|
||||
|
|
@ -239,47 +250,49 @@ namespace Substrate.Core
|
|||
return null;
|
||||
}
|
||||
|
||||
file.Seek(sectorNumber * SectorBytes, SeekOrigin.Begin);
|
||||
byte[] lengthBytes = new byte[4];
|
||||
file.Read(lengthBytes, 0, 4);
|
||||
lock (this.fileLock) {
|
||||
file.Seek(sectorNumber * SectorBytes, SeekOrigin.Begin);
|
||||
byte[] lengthBytes = new byte[4];
|
||||
file.Read(lengthBytes, 0, 4);
|
||||
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
Array.Reverse(lengthBytes);
|
||||
}
|
||||
int length = BitConverter.ToInt32(lengthBytes, 0);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
Array.Reverse(lengthBytes);
|
||||
}
|
||||
int length = BitConverter.ToInt32(lengthBytes, 0);
|
||||
|
||||
if (length > SectorBytes * numSectors) {
|
||||
Debugln("READ", x, z, "invalid length: " + length + " > 4096 * " + numSectors);
|
||||
if (length > SectorBytes * numSectors) {
|
||||
Debugln("READ", x, z, "invalid length: " + length + " > 4096 * " + numSectors);
|
||||
return null;
|
||||
}
|
||||
|
||||
byte version = (byte)file.ReadByte();
|
||||
if (version == VERSION_GZIP) {
|
||||
byte[] data = new byte[length - 1];
|
||||
file.Read(data, 0, data.Length);
|
||||
Stream ret = new GZipStream(new MemoryStream(data), CompressionMode.Decompress);
|
||||
|
||||
return ret;
|
||||
}
|
||||
else if (version == VERSION_DEFLATE) {
|
||||
byte[] data = new byte[length - 1];
|
||||
file.Read(data, 0, data.Length);
|
||||
|
||||
Stream ret = new ZlibStream(new MemoryStream(data), CompressionMode.Decompress, true);
|
||||
return ret;
|
||||
|
||||
/*MemoryStream sinkZ = new MemoryStream();
|
||||
ZlibStream zOut = new ZlibStream(sinkZ, CompressionMode.Decompress, true);
|
||||
zOut.Write(data, 0, data.Length);
|
||||
zOut.Flush();
|
||||
zOut.Close();
|
||||
|
||||
sinkZ.Seek(0, SeekOrigin.Begin);
|
||||
return sinkZ;*/
|
||||
}
|
||||
|
||||
Debugln("READ", x, z, "unknown version " + version);
|
||||
return null;
|
||||
}
|
||||
|
||||
byte version = (byte)file.ReadByte();
|
||||
if (version == VERSION_GZIP) {
|
||||
byte[] data = new byte[length - 1];
|
||||
file.Read(data, 0, data.Length);
|
||||
Stream ret = new GZipStream(new MemoryStream(data), CompressionMode.Decompress);
|
||||
|
||||
return ret;
|
||||
}
|
||||
else if (version == VERSION_DEFLATE) {
|
||||
byte[] data = new byte[length - 1];
|
||||
file.Read(data, 0, data.Length);
|
||||
|
||||
Stream ret = new ZlibStream(new MemoryStream(data), CompressionMode.Decompress, true);
|
||||
return ret;
|
||||
|
||||
/*MemoryStream sinkZ = new MemoryStream();
|
||||
ZlibStream zOut = new ZlibStream(sinkZ, CompressionMode.Decompress, true);
|
||||
zOut.Write(data, 0, data.Length);
|
||||
zOut.Flush();
|
||||
zOut.Close();
|
||||
|
||||
sinkZ.Seek(0, SeekOrigin.Begin);
|
||||
return sinkZ;*/
|
||||
}
|
||||
|
||||
Debugln("READ", x, z, "unknown version " + version);
|
||||
return null;
|
||||
}
|
||||
catch (IOException) {
|
||||
Debugln("READ", x, z, "exception");
|
||||
|
|
@ -407,17 +420,19 @@ namespace Substrate.Core
|
|||
* no free space large enough found -- we need to grow the
|
||||
* file
|
||||
*/
|
||||
Debug("SAVE", x, z, length, "grow");
|
||||
file.Seek(0, SeekOrigin.End);
|
||||
sectorNumber = sectorFree.Count;
|
||||
for (int i = 0; i < sectorsNeeded; ++i) {
|
||||
file.Write(emptySector, 0, emptySector.Length);
|
||||
sectorFree.Add(false);
|
||||
}
|
||||
sizeDelta += SectorBytes * sectorsNeeded;
|
||||
lock (this.fileLock) {
|
||||
Debug("SAVE", x, z, length, "grow");
|
||||
file.Seek(0, SeekOrigin.End);
|
||||
sectorNumber = sectorFree.Count;
|
||||
for (int i = 0; i < sectorsNeeded; ++i) {
|
||||
file.Write(emptySector, 0, emptySector.Length);
|
||||
sectorFree.Add(false);
|
||||
}
|
||||
sizeDelta += SectorBytes * sectorsNeeded;
|
||||
|
||||
Write(sectorNumber, data, length);
|
||||
SetOffset(x, z, (sectorNumber << 8) | sectorsNeeded);
|
||||
Write(sectorNumber, data, length);
|
||||
SetOffset(x, z, (sectorNumber << 8) | sectorsNeeded);
|
||||
}
|
||||
}
|
||||
}
|
||||
SetTimestamp(x, z, timestamp);
|
||||
|
|
@ -430,32 +445,36 @@ namespace Substrate.Core
|
|||
/* write a chunk data to the region file at specified sector number */
|
||||
private void Write (int sectorNumber, byte[] data, int length)
|
||||
{
|
||||
Debugln(" " + sectorNumber);
|
||||
file.Seek(sectorNumber * SectorBytes, SeekOrigin.Begin);
|
||||
lock (this.fileLock) {
|
||||
Debugln(" " + sectorNumber);
|
||||
file.Seek(sectorNumber * SectorBytes, SeekOrigin.Begin);
|
||||
|
||||
byte[] bytes = BitConverter.GetBytes(length + 1);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
;
|
||||
Array.Reverse(bytes);
|
||||
byte[] bytes = BitConverter.GetBytes(length + 1);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
;
|
||||
Array.Reverse(bytes);
|
||||
}
|
||||
file.Write(bytes, 0, 4); // chunk length
|
||||
file.WriteByte(VERSION_DEFLATE); // chunk version number
|
||||
file.Write(data, 0, length); // chunk data
|
||||
}
|
||||
file.Write(bytes, 0, 4); // chunk length
|
||||
file.WriteByte(VERSION_DEFLATE); // chunk version number
|
||||
file.Write(data, 0, length); // chunk data
|
||||
}
|
||||
|
||||
public void DeleteChunk (int x, int z)
|
||||
{
|
||||
int offset = GetOffset(x, z);
|
||||
int sectorNumber = offset >> 8;
|
||||
int sectorsAllocated = offset & 0xFF;
|
||||
lock (this.fileLock) {
|
||||
int offset = GetOffset(x, z);
|
||||
int sectorNumber = offset >> 8;
|
||||
int sectorsAllocated = offset & 0xFF;
|
||||
|
||||
file.Seek(sectorNumber * SectorBytes, SeekOrigin.Begin);
|
||||
for (int i = 0; i < sectorsAllocated; i++) {
|
||||
file.Write(emptySector, 0, SectorBytes);
|
||||
file.Seek(sectorNumber * SectorBytes, SeekOrigin.Begin);
|
||||
for (int i = 0; i < sectorsAllocated; i++) {
|
||||
file.Write(emptySector, 0, SectorBytes);
|
||||
}
|
||||
|
||||
SetOffset(x, z, 0);
|
||||
SetTimestamp(x, z, 0);
|
||||
}
|
||||
|
||||
SetOffset(x, z, 0);
|
||||
SetTimestamp(x, z, 0);
|
||||
}
|
||||
|
||||
/* is this an invalid chunk coordinate? */
|
||||
|
|
@ -476,16 +495,18 @@ namespace Substrate.Core
|
|||
|
||||
private void SetOffset (int x, int z, int offset)
|
||||
{
|
||||
offsets[x + z * 32] = offset;
|
||||
file.Seek((x + z * 32) * 4, SeekOrigin.Begin);
|
||||
lock (this.fileLock) {
|
||||
offsets[x + z * 32] = offset;
|
||||
file.Seek((x + z * 32) * 4, SeekOrigin.Begin);
|
||||
|
||||
byte[] bytes = BitConverter.GetBytes(offset);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
;
|
||||
Array.Reverse(bytes);
|
||||
byte[] bytes = BitConverter.GetBytes(offset);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
;
|
||||
Array.Reverse(bytes);
|
||||
}
|
||||
|
||||
file.Write(bytes, 0, 4);
|
||||
}
|
||||
|
||||
file.Write(bytes, 0, 4);
|
||||
}
|
||||
|
||||
private int Timestamp ()
|
||||
|
|
@ -507,21 +528,25 @@ namespace Substrate.Core
|
|||
|
||||
public void SetTimestamp (int x, int z, int value)
|
||||
{
|
||||
chunkTimestamps[x + z * 32] = value;
|
||||
file.Seek(SectorBytes + (x + z * 32) * 4, SeekOrigin.Begin);
|
||||
lock (this.fileLock) {
|
||||
chunkTimestamps[x + z * 32] = value;
|
||||
file.Seek(SectorBytes + (x + z * 32) * 4, SeekOrigin.Begin);
|
||||
|
||||
byte[] bytes = BitConverter.GetBytes(value);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
;
|
||||
Array.Reverse(bytes);
|
||||
byte[] bytes = BitConverter.GetBytes(value);
|
||||
if (BitConverter.IsLittleEndian) {
|
||||
;
|
||||
Array.Reverse(bytes);
|
||||
}
|
||||
|
||||
file.Write(bytes, 0, 4);
|
||||
}
|
||||
|
||||
file.Write(bytes, 0, 4);
|
||||
}
|
||||
|
||||
public void Close ()
|
||||
{
|
||||
file.Close();
|
||||
lock (this.fileLock) {
|
||||
file.Close();
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual int SectorBytes
|
||||
|
|
|
|||
Loading…
Reference in a new issue