Commit Graph

25 Commits (8912a9bef62386e5eecaa61ba9079d507ae16d90)

Author SHA1 Message Date
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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden 68c5a7f25c EXT-7889 FIXED Linux fails to load splash screen and side panel home tab. 2010-06-22 12:20:45 +01:00
Monroe Linden db3641363d Set up volume control code in webkit plugin for platform-specific implementations
Renamed LinuxVolumeCatcher class to VolumeCatcher.  Everything in the header except the class name was already platform-agnostic, so I just renamed it to volume_catcher.h.

Moved the stub implementation from the end of linux_volume_catcher.cpp (previously only used if LL_PULSEAUDIO_ENABLED was not defined) to dummy_volume_catcher.cpp, and made CMakeList.txt file use the dummy impl on Linux if PULSEAUDIO is not defined.

Removed the ifdefs on the use of VolumeCatcher in MediaPluginWebkit, so it gets called on all platforms.

Added a setPan() function to VolumeCatcher (currently unimplemented, but we'd like to have this capability in the future).
2010-04-09 12:34:24 -07:00
Tofu Linden 43a9699de1 slightly reduce the overhead of 'EXT-5601: Linux: volume adjustment of web-based media / Flash' 2010-02-23 13:11:38 +00:00
Tofu Linden 96ddf30a49 support LL_PULSEAUDIO_ENABLED=0 - probably. 2010-02-22 16:55:14 +00:00
Tofu Linden 4cfbfedec5 comment improvement. 2010-02-22 16:19:46 +00:00
Tofu Linden dfe3b9ff1c EXT-5601 Linux: volume adjustment of web-based media / Flash
Dynamic loading of pulseaudio works now.
All that's left is to package-up the pulseaudio headers...
2010-02-22 16:16:26 +00:00
Tofu Linden 03d3e64157 more work on dynamic grabbing of PA syms. 2010-02-22 15:50:49 +00:00
Tofu Linden 71efe007b2 start dynamic sym loading work. 2010-02-22 15:29:57 +00:00
Tofu Linden fa1bae0093 minor comment tweak. 2010-02-22 14:33:26 +00:00
Tofu Linden 95ccfd806c Do some decent cleanup in LinuxVolumeCatcherImpl's destructor. Though I don't think media plugins are really 'destroyed' as we know it, their process just ends. 2010-02-22 14:29:37 +00:00
Tofu Linden b2fbb28dc9 Well, whaddyaknow.. it works.
More cleanup needed: need to dlopen()-ize the pulseaudio stuff
2010-02-22 14:19:10 +00:00
Tofu Linden 66162bfca3 comment tweak. 2010-02-22 14:15:57 +00:00
Tofu Linden 235023d711 document the linux_volume_catcher high-level design 2010-02-22 14:15:15 +00:00
Tofu Linden df43c0e18b Wire the linux volume catcher into the webkit plugin. 2010-02-22 14:08:15 +00:00
Tofu Linden 551771fd90 Got this building okay now. It's not hooked-up to the webkit plugin yet, so I don't know if it *works*. 2010-02-22 14:00:10 +00:00
Tofu Linden 8c7d218f4e bunch o'fixing 2010-02-22 13:55:19 +00:00
Tofu Linden 7fb16ca505 pretty fleshed-out, now needs fixing-up. 2010-02-22 13:52:41 +00:00
Tofu Linden 9c66a9b6eb Really start to fill the implementation in. 2010-02-22 13:12:44 +00:00
Tofu Linden 1b6a57564c more work on the volume-catcher interface. 2010-02-22 12:36:10 +00:00
Tofu Linden aa654ae427 more work on the linux volume-catcher. 2010-02-22 12:32:07 +00:00
Tofu Linden cd368847dd fill out the interface. 2010-02-22 12:03:31 +00:00
Tofu Linden fae5c9b64e code code 2010-02-22 11:29:48 +00:00
Tofu Linden 3546075abf start to build up this code 2010-02-22 11:28:53 +00:00