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

* some more refactoring + bugfix

afrisby
lbsa71 2007-10-19 08:57:30 +00:00
parent e1bb245787
commit 656c72befc
4 changed files with 134 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Framework/Communications/Cache/AssetServer.cs
View File

@ -57,11 +57,6 @@ namespace OpenSim.Framework.Communications.Cache
{ {
SetUpAssetDatabase(); SetUpAssetDatabase();
} }
this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
this._localAssetServerThread.IsBackground = true;
this._localAssetServerThread.Start();
} }
public void CreateAndCommitAsset(AssetBase asset) public void CreateAndCommitAsset(AssetBase asset)
@ -76,6 +71,8 @@ namespace OpenSim.Framework.Communications.Cache
override public void Close() override public void Close()
{ {
base.Close();
if (db != null) if (db != null)
{ {
MainLog.Instance.Verbose("Closing local asset server database"); MainLog.Instance.Verbose("Closing local asset server database");
@ -83,7 +80,7 @@ namespace OpenSim.Framework.Communications.Cache
} }
} }
private void RunRequests() override protected void RunRequests()
{ {
while (true) while (true)
{ {
@ -135,12 +132,12 @@ namespace OpenSim.Framework.Communications.Cache
db.Commit(); db.Commit();
} }
private void SetUpAssetDatabase() protected virtual void SetUpAssetDatabase()
{ {
MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database"); MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database");
ForEachDefaultAsset(this, StoreAsset); ForEachDefaultAsset(StoreAsset);
ForEachXmlAsset(this, StoreAsset); ForEachXmlAsset(StoreAsset);
} }
} }

176
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@ -22,78 +22,27 @@ namespace OpenSim.Framework.Communications.Cache
protected abstract void StoreAsset(AssetBase asset); protected abstract void StoreAsset(AssetBase asset);
protected abstract void CommitAssets(); protected abstract void CommitAssets();
protected abstract void RunRequests();
public void LoadDefaultAssets() public void LoadDefaultAssets()
{ {
MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database"); MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database");
ForEachDefaultAsset( this, StoreAsset ); ForEachDefaultAsset(StoreAsset );
ForEachXmlAsset( this, StoreAsset ); ForEachXmlAsset(StoreAsset );
CommitAssets(); CommitAssets();
} }
public static AssetBase CreateAsset(IAssetServer assetServer, string assetIdStr, string name, string filename, bool isImage)
{
AssetBase asset = new AssetBase(
new LLUUID(assetIdStr),
name
);
if (!String.IsNullOrEmpty(filename))
{
MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename );
assetServer.LoadAsset(asset, isImage, filename);
}
else
{
MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name );
}
return asset;
}
private static AssetBase CreateImageAsset(IAssetServer assetServer, string assetIdStr, string name, string filename)
{
return CreateAsset(assetServer, assetIdStr, name, filename, true);
}
public static List<AssetBase> GetDefaultAssets(IAssetServer assetServer)
{
List<AssetBase> assets = new List<AssetBase>();
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000002", "Plywood", "plywood.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000003", "Rocks", "rocks.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000004", "Granite", "granite.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000005", "Hardwood", "hardwood.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-5005-000000000005", "Prim Base Texture", "plywood.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000006", "Map Base Texture", "map_base.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000007", "Map Texture", "map1.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000010", "Female Body Texture", "femalebody.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000012", "Female Face Texture", "femaleface.jp2"));
assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));
assets.Add(CreateAsset(assetServer, "77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));
assets.Add(CreateAsset(assetServer, "66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));
assets.Add(CreateAsset(assetServer, "00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));
assets.Add(CreateAsset(assetServer, "00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));
return assets;
}
public static void ForEachDefaultAsset(IAssetServer assetServer, Action<AssetBase> action)
{
List<AssetBase> assets = GetDefaultAssets(assetServer);
assets.ForEach(action);
}
public AssetServerBase() public AssetServerBase()
{ {
System.Console.WriteLine("Starting Db4o asset storage system"); System.Console.WriteLine("Starting Db4o asset storage system");
this._assetRequests = new BlockingQueue<ARequest>(); this._assetRequests = new BlockingQueue<ARequest>();
this._localAssetServerThread = new Thread( RunRequests );
this._localAssetServerThread.IsBackground = true;
this._localAssetServerThread.Start();
} }
public void LoadAsset(AssetBase info, bool image, string filename) public void LoadAsset(AssetBase info, bool image, string filename)
@ -115,30 +64,6 @@ namespace OpenSim.Framework.Communications.Cache
//info.loaded=true; //info.loaded=true;
} }
public static void ForEachXmlAsset(IAssetServer assetServer, Action<AssetBase> action)
{
string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
if (File.Exists(filePath))
{
XmlConfigSource source = new XmlConfigSource(filePath);
for (int i = 0; i < source.Configs.Count; i++)
{
string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());
string name = source.Configs[i].GetString("name", "");
sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0);
sbyte invType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
string fileName = source.Configs[i].GetString("fileName", "");
AssetBase newAsset = CreateAsset(assetServer, assetIdStr, name, fileName, false);
newAsset.Type = type;
newAsset.InvType = invType;
}
}
}
public void SetReceiver(IAssetReceiver receiver) public void SetReceiver(IAssetReceiver receiver)
{ {
this._receiver = receiver; this._receiver = receiver;
@ -170,11 +95,94 @@ namespace OpenSim.Framework.Communications.Cache
} }
} }
public virtual void Close()
{
_localAssetServerThread.Abort( );
}
public void SetServerInfo(string ServerUrl, string ServerKey) public void SetServerInfo(string ServerUrl, string ServerKey)
{ {
} }
public abstract void Close(); public virtual List<AssetBase> GetDefaultAssets()
{
List<AssetBase> assets = new List<AssetBase>();
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000002", "Plywood", "plywood.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000003", "Rocks", "rocks.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000004", "Granite", "granite.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000005", "Hardwood", "hardwood.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-5005-000000000005", "Prim Base Texture", "plywood.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000006", "Map Base Texture", "map_base.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000007", "Map Texture", "map1.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000010", "Female Body Texture", "femalebody.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000012", "Female Face Texture", "femaleface.jp2"));
assets.Add(CreateAsset("77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));
assets.Add(CreateAsset("66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));
assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));
assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));
return assets;
}
public AssetBase CreateImageAsset(string assetIdStr, string name, string filename)
{
return CreateAsset(assetIdStr, name, filename, true);
}
public void ForEachDefaultAsset(Action<AssetBase> action)
{
List<AssetBase> assets = GetDefaultAssets();
assets.ForEach(action);
}
public AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage)
{
AssetBase asset = new AssetBase(
new LLUUID(assetIdStr),
name
);
if (!String.IsNullOrEmpty(filename))
{
MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename );
LoadAsset(asset, isImage, filename);
}
else
{
MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name );
}
return asset;
}
public void ForEachXmlAsset(Action<AssetBase> action)
{
string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
if (File.Exists(filePath))
{
XmlConfigSource source = new XmlConfigSource(filePath);
for (int i = 0; i < source.Configs.Count; i++)
{
string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());
string name = source.Configs[i].GetString("name", "");
sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0);
sbyte invType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
string fileName = source.Configs[i].GetString("fileName", "");
AssetBase newAsset = CreateAsset(assetIdStr, name, fileName, false);
newAsset.Type = type;
newAsset.InvType = invType;
}
}
}
} }
} }

10
OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
View File

@ -44,11 +44,6 @@ namespace OpenSim.Framework.Communications.Cache
{ {
_assetRequests = new BlockingQueue<ARequest>(); _assetRequests = new BlockingQueue<ARequest>();
AddPlugin(pluginName); AddPlugin(pluginName);
this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
this._localAssetServerThread.IsBackground = true;
this._localAssetServerThread.Start();
} }
public SQLAssetServer(IAssetProvider assetProvider) public SQLAssetServer(IAssetProvider assetProvider)
@ -86,12 +81,13 @@ namespace OpenSim.Framework.Communications.Cache
public override void Close() public override void Close()
{ {
base.Close();
m_assetProviderPlugin.CommitAssets(); m_assetProviderPlugin.CommitAssets();
} }
private void RunRequests() override protected void RunRequests()
{ {
while (true) while (true)
{ {
ARequest req = this._assetRequests.Dequeue(); ARequest req = this._assetRequests.Dequeue();

7
OpenSim/Framework/General/Interfaces/IAssetServer.cs
View File

@ -25,6 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
using System;
using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
@ -43,6 +45,11 @@ namespace OpenSim.Framework.Interfaces
void SetServerInfo(string ServerUrl, string ServerKey); void SetServerInfo(string ServerUrl, string ServerKey);
void Close(); void Close();
void LoadAsset(AssetBase info, bool image, string filename); void LoadAsset(AssetBase info, bool image, string filename);
List<AssetBase> GetDefaultAssets();
AssetBase CreateImageAsset(string assetIdStr, string name, string filename);
void ForEachDefaultAsset(Action<AssetBase> action);
AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage);
void ForEachXmlAsset(Action<AssetBase> action);
} }
// could change to delegate? // could change to delegate?