Update svn properties.
parent
b0965a41d6
commit
9053e8510c
|
@ -1,24 +1,24 @@
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
namespace OpenSim.Data.MySQL
|
namespace OpenSim.Data.MySQL
|
||||||
{
|
{
|
||||||
public class MySQLSuperManager
|
public class MySQLSuperManager
|
||||||
{
|
{
|
||||||
public bool Locked;
|
public bool Locked;
|
||||||
private readonly Mutex m_lock = new Mutex(false);
|
private readonly Mutex m_lock = new Mutex(false);
|
||||||
public MySQLManager Manager;
|
public MySQLManager Manager;
|
||||||
|
|
||||||
public void GetLock()
|
public void GetLock()
|
||||||
{
|
{
|
||||||
Locked = true;
|
Locked = true;
|
||||||
m_lock.WaitOne();
|
m_lock.WaitOne();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Release()
|
public void Release()
|
||||||
{
|
{
|
||||||
m_lock.ReleaseMutex();
|
m_lock.ReleaseMutex();
|
||||||
Locked = false;
|
Locked = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,56 +1,56 @@
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Xml.Serialization;
|
using System.Xml.Serialization;
|
||||||
|
|
||||||
namespace OpenSim.Framework.Communications.Cache
|
namespace OpenSim.Framework.Communications.Cache
|
||||||
{
|
{
|
||||||
public class FileAssetClient : AssetServerBase
|
public class FileAssetClient : AssetServerBase
|
||||||
{
|
{
|
||||||
private readonly string m_dir;
|
private readonly string m_dir;
|
||||||
private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase));
|
private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase));
|
||||||
|
|
||||||
public FileAssetClient(string dir)
|
public FileAssetClient(string dir)
|
||||||
{
|
{
|
||||||
if(!Directory.Exists(dir))
|
if(!Directory.Exists(dir))
|
||||||
{
|
{
|
||||||
Directory.CreateDirectory(dir);
|
Directory.CreateDirectory(dir);
|
||||||
}
|
}
|
||||||
m_dir = dir;
|
m_dir = dir;
|
||||||
}
|
}
|
||||||
public override void StoreAsset(AssetBase asset)
|
public override void StoreAsset(AssetBase asset)
|
||||||
{
|
{
|
||||||
string cdir = m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]
|
string cdir = m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]
|
||||||
+ Path.DirectorySeparatorChar + asset.FullID.Data[1];
|
+ Path.DirectorySeparatorChar + asset.FullID.Data[1];
|
||||||
|
|
||||||
if (!Directory.Exists(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]))
|
if (!Directory.Exists(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]))
|
||||||
Directory.CreateDirectory(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]);
|
Directory.CreateDirectory(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]);
|
||||||
|
|
||||||
if (!Directory.Exists(cdir))
|
if (!Directory.Exists(cdir))
|
||||||
Directory.CreateDirectory(cdir);
|
Directory.CreateDirectory(cdir);
|
||||||
|
|
||||||
FileStream x = new FileStream(cdir + Path.DirectorySeparatorChar + asset.FullID + ".xml", FileMode.Create);
|
FileStream x = new FileStream(cdir + Path.DirectorySeparatorChar + asset.FullID + ".xml", FileMode.Create);
|
||||||
m_xs.Serialize(x, asset);
|
m_xs.Serialize(x, asset);
|
||||||
|
|
||||||
x.Flush();
|
x.Flush();
|
||||||
x.Close();
|
x.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void UpdateAsset(AssetBase asset)
|
public override void UpdateAsset(AssetBase asset)
|
||||||
{
|
{
|
||||||
StoreAsset(asset);
|
StoreAsset(asset);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override AssetBase GetAsset(AssetRequest req)
|
protected override AssetBase GetAsset(AssetRequest req)
|
||||||
{
|
{
|
||||||
string cdir = m_dir + Path.DirectorySeparatorChar + req.AssetID.Data[0]
|
string cdir = m_dir + Path.DirectorySeparatorChar + req.AssetID.Data[0]
|
||||||
+ Path.DirectorySeparatorChar + req.AssetID.Data[1];
|
+ Path.DirectorySeparatorChar + req.AssetID.Data[1];
|
||||||
if (File.Exists(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml"))
|
if (File.Exists(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml"))
|
||||||
{
|
{
|
||||||
FileStream x = File.OpenRead(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml");
|
FileStream x = File.OpenRead(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml");
|
||||||
AssetBase ret = (AssetBase) m_xs.Deserialize(x);
|
AssetBase ret = (AssetBase) m_xs.Deserialize(x);
|
||||||
x.Close();
|
x.Close();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue