Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

4 files changed, 70 insertions, 82 deletions

diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index 96536e8..8c2bec6 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -56,22 +56,25 @@ namespace OpenSim.Framework.Monitoring
                 Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
 
             Process myprocess = Process.GetCurrentProcess();
-            if (!myprocess.HasExited)
+//            if (!myprocess.HasExited)
+            try
             {
                 myprocess.Refresh();
                 sb.AppendFormat(
                         "Process memory:      Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
-                        Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0),
-                        Math.Round(Process.GetCurrentProcess().PagedMemorySize64 / 1024.0 / 1024.0),
-                        Math.Round(Process.GetCurrentProcess().VirtualMemorySize64 / 1024.0 / 1024.0));
+                        Math.Round(myprocess.WorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.VirtualMemorySize64 / 1024.0 / 1024.0));
                 sb.AppendFormat(
                         "Peak process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
-                        Math.Round(Process.GetCurrentProcess().PeakWorkingSet64 / 1024.0 / 1024.0),
-                        Math.Round(Process.GetCurrentProcess().PeakPagedMemorySize64 / 1024.0 / 1024.0),
-                        Math.Round(Process.GetCurrentProcess().PeakVirtualMemorySize64 / 1024.0 / 1024.0));
+                        Math.Round(myprocess.PeakWorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PeakPagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PeakVirtualMemorySize64 / 1024.0 / 1024.0));
             }
-            else
-                sb.Append("Process reported as Exited \n");
+            catch
+            { }
+//            else
+//                sb.Append("Process reported as Exited \n");
 
             return sb.ToString();
         }
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 6db9a67..7709f62 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -40,6 +40,8 @@ namespace OpenSim.Framework.Monitoring
 
         public int LogLevel { get; set; }
 
+        private object JobLock = new object();
+
         public string Name { get; private set; }
 
         public string LoggingName { get; private set; }
@@ -76,7 +78,7 @@ namespace OpenSim.Framework.Monitoring
         /// </remarks>
         private bool m_warnOverMaxQueue = true;
 
-        private BlockingCollection<Job> m_jobQueue;
+        private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
 
         private CancellationTokenSource m_cancelSource;
 
@@ -95,7 +97,7 @@ namespace OpenSim.Framework.Monitoring
 
         public void Start()
         {
-            lock (this)
+            lock (JobLock)
             {
                 if (IsRunning)
                     return;
@@ -104,7 +106,6 @@ namespace OpenSim.Framework.Monitoring
 
                 m_finishedProcessingAfterStop.Reset();
 
-                m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
                 m_cancelSource = new CancellationTokenSource();
 
                 WorkManager.StartThread(
@@ -120,43 +121,22 @@ namespace OpenSim.Framework.Monitoring
 
         public void Stop()
         {   
-            lock (this)
+            lock (JobLock)
             {
                 try
                 {
                     if (!IsRunning)
                         return;
 
-                    IsRunning = false;
+                    m_log.DebugFormat("[JobEngine] Stopping {0}", Name);
 
-                    int requestsLeft = m_jobQueue.Count;
+                    IsRunning = false;
 
-                    if (requestsLeft <= 0)
-                    {
+                    m_finishedProcessingAfterStop.Reset();
+                    if(m_jobQueue.Count <= 0)
                         m_cancelSource.Cancel();
-                    }
-                    else 
-                    {
-                        m_log.InfoFormat("[{0}]: Waiting to write {1} events after stop.", LoggingName, requestsLeft);
-
-                        while (requestsLeft > 0)
-                        {
-                            if (!m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop))
-                            {
-                                // After timeout no events have been written
-                                if (requestsLeft == m_jobQueue.Count)
-                                {
-                                    m_log.WarnFormat(
-                                        "[{0}]: No requests processed after {1} ms wait.  Discarding remaining {2} requests", 
-                                        LoggingName, RequestProcessTimeoutOnStop, requestsLeft);
-
-                                    break;
-                                }
-                            }
-
-                            requestsLeft = m_jobQueue.Count;
-                        }
-                    }
+
+                    m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop);
                 }
                 finally
                 {
@@ -245,48 +225,51 @@ namespace OpenSim.Framework.Monitoring
 
         private void ProcessRequests()
         {
-            try
+            while(IsRunning || m_jobQueue.Count > 0)
             {
-                while (IsRunning || m_jobQueue.Count > 0)
+                try
                 {
-                    try
-                    {
-                        CurrentJob = m_jobQueue.Take(m_cancelSource.Token);
-                    }
-                    catch (ObjectDisposedException e)
+                    CurrentJob = m_jobQueue.Take(m_cancelSource.Token);
+                }
+                catch(ObjectDisposedException e)
+                {
+                    // If we see this whilst not running then it may be due to a race where this thread checks
+                    // IsRunning after the stopping thread sets it to false and disposes of the cancellation source.
+                    if(IsRunning)
+                        throw e;
+                    else
                     {
-                        // If we see this whilst not running then it may be due to a race where this thread checks
-                        // IsRunning after the stopping thread sets it to false and disposes of the cancellation source.
-                        if (IsRunning)
-                            throw e;
-                        else
-                            break;
+                        m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue",
+                                Name,m_jobQueue.Count);
+                        break;
                     }
+                }
+                catch(OperationCanceledException)
+                {
+                    break;
+                }
 
-                    if (LogLevel >= 1)
-                        m_log.DebugFormat("[{0}]: Processing job {1}", LoggingName, CurrentJob.Name);
+                if(LogLevel >= 1)
+                    m_log.DebugFormat("[{0}]: Processing job {1}",LoggingName,CurrentJob.Name);
 
-                    try
-                    {
-                        CurrentJob.Action();
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(
-                            string.Format(
-                            "[{0}]: Job {1} failed, continuing.  Exception  ", LoggingName, CurrentJob.Name), e);
-                    }
+                try
+                {
+                    CurrentJob.Action();
+                }
+                catch(Exception e)
+                {
+                    m_log.Error(
+                        string.Format(
+                        "[{0}]: Job {1} failed, continuing.  Exception  ",LoggingName,CurrentJob.Name),e);
+                }
 
-                    if (LogLevel >= 1)
-                        m_log.DebugFormat("[{0}]: Processed job {1}", LoggingName, CurrentJob.Name);
+                if(LogLevel >= 1)
+                    m_log.DebugFormat("[{0}]: Processed job {1}",LoggingName,CurrentJob.Name);
 
-                    CurrentJob = null;
-                }
-            }
-            catch (OperationCanceledException)
-            {
+                CurrentJob = null;
             }
 
+            Watchdog.RemoveThread(false);
             m_finishedProcessingAfterStop.Set();
         }
 
@@ -338,4 +321,4 @@ namespace OpenSim.Framework.Monitoring
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index 4485a9c..b2c1fb1 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -332,29 +332,31 @@ namespace OpenSim.Framework.Monitoring
             if (callback != null)
             {
                 List<ThreadWatchdogInfo> callbackInfos = null;
+                List<ThreadWatchdogInfo> threadsInfo;
 
                 lock (m_threads)
                 {
                     // get a copy since we may change m_threads
-                    List<ThreadWatchdogInfo> threadsInfo = m_threads.Values.ToList();
-                    foreach (ThreadWatchdogInfo threadInfo in threadsInfo)
+                    threadsInfo = m_threads.Values.ToList();
+
+                    foreach(ThreadWatchdogInfo threadInfo in threadsInfo)
                     {
-                        if (threadInfo.Thread.ThreadState == ThreadState.Stopped)
+                        if(threadInfo.Thread.ThreadState == ThreadState.Stopped)
                         {
                             RemoveThread(threadInfo.Thread.ManagedThreadId);
 
-                            if (callbackInfos == null)
+                            if(callbackInfos == null)
                                 callbackInfos = new List<ThreadWatchdogInfo>();
 
                             callbackInfos.Add(threadInfo);
                         }
-                        else if (!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
+                        else if(!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
                         {
                             threadInfo.IsTimedOut = true;
 
-                            if (threadInfo.AlarmIfTimeout)
+                            if(threadInfo.AlarmIfTimeout)
                             {
-                                if (callbackInfos == null)
+                                if(callbackInfos == null)
                                     callbackInfos = new List<ThreadWatchdogInfo>();
 
                                 // Send a copy of the watchdog info to prevent race conditions where the watchdog
@@ -365,7 +367,7 @@ namespace OpenSim.Framework.Monitoring
                     }
                 }
 
-                if (callbackInfos != null)
+                if(callbackInfos != null)
                     foreach (ThreadWatchdogInfo callbackInfo in callbackInfos)
                         callback(callbackInfo);
             }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 4dafaef..4aad578 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -753,7 +753,7 @@ namespace OpenSim.Framework
             newy *= Constants.RegionSize;
             if (oldy + oldsizey + drawdist < newy)
                 return true;
-            if (newy + newsizey + drawdist< oldy)
+            if (newy + newsizey + drawdist < oldy)
                 return true;
 
             return false;