aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-101-2/+2
|\
| * Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-2/+2
| | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | Merge branch 'master' into careminsterMelanie2012-05-081-19/+19
|\ \ | |/
| * Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
| |
* | Merge branch 'master' into careminsterMelanie2012-05-059-35/+88
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: Tweak BaseHttpServer message to make it clear that this relates to ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | slow handling of inbound requests.
| * Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-039-35/+88
| | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
| * Revert "Log the full exception when errors occur in BaseHttpServer"Justin Clark-Casey (justincc)2012-04-271-19/+19
| | | | | | | | | | | | This reverts commit e31e7c68c8abfd61fed6dabac5403d8adf42ae87. Applied for patch assessment and accidentally committed too early.
| * Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-04-271-19/+19
| |
* | Merge branch 'master' into careminsterMelanie2012-04-201-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
| * Add more exception detail to Exception and IOException throws in ↵Justin Clark-Casey (justincc)2012-04-201-2/+2
| | | | | | | | BaseHttpServer.HandleRequest()
* | Merge branch 'master' into careminsterMelanie2012-04-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-03-311-1/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Add Extended flavour option to opensim version information.Justin Clark-Casey (justincc)2012-03-301-1/+2
| | | | | | | | | | This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable. This flavour will almost certainly never see a formal release.
* | Merge branch 'master' into careminsterMelanie2012-03-181-6/+10
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
| |
| * Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| | | | | | | | However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
| * Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)2012-03-161-6/+2
| | | | | | | | printed out periodically)
* | Merge branch 'master' into careminsterMelanie2012-03-081-10/+10
|\ \ | |/
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' into careminsterMelanie2012-03-031-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-02-242-1/+3
|\ \ | |/
| * Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵Justin Clark-Casey (justincc)2012-02-241-1/+1
| | | | | | | | returns and for consistency.
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-181-1/+3
| | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
* | Merge branch 'master' into careminsterMelanie2012-01-311-1/+1
|\ \ | |/
| * Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)2012-01-311-1/+1
| | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-082-11/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-072-11/+5
| | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* | Merge branch 'master' into bigmergeMelanie2011-12-0512-15/+210
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0512-15/+210
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-12-011-15/+48
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
| |
| * With "debug http 1", show the path with the query string instead of just the ↵Justin Clark-Casey (justincc)2011-11-291-21/+21
| | | | | | | | | | | | path. Also simplifies debug levels to just 0 and 1
| * Add "debug http" command for currently simple extra debug logging of ↵Justin Clark-Casey (justincc)2011-11-291-12/+43
| | | | | | | | non-event queue inbound http requests to a simulator
* | Merge branch 'master' into bigmergeMelanie2011-11-172-3/+21
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-151-4/+8
| | | | | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
| * improve formatting of "show threads"Justin Clark-Casey (justincc)2011-11-151-1/+8
| |
| * send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
| |
| * Add number of milliseconds since last update to "show threads"Justin Clark-Casey (justincc)2011-11-151-3/+7
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-101-8/+6
|\ \ | |/
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-265-19/+138
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Restart the event queue worker threads that I accidentally disabled earlier ↵Justin Clark-Casey (justincc)2011-10-251-7/+9
| | | | | | | | | | | | today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite)
| * minor: add "threads show" as synonym for "show threads" for consistencyJustin Clark-Casey (justincc)2011-10-251-0/+5
| |
| * Add "threads abort <thread-id>" simulator console command that allows us to ↵Justin Clark-Casey (justincc)2011-10-251-0/+25
| | | | | | | | | | | | abort a watchdog managed thread. This is for diagnostic purposes.
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-254-19/+106
| | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
generated by cgit v1.1 at 2024-12-22 19:10:30 +0000