livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid thread deadlock by early fsassetblacklist construction.

master
Nicky Dasmijn 2019-12-21 21:46:25 +01:00
parent a135b5b428
commit 5173871402
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llappviewer.cpp
View File

@ -280,7 +280,7 @@
#include "nd/ndlogthrottle.h"
#include "fsradar.h"
#include "fsassetblacklist.h"
#if (LL_LINUX || LL_SOLARIS) && LL_GTK
#include "glib.h"
@ -1096,6 +1096,15 @@ bool LLAppViewer::init()
LLToolMgr::getInstance(); // Initialize tool manager if not already instantiated
// <FS:ND/> Contruct singleton early.
// Otherwise it will get constructed inside the texture decode thread and this will lead to deadlocks:
// - Let "Thread I" be the image decode threat that causes the creation of FSAssetBlack.
// - Thread I holds a lock to a mutex the mainthread is sleeping on.
// - Thread I will defer the singleton creation to the mainthread, which will cause Thread I to sleep on a mutex till the mainthread is done creating the object.
// - The mainthread can never wake up and create the object due do it sleeping on something Tread I must release.
// - Thread I can never wake up and release the mutex as the mainthread can never wake up and wake thread I again.
FSAssetBlacklist::getInstance();
LLViewerFloaterReg::registerFloaters();
/////////////////////////////////////////////////