[Libreoffice-commits] online.git: common/Util.cpp

[Ashod Nakashian (via logerrit)]

 common/Util.cpp |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f1aa98af75d75eb0a3ad43fdd1d2e2d0732bac56
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Apr 14 14:14:12 2019 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Sat Aug 17 04:28:07 2019 +0200

    wsd: Use unordered map for anonymization
    
    And simplify the trace-logging enablement check.
    
    Change-Id: I4f5c9e08912b8dbc708b191b80032660ce4e1ba0
    Reviewed-on: https://gerrit.libreoffice.org/70742
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/71093

diff --git a/common/Util.cpp b/common/Util.cpp
index 774b522db..9cba4a24c 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -36,6 +36,7 @@
 #include <iomanip>
 #include <iostream>
 #include <mutex>
+#include <unordered_map>
 #include <random>
 #include <sstream>
 #include <string>
@@ -683,7 +684,7 @@ namespace Util
         return std::make_tuple(base, filename, ext, params);
     }
 
-    static std::map<std::string, std::string> AnonymizedStrings;
+    static std::unordered_map<std::string, std::string> AnonymizedStrings;
     static std::atomic<unsigned> AnonymizationCounter(0);
     static std::mutex AnonymizedMutex;
 
@@ -692,8 +693,7 @@ namespace Util
         if (plain.empty() || anonymized.empty())
             return;
 
-        auto &log = Log::logger();
-        if (log.trace() && plain != anonymized)
+        if (Log::traceEnabled() && plain != anonymized)
             LOG_TRC("Anonymizing [" << plain << "] -> [" << anonymized << "].");
 
         std::unique_lock<std::mutex> lock(AnonymizedMutex);
@@ -709,8 +709,7 @@ namespace Util
             const auto it = AnonymizedStrings.find(text);
             if (it != AnonymizedStrings.end())
             {
-                auto &log = Log::logger();
-                if (log.trace() && text != it->second)
+                if (Log::traceEnabled() && text != it->second)
                     LOG_TRC("Found anonymized [" << text << "] -> [" << it->second << "].");
                 return it->second;
             }