Commit Graph

324 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
Nicky Dasmijn cff453ff51 Merge remote-tracking branch 'eep/master' into fs-eep-vs2017 2020-05-20 13:49:20 +02:00
Nat Goodspeed ca6f092929 DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72 2020-05-06 16:06:26 -04:00
Nat Goodspeed 962ccb4f01 DRTVWR-476: Facilitate debugging test programs with logging.
On Mac, even if you run a test program with --debug or set LOGTEST=DEBUG, it
won't log to stderr if you're filtering build output or running the build in
an emacs compile buffer. This is because, on Mac, a viewer launched by mouse
rather than from the command line is passed a stderr stream that ultimately
gets logged to the system Console. The shouldLogToStderr() function is
intended to avoid spamming the Console with the (voluminous) viewer log
output. It tests whether stderr isatty() and, if not, suppresses calling
LLError::logToStderr().

This makes debugging test programs using log output trickier than necessary.
Change shouldLogToStderr() to permit logging when either stderr isatty() or is
a pipe. The original intention is preserved in that empirically, a viewer
launched by mouse is passed a stderr stream identified as a character device
rather than as a pipe.

Also introduce SetEnv, a class that facilitates setting (e.g.) LOGTEST=DEBUG
for specific test programs without setting it for all test programs in the
build. Using the constructor for a static object means you can set environment
variables before main() is entered, which is important because it's the main()
function in test.cpp that acts on the LOGTEST and LOGFAIL environment
variables.

These changes make it unnecessary to retain the temporary change in test.cpp
to force LOGTEST to DEBUG.
2020-04-03 10:46:17 -04:00
Nat Goodspeed cc9bdbcf19 DRTVWR-476: Introduce LLStacktrace, a token to stream stack trace.
LLStacktrace has no behavior except when you stream an instance to a
std::ostream. Then it reports the current traceback at that point to the
ostream.

This bit of indirection is intended to avoid the boost/stacktrace.hpp header
from being included everywhere.
2020-03-25 19:21:16 -04:00
Nat Goodspeed 7826683fa2 DRTVWR-476: Back out 355d9db4a59f: unroll stderr redirection. 2020-03-25 19:06:13 -04:00
Nat Goodspeed 99d4ddc668 DRTVWR-476: Back out e913c05d43b6: unroll stderr redirection. 2020-03-25 19:06:13 -04:00
Nat Goodspeed d94e4613ca DRTVWR-476: Back out e66ec842b851: unrolling stderr redirection. 2020-03-25 19:06:13 -04:00
Nat Goodspeed 950204a5d7 DRTVWR-476: Partially revert 978e09882565: undo using LLTempRedirect.
But leave LLTempRedirect available in the code base.
2020-03-25 19:06:13 -04:00
Nat Goodspeed 7ef10fe11c DRTVWR-476: Don't test configuration.emptyMap().
LLSD::emptyMap() is a factory for an empty map instance, NOT a predicate on
any particular instance. In fact checking configuration.isUndefined() and
testing whether the map is empty are both subsumed by (! configuration).
2020-03-25 19:06:13 -04:00
Nat Goodspeed ec2bd40d3e DRTVWR-476: Encapsulate dup()/dup2() fd saving as LLTempRedirect. 2020-03-25 19:06:12 -04:00
Nat Goodspeed 7f1a200214 DRTVWR-476: On Windows, dup2() et al. need <io.h> 2020-03-25 19:05:17 -04:00
Nat Goodspeed 07134aaee7 DRTVWR-476: Try to extend stderr redirection to Windows as well.
Make the LLError::Settings LLSingleton duplicate the file handle for stderr
(usually 2) on construction. Make its destructor restore the original target
for that file handle. Provide a getDupStderr() method to obtain the duplicate
file handle.

Move Settings declaration up to the top of the file so other code can
reference it.

Make RecordToFile (the Recorder subclass engaged by LLError::logToFile()),
instead of duplicating stderr's file handle itself, capture the duplicate
stderr file handle from Settings to revert stderr redirection on destruction.

Make RecordToStderr (the Recorder subclass engaged by LLError::logToStderr())
use fdopen() to create an LLFILE* targeting the duplicate file handle from
Settings. Write output to that instead of to stderr so logToStderr() continues
to provide output for the user instead of duplicating each line into the log
file.
2020-03-25 19:05:17 -04:00
Nat Goodspeed 7845f73c76 DRTVWR-476: Try to log stderr output from classic-C libraries.
Some of the libraries we use produce log output to stderr. Such output can be
informative, but is invisible unless you launch the viewer from a console. In
particular, it's invisible to anyone trying to diagnose a problem by reading
someone else's SecondLife.log file.

Make RecordToFile -- the Recorder subclass engaged by LLError::logToFile() --
redirect STDERR_FILENO to the newly-opened log file so that any subsequent
writes to stderr (or cerr, for that matter) will be captured in the log file.
But first duplicate the original stderr file handle, and restore it when
RecordToFile is destroyed. That way, output written to stderr during the final
moments of application shutdown should still appear on (console) stderr.
2020-03-25 19:05:17 -04:00
Nat Goodspeed 6b70493ddb DRTVWR-476: Make test program --debug switch work like LOGTEST=DEBUG.
The comments within indra/test/test.cpp promise that --debug is, in fact, like
LOGTEST=DEBUG. Until now, that was a lie. LOGTEST=level displayed log output
on stderr as well as in testprogram.log, while --debug did not.

Add LLError::logToStderr() function, and make initForApplication() (i.e.
commonInit()) call that instead of instantiating RecordToStderr inline. Also
call it when test.cpp recognizes --debug switch.

Remove the mFileRecorder, mFixedBufferRecorder and mFileRecorderFileName
members from SettingsConfig. That tactic doesn't scale.

Instead, add findRecorder<RECORDER>() and removeRecorder<RECORDER>() template
functions to locate (or remove) a RecorderPtr to an object of the specified
subclass. Both are based on an underlying findRecorderPos<RECORDER>() template
function. Since we never expect to manage more than a handful of RecorderPtrs,
and since access to the deleted members is very much application setup rather
than any kind of ongoing access, a search loop suffices.

logToFile() uses removeRecorder<RecordToFile>() rather than removing
mFileRecorder (the only use of mFileRecorder).

logToFixedBuffer() uses removeRecorder<RecordToFixedBuffer>() rather than
removing mFixedBufferRecorder (the only use of mFixedBufferRecorder).

Make RecordToFile store the filename with which it was instantiated. Add a
getFilename() method to retrieve it. logFileName() is now based on
findRecorder<RecordToFile>() instead of mFileRecorderFileName (the only use of
mFileRecorderFileName).

Make RecordToStderr::mUseANSI a simple bool rather than a three-state enum,
and set it immediately on construction. Apparently the reason it was set
lazily was because it consults its own checkANSI() method, and of course
'this' doesn't acquire the leaf class type until the constructor has completed
successfully. But since nothing in checkANSI() depends on anything else in
RecordToStderr, making it static solves that problem.
2020-03-25 18:47:13 -04:00
Brad Kittenbrink a6f31e9167 Fixed variadic macro usage in LL_ERRS_IF and LL_WARNS_IF and improved LLError::shouldLogToStderr() behavior under xcode. 2020-03-25 18:39:21 -04:00
Nat Goodspeed 4c9e90de43 DRTVWR-494: Get initialized LLMutexes for very early log calls.
Use function-static LLMutex instances instead of module-static instances,
since some log calls are evidently issued before we get around to initializing
llerror.cpp module-static variables.
2020-03-25 15:28:17 -04:00
Nat Goodspeed 1fc7c994d6 DRTVWR-494: Fix VS LLError::Log::demangle() vulnerability.
The Windows implementation of demangle() assumed that a "mangled" class name
produced by typeid(class).name() always starts with the prefix "class ",
checked for that and removed it. If the mangled name didn't start with that
prefix, it would emit a debug message and return the full name.

When the class in question is actually a struct, the prefix is "struct "
instead. But when demangle() was being called before logging had been fully
initialized, the debug message remarking that it didn't start with "class "
crashed.

Look for either "class " or "struct " prefix. Remove whichever is found and
return the rest of the name. If neither is found, only log if logging is
available.
2020-03-25 15:28:17 -04:00
Nicky Dasmijn a135b5b428 Merge remote-tracking branch 'origin/ll-vs2017' into fs-vs2017 2019-12-21 13:14:51 +01:00
Nat Goodspeed 82bdbd5e41 DRTVWR-476: Reinstate operator<<(std::ostream, LLError::LLStacktrace)
which was accidentally deleted by a merge.
2019-12-18 13:18:37 -05:00
Nat Goodspeed db074a29af DRTVWR-476: Merge in logging, coord conversion crash fixes. 2019-12-18 12:58:43 -05:00
Nat Goodspeed 632782e7ef DRTVWR-494: Get initialized LLMutexes for very early log calls.
Use function-static LLMutex instances instead of module-static instances,
since some log calls are evidently issued before we get around to initializing
llerror.cpp module-static variables.
2019-12-18 12:25:45 -05:00
Nat Goodspeed 8b4e4a950c Automated merge with file:///C:%5CUsers%5CNat%5Clinden%5Cviewer-llsingleton 2019-12-12 07:57:31 -05:00
Nat Goodspeed e8d174a1a6 DRTVWR-494: Fix VS LLError::Log::demangle() vulnerability.
The Windows implementation of demangle() assumed that a "mangled" class name
produced by typeid(class).name() always starts with the prefix "class ",
checked for that and removed it. If the mangled name didn't start with that
prefix, it would emit a debug message and return the full name.

When the class in question is actually a struct, the prefix is "struct "
instead. But when demangle() was being called before logging had been fully
initialized, the debug message remarking that it didn't start with "class "
crashed.

Look for either "class " or "struct " prefix. Remove whichever is found and
return the rest of the name. If neither is found, only log if logging is
available.
2019-12-12 07:39:23 -05:00
Nicky 9335eded97 Merge with viewer-vs2107 2019-12-08 17:18:43 +01:00
Nat Goodspeed 9e58f09096 DRTVWR-476: Introduce LLStacktrace, a token to stream stack trace.
LLStacktrace has no behavior except when you stream an instance to a
std::ostream. Then it reports the current traceback at that point to the
ostream.

This bit of indirection is intended to avoid the boost/stacktrace.hpp header
from being included everywhere.
2019-11-18 18:43:01 -05:00
Nat Goodspeed 3b1dce4d3f DRTVWR-476: Merge backout of 355d9db4a59f 2019-11-12 17:02:28 -05:00
Nat Goodspeed 369daed759 DRTVWR-476: Back out 355d9db4a59f: unroll stderr redirection. 2019-11-12 17:02:11 -05:00
Nat Goodspeed dbfd51b787 DRTVWR-476: Merge backout of e913c05d43b6 2019-11-12 16:59:23 -05:00
Nat Goodspeed 4c0a0712bb DRTVWR-476: Back out e913c05d43b6: unroll stderr redirection. 2019-11-12 16:59:08 -05:00
Nat Goodspeed d92ff30320 DRTVWR-476: Merge backout of e66ec842b851 2019-11-12 16:57:13 -05:00
Nat Goodspeed 814a7f14ad DRTVWR-476: Back out e66ec842b851: unrolling stderr redirection. 2019-11-12 16:56:43 -05:00
Nat Goodspeed bf33976b48 DRTVWR-476: Partially revert 978e09882565: undo using LLTempRedirect.
But leave LLTempRedirect available in the code base.
2019-11-12 16:54:56 -05:00
Nat Goodspeed 3e9d18671e DRTVWR-476: Don't test configuration.emptyMap().
LLSD::emptyMap() is a factory for an empty map instance, NOT a predicate on
any particular instance. In fact checking configuration.isUndefined() and
testing whether the map is empty are both subsumed by (! configuration).
2019-11-12 14:47:13 -05:00
Nicky fee98dac77 Merge with VS2017 2019-11-10 12:07:34 +01:00
Nat Goodspeed 2a582e31ce DRTVWR-476: Encapsulate dup()/dup2() fd saving as LLTempRedirect. 2019-10-31 12:39:31 -04:00
Nat Goodspeed 75344c296e DRTVWR-476: On Windows, dup2() et al. need <io.h> 2019-10-29 07:32:10 -04:00
Nat Goodspeed e5bb19d2fa DRTVWR-476: Try to extend stderr redirection to Windows as well.
Make the LLError::Settings LLSingleton duplicate the file handle for stderr
(usually 2) on construction. Make its destructor restore the original target
for that file handle. Provide a getDupStderr() method to obtain the duplicate
file handle.

Move Settings declaration up to the top of the file so other code can
reference it.

Make RecordToFile (the Recorder subclass engaged by LLError::logToFile()),
instead of duplicating stderr's file handle itself, capture the duplicate
stderr file handle from Settings to revert stderr redirection on destruction.

Make RecordToStderr (the Recorder subclass engaged by LLError::logToStderr())
use fdopen() to create an LLFILE* targeting the duplicate file handle from
Settings. Write output to that instead of to stderr so logToStderr() continues
to provide output for the user instead of duplicating each line into the log
file.
2019-10-28 17:15:40 -04:00
Nat Goodspeed 686e452659 DRTVWR-476: Try to log stderr output from classic-C libraries.
Some of the libraries we use produce log output to stderr. Such output can be
informative, but is invisible unless you launch the viewer from a console. In
particular, it's invisible to anyone trying to diagnose a problem by reading
someone else's SecondLife.log file.

Make RecordToFile -- the Recorder subclass engaged by LLError::logToFile() --
redirect STDERR_FILENO to the newly-opened log file so that any subsequent
writes to stderr (or cerr, for that matter) will be captured in the log file.
But first duplicate the original stderr file handle, and restore it when
RecordToFile is destroyed. That way, output written to stderr during the final
moments of application shutdown should still appear on (console) stderr.
2019-10-28 14:33:36 -04:00
Nat Goodspeed 18bb6d5d49 DRTVWR-476: Make test program --debug switch work like LOGTEST=DEBUG.
The comments within indra/test/test.cpp promise that --debug is, in fact, like
LOGTEST=DEBUG. Until now, that was a lie. LOGTEST=level displayed log output
on stderr as well as in testprogram.log, while --debug did not.

Add LLError::logToStderr() function, and make initForApplication() (i.e.
commonInit()) call that instead of instantiating RecordToStderr inline. Also
call it when test.cpp recognizes --debug switch.

Remove the mFileRecorder, mFixedBufferRecorder and mFileRecorderFileName
members from SettingsConfig. That tactic doesn't scale.

Instead, add findRecorder<RECORDER>() and removeRecorder<RECORDER>() template
functions to locate (or remove) a RecorderPtr to an object of the specified
subclass. Both are based on an underlying findRecorderPos<RECORDER>() template
function. Since we never expect to manage more than a handful of RecorderPtrs,
and since access to the deleted members is very much application setup rather
than any kind of ongoing access, a search loop suffices.

logToFile() uses removeRecorder<RecordToFile>() rather than removing
mFileRecorder (the only use of mFileRecorder).

logToFixedBuffer() uses removeRecorder<RecordToFixedBuffer>() rather than
removing mFixedBufferRecorder (the only use of mFixedBufferRecorder).

Make RecordToFile store the filename with which it was instantiated. Add a
getFilename() method to retrieve it. logFileName() is now based on
findRecorder<RecordToFile>() instead of mFileRecorderFileName (the only use of
mFileRecorderFileName).

Make RecordToStderr::mUseANSI a simple bool rather than a three-state enum,
and set it immediately on construction. Apparently the reason it was set
lazily was because it consults its own checkANSI() method, and of course
'this' doesn't acquire the leaf class type until the constructor has completed
successfully. But since nothing in checkANSI() depends on anything else in
RecordToStderr, making it static solves that problem.
2019-10-14 15:41:09 -04:00
Ansariel 61c56570ab Merge viewer-eep 2019-08-13 19:05:23 +02:00
Graham Linden 9bb6da1e76 Make llerror do 66% fewer fprintf calls when engaging ANSI encoding and eliminate branches from high-traffic code. 2019-07-30 11:59:20 -07:00
Nicky e6e66a953e Merge with viewer-vs2017 2019-06-06 14:37:27 +02:00
Nat Goodspeed ebcfbf277e Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2019-06-05 14:15:15 -04:00
Brad Kittenbrink 7ba60f7682 Fixed variadic macro usage in LL_ERRS_IF and LL_WARNS_IF and improved LLError::shouldLogToStderr() behavior under xcode. 2019-03-08 13:39:56 -08:00
Ansariel c96314964a Merge Firestorm LGPL 2019-03-01 17:36:52 +01:00
AndreyL ProductEngine 36cb6933e6 Merged in lindenlab/viewer-release 2019-03-01 02:24:00 +02:00
Ansariel 536a3f6c8e Merge viewer-neko 2019-01-18 23:41:21 +01:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
Ansariel 06ad0722ce Merge Firestorm LGPL 2018-12-16 02:11:33 +01:00
Ansariel a622ad8b07 Merge Firestorm LGPL 2018-12-07 23:41:35 +01:00
Ansariel 0e36db79e1 Merge viewer-neko 2018-12-01 16:34:33 +01:00
andreykproductengine 3b83f5650d SL-9954 Mac Viewer crashes if logcontrol-dev.xml is modified 2018-11-29 19:25:00 +02:00
andreykproductengine 13f8cfd1c2 SL-9954 Mac Viewer crashes if logcontrol-dev.xml is modified 2018-11-29 19:25:00 +02:00
Ansariel 5532f87f80 Merge Firestorm LGPL 2018-11-16 00:09:19 +01:00
Ansariel 0d7978ecf8 Merge Firestorm LGPL 2018-11-15 20:20:00 +01:00
Ansariel 0e2c5147dd Merge Firestorm LGPL 2018-11-15 18:48:02 +01:00
Nat Goodspeed f7e99f0db7 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2018-11-14 16:17:36 -05:00
AndreyL ProductEngine 39652180ae Merged in lindenlab/axon 2018-11-14 16:20:05 +02:00
Ansariel ee34ea1f4b Merge viewer-bugsplat 2018-10-27 00:50:58 +02:00
Ansariel 1be44852f6 Merge viewer-neko 2018-10-19 14:09:13 +02:00
Ansariel 5e22507d2b Merge Firestorm LGPL 2018-10-19 12:58:11 +02:00
Oz Linden d87cc1859f Modify logging so that the in-viewer console and stderr do not escape line breaks
Improve the implementation so that escaping is computed only once
2018-10-11 14:17:52 -04:00
Ansariel a27321fa51 Merge Firestorm LGPL 2018-10-04 01:38:36 +02:00
Brad Payne (Vir Linden) a84ee929a5 merge 2018-09-27 19:54:10 +01:00
Liny 042dedf85f Hide the log sanitize function so gcc doesnt complain. 2018-09-27 06:36:59 -07:00
Ansariel 23fd31faf6 Merge Firestorm LGPL 2018-09-27 11:59:30 +02:00
Ansariel 95aa7f7583 Fix log output - we don't need an escaped output 2018-09-27 11:47:42 +02:00
Ansariel 0d04687377 Merge viewer-bugsplat 2018-09-27 00:21:50 +02:00
Ansariel d5fdcd67ab Merge axon 2018-09-25 17:45:20 +02:00
Oz Linden a9b3c67534 remove unused control flags in internal logging method 2018-09-19 11:27:45 -04:00
Ansariel d93b92ec1d Merge viewer-bear 2018-09-12 20:13:12 +02:00
Nat Goodspeed fc8b4ec587 DRTVWR-447: Finish pulling in new viewer-release. 2018-09-26 16:50:58 -04:00
Brad Payne (Vir Linden) d6cec8d68d SL-944 - enabled log types consistent notation in xml and cpp 2018-09-07 16:00:43 +01:00
Oz Linden f1d4e788e7 SL-967 simplify viewer log file field syntax
MAINT-8991: only escape log message characters once, add unit test
remove extra log line created by LL_ERRS
document that tags may not contain spaces
2018-08-29 16:43:45 -04:00
AndreyL ProductEngine 36e89143b7 Backed out changeset: 5b0f20062633 2018-08-28 22:25:18 +03:00
Brad Payne (Vir Linden) e3d5a6df0a SL-944 - mac build error fix: wants override to be used throughout a class if it is used at all 2018-08-27 14:22:42 +01:00
Brad Payne (Vir Linden) 9ae973ec5b SL-944 - mac build error fix: wants override to be used throughout a class if it is used at all 2018-08-27 14:22:42 +01:00
Brad Payne (Vir Linden) 35b12f7547 SL-944 - logcontrol options to control which log recorders get used. This can be useful for performance reasons when especially verbose debug logging is needed. 2018-08-24 21:55:07 +01:00
Brad Payne (Vir Linden) 9c6678b5e7 SL-944 - logcontrol options to control which log recorders get used. This can be useful for performance reasons when especially verbose debug logging is needed. 2018-08-24 21:55:07 +01:00
Ansariel 6f7a3cdc74 Merge viewer-bear 2018-08-22 14:47:49 +02:00
maxim_productengine 7aaaabdea7 MAINT-8991 Escape newlines in log entries 2018-08-17 16:14:03 +03:00
Brad Payne (Vir Linden) 6ce09ad712 merge 2018-08-02 21:54:09 +01:00
Ansariel 0f121d042d Merge viewer-bugsplat 2018-07-27 11:19:42 +02:00
Nat Goodspeed cd52724ef8 DRTVWR-447: Suppress BugSplat UI; auto-fill certain BugSplat data.
Direct BugSplat to send crash reports without prompting, on both Windows and
Mac.

Add a mechanism by which code called after LL_ERRS() can retrieve the fatal
log message string. (How did the crash logger extract that for Linden crash
logging?)

Add that fatal message to crash reports on Windows. But as BugsplatMac is
engaged only on the run _after_ the crash, we no longer have that message in
memory.

Also add user name and region location to Windows crash reports. On Mac, (a)
we don't have the information from the previous run and (b) BugsplatMac
doesn't provide an API to attach that information to the crash report.

Add Mac logging to indicate the success or failure of sending the crash
report. Add Windows logging to indicate we're about to send.
2018-06-28 21:49:07 -04:00
Ansariel c1f3b20f55 Merge axon 2018-06-20 19:07:46 +02:00
Brad Payne (Vir Linden) edf6795eda SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output 2018-06-13 21:49:24 +01:00
Ansariel 106d34da3a Merge viewer-neko 2018-06-12 21:54:15 +02:00
Ansariel c3e588c228 Pull fixes for Mac OSX 10.14 2018-06-11 18:32:24 +02:00
Brad Payne (Vir Linden) 887638c4d2 SL-915 - fix for crash when logcontrol file reloaded 2018-06-11 13:55:34 +01:00
Brad Payne (Vir Linden) 430f9420cf SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues 2018-06-07 22:18:15 +01:00
Graham Linden 88da45148e Better fix for OSX 10.14 libc++abi demangling crash on mem shenanigans.
Silence nagging about running launcher for non-release for download builds.

Tweak newview CMake to use executable instead of SL_Launcher and
re-enable debugging within Xcode.
2018-06-07 22:14:46 +01:00
Graham Linden 1c4decadfe Disable name demangling via libc++abi on OS X to avoid malloc abort trap on OS X 10.14 Mojave 2018-06-07 01:22:49 +01:00
Nicky 7cc408a5cd Merge. 2018-04-10 12:33:45 +02:00
Nicky 3ea9a01423 Change pointer to member where possible and do a bit of cleanup in lerror (move the mutexex in there and us the LLMutextTryLock rather than a custom class). 2018-04-06 09:49:32 +02:00
Nicky ef20e3f523 Replace ARP Mutex and Condition with std::mutx and std::conditional_variable 2018-04-05 12:02:12 +02:00
Oz Linden d7c8678c3a merge 5.1.0-release 2018-01-17 12:43:28 -05:00
Ansariel 6131e12bf6 Merge Firestorm LGPL 2017-11-12 11:23:26 +01:00
Ansariel 6a6d6efe22 Merge viewer-vivox 2017-08-23 15:54:53 +02:00
Oz Linden fa53653e60 fix separator between tags and file/function 2017-07-24 14:49:56 -04:00
Ansariel 1baf1f5091 Merge Firestorm LGPL 2017-06-20 23:24:35 +02:00
Oz Linden 347015be33 fix presentation of log tags for better searchability 2017-06-20 17:03:20 -04:00
Nat Goodspeed a3066b7375 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-06-20 16:11:33 -04:00
Ansariel 915496bbea Merge viewer-vivox 2017-03-21 22:14:02 +01:00
Nat Goodspeed f579b94138 DRTVWR-418: Ignore logging that requires resurrecting singletons.
The logging subsystem depends on two different LLSingletons for some reason.
It turns out to be very difficult to completely avoid executing any logging
calls after the LLSingletonBase::deleteAll(), but we really don't want to
resurrect those LLSingletons so late in the run for a couple stragglers.
Introduce LLSingleton::wasDeleted() query method, and use it in logging
subsystem to simply bypass last-millisecond logging requests.
2017-03-13 14:09:14 -04:00
Nat Goodspeed 1a8c8df686 DRTVWR-418: Ignore logging that requires resurrecting singletons.
The logging subsystem depends on two different LLSingletons for some reason.
It turns out to be very difficult to completely avoid executing any logging
calls after the LLSingletonBase::deleteAll(), but we really don't want to
resurrect those LLSingletons so late in the run for a couple stragglers.
Introduce LLSingleton::wasDeleted() query method, and use it in logging
subsystem to simply bypass last-millisecond logging requests.
2017-03-13 14:09:14 -04:00
Ansariel e16b1a6093 Undo some fixes so the LL patches apply cleanly 2017-10-26 12:07:53 +02:00
Oz Linden dd63291355 construct tag string without using += 2017-03-09 17:56:30 -05:00
Oz Linden e479d51068 experiment reformatting of tags in log lines 2017-03-09 14:16:33 -05:00
Ansariel 07d91c5d19 Merge asset-http 2017-03-06 22:48:05 +01:00
Brad Payne (Vir Linden) f70abb4ad6 SL-409 - added tracking for bytes fetched to viewer assets metrics (does not currently work for textures) 2017-03-03 15:14:09 -05:00
Oz Linden 0a7fd3686a Look for logcontrol-dev.xml in the user settings directory 2017-02-27 09:52:50 -05:00
Ansariel 8c083cf771 Merge Firestorm LGPL 2016-12-05 22:40:59 +01:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Ansariel aa25acc045 Merge Firestorm LGPL 2016-11-30 09:43:52 +01:00
Ansariel 5351c445a8 Merge Firestorm LGPL 2016-11-29 19:26:31 +01:00
Ansariel 5a58635b64 Merge Firestorm LGPL 2016-11-16 16:11:56 +01:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
AndreyL ProductEngine 7fceb3a63f Merged in lindenlab/viewer-cleanup 2016-11-14 22:04:37 +02:00
Ansariel 79c0b8a9b5 Merge viewer-bear 2016-10-19 10:56:32 +02:00
Ansariel 951f829d26 Fix log output formatting 2016-11-26 03:35:27 +01:00
Glenn Glazer d68befaced maint-6633: remove commented out code 2016-10-11 13:28:30 -07:00
Glenn Glazer f447cf7223 maint-6633: yet more futzing with spaces 2016-10-11 08:16:25 -07:00
Glenn Glazer 0a55b1d022 maint-6633: more futzing with spaces 2016-10-10 19:27:12 -07:00
Glenn Glazer 22ac9a10d8 maint-6633: fix spacing after level: 2016-10-10 16:03:10 -07:00
Glenn Glazer 64ab1979db maint-6633: fix ordering of log entries 2016-10-10 10:50:22 -07:00
Ansariel 68a8141cd6 Merge bento-box 2016-10-04 12:49:38 +02:00
Brad Payne (Vir Linden) 8d6bb9ee4e SL-451 - SSE-optimized matrix multiply, used in initSkinningMatrixPalette() 2016-09-28 15:43:07 -04:00
Nat Goodspeed d0249fb7c0 MAINT-5232: Eliminate pointless string search for "class " prefix.
The Visual C++ runtime produces typeid(MyClass).name() as "class MyClass".
It's prudent to check for the presence of that prefix before stripping off the
first six characters, but if the first comparison should ever fail, find()
would continue searching the rest of the string for "class " -- a search
guaranteed to fail. Use compare() instead.
2016-09-17 20:54:50 -04:00
Nat Goodspeed d2c3c2f9fe MAINT-5232: Normalize LLSingleton subclasses.
A shocking number of LLSingleton subclasses had public constructors -- and in
several instances, were being explicitly instantiated independently of the
LLSingleton machinery. This breaks the new LLSingleton dependency-tracking
machinery. It seems only fair that if you say you want an LLSingleton, there
should only be ONE INSTANCE!

Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the
friend class LLSingleton<whatevah>;
and explicitly declare a private nullary constructor.

To try to enforce the LLSINGLETON() convention, introduce a new pure virtual
LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might
suspect, defined by the macro. If you declare an LLSingleton subclass without
using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't
instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro()
implementation -- which will hopefully remind the coder.

Trawl through ALL LLSingleton subclass definitions, sprinkling in
LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit
constructor declarations, public or private, along with relevant 'friend class
LLSingleton<myself>' declarations. Where destructors are declared, move them
into private section as well. Where the constructor was inline but nontrivial,
move out of class body.

Fix several LLSingleton abuses revealed by making ctors/dtors private:

LLGlobalEconomy was both an LLSingleton and the base class for
LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance
contained another instance of the LLGlobalEconomy "singleton.") Extract
LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that.
LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy.

LLToolGrab, an LLSingleton, was also explicitly instantiated by
LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated,
with trivial subclass LLToolGrab, the LLSingleton instance.

(WARNING: LLToolGrabBase methods have an unnerving tendency to go after
LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship
between the instance in LLToolCompGun and the LLToolGrab singleton instance.)

LLGridManager declared a variant constructor accepting (const std::string&),
with the comment:
// initialize with an explicity grid file for testing.
As there is no evidence of this being called from anywhere, delete it.

LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD
parameter wasn't used, and as there is no evidence of it being passed from
anywhere, delete the parameter.

LLViewerWindow::shutdownViews() was checking LLNavigationBar::
instanceExists(), then deleting its getInstance() pointer -- leaving a
dangling LLSingleton instance pointer, a land mine if any subsequent code
should attempt to reference it. Use deleteSingleton() instead.

~LLAppViewer() was calling LLViewerEventRecorder::instance() and then
explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the
LLSingleton instance pointer pointing to an allocated-but-destroyed instance.
Use deleteSingleton() instead.
2016-09-15 20:18:12 -04:00
Nat Goodspeed 4af7e496b4 MAINT-5232: Make LLError::is_available() depend on both LLSingletons.
LLError machinery depends on two different LLSingletons. Its is_available()
function is primarily for LLSingleton itself to determine whether it is, or is
not, safe to log. Until both of LLError's LLSingletons have been constructed,
attempting to log LLSingleton operations could produce infinite recursion.
2016-09-03 11:22:54 -04:00
Nat Goodspeed c92eb7e591 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-08-30 11:36:06 -04:00
Nicky 2d2535f987 FIRE-19403; Do not access deleted static instance during viewer shutdown. 2016-06-19 17:54:07 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nat Goodspeed 11c428759e Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2015-11-02 14:09:43 -05:00
Nat Goodspeed 3f52cefcc4 MAINT-5232: merge LLError::Log::demangle() to tip 2015-06-26 15:27:34 -04:00
Nat Goodspeed 33c88a1c60 MAINT-5232: Publish class name demangler as LLError::Log::demangle().
We've had this functionality buried in llerror.cpp for years. Make it
available for callers outside llerror.cpp too.
2015-06-26 15:27:06 -04:00
Nat Goodspeed 0ea1b2a164 MAINT-5232: Try to avoid circularity between LLError and LLSingleton.
Part of LLError's logging infrastructure is implemented with an LLSingleton.
Therefore, attempts to log from within LLSingleton machinery could potentially
go south if LLError's LLSingleton is not yet initialized.
Introduce LLError::is_available() in llerrorcontrol.h and llerror.cpp.
Make LLSingletonBase::logwarns() and logerrs() consult LLError::is_available()
before attempting to use LL_WARNS or LL_ERRS, respectively.
Moreover, make all LLSingleton internal logging use logwarns() and logerrs()
instead of directly engaging LL_ERRS or LL_WARNS.
2015-06-25 16:04:01 -04:00
Ansariel 2caa5273be Merge Viewer-Big Bird 2015-06-04 15:59:17 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Brad Payne (Vir Linden) 76fb5f1542 merge with viewer tools update 2015-04-24 10:08:13 -04:00
Brad Payne (Vir Linden) 4d689fc515 MAINT-4653 WIP, DRTVWR-397 WIP - log output to file now includes tags. Request max 5 attachments per idle loop to reduce sim-side failures seen when requesting large numbers. 2015-04-22 16:09:02 -04:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
callum_linden 0b1259a084 no implicit conversion from ofsteam to bool in VS2013!!!! 2014-12-09 17:29:07 -08:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Stinson Linden 08e83a341e MAINT-4009: Final pass refactoring to eliminate memory allocation related to error reporting that is not properly cleaned up. 2014-05-17 00:41:36 +01:00
Stinson Linden 34b2f2d1f8 MAINT-4009: First pass refactoring to eliminate memory related to error reporting that is not properly cleaned up. 2014-05-16 22:44:25 +01:00