[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source tsan-suppress.txt

[Noel Grandin (via logerrit)]

 i18nlangtag/source/languagetag/languagetag.cxx |    3 ++-
 tsan-suppress.txt                              |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 186398e2661c8be9c4d8447d2c8fada443b26ad4
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 30 12:09:39 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 30 17:38:16 2023 +0100

    update tsan-suppress
    
    with some more glib-related noise
    
    Change-Id: Ie91f8036613d955f5a4a62d7df10b62ba0bec227
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158652
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/tsan-suppress.txt b/tsan-suppress.txt
index e1eb43c0a772..2c431f4da22d 100644
--- a/tsan-suppress.txt
+++ b/tsan-suppress.txt
@@ -63,6 +63,10 @@ race:g_task_finalize
 race:g_socket_send_message_with_timeout
 race:g_idle_source_new
 race:g_slice_alloc0
+race:g_str_has_suffix
+race:g_str_equal
+race:g_strsplit
+race:g_variant_store
 
 # Python build, lock order inversion
 deadlock:take_gil
commit cee0a8b26340097807afc1939d296cbf9e0be428
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 30 12:09:23 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 30 17:38:07 2023 +0100

    tsan:data race in LanguageTag::registerImpl
    
    not important, just reduces noise when running tsan
    
    Change-Id: I96de4f9e70c8165f0c1135e24ae7522266aa0c0c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158651
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index b57186d49367..ebf31acc4f9a 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -20,6 +20,7 @@
 #include <rtl/locale.h>
 #include <o3tl/string_view.hxx>
 #include <algorithm>
+#include <atomic>
 #include <map>
 #include <mutex>
 #include <string_view>
@@ -759,7 +760,7 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
     ImplPtr pImpl;
 
 #if OSL_DEBUG_LEVEL > 0
-    static size_t nCalls = 0;
+    static std::atomic_int nCalls = 0;
     ++nCalls;
     SAL_INFO( "i18nlangtag", "LanguageTag::registerImpl: " << nCalls << " 
calls");
 #endif