Commit Graph

69 Commits (12e50e1fccef153e230f7fe91c1cedbc4e718d53)

Author SHA1 Message Date
Ansariel 31955780d3 Backed out changeset: 426b89263aba: Causes crash due to heap corruption 2013-03-23 23:01:20 +01:00
Ansariel eadca62857 Pull fix for heap corruption warning due to freeing new[]'ed memory with free() from Kitty Barnett / Catznip viewer 2013-03-23 21:43:50 +01:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Nicky 7893cf238d Add ndfile.h into llapr.h so it is visible where needed. Add typedef apr_file_t tFiletype to LLAPRFile and then use this in all classes instead of apr_file_t, this way we can swap between LLAPRFile and ndFile with use a typedef 2013-01-23 02:25:14 +01:00
Cinders 0fddd0f4de Backout Rev 18389. String returns correctly with KDU 7.1 2012-12-23 11:20:08 -07:00
Tank_Master 5b5f4c8bf5 Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Merov Linden 60f602d5e1 Pull from VirLinden/drano 2012-05-08 10:18:03 -07:00
Merov Linden 5c11b6b2e5 SH-3047 : Tweak of the performance compression data gathering code 2012-05-08 10:16:14 -07:00
Merov Linden 29da931051 SH-3047 : Tweak of the performance compression data gathering code 2012-05-08 10:16:14 -07:00
Brad Payne (Vir Linden) 678864e4ed merge viewer-release to drano 2012-05-02 13:00:59 -04:00
Merov Linden adf5b5c1ef Final pull from viewer-thx1138 2012-04-13 17:20:53 -07:00
Merov Linden 8b3703bd03 SH-3060 : Always use old byte range on low res (faster), reserve new byte range for high res. 2012-04-13 15:42:54 -07:00
Brad Payne (Vir Linden) 8778010fee fix for linux build failure 2012-04-13 17:03:29 -04:00
Merov Linden c410a4e332 SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter 2012-04-12 20:19:56 -07:00
Merov Linden 172b45d5a2 SH-3060 : Complete new byte range computation, clean up and back pedal on some changes that didn't pay of. 2012-04-06 18:28:47 -07:00
Merov Linden 91094d92a7 SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well. 2012-04-05 22:05:00 -07:00
Merov Linden 782981866a SH-3060 : New byte range implementation. Intermediate (not working) state. 2012-04-04 18:58:34 -07:00
Merov Linden df09fd8e8b SH-3060 : Preliminary implementation of the new byte range computation, implement setting to turn it on or off 2012-04-02 19:05:32 -07:00
Merov Linden bc6f669ff4 SH-3047 : Read the number of levels from the j2c image header instead of relying on hacked computation based on width / height. 2012-03-15 13:01:14 -07:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Dave Parks 4924f0c99b b782a75c99e6 backout cleanup 2011-10-14 12:38:48 -05:00
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Xiaohong Bao b594d3b04d add debug mode to track the memory allocation/deallocation. 2011-05-10 21:02:20 -06:00
Merov Linden c6c1419faa EXP-664 : Make encoding parameters more resilient to bad entries, add levels as encoding parameters, update test applet to support this 2011-05-04 22:43:51 -07:00
Merov Linden e752e91828 STORM-746 : add precincts and blocks arguments taken into account in j2c output 2011-04-04 23:49:40 -07:00
Merov Linden 83ec0cd62f STORM-746 : add new arguments for precincts and blocks on output, region and level on input, add code for input loading restriction 2011-04-04 18:37:32 -07:00
Merov Linden c2e88db89a STORM-987 : Took Vadim's comment into account: check arguments consistency, make sure remaining perf data are flushed on exit. 2011-03-10 22:02:49 -08:00
Xiaohong Bao 29415d1407 Merge 2011-02-23 13:48:35 -07:00
Xiaohong Bao 01cdeb0cdd Merge from viewer-development 2011-02-23 10:44:59 -07:00
Aleric Inglewood ef490e308c Introduces a LLThreadLocalData class that can be
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-02-05 15:58:07 +01:00
Xiaohong Bao 611d8bdf61 use the private pool in the texture pipeline 2011-01-06 16:20:21 -07:00
Merov Linden 0e07758b54 merge with STORM-105 and viewer-development 2010-11-10 22:39:11 -08:00
Merov Linden b5df1d2abc STORM-105 : takes Vadim's comments into account, clean up use of static globals and magic strings, enforce naming conventions 2010-11-08 17:16:31 -08:00
Merov Linden 85509457c6 STORM-105 : Take Vadim code review into account, code clean up 2010-11-05 18:40:08 -07:00
Merov Linden 4bbe823302 merge with STORM-105 2010-11-04 18:10:29 -07:00
Merov Linden ba3307b8d0 merge with STORM-105 2010-11-04 18:09:35 -07:00
Merov Linden c2500f808c STORM-105 : Tweak the data labels to make them easier to read 2010-11-04 13:52:46 -07:00
Merov Linden dac53830f1 STORM-104 : make kdu statically linked, suppress the need for llkdu 2010-10-27 23:40:35 -07:00
Merov Linden 40979589af STORM-105 : improve decompression perf gathering, allow perf name to be passed on the command line, fix crash in analysis phase 2010-10-27 23:15:22 -07:00
ziree d82625d90b Added control name copy to debug settings, typing in search now auto selects the topmost entry, if any, added warning message to debug settings editor. 2011-12-08 00:15:08 +01:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Arrehn 2469f765c1 Working around odd corrupted version string interface to kdu library. 2011-08-08 15:19:36 -04:00
Merov Linden 88e33d00cd STORM-105 : Add compression data gathering, took partial decompression into account in stats 2010-09-17 19:17:12 -07:00
Merov Linden 39e5d2ecf0 VWR-22761 : Rearchitecture of llmetricperformancetester and simple (non complete) implementation in llimagej2c 2010-09-08 23:03:56 -07:00