aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-071-2/+152
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add "debug threadpool status" console command to show min/max/current ↵Justin Clark-Casey (justincc)2013-08-061-0/+23
| | | | | | | | worker/iocp threadpool numbers
| * Add "debug comms status" command to show current debug comms settingsJustin Clark-Casey (justincc)2013-08-051-0/+11
| |
| * Make it possible to switch whether we serialize osd requests per endpoint or ↵Justin Clark-Casey (justincc)2013-08-051-0/+37
| | | | | | | | | | | | not, either via config (SerializeOSDRequests in [Network]) or via the "debug comms set" console command. For debug purposes to assess what impact this has on network response in a heavy test environment.
| * minor: move "threads abort" and "force gc" console commands into debug ↵Justin Clark-Casey (justincc)2013-08-051-2/+2
| | | | | | | | category - these are not things one needs to do in normal operation
| * Make it possible to set worker/iocp min/max threadpool limits on the fly ↵Justin Clark-Casey (justincc)2013-08-051-0/+78
| | | | | | | | with the console command "debug threadpool set"
| * Add checks monitoring framework to provide alerts if certain conditions do ↵Justin Clark-Casey (justincc)2013-08-051-0/+1
| | | | | | | | | | | | not hold. Not yet in use.
* | Merge branch 'master' into careminsterMelanie2013-07-291-0/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Increased the rate of the PollServiceRequestManager to 0.5 secs (it was ↵Diva Canto2013-07-261-1/+1
| | | | | | | | 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.
| * Fix regression tests relating to agent transfer by making simulator use last ↵Justin Clark-Casey (justincc)2013-07-261-0/+5
| | | | | | | | week's SIMULATOR/0.1 protocol for now.
| * Removed verbose debug from previous commitDiva Canto2013-07-211-1/+0
| |
| * PollServiceRequestManager: changed the long poll from a Queue to a List. No ↵Diva Canto2013-07-211-13/+17
| | | | | | | | need to dequeue and enqueue items every 1sec.
| * Delay the enqueueing of non-longpoll requests for 100ms. No need to have ↵Diva Canto2013-07-211-1/+11
| | | | | | | | these requests actively on the processing queue if it seems they're not ready.
* | Merge branch 'master' into careminsterMelanie2013-07-244-4/+65
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post ↵Diva Canto2013-07-181-1/+1
| | | | | | | | | | | | requests timeout in 60 secs. There's plenty of room for improvement in handling the EQs. Some other time...
| * 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.
| * Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-182-48/+35
| | | | | | | | | | | | | | | | 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.
| * Revert "Cleared up much confusion in PollServiceRequestManager. Here's the ↵Diva Canto2013-07-172-35/+48
| | | | | | | | | | | | history:" This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
| * 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 "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.
| * Putting the requests back in the queue while testing for count >0 is not the ↵Diva Canto2013-07-171-3/+7
| | | | | | | | smartest move...
| * Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-172-48/+35
| | | | | | | | | | | | 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.
| * Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-154-50/+69
| | | | | | | | | | | | | | handlers. This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding. Other refactoring was required to get logic into the right places to support this.
* | Merge branch 'master' into careminsterMelanie2013-07-189-17/+112
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Add missing file BaseOutputStreamHandler.cs from recent commit e19defdJustin Clark-Casey (justincc)2013-07-081-0/+60
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| |\
| | * BaseHttpServer: if the handler sets the content length, don't override it. ↵Diva Canto2013-07-081-1/+1
| | | | | | | | | | | | This happens in HEAD handlers.
| * | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-087-16/+51
| |/ | | | | | | | | | | | | | | | | to print various counts of capability invocation by user and by cap This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected. This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle() However, existing inheriting classes overriding Handle() will still work, albeit without stats recording. "show caps" becomes "show caps list" to disambiguate between show caps commands
* | Merge branch 'master' into careminsterMelanie2013-06-234-52/+139
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * minor: remove mono compiler warnings in WebsocketServerHandler.csJustin Clark-Casey (justincc)2013-06-201-13/+7
| |
| * Display existing statistic of how many http requests a server is making as ↵Justin Clark-Casey (justincc)2013-06-191-1/+1
| | | | | | | | server.network.HTTPRequestsMade in "show stats all"
| * Make number of inbound http requests handled available as a ↵Justin Clark-Casey (justincc)2013-06-181-5/+25
| | | | | | | | httpserver.<port>.IncomingHTTPRequestsProcessed stat
| * refactor: Move existing code to generate report information on the ↵Justin Clark-Casey (justincc)2013-06-171-1/+62
| | | | | | | | threadpool to the ServerBase rather than being in Util
| * Make general server stats available on the robust console as well as the ↵Justin Clark-Casey (justincc)2013-06-172-33/+45
| | | | | | | | | | | | simulator console This means the "show stats" command is now active on the robust console.
* | Merge branch 'master' into careminsterMelanie2013-06-131-3/+5
|\ \ | |/
| * Implement logging of first 80 characters (debug level 5) or full body data ↵Justin Clark-Casey (justincc)2013-06-121-3/+5
| | | | | | | | | | | | | | (debug level 6) on outgoing requests, depending on debug level This is set via "debug http out <level>" This matches the existing debug level behaviours for logging incoming http data
* | Merge branch 'avination-current' into careminsterMelanie2013-06-112-319/+0
|\ \
| * | Clean up poll serviceMelanie2013-06-072-319/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-112-7/+9
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | Add port numbers to poll service thread names so that we can tell which ↵Justin Clark-Casey (justincc)2013-06-101-2/+2
| | | | | | | | | | | | belong to which HttpServer
| * | Reinstate explicit starting and stopping of PollServiceRequestManager added ↵Justin Clark-Casey (justincc)2013-06-102-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | in 3eee991 but removed in 7c0bfca Do not rely on destructors to stop things. These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503 and most probably http://opensimulator.org/mantis/view.php?id=6668
| * | Supply proper type information for the various types of requestsMelanie2013-06-071-3/+1
| | |
| * | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-074-226/+209
| | |
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Send 503 when throttling texturesMelanie2013-04-251-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-04-101-0/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | If OpenSimulator is writing a PID file and finds the file already present on ↵Justin Clark-Casey (justincc)2013-04-091-0/+5
| | | | | | | | | | | | | | | | | | startup, logging an error since this is commonly due to an unclean shutdown. Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.