ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-23 17:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 93 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

215 Commits

Author SHA1 Message Date
Melanie
a97436f2f1 Catch a nullref in the code to suppress GetTexture warnign spam we can't 
do a thing about anyway.
 2012-09-16 16:42:30 +02:00
Melanie
2aa7a22129 Sequence/throttle asset retrievals. 2012-09-14 23:09:07 +02:00
Melanie
387e59ff7f Revamp the HTTP textures handler to allow a maximum of four fetches 
at any time and to drop requests for avatars n longer in the scene
 2012-09-14 21:24:25 +02:00
Melanie
52d74cf274 Allow setting max connections for an endpoint 2012-09-14 00:11:23 +02:00
UbitUmarov
a7250c6ea1 add a extra httppool thread to compensate for webfetchinventory 2012-09-10 01:23:20 +01:00
Melanie
7e17f4296e Fix background inventory loading (Viewer 3) so it won't lag out the sim 2012-08-24 23:48:01 +02:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc)
5aec0ff207 Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework 2012-07-25 23:27:00 +01:00
Melanie
0797736fba Merge branch 'ubitwork' into avination 2012-07-17 10:25:13 +02:00
UbitUmarov
5874dfd342 fix PollServiceRequestManager 2012-07-17 09:47:20 +01:00
Melanie
b35f97db46 Replace PollServiceRequestManager with older version, add extra logging to 
event exceptions to see call path leading up to it.
 2012-07-17 10:21:12 +02:00
Melanie
c256447f46 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-16 22:22:42 +01:00
Melanie
ad75a4b50b Eliminate a spurious exception report when a https url is accessed with a wrong 
CN
 2012-07-15 12:28:58 +02:00
Melanie
26d89777d8 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-06 20:51:18 +01:00
Melanie
b8c2efa49c Convert the slow request queue into a regular queue and add some cleanup 
and locking.
 2012-07-06 00:23:05 +02:00
Melanie
bf292ce26f Fix the boo-boo 2012-07-05 23:24:15 +02:00
Melanie
4854d77904 Add an EventType enum and Type field to the poll service event args. This allows 
the manager to tell what type of event it is. All events except for lsl http in
go to the "slow queue" which is run once per second as before.
 2012-07-05 23:09:20 +02:00
UbitUmarov
bc5d554f54 use the pollEvent timeout paramenter on pooling 2012-07-04 17:58:32 +01:00
UbitUmarov
02cb0bf80a added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout 2012-07-04 17:40:02 +01:00
UbitUmarov
e533eef962 *test2* http poll: increased again the pool rate do 10/s but increased timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable 2012-07-04 15:07:10 +01:00
UbitUmarov
b2fa20001f *test* slow http retries pool rate to original 1s 2012-07-04 06:14:47 +01:00
UbitUmarov
d3f1fc79e5 *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming. 2012-07-01 01:33:20 +01:00
Melanie
05cf51cbbd Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
 2012-06-29 22:11:49 +01:00
Melanie
7cc5b3d7d3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-06-26 17:35:55 +01:00
Melanie
9a8de52940 Add an event to the poll service manager thread to allow starting it 
when needed rather than once per second. That is just too slow!
 2012-06-26 10:49:37 +02:00
Justin Clark-Casey (justincc)
dca04c7b61 Avoid a race condition where an incoming request to a script external URL can trigger an exception is the URL was being removed at the same time. 
This involves three steps
1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index
2) Return true instead of false in HasEvents() if no matching request is found in the map.  This call will only happen in the first place for raced requests.
3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK.

Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
 2012-06-22 23:16:18 +01:00
Melanie
eab211f94d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-06-21 01:10:13 +01:00
Justin Clark-Casey (justincc)
ed513fc7be Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses would always return OK even if some other status code had been set 2012-06-16 03:43:45 +01:00
Melanie
30d872caad Merge branch 'master' into careminster 2012-06-15 02:53:34 +01:00
Melanie
ca4e6d9b5b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2012-06-15 02:52:56 +01:00
Justin Clark-Casey (justincc)
94517c8d5c Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen. 
This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
 2012-06-15 02:51:52 +01:00
Justin Clark-Casey (justincc)
257b1b517d Add main instance to internal MainServer.m_Servers list to simplify internal logic. 
This does require the server to be added before it is set as the main Instance
 2012-06-15 02:03:50 +01:00
Justin Clark-Casey (justincc)
478acfff34 When setting debug http level, do this for all known http servers, not just the main instance. 2012-06-15 01:24:36 +01:00
Justin Clark-Casey (justincc)
9825861f4a Shuffle "debug http" levels so that 1 and 2 now cause different levels of warn to be logged if we receive invalid xml for xmlrpc. 2012-06-14 23:46:09 +01:00
Justin Clark-Casey (justincc)
f4b02f8e39 Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752 
Accidentally make responseString null by default instead of String.Empty.
It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
 2012-06-14 04:29:15 +01:00
Melanie
12621201ba Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
 2012-06-13 02:15:12 +01:00
Justin Clark-Casey (justincc)
c6e375291a Don't include time to transmit response back to requester when assessing slow handling of requests. 
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response.
This is not something we can do much about on the server end - it's server-side delay that we're interested in.
To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change.
IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this.
Only the GetTextureHandler was sending its own response.  Now it leaves this to BaseHttpServer, like all other core handlers.
 2012-06-13 00:03:44 +01:00
Melanie
e8cd9fbbb7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-06-07 23:33:40 +01:00
BlueWall
a1e857932a Make change to fix Windows builds 2012-06-07 10:17:37 -04:00
Justin Clark-Casey (justincc)
98b46d48fe Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached. 
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
 2012-06-07 02:44:13 +01:00
Melanie
884c0e7bb1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-05-27 19:24:30 +01:00
SignpostMarv
99cebec4ab adding status codes from rfc 6585 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-05-24 12:09:15 -04:00
SignpostMarv
87f9aa9d08 porting IDE tooltip-friendly documentation tweaks from Aurora-Sim 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-05-24 12:09:15 -04:00
Melanie
a90822f4b8 Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
Justin Clark-Casey (justincc)
6987aef38d Improve logging on the prim inventory script asset request path for future use. 
This adds name and description of the request handler to http request logging when DebugLevel >= 1
 2012-05-09 23:12:30 +01:00
Melanie
05634907e9 Merge branch 'master' into careminster 2012-05-08 00:07:18 +01:00
Oren Hurvitz
15844da3af Log the full exception when errors occur in BaseHttpServer 2012-05-07 19:56:00 +01:00
Melanie
31ab8b2fe0 Merge branch 'master' into careminster 
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
 2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc)
fb99ee6774 minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests. 2012-05-04 01:16:56 +01:00
Justin Clark-Casey (justincc)
231a3bf147 Implement optional name and description on http stream handlers so that we 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.
 2012-05-03 01:45:49 +01:00