summaryrefslogtreecommitdiff
path: root/indra/llmessage/lliosocket.cpp
AgeCommit message (Collapse)Author
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-01-20fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() ↵Xiaohong Bao
and LLBufferArray::copyIntoBuffers
2011-10-14Merge backout of b782a75c99e6Dave Parks
2011-10-14Backed out changeset b782a75c99e6Dave Parks
2011-08-31MergeXiaohong Bao
2011-07-28MergeLogan Dethrow
2011-07-21SH-2031 Don't do network I/O from the main thread in llcurl.Dave Parks
Reviewed by Kelly
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-07-05STORM-1112 Fixed crash on quit. Other minor fixes:Logan Dethrow
* Reordered HTTP proxy choices in settings dialog * Now using setBlocking and setNonBlocking LLSocket methods during TCP handshakes. * Made those LLSocket methods available outside the class.
2011-06-27STORM-1446 Portability fix when setting non-blocking socket options.Aaron Stone
2011-02-05Introduces a LLThreadLocalData class that can beAleric Inglewood
accessed through the static LLThread::tldata(). Currently this object contains two (public) thread-local objects: a LLAPRRootPool and a LLVolatileAPRPool. The first is the general memory pool used by this thread (and this thread alone), while the second is intended for short lived memory allocations (needed for APR). The advantages of not mixing those two is that the latter is used most frequently, and as a result of it's nature can be destroyed and reconstructed on a "regular" basis. This patch adds LLAPRPool (completely replacing the old one), which is a wrapper around apr_pool_t* and has complete thread-safity checking. Whenever an apr call requires memory for some resource, a memory pool in the form of an LLAPRPool object can be created with the same life-time as this resource; assuring clean up of the memory no sooner, but also not much later than the life-time of the resource that needs the memory. Many, many function calls and constructors had the pool parameter simply removed (it is no longer the concern of the developer, if you don't write code that actually does an libapr call then you are no longer bothered with memory pools at all). However, I kept the notion of short-lived and long-lived allocations alive (see my remark in the jira here: https://jira.secondlife.com/browse/STORM-864?focusedCommentId=235356&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-235356 which requires that the LLAPRFile API needs to allow the user to specify how long they think a file will stay open. By choosing 'short_lived' as default for the constructor that immediately opens a file, the number of instances where this needs to be specified is drastically reduced however (obviously, any automatic LLAPRFile is short lived). *** Addressed Boroondas remarks in https://codereview.secondlife.com/r/99/ regarding (doxygen) comments. This patch effectively only changes comments. Includes some 'merge' stuff that ended up in llvocache.cpp (while starting as a bug fix, now only resulting in a cleanup). *** Added comment 'The use of apr_pool_t is OK here'. Added this comment on every line where apr_pool_t is correctly being used. This should make it easier to spot (future) errors where someone started to use apr_pool_t; you can just grep all sources for 'apr_pool_t' and immediately see where it's being used while LLAPRPool should have been used. Note that merging this patch is very easy: If there are no other uses of apr_pool_t in the code (one grep) and it compiles, then it will work. *** Second Merge (needed to remove 'delete mCreationMutex' from LLImageDecodeThread::~LLImageDecodeThread). *** Added back #include <apr_pools.h>. Apparently that is needed on libapr version 1.2.8., the version used by Linden Lab, for calls to apr_queue_*. This is a bug in libapr (we also include <apr_queue.h>, that is fixed in (at least) 1.3.7. Note that 1.2.8 is VERY old. Even 1.3.x is old. *** License fixes (GPL -> LGPL). And typo in comments. Addresses merov's comments on the review board. *** Added Merov's compile fixes for windows.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-09-17svn merge -r95195:96886 ↵Kyle Ambroff
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release Merging fixes from 1.24 Server. From vcr-maint-2: * QAR-856: viewer crash log analyzer updates. From direct-slurl-1: * login.cgi: simplification of the way start-locations are chosen and the new-user browser tutorial is shown. * No longer fake ever-logged-in flag * support for dataservice query string encryption from maint-server-4: * DEV-19961: llInstantMessages of length N fail. from landstore-v2-01-merge: * DEV-12330: Allow Neighbors & Tweaks. * DEV-14126: Re-order items on Region Detail page. * DEV-14064: Add "Delete" order buttons in the View Cart area. * DEV-15026: Indicate in the Event Log whether purchase is a Openspace or regular region. * DEV-15242: disable checkout button after first click. * DEV-15285: Region Names in cart or fulfilled should expire after 30 min or when delivered. * DEV-14018: No currency listed for land prices * DEV-1688: Tool: Ability to view and clear Allowed Neighbors from a region. * DEV-17199: Fatal error when adding your login name to your allowed neighbors list. * DEV-17251: Deleting an unavailable item from the shopping cart causes a fatal error. * DEV-17291: Fatal error occurs when performing various activities. * DEV-17177: Typo on Land store 2.01 checkout page. From 1.24: * DEV-19865 (SVC-2927): Abandoning land changes land name and description even when done by an Estate Manager. * DEV-19916 (SVC-2938): bug fix for llGetNextEmail() failure. * DEV-19936 (SVC-2962): adding a value to a list also modifies the list in place. * SVC-2750, SVC-2958, SVC-2973: Changed LSL scheduler logic to yield if finished and no state change is pending. * indra/lib/python/indra/agent/auth.py no longer assumes there is a critical message, and checks credential as specified by OGP rev3. * DEV-20051: Added defensive checks on script rez path. * Improvements to scripts/make_deploy_group.py. * DEV-18897: llScriptReset wasn't resetting events for LSL scripts. * DEV-20127: Fix for stl misuse in newsim/llsimparcel.cpp. * DEV-18897: Mono Beta - LSL attach() event survives reset. * DEV-20212 (VWR-9026): String fix - Attempting to teleport to "Help Island" produces a dialog referencing "Orientation Island" * DEV-20164: llListen caching indefinitely across states. * DEV-19950: timer() event triggers before on_rez(), & state_entry() * DEV-19712 (SVC-2908): C# error messages with Mono Compiled scripts * Fixes for chat service unit tests. * DEV-19106: (SVC-1571): Rezzing a coalesced objects with 1024 scripted prims fails.
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2007-12-05Result of svn merge -r74235:74242 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/robust-pump into release
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵Tess Chu
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-01-02Print done when done.James Cook