Restoring authorship annotation for <ienkovich@yandex-team.ru>. Commit 2 of 2.

contrib/libs/c-ares/ares_library_init.c

@@ -21,8 +21,8 @@
 #include "ares_library_init.h"
 #include "ares_private.h"
 
-#include "atomic.h" 
- 
+#include "atomic.h"
+
 /* library-private global and unique instance vars */
 
 #ifdef USE_WINSOCK
@@ -38,7 +38,7 @@ fpGetBestRoute2_t ares_fpGetBestRoute2 = ZERO_NULL;
 
 /* library-private global vars with source visibility restricted to this file */
 
-static atomic_t     ares_init_lock; 
+static atomic_t     ares_init_lock;
 static unsigned int ares_initialized;
 static int          ares_init_flags;
 
@@ -130,23 +130,23 @@ static void ares_win32_cleanup(void)
 
 int ares_library_init(int flags)
 {
-  int res = ARES_SUCCESS; 
+  int res = ARES_SUCCESS;
+
+  acquire_lock(&ares_init_lock);
 
-  acquire_lock(&ares_init_lock); 
- 
-  ares_initialized++; 
-  if (ares_initialized == 1) 
+  ares_initialized++;
+  if (ares_initialized == 1)
     {
-      if (flags & ARES_LIB_INIT_WIN32) 
-        res = ares_win32_init(); 
+      if (flags & ARES_LIB_INIT_WIN32)
+        res = ares_win32_init();
 
-      if (res == ARES_SUCCESS) 
-        ares_init_flags = flags; 
+      if (res == ARES_SUCCESS)
+        ares_init_flags = flags;
     }
 
-  release_lock(&ares_init_lock); 
+  release_lock(&ares_init_lock);
 
-  return res; 
+  return res;
 }
 
 int ares_library_init_mem(int flags,
@@ -166,28 +166,28 @@ int ares_library_init_mem(int flags,
 
 void ares_library_cleanup(void)
 {
-  acquire_lock(&ares_init_lock); 
- 
+  acquire_lock(&ares_init_lock);
+
   if (ares_initialized)
-    { 
-      ares_initialized--; 
-      if (!ares_initialized) 
-        { 
-          if (ares_init_flags & ARES_LIB_INIT_WIN32) 
-            ares_win32_cleanup(); 
+    {
+      ares_initialized--;
+      if (!ares_initialized)
+        {
+          if (ares_init_flags & ARES_LIB_INIT_WIN32)
+            ares_win32_cleanup();
 
 #if defined(ANDROID) || defined(__ANDROID__)
           ares_library_cleanup_android();
 #endif
 
-          ares_init_flags = ARES_LIB_INIT_NONE; 
+          ares_init_flags = ARES_LIB_INIT_NONE;
           ares_malloc = malloc;
           ares_realloc = realloc;
           ares_free = free;
-        } 
-    } 
+        }
+    }
 
-  release_lock(&ares_init_lock); 
+  release_lock(&ares_init_lock);
 }
 
 

contrib/libs/c-ares/atomic.cpp

@@ -1,13 +1,13 @@
-#include <util/system/spinlock.h> 
- 
-#include "atomic.h" 
- 
-EXTERN_C void acquire_lock(atomic_t *lock) 
-{ 
-    AcquireAdaptiveLock(lock); 
-} 
- 
-EXTERN_C void release_lock(atomic_t *lock) 
-{ 
-    ReleaseAdaptiveLock(lock); 
-} 
+#include <util/system/spinlock.h>
+
+#include "atomic.h"
+
+EXTERN_C void acquire_lock(atomic_t *lock)
+{
+    AcquireAdaptiveLock(lock);
+}
+
+EXTERN_C void release_lock(atomic_t *lock)
+{
+    ReleaseAdaptiveLock(lock);
+}

contrib/libs/c-ares/atomic.h

@@ -1,15 +1,15 @@
-#ifndef ATOMIC__H 
-#define ATOMIC__H 
- 
-typedef volatile intptr_t atomic_t; 
- 
-#ifdef __cplusplus 
-  #define EXTERN_C extern "C" 
-#else 
-  #define EXTERN_C 
-#endif 
- 
-EXTERN_C void acquire_lock(atomic_t *lock); 
-EXTERN_C void release_lock(atomic_t *lock); 
- 
-#endif 
+#ifndef ATOMIC__H
+#define ATOMIC__H
+
+typedef volatile intptr_t atomic_t;
+
+#ifdef __cplusplus
+  #define EXTERN_C extern "C"
+#else
+  #define EXTERN_C
+#endif
+
+EXTERN_C void acquire_lock(atomic_t *lock);
+EXTERN_C void release_lock(atomic_t *lock);
+
+#endif

contrib/libs/c-ares/ya.make

@@ -101,7 +101,7 @@ SRCS(
     ares_timeout.c
     ares_version.c
     ares_writev.c
-    atomic.cpp 
+    atomic.cpp
     bitncmp.c
     inet_net_pton.c
     inet_ntop.c

library/cpp/actors/core/hfunc.h

@@ -64,9 +64,9 @@
         HandleFunc(ctx);              \
         break;
 
-#define cFunc(TEventType, HandleFunc) \ 
-    case TEventType:                  \ 
-        HandleFunc();                 \ 
+#define cFunc(TEventType, HandleFunc) \
+    case TEventType:                  \
+        HandleFunc();                 \
         break;
 
 #define FFunc(TEventType, HandleFunc) \

library/cpp/actors/core/interconnect.h

@@ -128,9 +128,9 @@ namespace NActors {
             EvRegisterNodeResult,
             EvListNodes,
             EvNodesInfo,
-            EvDisconnect, 
-            EvGetNode, 
-            EvNodeInfo, 
+            EvDisconnect,
+            EvGetNode,
+            EvNodeInfo,
             EvClosePeerSocket,
             EvCloseInputSession,
             EvPoisonSession,
@@ -146,7 +146,7 @@ namespace NActors {
         static_assert(EvEnd < EventSpaceEnd(TEvents::ES_INTERCONNECT), "expect EvEnd < EventSpaceEnd(TEvents::ES_INTERCONNECT)");
 
         struct TEvResolveNode;
-        struct TEvNodeAddress; 
+        struct TEvNodeAddress;
 
         struct TEvConnectNode: public TEventBase<TEvConnectNode, EvConnectNode> {
             DEFINE_SIMPLE_LOCAL_EVENT(TEvConnectNode, "TEvInterconnect::TEvConnectNode")
@@ -178,38 +178,38 @@ namespace NActors {
         struct TEvListNodes: public TEventLocal<TEvListNodes, EvListNodes> {
         };
 
-        struct TNodeInfo { 
-            ui32 NodeId; 
-            TString Address; 
-            TString Host; 
-            TString ResolveHost; 
-            ui16 Port; 
+        struct TNodeInfo {
+            ui32 NodeId;
+            TString Address;
+            TString Host;
+            TString ResolveHost;
+            ui16 Port;
             TNodeLocation Location;
 
             TNodeInfo() = default;
             TNodeInfo(const TNodeInfo&) = default;
             TNodeInfo& operator =(const TNodeInfo&) = default;
-            TNodeInfo(ui32 nodeId, 
-                      const TString& address, 
-                      const TString& host, 
-                      const TString& resolveHost, 
-                      ui16 port, 
+            TNodeInfo(ui32 nodeId,
+                      const TString& address,
+                      const TString& host,
+                      const TString& resolveHost,
+                      ui16 port,
                       const TNodeLocation& location)
-                : NodeId(nodeId) 
-                , Address(address) 
-                , Host(host) 
-                , ResolveHost(resolveHost) 
-                , Port(port) 
-                , Location(location) 
-            { 
-            } 
-
-            operator ui32() const { 
-                return NodeId; 
-            } 
-        }; 
-
-        struct TEvNodesInfo: public TEventLocal<TEvNodesInfo, EvNodesInfo> { 
+                : NodeId(nodeId)
+                , Address(address)
+                , Host(host)
+                , ResolveHost(resolveHost)
+                , Port(port)
+                , Location(location)
+            {
+            }
+
+            operator ui32() const {
+                return NodeId;
+            }
+        };
+
+        struct TEvNodesInfo: public TEventLocal<TEvNodesInfo, EvNodesInfo> {
             TVector<TNodeInfo> Nodes;
 
             const TNodeInfo* GetNodeInfo(ui32 nodeId) const {
@@ -220,29 +220,29 @@ namespace NActors {
                 return nullptr;
             }
         };
- 
-        struct TEvDisconnect; 
- 
-        struct TEvGetNode: public TEventLocal<TEvGetNode, EvGetNode> { 
-            ui32 NodeId; 
+
+        struct TEvDisconnect;
+
+        struct TEvGetNode: public TEventLocal<TEvGetNode, EvGetNode> {
+            ui32 NodeId;
             TInstant Deadline;
- 
+
             TEvGetNode(ui32 nodeId, TInstant deadline = TInstant::Max())
-                : NodeId(nodeId) 
+                : NodeId(nodeId)
                 , Deadline(deadline)
-            { 
-            } 
-        }; 
- 
-        struct TEvNodeInfo: public TEventLocal<TEvNodeInfo, EvNodeInfo> { 
-            TEvNodeInfo(ui32 nodeId) 
-                : NodeId(nodeId) 
-            { 
-            } 
- 
-            ui32 NodeId; 
-            THolder<TNodeInfo> Node; 
-        }; 
+            {
+            }
+        };
+
+        struct TEvNodeInfo: public TEventLocal<TEvNodeInfo, EvNodeInfo> {
+            TEvNodeInfo(ui32 nodeId)
+                : NodeId(nodeId)
+            {
+            }
+
+            ui32 NodeId;
+            THolder<TNodeInfo> Node;
+        };
 
         struct TEvClosePeerSocket : TEventLocal<TEvClosePeerSocket, EvClosePeerSocket> {};
 

library/cpp/actors/core/log_settings.h

@@ -118,8 +118,8 @@ namespace NActors {
                         return func(static_cast<T>(c));
                     }
                 );
-            } 
- 
+            }
+
             inline bool Satisfies(EPriority priority, EComponent component, ui64 sampleBy = 0) const {
                 // by using Mask we don't get outside of array boundaries
                 TComponentSettings settings = GetComponentSettings(component);

library/cpp/actors/interconnect/interconnect_nameserver_table.cpp

@@ -48,34 +48,34 @@ namespace NActors {
         for (const auto& x : StaticNodeTable)
             infos.push_back(&x.second);
 
-        auto CompareAddressLambda = 
+        auto CompareAddressLambda =
             [](const TNodeInfo* left, const TNodeInfo* right) {
                 return left->Port == right->Port ? left->Address < right->Address : left->Port < right->Port;
             };
 
-        Sort(infos, CompareAddressLambda); 
+        Sort(infos, CompareAddressLambda);
 
         for (ui32 idx = 1, end = StaticNodeTable.size(); idx < end; ++idx) {
             const TNodeInfo* left = infos[idx - 1];
             const TNodeInfo* right = infos[idx];
-            if (left->Address && left->Address == right->Address && left->Port == right->Port) 
+            if (left->Address && left->Address == right->Address && left->Port == right->Port)
+                return false;
+        }
+
+        auto CompareHostLambda =
+            [](const TNodeInfo* left, const TNodeInfo* right) {
+                return left->Port == right->Port ? left->ResolveHost < right->ResolveHost : left->Port < right->Port;
+            };
+
+        Sort(infos, CompareHostLambda);
+
+        for (ui32 idx = 1, end = StaticNodeTable.size(); idx < end; ++idx) {
+            const TNodeInfo* left = infos[idx - 1];
+            const TNodeInfo* right = infos[idx];
+            if (left->ResolveHost == right->ResolveHost && left->Port == right->Port)
                 return false;
         }
 
-        auto CompareHostLambda = 
-            [](const TNodeInfo* left, const TNodeInfo* right) { 
-                return left->Port == right->Port ? left->ResolveHost < right->ResolveHost : left->Port < right->Port; 
-            }; 
- 
-        Sort(infos, CompareHostLambda); 
- 
-        for (ui32 idx = 1, end = StaticNodeTable.size(); idx < end; ++idx) { 
-            const TNodeInfo* left = infos[idx - 1]; 
-            const TNodeInfo* right = infos[idx]; 
-            if (left->ResolveHost == right->ResolveHost && left->Port == right->Port) 
-                return false; 
-        } 
- 
         return true;
     }
 

library/cpp/actors/testlib/test_runtime.cpp

@@ -815,9 +815,9 @@ namespace NActors {
     }
 
     void TTestActorRuntimeBase::AdvanceCurrentTime(TDuration duration) {
-        UpdateCurrentTime(GetCurrentTime() + duration); 
-    } 
- 
+        UpdateCurrentTime(GetCurrentTime() + duration);
+    }
+
     TIntrusivePtr<ITimeProvider> TTestActorRuntimeBase::GetTimeProvider() {
         Y_VERIFY(!UseRealThreads);
         return TimeProvider;
@@ -1650,7 +1650,7 @@ namespace NActors {
         common.Reset(new TInterconnectProxyCommon);
         common->NameserviceId = nameserviceId;
         common->MonCounters = interconnectCounters;
-        common->TechnicalSelfHostName = "::1"; 
+        common->TechnicalSelfHostName = "::1";
 
         if (!UseRealThreads) {
             common->Settings.DeadPeer = TDuration::Max();

library/cpp/actors/testlib/test_runtime.h

@@ -231,7 +231,7 @@ namespace NActors {
         TIntrusivePtr<ITimeProvider> GetTimeProvider();
         TInstant GetCurrentTime() const;
         void UpdateCurrentTime(TInstant newTime);
-        void AdvanceCurrentTime(TDuration duration); 
+        void AdvanceCurrentTime(TDuration duration);
         void AddLocalService(const TActorId& actorId, const TActorSetupCmd& cmd, ui32 nodeIndex = 0);
         virtual void Initialize();
         ui32 GetNodeId(ui32 index = 0) const;
@@ -269,21 +269,21 @@ namespace NActors {
         bool IsScheduleForActorEnabled(const TActorId& actorId) const;
         TIntrusivePtr<NMonitoring::TDynamicCounters> GetDynamicCounters(ui32 nodeIndex = 0);
         void SetupMonitoring();
- 
-        template<typename T> 
-        void AppendToLogSettings(NLog::EComponent minVal, NLog::EComponent maxVal, T func) { 
-            Y_VERIFY(!IsInitialized); 
- 
-            for (const auto& pair : Nodes) { 
-                pair.second->LogSettings->Append(minVal, maxVal, func); 
-            } 
-        } 
- 
-        TIntrusivePtr<NLog::TSettings> GetLogSettings(ui32 nodeIdx) 
-        { 
-            return Nodes[FirstNodeId + nodeIdx]->LogSettings; 
-        } 
- 
+
+        template<typename T>
+        void AppendToLogSettings(NLog::EComponent minVal, NLog::EComponent maxVal, T func) {
+            Y_VERIFY(!IsInitialized);
+
+            for (const auto& pair : Nodes) {
+                pair.second->LogSettings->Append(minVal, maxVal, func);
+            }
+        }
+
+        TIntrusivePtr<NLog::TSettings> GetLogSettings(ui32 nodeIdx)
+        {
+            return Nodes[FirstNodeId + nodeIdx]->LogSettings;
+        }
+
         TActorSystem* SingleSys() const;
         TActorSystem* GetAnyNodeActorSystem();
         TActorSystem* GetActorSystem(ui32 nodeId);