aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 07:53:13 +0000
committerTedd Hansen2008-02-02 07:53:13 +0000
commit785b641272f0e41c50d42406496baee10e5303a9 (patch)
treef6e37734d8e5b5e98d1dbf7e6a01b82b41773ea2
parentAdded commands to change config file from console: (diff)
downloadopensim-SC_OLD-785b641272f0e41c50d42406496baee10e5303a9.zip
opensim-SC_OLD-785b641272f0e41c50d42406496baee10e5303a9.tar.gz
opensim-SC_OLD-785b641272f0e41c50d42406496baee10e5303a9.tar.bz2
opensim-SC_OLD-785b641272f0e41c50d42406496baee10e5303a9.tar.xz
fixed a timing bug in config re-read. Apparently there is 1000000000 ns in one second...
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs12
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/Program.cs24
-rwxr-xr-xbin/OpenSim.32BitLaunch.exebin4608 -> 5632 bytes
-rw-r--r--bin/OpenSim.32BitLaunch.pdbbin11776 -> 13824 bytes
6 files changed, 34 insertions, 13 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 223b4a5..1754f7e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -720,8 +720,8 @@ namespace OpenSim
720 m_log.Error("show modules - shows info aboutloaded modules."); 720 m_log.Error("show modules - shows info aboutloaded modules.");
721 m_log.Error("stats - statistical information for this server not displayed in the client"); 721 m_log.Error("stats - statistical information for this server not displayed in the client");
722 m_log.Error("shutdown - disconnect all clients and shutdown."); 722 m_log.Error("shutdown - disconnect all clients and shutdown.");
723 m_log.Error("config set category field value - set a config value"); 723 m_log.Error("config set section field value - set a config value");
724 m_log.Error("config get category field - get a config value"); 724 m_log.Error("config get section field - get a config value");
725 m_log.Error("config save - save OpenSim.ini"); 725 m_log.Error("config save - save OpenSim.ini");
726 m_log.Error("terrain help - show help for terrain commands."); 726 m_log.Error("terrain help - show help for terrain commands.");
727 break; 727 break;
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index ae6f001..57e56d4 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -90,12 +90,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
90 m_ScriptEngine.Log.Warn(m_ScriptEngine.ScriptEngineName, 90 m_ScriptEngine.Log.Warn(m_ScriptEngine.ScriptEngineName,
91 "Configuration error: MaxEventExecutionTimeMs is less than MaintenanceLoopms. The Maintenance Loop will only check scripts once per run."); 91 "Configuration error: MaxEventExecutionTimeMs is less than MaintenanceLoopms. The Maintenance Loop will only check scripts once per run.");
92 92
93 long Last_maxFunctionExecutionTimens = 0; // DateTime.Now.Ticks;
94 long Last_ReReadConfigFilens = DateTime.Now.Ticks;
93 while (true) 95 while (true)
94 { 96 {
95 try 97 try
96 { 98 {
97 long Last_maxFunctionExecutionTimens = 0; // DateTime.Now.Ticks;
98 long Last_ReReadConfigFilens = DateTime.Now.Ticks;
99 while (true) 99 while (true)
100 { 100 {
101 System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass 101 System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass
@@ -107,11 +107,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
107 // 107 //
108 // Re-reading config every x seconds 108 // Re-reading config every x seconds
109 // 109 //
110 if (m_ScriptEngine.RefreshConfigFileSeconds > 0) 110 if (m_ScriptEngine.RefreshConfigFilens > 0)
111 { 111 {
112 // Check if its time to re-read config 112 // Check if its time to re-read config
113 if (DateTime.Now.Ticks - Last_ReReadConfigFilens > m_ScriptEngine.RefreshConfigFilens) 113 if (DateTime.Now.Ticks - Last_ReReadConfigFilens > m_ScriptEngine.RefreshConfigFilens)
114 { 114 {
115 //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens );
115 // Its time to re-read config file 116 // Its time to re-read config file
116 m_ScriptEngine.ReadConfig(); 117 m_ScriptEngine.ReadConfig();
117 Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time 118 Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index 4cf39b4..f09e631 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -61,10 +61,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
61 /// How many seconds between re-reading config-file. 0 = never. ScriptEngine will try to adjust to new config changes. 61 /// How many seconds between re-reading config-file. 0 = never. ScriptEngine will try to adjust to new config changes.
62 /// </summary> 62 /// </summary>
63 public int RefreshConfigFileSeconds { 63 public int RefreshConfigFileSeconds {
64 get { return (int)(RefreshConfigFilens / 10000); } 64 get { return (int)(RefreshConfigFilens / 10000000); }
65 set { RefreshConfigFilens = value * 10000; } 65 set { RefreshConfigFilens = value * 10000000; }
66 } 66 }
67 public long RefreshConfigFilens = 0; 67 public long RefreshConfigFilens;
68 68
69 public ScriptManager GetScriptManager() 69 public ScriptManager GetScriptManager()
70 { 70 {
@@ -131,9 +131,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
131 } 131 }
132 public void ReadConfig() 132 public void ReadConfig()
133 { 133 {
134#if DEBUG 134//#if DEBUG
135 Log.Debug(ScriptEngineName, "Refreshing configuration for all modules"); 135// Log.Debug(ScriptEngineName, "Refreshing configuration for all modules");
136#endif 136//#endif
137 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30); 137 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
138 138
139 // Reload from disk? No! 139 // Reload from disk? No!
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
index afd7754..c15b738 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
@@ -1,10 +1,30 @@
1namespace OpenSim._32BitLaunch 1using System;
2
3namespace OpenSim._32BitLaunch
2{ 4{
3 class Program 5 class Program
4 { 6 {
5 static void Main(string[] args) 7 static void Main(string[] args)
6 { 8 {
7 OpenSim.Application.Main(args); 9 System.Console.WriteLine("32-bit OpenSim executor");
10 System.Console.WriteLine("-----------------------");
11 System.Console.WriteLine("");
12 System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar.");
13 System.Console.WriteLine("All 64-bit incompatibilities should be gone.");
14 System.Console.WriteLine("");
15 System.Threading.Thread.Sleep(300);
16 try
17 {
18 OpenSim.Application.Main(args);
19 }
20 catch (Exception ex)
21 {
22 System.Console.WriteLine("OpenSim threw an exception:");
23 System.Console.WriteLine(ex.ToString());
24 System.Console.WriteLine("");
25 System.Console.WriteLine("Application will now terminate!");
26 System.Console.WriteLine("");
27 }
8 } 28 }
9 } 29 }
10} 30}
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
index f16f5b2..fce690f 100755
--- a/bin/OpenSim.32BitLaunch.exe
+++ b/bin/OpenSim.32BitLaunch.exe
Binary files differ
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb
index 4ae2e48..645e3ba 100644
--- a/bin/OpenSim.32BitLaunch.pdb
+++ b/bin/OpenSim.32BitLaunch.pdb
Binary files differ