Changeset 92145 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Oct 29, 2021 1:00:02 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147966

Message:

Main/VirtualBoxTranslator.cpp: Write lock the object in the destructor to try prevent destroying it while someone is changing the language (com::Shutdown / notification race). Introduced some logging. bugref:1909

File:

• trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp

@@ -16 +16 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_MAIN_VIRTUALBOXCLIENT /** @todo add separate logging group! */
+#include "LoggingNew.h"
+
 #include <iprt/asm.h>
 #include <iprt/ctype.h>
@@ -31 +38 @@
 #include "VirtualBoxTranslator.h"
 
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define TRANSLATOR_CACHE_SIZE 32
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 /** Init once for the critical section. */
 static RTONCE               g_Once = RTONCE_INITIALIZER;
@@ -42 +57 @@
 static RTTLS                g_idxTlsSrc = NIL_RTTLS;
 
+
+
 /**
  * @callback_method_impl{FNRTONCE}
@@ -65 +82 @@
     if (RT_FAILURE(rc))
         m_hStrCache = NIL_RTSTRCACHE; /* (loadLanguage will fail) */
+    LogFlowFunc(("m_rcCache=%Rrc g_idxTlsTr=%#x g_idxTlsSrc=%#x\n", m_rcCache, g_idxTlsTr, g_idxTlsSrc));
 }
 
@@ -70 +88 @@
 VirtualBoxTranslator::~VirtualBoxTranslator()
 {
+    LogFlowFunc(("enter\n"));
+
+    /* Write-lock the object as we could be racing language change
+       notifications processing during XPCOM shutdown. (risky?) */
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     RTTlsFree(g_idxTlsTr);
     g_idxTlsTr = NIL_RTTLS;
@@ -91 +115 @@
         m_rcCache = VERR_WRONG_ORDER;
     }
+    LogFlowFunc(("returns\n"));
 }
 
@@ -203 +228 @@
 int VirtualBoxTranslator::i_loadLanguage(const char *pszLang)
 {
+    LogFlowFunc(("pszLang=%s\n", pszLang));
     int  rc = VINF_SUCCESS;
     char szLocale[256];
@@ -241 +267 @@
 {
     AssertReturn(aComponent, VERR_INVALID_PARAMETER);
+    LogFlow(("aComponent=%s aLang=%s\n", aComponent->strPath.c_str(), aLang));
+
     int rc;
     if (strcmp(aLang, "C") != 0)