OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Added static mutex to terrain load-tile to prevent file IO locking issues.

afrisby
Adam Frisby 2007-10-25 15:17:42 +00:00
parent 2048d611cf
commit 6804f9affb
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
View File

@ -51,6 +51,8 @@ namespace OpenSim.Region.Terrain
public class TerrainEngine public class TerrainEngine
{ {
public static System.Threading.Mutex fileIOLock = new System.Threading.Mutex();
/// <summary> /// <summary>
/// Plugin library for scripts /// Plugin library for scripts
/// </summary> /// </summary>
@ -731,36 +733,45 @@ namespace OpenSim.Region.Terrain
/// <param name="lowerboundY">Where do the region coords start for this terrain?</param> /// <param name="lowerboundY">Where do the region coords start for this terrain?</param>
public void LoadFromFileF32(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY) public void LoadFromFileF32(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY)
{ {
int sectionToLoadX = ((this.offsetX - lowerboundX) * this.w); fileIOLock.WaitOne();
int sectionToLoadY = ((this.offsetY - lowerboundY) * this.h); try
double[,] tempMap = new double[dimensionX, dimensionY];
FileInfo file = new FileInfo(filename);
FileStream s = file.Open(FileMode.Open, FileAccess.Read);
BinaryReader bs = new BinaryReader(s);
int x, y;
for (x = 0; x < dimensionX; x++)
{ {
for (y = 0; y < dimensionY; y++)
{
tempMap[x,y] = (double)bs.ReadSingle();
}
}
for (y = 0; y < h; y++) int sectionToLoadX = ((this.offsetX - lowerboundX) * this.w);
int sectionToLoadY = ((this.offsetY - lowerboundY) * this.h);
double[,] tempMap = new double[dimensionX, dimensionY];
FileInfo file = new FileInfo(filename);
FileStream s = file.Open(FileMode.Open, FileAccess.Read);
BinaryReader bs = new BinaryReader(s);
int x, y;
for (x = 0; x < dimensionX; x++)
{
for (y = 0; y < dimensionY; y++)
{
tempMap[x, y] = (double)bs.ReadSingle();
}
}
for (y = 0; y < h; y++)
{
for (x = 0; x < w; x++)
{
heightmap.Set(x, y, tempMap[x + sectionToLoadX, y + sectionToLoadY]);
}
}
bs.Close();
s.Close();
tainted++;
}
finally
{ {
for (x = 0; x < w; x++) fileIOLock.ReleaseMutex();
{
heightmap.Set(x, y, tempMap[x + sectionToLoadX, y + sectionToLoadY]);
}
} }
bs.Close();
s.Close();
tainted++;
} }
/// <summary> /// <summary>