diff options
| author | UbitUmarov | 2016-12-12 00:54:41 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-12 00:54:41 +0000 |
| commit | da2c1e8aadd3de2821e1aa1e002259876077d271 (patch) | |
| tree | c9d95d2fa4223183e86aa3bfb5fbf5a90568d5fb /OpenSim | |
| parent | Allow OpenSim to respond to Unix signals. This may need work to be (diff) | |
| download | opensim-SC_OLD-da2c1e8aadd3de2821e1aa1e002259876077d271.zip opensim-SC_OLD-da2c1e8aadd3de2821e1aa1e002259876077d271.tar.gz opensim-SC_OLD-da2c1e8aadd3de2821e1aa1e002259876077d271.tar.bz2 opensim-SC_OLD-da2c1e8aadd3de2821e1aa1e002259876077d271.tar.xz | |
don't do unix signals on windows
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 203fe5e..aba09e0 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -126,11 +126,8 @@ namespace OpenSim | |||
| 126 | m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); | 126 | m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | private static Mono.Unix.UnixSignal[] signals = new Mono.Unix.UnixSignal[] | 129 | private static Mono.Unix.UnixSignal[] signals; |
| 130 | { | 130 | |
| 131 | // new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGINT), | ||
| 132 | new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) | ||
| 133 | }; | ||
| 134 | 131 | ||
| 135 | private Thread signal_thread = new Thread (delegate () | 132 | private Thread signal_thread = new Thread (delegate () |
| 136 | { | 133 | { |
| @@ -154,7 +151,16 @@ namespace OpenSim | |||
| 154 | m_log.Info("========================= STARTING OPENSIM ========================="); | 151 | m_log.Info("========================= STARTING OPENSIM ========================="); |
| 155 | m_log.Info("===================================================================="); | 152 | m_log.Info("===================================================================="); |
| 156 | 153 | ||
| 157 | signal_thread.Start(); | 154 | if(!Util.IsWindows()) |
| 155 | { | ||
| 156 | // linux mac os specifics | ||
| 157 | signals = new Mono.Unix.UnixSignal[] | ||
| 158 | { | ||
| 159 | // new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGINT), | ||
| 160 | new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) | ||
| 161 | }; | ||
| 162 | signal_thread.Start(); | ||
| 163 | } | ||
| 158 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); | 164 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); |
| 159 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx | 165 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx |
| 160 | //GCSettings.LatencyMode = GCLatencyMode.Batch; | 166 | //GCSettings.LatencyMode = GCLatencyMode.Batch; |