Commit Graph

65 Commits (8ffa65d42486afe337e383404cf95d33fd059a0f)

Author SHA1 Message Date
Ansariel 25f20cfd59 const ref please! 2023-04-04 13:16:14 +02:00
Ansariel 068d2a9b02 Fix disk cache after merge 2023-04-01 16:16:53 +02:00
Ansariel f7f941ae5b Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llfilesystem/lldiskcache.cpp
2023-02-03 13:06:40 +01:00
Andrey Kleshchev 1c0d478436 SL-18773 Crash incrementing directory_iterator
make_iterator_range doesn't verify errors, replaced with basic increments
2023-01-18 19:20:36 +02:00
Ansariel 656dd12dfc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/llmodelpreview.h
2022-09-15 20:35:44 +02:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
Ansariel 30df86e318 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-06-29 22:07:42 +02:00
Cosmic Linden 7bf25aa8b8 SL-17329: Remove unused extra variable initialization 2022-06-24 13:32:14 -07:00
Ansariel cfb6c083fe Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/llfilesystem/lldiskcache.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
2022-06-24 22:18:44 +02:00
Cosmic Linden ccdeac3223 SL-17329: Do logging of individual files after the disk cache purge finishes so it doesn't affect the time measurement.
The time resolution of the debug log is in seconds, so it's not particularly useful.

Arguably, one could remove this fine logging in favor of Tracy markers. Or have both. Depends on the use case.
2022-06-22 13:28:25 -07:00
Ansariel 1edfb172f5 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llfilesystem/lldiskcache.h
#	indra/newview/app_settings/settings.xml
2022-01-12 16:46:56 +01:00
Mnikolenko Productengine c09155574d SL-15083 Remove old vfs files 2022-01-11 19:31:51 +02:00
Ansariel 931fec6d7a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-09-20 11:12:47 +02:00
Ansariel ac70e21c93 More boost::filesystem failure checks 2021-08-30 13:59:36 +02:00
PanteraPolnocy 9dee543ea3 Revert "Simple cache viewer: Enable some cache purge log output for testing"
This reverts commit ad952d6744. Iterate over the cache directory one time instead of three.
2021-08-30 10:03:56 +02:00
Ansariel eb5d535cb6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 13:15:50 +02:00
Tonya Souther 775adeb647 FIRE-31070: Crash on clearing cache on macOS and Linux. 2021-07-17 19:23:45 -05:00
Ansariel 738e5c2659 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-15 19:56:26 +02:00
Ansariel a4e0fde3ee Shuffle stuff around 2021-07-06 09:50:32 +02:00
Beq 98b19c8845 Additional static cache fixes to prevent purging 2021-07-05 14:46:55 +01:00
Beq cbe3910620 Cleanup cache clearing to re-enable threaded clear
fixup silly mis-edits
2021-07-04 00:12:13 +01:00
Beq 6d6c48d609 [FIRE-31003] Add back static cache (opensim) + pre-cache pose stand 2021-07-04 00:12:13 +01:00
Ansariel 8e2adbcde7 Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer 2021-06-15 12:04:03 +02:00
Ansariel 2f228886d6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-15 12:01:32 +02:00
Ansariel fedae88be7 boost::filesystem::directory_iterator uses throw-behavior by default as well 2021-06-11 22:59:55 +02:00
Ansariel 3c3aaaccb0 Simple Cache Viewer: boost::filesystem::recursive_directory_iterator uses throw-behavior by default as well... 2021-06-11 22:58:42 +02:00
Ansariel 564a7acb32 Change all remaining boost::filesystem methods to their non-throwing overloads 2021-06-11 22:50:39 +02:00
Ansariel 3b8252340c Simple Cache Viewer: Change all remaining boost::filesystem methods to their non-throwing overloads 2021-06-11 22:50:19 +02:00
Ansariel 4c558e85bd Fix more crashes in disk cache due to boost error handling 2021-06-10 01:09:31 +02:00
Ansariel c4496e0379 FIRE-30996: Prevent crash on diskcache filesystem errors 2021-06-10 01:00:43 +02:00
Ansariel dde3c2c7a8 Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer 2021-06-05 14:03:30 +02:00
Nat Goodspeed ac8640d338 SL-15200: LLPurgeDiskCacheThread's CHECK_INTERVAL is secs. 2021-05-18 09:51:45 -04:00
Ansariel ef501d40af Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer 2021-05-18 09:02:44 +02:00
Nat Goodspeed b3708ac238 SL-15200: Use new LLApp::sleep() in LLPurgeDiskCacheThread::run(). 2021-05-17 15:10:06 -04:00
Nat Goodspeed 87faf25891 SL-15200: Explain why purge() is called on another thread.
Also add Ansariel's explanation for why interaction through the filesystem
itself should be safe.
2021-05-17 10:24:27 -04:00
Ansariel 89cf988aaf BUG-230673: Add warning that LLDiskCache::purge() is also called from outside the main thread 2021-05-17 09:49:32 +02:00
Ansariel 0e253cb909 BUG-230673: Trim asset disk cache regularly 2021-05-12 10:45:23 +02:00
Callum Prentice c241c5d4b8 Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519 2021-05-11 12:59:37 -07:00
Callum Prentice 3898609ae2 Fix for SL-15226 Simple cache viewer: Integer overflow in cache size - via FS:Ansariel 2021-05-11 12:58:05 -07:00
Ansariel 8633ba9c8b BUG-230697: Do not crash viewer during cache cleanup 2021-05-11 20:27:07 +02:00
Ansariel 44081af153 Simple cache viewer: Fix integer overflow 2021-05-06 11:50:13 +02:00
Ansariel 1322c097e7 Simple disk cache: Commented out a comment too much 2021-05-06 11:45:16 +02:00
Ansariel ad952d6744 Simple cache viewer: Enable some cache purge log output for testing 2021-05-06 10:06:55 +02:00
Ansariel 5f90dbbc63 Simple cache viewer: Add regular cache cleanup 2021-05-06 10:05:29 +02:00
Ansariel 14b1cf1852 Simple cache viewer: Do not crash the viewer if a cached asset file cannot be deleted - thank you! 2021-05-04 10:55:46 +02:00
Ansariel b536ffa881 Simple asset disk cache optimization... 2021-05-03 10:55:08 +02:00
Ansariel e66659fe9d More simplified cache tweaks 2021-03-14 21:32:07 +01:00
Ansariel 0e7a96b16b Forgot about the directory delimiter... 2021-03-14 20:54:11 +01:00
Ansariel 3817e0b5e9 More improvements to simple disk cache 2021-03-14 15:28:22 +01:00
Ansariel e6c34f01d2 Revert revert of Simplified Cache viewer release - continue with simplified cache
This reverts commit 40ad606ae0, reversing
changes made to 906cfe699d.
2021-03-10 15:13:12 +01:00