| Age | Commit message (Collapse) | Author |
|---|
|
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
made marker file lock use append, not truncate
|
|
|
|
|
|
more fixes for unit test crashes
added llcommon initialization/teardown for unit tests
that indirectly trigger lltrace
changed access of atomic refcount to use preincrement/decrement
operators to reflect desired semantics
always call apr_initialize in LLCommon::initClass, even
if already initialized...apr does internal reference counting
to keep things straight
|
|
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
|
|
fixed crash on exit by making LLInstanceTracker iterators use atomic iterator
nesting count for thread safety
|
|
improvements on lifetime of lltrace core data structures
tweaks to thread local pointer handling so that static constructors/destructors
can safely call functions that use lltrace
|
|
removed some potential data races
got memory stats recording in trace system
|
|
|
|
|
|
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
|
|
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
|
|
fixed trace data gathering and routing from background thread
simplified slave->master thread communication (eliminated redundant recording and proxy object)
improved performance of fast timer data gathering (slow iterators)
|
|
renamed LLTrace::ThreadTrace to LLTrace::ThreadRecorder
renamed LLTrace::Sampler to LLTrace::Recording
|
|
cleaned up API
samplers are now value types with copy-on-write buffers under the hood
removed coupling with LLThread
|
|
factored out lltrace::sampler into separate file
added rudimentary lltrace support to llstatgraph
made llstatgraph use param blocks more effectively
moves initial set of stats over to lltrace
removed windows.h #defines for min and max
|
|
fixed various issues related to unit tests and LLThreadLocalPtr initialization and teardown
|
|
moved LLThreadLocalPtr to llapr
fixed various startup race conditions for LLThreadLocalPtr
|
|
Beware of bad documentation. operator--(int) does not return what
the header claimed it did.
|
|
In addition to its usual apr_sterror() function, APR defines a special
function specifically for errors relating to the apr_dso_*() functions.
Introduce ll_apr_warn_status() and ll_apr_assert_status() overloads accepting
apr_dso_handle_t* to call apr_dso_error() as well as apr_strerror() and log
its output. Use new ll_apr_warn_status() in LLAppViewer::loadEventHostModule()
for apr_dso_load() and apr_dso_sym() calls. Instead of shorthand
ll_apr_assert_status(), use with llassert_always() so check is still performed
even in Release build.
Add more lleventhost-related debugging output, e.g. full pathname of the DLL.
On Mac and Linux, call 'file' command to report nature of the DLL too.
|
|
|
|
from the end'.
Also, more comments.
Also, try to avoid a seek when offset==0 in read.
To be reviewed by Bao.
(transplanted from 60eb013221a83ff76054ab7dcb1d07c108f51a9d)
|
|
close(). to be reviewed by bao.
(transplanted from 17c6af7a2396f9890aab8226356a556b4d58a7d8)
|
|
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
|
|
|
|
|
|
--HG--
branch : avatar-pipeline
|
|
Moves libllcommon.so to a staging dir for unit tests to work
and gets rid of LL_COMMON_API in forward declarations
|
|
up to viewer-2.0.0-3
|
|
|
|
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.
reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
|
|
(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
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
merge viewer_1-21 94770-96059 -> release
|
|
dataserver-is-deprecated
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
|
|
release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
|
