Commit Graph

152 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 627eecd577 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 08:22:59 +01:00
Nicky Dasmijn a8df27ccdd FIRE-31248; Fixup older GCC vesions. 2021-10-16 21:44:17 +02:00
Ansariel 738e5c2659 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-15 19:56:26 +02:00
Ansariel dde3c2c7a8 Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer 2021-06-05 14:03:30 +02:00
Nat Goodspeed d313d7021f SL-15200: Add LLApp::sleep(duration) methods.
Two sleep() methods: one accepting F32Milliseconds, or in general any LLUnits
time class; the other accepting any std::chrono::duration.

The significant thing about each of these sleep() methods, as opposed to any
freestanding sleep() function, is that it only sleeps until the app starts
shutdown. Moreover, it returns true if it slept for the whole specified
duration, false if it woke for app shutdown.

This is accomplished by making LLApp::sStatus be an LLScalarCond<EAppStatus>
instead of a plain EAppStatus enum, and by making setStatus() call set_all()
each time the value changes. Then each new sleep() method can call
wait_for_unequal(duration, APP_STATUS_RUNNING).

Introducing llcond.h into llapp.h triggered an #include circularity because
llthread.h #included llapp.h even though it didn't reference anything from it.
Removed. This, in turn, necessitated adding #include "llapp.h" to several .cpp
files that reference LLApp but had been depending on other header files to
drag in llapp.h.
2021-05-17 13:37:13 -04:00
Ansariel 14fb8f66f8 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-24 16:34:12 +02:00
Andrey Kleshchev 8c8eac256b SL-13927 Turn SSL verification On for all SL services in viewer 2020-09-11 16:32:19 +03:00
Nicky 69de6ece31 Use reinterpret_cast to pass pthread_self (pthread_t) into CRYPTO_THREADID_set_pointer (void*). 2020-03-25 18:40:45 -04:00
Nat Goodspeed 663b9ff6af DRTVWR-476: pthread_self() also needs CRYPTO_THREADID_set_pointer() 2020-03-25 16:12:46 -04:00
Nat Goodspeed 3753dbd5ed DRTVWR-476: Use OpenSSL API suitable for 64-bit pointers.
In three different places we use the same pattern: an ssl_thread_id_callback()
function (a static member of LLCrashLogger, in that case) that used to be
passed to CRYPTO_set_id_callback() and therefore returned an unsigned long
representing the ID of the current thread.

But GetCurrentThread() is a HANDLE, an alias for a pointer, and you can't
uniquely cram a 64-bit pointer into an unsigned long.

Fortunately OpenSSL has a more modern API for retrieving thread ID. Pass
each ssl_thread_id_callback() function to CRYPTO_THREADID_set_callback()
instead, converting it to accept CRYPTO_THREADID* and call
CRYPTO_THREADID_set_pointer() or CRYPTO_THREADID_set_numeric() as appropriate().
2020-03-25 16:12:46 -04:00
Nicky 1b4a6eeea6 Merge with viewer-vs2107 2019-06-07 20:06:52 +02:00
Nicky 0f2d02e12d Use reinterpret_cast to pass pthread_self (pthread_t) into CRYPTO_THREADID_set_pointer (void*). 2019-06-06 20:59:01 +02:00
Ansariel b75b1eb789 Merge viewer-vs2017 2019-03-31 01:37:56 +01:00
Nat Goodspeed dcc2bbbd30 DRTVWR-476: pthread_self() also needs CRYPTO_THREADID_set_pointer() 2018-10-28 22:30:42 -04:00
Nat Goodspeed 1d11bc3c03 DRTVWR-476: Use OpenSSL API suitable for 64-bit pointers.
In three different places we use the same pattern: an ssl_thread_id_callback()
function (a static member of LLCrashLogger, in that case) that used to be
passed to CRYPTO_set_id_callback() and therefore returned an unsigned long
representing the ID of the current thread.

But GetCurrentThread() is a HANDLE, an alias for a pointer, and you can't
uniquely cram a 64-bit pointer into an unsigned long.

Fortunately OpenSSL has a more modern API for retrieving thread ID. Pass
each ssl_thread_id_callback() function to CRYPTO_THREADID_set_callback()
instead, converting it to accept CRYPTO_THREADID* and call
CRYPTO_THREADID_set_pointer() or CRYPTO_THREADID_set_numeric() as appropriate().
2018-10-25 10:58:12 -04:00
Ansariel 3a1fcb9521 Merge Firestorm LGPL 2018-01-17 20:28:45 +01:00
Ansariel 06db7c626f Merge Firestorm LGPL 2017-10-11 17:58:16 +02:00
Oz Linden d62ad1ef8a merge changes for 5.0.8-release 2017-10-11 09:13:55 -04:00
Ansariel 2d6314182b Merge Firestorm LGPL 2017-10-11 19:53:58 +02:00
Ansariel 7c97b96d5d Merge viewer-neko 2017-08-30 20:00:53 +02:00
andreykproductengine 9d9c04b044 MAINT-7691 One more crashreported issue with unicode in windows 2017-08-30 17:44:21 +03:00
andreykproductengine 8f49a267da MAINT-7691 Crash report is not generated/sent if appdata path contains unicode symbols 2017-08-29 19:47:20 +03:00
Ansariel 915496bbea Merge viewer-vivox 2017-03-21 22:14:02 +01:00
Oz Linden 0a7fd3686a Look for logcontrol-dev.xml in the user settings directory 2017-02-27 09:52:50 -05:00
Nicky 6d3df79ea9 Merge #3 with lgpl. 2017-02-06 12:07:45 +01:00
Nicky 688bf1e547 Synchronize with viewer64 source. 2017-01-11 15:36:33 +01:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
Nat Goodspeed c92eb7e591 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-08-30 11:36:06 -04:00
Ansariel b0976f0604 Manual sync of changes in quickgraphics repo that are not changes from viewer-bear so we can simply ignore remote changes later when merging 2016-05-09 11:42:59 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Ansariel 607625a1b5 Merge viewer-quickgraphics 2016-04-23 12:26:49 +02:00
Oz Linden 6de1d311f9 reset crash dump upload retries and timeouts 2016-04-20 12:26:28 -04:00
Oz Linden 928f8fb608 reset crash dump upload retries and timeouts 2016-04-20 12:26:28 -04:00
Ansariel e1dffbcab5 Re-apply Nicky's changes to the crashlogger 2016-04-20 18:15:43 +02:00
Ansariel acb6326869 Merge viewer-quickgraphics 2016-04-20 18:09:48 +02:00
Oz Linden ddd476c90c MAINT-6322 fix merge error that prevented crash dumps from being located for upload (and add better logging) 2016-04-20 11:52:00 -04:00
Oz Linden ecdb190d70 MAINT-6322 fix merge error that prevented crash dumps from being located for upload (and add better logging) 2016-04-20 11:52:00 -04:00
Ansariel 4abe10db36 Restore crash report user settings and (hopefully) make them actually work again after they got broken in the breakpad merge (see FIRE-6914) 2016-04-14 13:17:17 +02:00
Ansariel da9446dcd8 Merge viewer-quickgraphics 2016-04-14 13:03:39 +02:00
Oz Linden a6bc849992 add logging around crash reporting, with minor code cleanups 2016-04-13 14:41:38 -04:00
Oz Linden 8b5a8e3b57 merge changes for MAINT-5974 2016-05-04 13:45:15 -04:00
Oz Linden 57488bc381 add logging around crash reporting, with minor code cleanups 2016-04-13 14:41:38 -04:00
Oz Linden ed38b5c923 merge changes for MAINT-5974 2016-04-08 11:32:48 -04:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Glenn Glazer 68745390ea maint-5974 / maint-5422: remove extraneous return statement 2016-03-08 09:39:05 -08:00
Glenn Glazer 442c4842ab maint-5974/maint-5422: viewer changes for new crash reporting, remove no send logic 2016-03-08 08:09:11 -08:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky 447493f484 Merge. 2016-02-29 14:15:48 +01:00
Rider Linden b9292fdef7 MAINT-6099: One more log message. 2016-01-29 16:11:52 -08:00