aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-2431-278/+657
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-192-5/+20
| |\
| | * BulletSim: add position resetting for stationary avatars so they don'tRobert Adams2013-07-182-5/+20
| | | | | | | | | | | | | | | | | | move around when standing on a stationary object. Create proper linkage between BSCharacter and its actor by generating a UpdatedProperties event the same way BSPrim does.
| * | Fix HGTravelStore.migrations in SQLite (mantis #6709)Diva Canto2013-07-191-10/+10
| |/
| * Enable storing of environment settings in NullSimulationDataDan Lake2013-07-181-3/+17
| |
| * Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post ↵Diva Canto2013-07-182-3/+10
| | | | | | | | | | | | requests timeout in 60 secs. There's plenty of room for improvement in handling the EQs. Some other time...
| * try Hacking in an AutoResetEvent to control the outgoing UDP loop instead of ↵Justin Clark-Casey (justincc)2013-07-182-2/+28
| | | | | | | | | | | | a continuous loop with sleeps. Does appear to have a cpu impact but may need further tweaking
| * Revert "Revert "I confuse myself. Let's try this variable name instead.""Diva Canto2013-07-181-3/+3
| | | | | | | | This reverts commit 52dc7b2a96a28798d55d07d79d003ce5e3d35216.
| * Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)""Diva Canto2013-07-181-2/+3
| | | | | | | | This reverts commit 5495df74436d6c0039a1500d979a964b003abfdf.
| * Revert "Revert "Putting the requests back in the queue while testing for ↵Diva Canto2013-07-181-3/+7
| | | | | | | | | | | | count >0 is not the smartest move..."" This reverts commit 71278919575b0e0222cdbe3c0cefa5919f9a75bc.
| * Revert "Revert "Didn't mean to commit this change in BlockingQueue.cs""Diva Canto2013-07-181-1/+1
| | | | | | | | This reverts commit fda91d93dad1fa6f901e8db5829aa8b70477c97e.
| * Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-184-52/+41
| | | | | | | | | | | | | | | | successfully tested, and I'm merging back those changes, which proved to be good. Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"" This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-07-181-1/+1
| |\
| | * Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T data) ↵Justin Clark-Casey (justincc)2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | where the q parmater is ignored and everyghig is always placed on m_lowQueue. No actual impact presently since nothing ends up calling EnqueueHigh()
| * | Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.Dan Lake2013-07-182-4/+8
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-171-2/+3
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-07-1711-114/+192
| | |\
| | * | command line kick user now uses exact name match instead of substring search ↵Dan Lake2013-07-171-2/+3
| | | | | | | | | | | | | | | | to avoid kicking the wrong user or multiple wrong users.
| * | | Revert "Cleared up much confusion in PollServiceRequestManager. Here's the ↵Diva Canto2013-07-174-41/+52
| | | | | | | | | | | | | | | | | | | | | | | | history:" This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
| * | | Revert "Didn't mean to commit this change in BlockingQueue.cs"Diva Canto2013-07-171-1/+1
| | | | | | | | | | | | | | | | This reverts commit 0f5b616fb0ebf9207b3cc81771622ed1290ea7d6.
| * | | Revert "Putting the requests back in the queue while testing for count >0 is ↵Diva Canto2013-07-171-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | not the smartest move..." This reverts commit f4317dc26d670c853d0ea64b401b00f718f09474.
| * | | Revert "Do the same trick that dahlia did for Dequeue(timeout)"Diva Canto2013-07-171-3/+2
| | | | | | | | | | | | | | | | This reverts commit af792bc7f2504e9ccf1c8ae7568919785dc397c9.
| * | | Revert "I confuse myself. Let's try this variable name instead."Diva Canto2013-07-171-3/+3
| | | | | | | | | | | | | | | | This reverts commit 1d3deda10cf85abd68a5f904d6698ae597a67cc0.
| * | | Revert "Now trying DoubleQueue instead of BlockingQueue for the ↵Diva Canto2013-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PollServiceRequestManager." This reverts commit 5f95f4d78e8c7d17b8ba866907156fe6d4444c04.
| * | | Revert "This is a completely unreasonable thing to do, effectively defying ↵Diva Canto2013-07-171-52/+40
| | |/ | |/| | | | | | | | | | | | | the purpose of BlockingQueues. Trying this, to see the effect on CPU." This reverts commit 5232ab0496eb4fe6903a0fd328974ac69df29ad8.
| * | This is a completely unreasonable thing to do, effectively defying the ↵Diva Canto2013-07-171-40/+52
| | | | | | | | | | | | purpose of BlockingQueues. Trying this, to see the effect on CPU.
| * | Now trying DoubleQueue instead of BlockingQueue for the ↵Diva Canto2013-07-171-2/+2
| | | | | | | | | | | | PollServiceRequestManager.
| * | I confuse myself. Let's try this variable name instead.Diva Canto2013-07-171-3/+3
| | |
| * | Do the same trick that dahlia did for Dequeue(timeout)Diva Canto2013-07-171-2/+3
| | |
| * | Putting the requests back in the queue while testing for count >0 is not the ↵Diva Canto2013-07-171-3/+7
| | | | | | | | | | | | smartest move...
| * | Didn't mean to commit this change in BlockingQueue.csDiva Canto2013-07-171-1/+1
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-172-6/+10
| |\ \
| | * | BulletSim: fix small bug where everything looked like it was collidingRobert Adams2013-07-172-6/+10
| | | | | | | | | | | | | | | | before the first simulator step.
| * | | Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-174-52/+41
| |/ / | | | | | | | | | | | | | | | When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle! This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached. This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
| * | Removed the MapItems thread. Redirected the map items requests to the ↵Diva Canto2013-07-162-9/+45
| | | | | | | | | | | | services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
| * | Improvements to the ServiceThrottleModule: added a category and an itemid to ↵Diva Canto2013-07-164-11/+40
| | | | | | | | | | | | the interface, so that duplicate requests aren't enqueued more than once.
| * | UserManagementModule: in the continuation, call the method that also looks ↵Diva Canto2013-07-161-2/+2
| | | | | | | | | | | | up the cache, because the resource may be here in the meantime
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-163-6/+12
| |\ \ | | |/
| | * Attachments module only registers when enabled. This enables alternative ↵Dan Lake2013-07-163-6/+12
| | | | | | | | | | | | attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
| * | Added config var to fiddle with the Interval for the service throttle threadDiva Canto2013-07-161-1/+4
| |/
| * Deleted a couple of verbose messagesDiva Canto2013-07-162-4/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-161-1/+19
| |\
| | * minor: Add warning method doc about possibly inconsistent results returned ↵Justin Clark-Casey (justincc)2013-07-161-1/+19
| | | | | | | | | | | | from BlockingQueue.Contains(), Count() and GetQueueArray()
| | * Revert "Revert "MSDN documentation is unclear about whether exiting a lock() ↵Justin Clark-Casey (justincc)2013-07-161-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class."" This reverts commit 21a09ad3ad42b24bce4fc04c6bcd6f7d9a80af08. After more analysis and discussion, it is apparant that the Count(), Contains() and GetQueueArray() cannot be made thread-safe anyway without external locking And this change appears to have a positive impact on performance. I still believe that Monitor.Exit() will not release any thread for Monitor.Wait(), as per http://msdn.microsoft.com/en-gb/library/vstudio/system.threading.monitor.exit%28v=vs.100%29.aspx so this should in theory make no difference, though mono implementation issues could possibly be coming into play.
| | * Revert "MSDN documentation is unclear about whether exiting a lock() block ↵Justin Clark-Casey (justincc)2013-07-161-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class." This reverts commit 42e2a0d66eaa7e322bce817e9e2cc9a288de167b Reverting because unfortunately this introduces race conditions because Contains(), Count() and GetQueueArray() may now end up returning the wrong result if another thread performs a simultaneous update on m_queue. Code such as PollServiceRequestManager.Stop() relies on the count being correct otherwise a request may be lost. Also, though some of the internal queue methods do not affect state, they are not thread-safe and could return the wrong result generating the same problem lock() generates Monitor.Enter() and Monitor.Exit() under the covers. Monitor.Exit() does not cause Monitor.Wait() to exist, only Pulse() and PulseAll() will do this Reverted with agreement.
| * | Added IServiceThrottleModule.csDiva Canto2013-07-161-0/+11
| | |
| * | Changed the name to ServiceThrottle/ServiceThrottleModule in order to ↵Diva Canto2013-07-161-0/+0
| | | | | | | | | | | | reflect its more generic nature.
| * | Eliminated the UserManagement/UserManagementModule throttle thread. Made the ↵Diva Canto2013-07-162-189/+148
| |/ | | | | | | other one generic, taking any continuation.
| * In the pursuit of using less CPU: now trying to avoid blocking queues ↵Diva Canto2013-07-162-15/+120
| | | | | | | | altogether. Instead, this uses a timer. No sure if it's better or worse, but worth the try.
| * Actually use DoubleQueue in UserManagement/UserManagementModuleDiva Canto2013-07-161-1/+1
| |
generated by cgit v1.1 at 2024-08-22 02:15:08 +0000