ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* optimized usings.

Browse Source
This commit is contained in:
lbsa71
2009-02-12 09:53:12 +00:00
parent d21601d497
commit 801da4346a
383 changed files with 1318 additions and 2154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Data/MySQL/MySQLAssetData.cs
View File

@@ -26,15 +26,13 @@
*/
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
{
/// <summary>
@@ -62,7 +60,7 @@ namespace OpenSim.Data.MySQL
/// <param name="connect">connect string</param>
override public void Initialise(string connect)
{
TicksToEpoch = new System.DateTime(1970,1,1).Ticks;
TicksToEpoch = new DateTime(1970,1,1).Ticks;
// TODO: This will let you pass in the connect string in
// the config, though someone will need to write that.
@@ -145,7 +143,7 @@ namespace OpenSim.Data.MySQL
{
asset.Metadata.Local = (bool)dbReader["local"];
}
catch (System.InvalidCastException)
catch (InvalidCastException)
{
asset.Metadata.Local = false;
}
@@ -199,7 +197,7 @@ namespace OpenSim.Data.MySQL
using (cmd)
{
// create unix epoch time
int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
cmd.Parameters.AddWithValue("?name", asset.Metadata.Name);
cmd.Parameters.AddWithValue("?description", asset.Metadata.Description);
@@ -240,7 +238,7 @@ namespace OpenSim.Data.MySQL
using (cmd)
{
// create unix epoch time
int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
cmd.Parameters.AddWithValue("?access_time", now);
cmd.ExecuteNonQuery();

11
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@@ -28,15 +28,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Reflection;
using System.Threading;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.MySQL
{
@@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL
cmd.Dispose();
}
m_lastConnectionUse = System.DateTime.Now.Ticks;
m_lastConnectionUse = DateTime.Now.Ticks;
m_log.DebugFormat(
"[REGION DB]: Connection wait timeout {0} seconds",
@@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL
protected void CheckConnection()
{
long timeNow = System.DateTime.Now.Ticks;
long timeNow = DateTime.Now.Ticks;
if (timeNow - m_lastConnectionUse > m_waitTimeout ||
m_connection.State != ConnectionState.Open)
{
@@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL
else
m_FieldMap[name].SetValue(es, false);
}
else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
else if (m_FieldMap[name].GetValue(es) is UUID)
{
UUID uuid = UUID.Zero;

5
OpenSim/Data/MySQL/MySQLGridData.cs
View File

@@ -29,8 +29,9 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
@@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL
if (lockedCons > m_maxConnections)
{
lockedCons = 0;
System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
Thread.Sleep(1000); // Wait some time before searching them again.
m_log.Debug(
"WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
}

2
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

@@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL

2
OpenSim/Data/MySQL/MySQLLogData.cs
View File

@@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Reflection;
using System.Collections.Generic;
using System.Reflection;
using log4net;
using OpenSim.Framework;

8
OpenSim/Data/MySQL/MySQLManager.cs
View File

@@ -26,14 +26,14 @@
*/
using System;
using System.Collections.Generic;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Reflection;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
@@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL
cmd.Dispose();
}
m_lastConnectionUse = System.DateTime.Now.Ticks;
m_lastConnectionUse = DateTime.Now.Ticks;
m_log.DebugFormat(
"[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond);
@@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL
{
//m_log.Debug("[REGION DB]: Checking connection");
long timeNow = System.DateTime.Now.Ticks;
long timeNow = DateTime.Now.Ticks;
if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open)
{
m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting");

8
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@@ -28,13 +28,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Threading;
using System.Drawing;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
@@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL
}
catch (Exception)
{
System.Threading.Thread.Sleep(500);
Thread.Sleep(500);
m_Connection.Close();
m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
}
catch (Exception)
{
System.Threading.Thread.Sleep(500);
Thread.Sleep(500);
m_Connection.Close();
m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();

5
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@@ -31,8 +31,9 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Text.RegularExpressions;
using OpenMetaverse;
using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
@@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL
if (lockedCons > m_maxConnections)
{
lockedCons = 0;
System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
Thread.Sleep(1000); // Wait some time before searching them again.
m_log.Debug(
"WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
m_log.Debug("Current connections-in-use dump:");

9
OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
View File

@@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

9
OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
View File

@@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@@ -63,7 +56,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

9
OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
View File

@@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

10
OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
View File

@@ -26,16 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using log4net;
namespace OpenSim.Data.MySQL.Tests
{
@@ -62,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

9
OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
View File

@@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

9
OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
View File

@@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}