summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.cpp
AgeCommit message (Collapse)Author
2011-03-11STORM-1059 : Fix for cache purging (fix by Aleric)Merov Linden
2011-02-23MergeXiaohong Bao
2011-02-23Merge from viewer-developmentXiaohong Bao
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.
2011-01-24Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-01-24VWR-24321: fix validation of textures that start with 00Aleric Inglewood
2011-01-21Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: ↵Xiaohong Bao
Viewer attempting to load precached images in file types that are not being used.)
2011-01-20fix for SH-829: Viewer attempting to load precached images in file types ↵Xiaohong Bao
that are not being used.
2011-01-20VWR-24317: remove warnings for deleting non-existant texture file on startupAleric Inglewood
2011-01-06use the private pool in the texture pipelineXiaohong Bao
2010-09-01code for DEV-52939: viewer's object geometry cache files are not limited in ↵Xiaohong Bao
number, and can also be incorrectly cleared with the VFS cache. reviewed by andrew.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-06EXT-8447: FIXED: crash at ↵Xiaohong Bao
LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp]
2010-07-15EXT-8283 FIX - allow saveWearable to change name of wearable, split off ↵Brad Payne (Vir Linden)
logic for saveAs case. Some remaining UI issues will be filed separately. Reviewed by Nyx
2010-05-10EXT-7294: FIXED: crash at LLTextureCache::updateEntry [secondlife-bin ↵Xiaohong Bao
lltexturecache.cpp:1231] Also simply the writing flow of the texture cache.
2010-04-12fix merge poopage.Tofu Linden
2010-04-12(slightly hairy) merge from viewer-hotfixTofu Linden
2010-04-07fix for all wierd crashes happening to lltexturecache.cpp, cuased by running ↵Xiaohong Bao
viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras: EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145] EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126] possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-01fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin ↵Xiaohong Bao
lltexturecache.cpp:1111]
2010-03-29fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == ↵Xiaohong Bao
mHeaderEntriesInfo.mEntries)
2010-03-29fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile ↵Xiaohong Bao
[secondlife-bin lltexturecache.cpp:1292]
2010-03-29fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == ↵Xiaohong Bao
mHeaderEntriesInfo.mEntries)
2010-03-29fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile ↵Xiaohong Bao
[secondlife-bin lltexturecache.cpp:1292]
2010-04-01fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin ↵Xiaohong Bao
lltexturecache.cpp:1111]
2010-04-07fix for all wierd crashes happening to lltexturecache.cpp, cuased by running ↵Xiaohong Bao
viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras: EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145] EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126] possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-03-18fixing linux build errors from bao's checkin for EXT-6093Nyx (Neal Orman)
viewer wouldn't compile under linux, due to gcc being paranoid about a few things. Fixed them up and got them reviewed. Code reviewed by bao.
2010-03-17more for lltexturecache.cpp: fix the crash due to deleting the entries ↵Xiaohong Bao
header file after clearing the texture cache.
2010-03-17fix for EXT-6093: crash at ↵Xiaohong Bao
LLTextureCache::updateTextureEntryList[secondlife-bin lltexturecache.cpp:847]; EXT-5711: Some textures loading from cache seems jammed; EXT-5599: Viewer crashes consistently, in Linden Homes region.
2010-03-10debug code for EXT-6093: crash at LLTextureCache::updateTextureEntryList ↵Xiaohong Bao
[secondlife-bin lltexturecache.cpp:847]
2010-03-07partial fix for EXT-5711: Some textures loading from cache seems jammed.Xiaohong Bao
This fix should be able to improve the speed of loading texturs from cache noticeably (30% or more). More fix to come.
2010-03-04fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: ↵Xiaohong Bao
LLWorkerClass::checkWork: ASSERT(workreq).
2010-02-09more for EXT-4352: texture problem in viewer 2.0. TEXTURE_CACHE_ENTRY_SIZE ↵Xiaohong Bao
does not match the FIRST_PACKET_SIZE on the sim side.
2010-01-27CID-99Tofu Linden
Checker: INVALIDATE_ITERATOR Function: LLAllocatorHeapProfile::parse(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&) File: /indra/llcommon/llallocator_heap_profile.cpp not a bug, but make it clearer to coverity.
2010-01-27CID-101Tofu Linden
Checker: INVALIDATE_ITERATOR Function: LLTextureCache::writeComplete(unsigned int, bool) File: /indra/newview/lltexturecache.cpp not really a bug, but rearranged a little.
2009-12-29fix for EXT-3553: unknown Crash.Xiaohong Bao
2009-11-16Increasing texture cache version to force cache clear of possibly corrupted ↵Steve Bennetts
texture caches from previous 2.0 versions. Enabling Admin menu in God Mode independent of Advanced menu.
2009-11-15Fixed a deadlock causing textrue caching to stall.Steve Bennetts
2009-11-14More texture cache fixes, including a possible deadlock when the cache was ↵Steve Bennetts
getting purged. Significantly reduced spurrious warnings and delition of non sin-based texture fetch comptabable sided cache files.
2009-11-13Mutex lock fix for texture cache.Steve Bennetts
Also a fix for texture purging when reducing the cache size.
2009-11-12Better fix for edge case where abort call to readComplete() can cause a crash.Steve Bennetts
2009-11-10check for NULL to prevent crashingangela
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk (for real)
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
merge viewer_1-21 96116-97380 -> release