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

move the locks closer to the data, sqlite for assets now works like a champ

afrisby
Sean Dague 2007-09-11 08:25:32 +00:00
parent b3777729b4
commit a1e2fea7c1
2 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -200,10 +200,7 @@ namespace OpenSim.Framework.Communications.Caches
//Console.WriteLine("new texture to send"); //Console.WriteLine("new texture to send");
TextureSender sender = new TextureSender(req); TextureSender sender = new TextureSender(req);
//sender.OnComplete += this.TextureSent; //sender.OnComplete += this.TextureSent;
lock (this.SendingTextures)
{
this.SendingTextures.Add(req.ImageInfo.FullID, sender); this.SendingTextures.Add(req.ImageInfo.FullID, sender);
}
this.QueueTextures.Enqueue(sender); this.QueueTextures.Enqueue(sender);
} }
@ -262,14 +259,11 @@ namespace OpenSim.Framework.Communications.Caches
public void TextureSent(TextureSender sender) public void TextureSent(TextureSender sender)
{ {
if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID)) if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
{
lock (this.SendingTextures)
{ {
this.SendingTextures.Remove(sender.request.ImageInfo.FullID); this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
// this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID); // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
} }
} }
}
public void AssetReceived(AssetBase asset, bool IsTexture) public void AssetReceived(AssetBase asset, bool IsTexture)
{ {

17
OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
View File

@ -62,6 +62,7 @@ namespace OpenSim.Framework.Data.SQLite
ds = new DataSet(); ds = new DataSet();
da = new SqliteDataAdapter(new SqliteCommand(assetSelect, conn)); da = new SqliteDataAdapter(new SqliteCommand(assetSelect, conn));
lock (ds) {
ds.Tables.Add(createAssetsTable()); ds.Tables.Add(createAssetsTable());
setupAssetCommands(da, conn); setupAssetCommands(da, conn);
@ -73,7 +74,7 @@ namespace OpenSim.Framework.Data.SQLite
{ {
MainLog.Instance.Verbose("AssetStorage", "Caught fill error on asset table"); MainLog.Instance.Verbose("AssetStorage", "Caught fill error on asset table");
} }
}
return; return;
} }
@ -110,6 +111,7 @@ namespace OpenSim.Framework.Data.SQLite
", Local: " + asset.Local + ", Local: " + asset.Local +
", Data Length: " + asset.Data.Length ); ", Data Length: " + asset.Data.Length );
DataTable assets = ds.Tables["assets"]; DataTable assets = ds.Tables["assets"];
lock(ds) {
DataRow row = assets.Rows.Find(asset.FullID); DataRow row = assets.Rows.Find(asset.FullID);
if (row == null) if (row == null)
{ {
@ -121,8 +123,7 @@ namespace OpenSim.Framework.Data.SQLite
{ {
fillAssetRow(row, asset); fillAssetRow(row, asset);
} }
da.Update(ds, "assets"); }
ds.AcceptChanges();
} }
public bool ExistsAsset(LLUUID uuid) public bool ExistsAsset(LLUUID uuid)
@ -133,19 +134,21 @@ namespace OpenSim.Framework.Data.SQLite
public void DeleteAsset(LLUUID uuid) public void DeleteAsset(LLUUID uuid)
{ {
lock (ds) {
DataRow row = ds.Tables["assets"].Rows.Find(uuid); DataRow row = ds.Tables["assets"].Rows.Find(uuid);
if (row != null) { if (row != null) {
row.Delete(); row.Delete();
} }
da.Update(ds, "assets"); }
ds.AcceptChanges();
} }
public void CommitAssets() // force a sync to the database public void CommitAssets() // force a sync to the database
{ {
MainLog.Instance.Verbose("AssetStorage", "Attempting commit"); MainLog.Instance.Verbose("AssetStorage", "Attempting commit");
// da.Update(ds, "assets"); lock (ds) {
// ds.AcceptChanges(); da.Update(ds, "assets");
ds.AcceptChanges();
}
} }
/*********************************************************************** /***********************************************************************