From f60bc970eb925cd245cc77b1ae700b28d4589163 Mon Sep 17 00:00:00 2001 From: MW Date: Thu, 8 Mar 2007 13:21:24 +0000 Subject: Another attemp to fix the Session Logout bug World map data is now saved in database and recovered on startup. Primitives are now backed up to a local database and reloaded on startup. --- src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs | 31 ++++++ .../Db4LocalStorage/Db4LocalStorage.cs | 119 +++++++++++++++++++++ .../Db4LocalStorage/Db4LocalStorage.csproj | 53 +++++++++ .../Db4LocalStorage/Db4LocalStorage.sln | 7 ++ 4 files changed, 210 insertions(+) create mode 100644 src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs create mode 100644 src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs create mode 100644 src/LocalStorage/Db4LocalStorage/Db4LocalStorage.csproj create mode 100644 src/LocalStorage/Db4LocalStorage/Db4LocalStorage.sln (limited to 'src/LocalStorage') diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs new file mode 100644 index 0000000..6610606 --- /dev/null +++ b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs @@ -0,0 +1,31 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Information about this assembly is defined by the following +// attributes. +// +// change them to the information which is associated with the assembly +// you compile. + +[assembly: AssemblyTitle("Db4LocalStorage")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Db4LocalStorage")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// This sets the default COM visibility of types in the assembly to invisible. +// If you need to expose a type to COM, use [ComVisible(true)] on that type. +[assembly: ComVisible(false)] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all values by your own or you can build default build and revision +// numbers with the '*' character (the default): + +[assembly: AssemblyVersion("1.0.*")] diff --git a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs b/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs new file mode 100644 index 0000000..9dc81a1 --- /dev/null +++ b/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs @@ -0,0 +1,119 @@ +/* +* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ +using System; +using System.Collections.Generic; +using Db4objects.Db4o; +using Db4objects.Db4o.Query; +using libsecondlife; +using GridInterfaces; + +namespace Db4LocalStorage +{ + /// + /// + /// + public class Db4LocalStorage : ILocalStorage + { + private IObjectContainer db; + + public Db4LocalStorage() + { + try + { + db = Db4oFactory.OpenFile("localworld.yap"); + ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage creation"); + } + catch(Exception e) + { + db.Close(); + ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured"); + ServerConsole.MainConsole.Instance.WriteLine(e.ToString()); + } + } + + public void StorePrim(PrimStorage prim) + { + IObjectSet result = db.Query(new UUIDQuery(prim.FullID)); + if(result.Count>0) + { + //prim already in storage + //so update it + PrimStorage found = (PrimStorage) result.Next(); + found.Data = prim.Data; + found.Position = prim.Position; + found.Rotation = prim.Rotation; + db.Set(found); + } + else + { + //not in storage + db.Set(prim); + } + } + + public void RemovePrim(LLUUID primID) + { + IObjectSet result = db.Query(new UUIDQuery(primID)); + if(result.Count>0) + { + PrimStorage found = (PrimStorage) result.Next(); + db.Delete(found); + } + } + + + public void LoadPrimitives(ILocalStorageReceiver receiver) + { + IObjectSet result = db.Get(typeof(PrimStorage)); + ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count); + foreach (PrimStorage prim in result) { + receiver.PrimFromStorage(prim); + } + } + + public void ShutDown() + { + db.Commit(); + db.Close(); + } + } + + public class UUIDQuery : Predicate + { + private LLUUID _findID; + + public UUIDQuery(LLUUID find) + { + _findID = find; + } + public bool Match(PrimStorage prim) + { + return (prim.FullID == _findID); + } + } + +} diff --git a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.csproj b/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.csproj new file mode 100644 index 0000000..9b5c487 --- /dev/null +++ b/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.csproj @@ -0,0 +1,53 @@ + + + Library + Db4LocalStorage + Db4LocalStorage + Debug + AnyCPU + {74784F23-B0FD-484C-82C1-96C0215733DC} + + + bin\Debug\ + False + DEBUG;TRACE + True + Full + True + + + bin\Release\ + True + TRACE + False + None + False + + + + + + ..\..\..\bin\Db4objects.Db4o.dll + False + + + ..\..\..\..\..\..\..\Libsecond-dailys\libsl07-03\trunk\libsecondlife-cs\obj\Debug\libsecondlife.dll + False + + + + + + + + + {5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9} + GridInterfaces + + + {C9A6026D-8E0C-4FE4-8691-FB2A566AA245} + ServerConsole + + + + \ No newline at end of file diff --git a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.sln b/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.sln new file mode 100644 index 0000000..89e4710 --- /dev/null +++ b/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.sln @@ -0,0 +1,7 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# SharpDevelop 2.1.0.2017 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Db4LocalStorage", "Db4LocalStorage.csproj", "{74784F23-B0FD-484C-82C1-96C0215733DC}" +EndProject +Global +EndGlobal -- cgit v1.1