aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Slight variation on the locking scheme: now locking always, except the ↵Diva Canto2009-10-091-9/+9
| | | | ForEach, which gets a copy of the Array. I think the ForEach was the big gorilla.
* This is to *try* to avoid the exception we are seeing repeatedly:Diva Canto2009-10-091-0/+4
| | | | | | | | | | | | | | | #13:53:03 - [LLUDPSERVER]: Packet exceeded buffer size during zerocoding. Removing MSG_ZEROCODED flag #13:53:03 - [Scene]: Failed with exception System.ArgumentException: Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection. # at System.Buffer.BlockCopy (System.Array src, Int32 srcOffset, System.Array dst, Int32 dstOffset, Int32 count) [0x000b7] in /home/grid/install/mono24/mono-2.4.2.3/mcs/class/corlib/System/Buffer.cs:116 # at OpenSim.Region.ClientStack.LindenUDP.LLUDPServer.SendPacketData (OpenSim.Region.ClientStack.LindenUDP.LLUDPClient client, System.Byte[] data, Int32 dataLength, PacketType type, Boolean doZerocode, ThrottleOutPacketType category) [0x00060] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs:290 # at OpenSim.Region.ClientStack.LindenUDP.LLUDPServer.SendPacket (OpenSim.Region.ClientStack.LindenUDP.LLUDPClient client, OpenMetaverse.Packets.Packet packet, ThrottleOutPacketType category, Boolean allowSplitting) [0x00077] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs:265 # at OpenSim.Region.ClientStack.LindenUDP.LLClientView.OutPacket (OpenMetaverse.Packets.Packet packet, ThrottleOutPacketType throttlePacketType) [0x00000] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs:5244 # at OpenSim.Region.ClientStack.LindenUDP.LLClientView.SendCoarseLocationUpdate (System.Collections.Generic.List`1 users, System.Collections.Generic.List`1 CoarseLocations) [0x0012a] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs:3424 # at OpenSim.Region.Framework.Scenes.ScenePresence.SendCoarseLocationsDefault (UUID sceneId, OpenSim.Region.Framework.Scenes.ScenePresence p) [0x000fa] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2536 # at OpenSim.Region.Framework.Scenes.ScenePresence.SendCoarseLocations () [0x0000d] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2491 # at OpenSim.Region.Framework.Scenes.ScenePresence.Update () [0x00011] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2404 # at OpenSim.Region.Framework.Scenes.SceneGraph.UpdateEntities () [0x0001b] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/SceneGraph.cs:164 # at OpenSim.Region.Framework.Scenes.Scene.Update () [0x000dc] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/Scene.cs:1031 On Region: Wright Plaza
* Putting this to exactly what it was yesterday around this time, so we can do ↵Diva Canto2009-10-092-182/+411
| | | | the 100-ppl load test in WP. We need to carefully play with this code in order to understand all the problems.
* Putting the lock back in TryGetValue.Diva Canto2009-10-082-349/+349
|
* Fork UDPBase from libOMV into opensimMelanie2009-10-082-1/+341
|
* Added guards against the exception reported:Diva Canto2009-10-081-0/+9
| | | | | | | | | #2009-10-08 12:58:34,462 ERROR - OpenSim.Application [APPLICATION]: #APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs # #Exception: System.Exception: Object reference not set to an instance of an object. ---> System.NullReferenceException: Object reference not set to an instance of an object. # at OpenSim.Region.ClientStack.LindenUDP.J2KImage.SendFirstPacket(LLClientView client) in c:\Opensim\OpenSim\Region\ClientStack\LindenUDP\J2KImage.cs:line 230 # at OpenSim.Region.ClientStack.LindenUDP.J2KImage.SendPackets(LLClientView client, Int32 maxpack) in c:\Opensim\OpenSim\Region\ClientStack\LindenUDP\J2KImage.cs:line 84
* One last attempt at tunning the locking/no locking behaviour. The previous ↵Diva Canto2009-10-071-10/+16
| | | | one was too lax and made the important login packets fail.
* Another go at the deadlock: not locking TryGetValue, and just catch/ignore ↵Diva Canto2009-10-071-15/+31
| | | | exceptions.
* Changed the locking mechanism, because the existing one is causing deadlocks ↵Diva Canto2009-10-071-25/+100
| | | | to occur.
* replace LLClientView with proper versionMelanie2009-10-071-1898/+1332
|
* Replace LLClientView on the branch with master. UNCOMPILABLE!Melanie2009-10-071-1332/+1898
|
* Revert "Merging in diva's locking fixes"Melanie2009-10-071-69/+47
| | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633.
* Commented noisy debugging about packet splittingJohn Hurliman2009-10-061-4/+4
|
* Merging in diva's locking fixesJohn Hurliman2009-10-061-47/+69
|\
| * Rewrote parts of the code that were double-locking different objects. This ↵Diva Canto2009-10-061-47/+69
| | | | | | | | is about half of the code base reviewed.
* | Applying the real fix (thank you for tracking that MSDN doc down Melanie)John Hurliman2009-10-061-5/+6
| |
* | Trying Melanie's fixJohn Hurliman2009-10-061-3/+4
| |
* | * Added a sanity check for Mono before trying to enumerate over an empty ↵John Hurliman2009-10-061-0/+3
| | | | | | | | | | | | SortedDictionary * Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading
* | * Added missing references to prebuild.xml and commented out the LindenUDP ↵John Hurliman2009-10-067-195/+195
| | | | | | | | | | | | | | | | tests until a new test harness is written * Clients are no longer disconnected when a packet handler crashes. We'll see how this works out in practice * Added documentation and cleanup, getting ready for the first public push * Deleted an old LLUDP file
* | * Try/catch around EndInvoke() when Util.FireAndForget() returns to catch ↵John Hurliman2009-10-063-78/+112
| | | | | | | | | | | | | | exceptions thrown in the async method * Added packet stats handling to the new LLUDP implementation * Attempting to avoid a race condition when creating a new LLUDPClient
* | * Continued work on the new LLUDP implementation. Appears to be functioning, ↵John Hurliman2009-10-0613-2116/+1028
| | | | | | | | | | | | | | | | although not everything is reimplemented yet * Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing * Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively * Fixed formatting for a MySQLAssetData error logging line
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-051-18/+24
|\ \ | |/ | | | | htb-throttle
| * Changed the lock object, to see if this helps at all. Also switched the ↵Diva Canto2009-10-051-11/+15
| | | | | | | | order of lock and try/catch in RemoveImageFromQueue.
| * Reduced locking.Diva Canto2009-10-041-8/+10
| |
* | Beginning work on the new LLUDP implementationJohn Hurliman2009-10-0512-2328/+1815
|/
* Guarding a line that is sometimes throwing a null pointer exception.Diva Canto2009-10-041-5/+6
|
* Trying to avoid the null pointer exception in J2KImage, RunUpdate.Diva Canto2009-10-041-1/+9
|
* Merge branch 'diva-textures-osgrid'Melanie2009-10-041-2/+2
|\
| * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵John Hurliman2009-10-021-2/+2
| | | | | | | | | | | | Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework) * Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
* | Merge branch 'diva-textures-osgrid'Melanie2009-10-031-126/+88
|\ \ | |/
| * * Removed code that is no longer used with Melanie's queue callback optimizationJohn Hurliman2009-10-021-126/+88
| | | | | | | | | | * Moved all priority queue access to helper functions to improve reliability and readability * New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug
* | Merge branch 'diva-textures-osgrid'Melanie2009-10-022-182/+142
|\ \ | |/
| * * Removed even more unnecessary state variables from J2KImageJohn Hurliman2009-10-022-182/+142
| | | | | | | | | | * Fixed the incorrect "out of memory?" exception messages and replaced them with useful information * Cleaned up J2KImage and LLImageManager to conform to coding conventions
* | Merge branch 'diva-textures-osgrid' into diva-texturesMelanie2009-10-023-59/+19
|\ \ | |/
| * * Changed the flush logic to drop packets in non-transactional streams, and ↵John Hurliman2009-10-023-59/+19
| | | | | | | | | | | | to not fire any "put more data in the queues" callbacks * Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow
* | Merge branch 'master' into diva-texturesMelanie2009-10-0215-87/+91
|\ \ | |/ |/|
| * Formatting cleanup.Jeff Ames2009-10-015-8/+8
| |
| * Formatting cleanup.Jeff Ames2009-10-0116-82/+82
| |
| * Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵Diva Canto2009-09-271-1/+2
| | | | | | | | neighbours in the grid service modules.
| * * Makes SimulatorEnable messages 'reliable' and subject to redelivery.Adam Frisby2009-09-231-0/+3
| |
* | Restore the missing image handling to the image manager. The missingMelanie2009-10-023-71/+92
| | | | | | | | image packet crashes Hippo without a message.
* | Merge branch 'diva-textures-osgrid' into texturetestMelanie2009-10-021-7/+28
|\ \
| * | Locking the priority queue to see if it gets pass that exception.Diva Canto2009-10-011-7/+28
| | |
* | | Change texture sending to be driven by the queue empty event from theMelanie2009-10-024-90/+60
|/ / | | | | | | packet queue, rather than a timer
* | Removing console debug spewJohn Hurliman2009-10-011-7/+7
| |
* | Merge branch 'diva-textures-osgrid' of ↵John Hurliman2009-10-013-2/+93
|\ \ | | | | | | | | | ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
| * | Add a method to determine the count of packets in a throttleMelanie2009-10-013-0/+27
| | |
| * | Add OnQueueEmpty event to the packet layers. No user functinality yetMelanie2009-10-013-2/+66
| | |
* | | * Rewrote LLImageManager to use a real priority queue and hold minimal stateJohn Hurliman2009-10-012-448/+331
|/ / | | | | | | | | * Rewrote the logic in J2KImage.RunUpdate() * Added a default avatar texture (I made it myself)
* | Fixing LLClientView memory leakJames J Greensky2009-10-014-8/+29
| | | | | | | | | | | | | | Fixing LLClientView memory leak by disposing of all timers utilized in LLClientView as they contain references to the callback method. This required the use of the Terminate and Close infrastructure that was already in place but was not being utilized.