Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -1/+14 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| * | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -4/+7 |
| | | | | | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in. | ||||
| * | Add number of milliseconds since last update to "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+11 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-12 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | doh - correct build break | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -6/+7 |
| | | |||||
| * | Add threads to the watchdog thread list before we start them. | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -5/+5 |
| | | | | | | | | Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -8/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -16/+86 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| * | Restart the event queue worker threads that I accidentally disabled earlier ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -2/+2 |
| | | | | | | | | | | | | today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite) | ||||
| * | In Watchdog, add ability to specific timeout for a thread. | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -16/+56 |
| | | | | | | | | This also changes the point of registration to the StartThread() call rather than the first Update() | ||||
| * | Add m_threads dictionary locking to Watchdog.GetThreads() | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+2 |
| | | |||||
| * | Add "threads abort <thread-id>" simulator console command that allows us to ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -2/+23 |
| | | | | | | | | | | | | abort a watchdog managed thread. This is for diagnostic purposes. | ||||
* | | Prevent a null ref when an avatar login doesn't go as planned | Melanie | 2010-12-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -2/+12 |
|\ \ | |/ | |||||
| * | Fix "show threads" to show threads now being managed by ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -2/+12 |
| | | | | | | | | OpenSim.Framework.Watchdog | ||||
* | | don't mask current time reads (since we don't mask the corresponding subtract) | Mike Rieker | 2010-08-03 | 1 | -3/+3 |
|/ | | | | | if you mask the reads you have to mask the subtract as well. simplest is just don't mask any of it. | ||||
* | * Changed the watchdog timer to improve the speed of UpdateThread(), only ↵ | John Hurliman | 2009-10-26 | 1 | -30/+30 |
| | | | | | | track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later * Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it | ||||
* | Implemented a Watchdog class. Do not manually create Thread objects anymore, ↵ | John Hurliman | 2009-10-22 | 1 | -0/+183 |
use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated |