Fixing build.

KochetovNicolai · KochetovNicolai · commit 9f613cf11d22 · 2020-12-10T22:05:38.000+03:00
diff --git a/src/DwarfParser.hpp b/src/DwarfParser.hpp
@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdatomic.h>
+#include <atomic>
 
 #include "libunwind.h"
 #include "dwarf2.h"
@@ -85,29 +85,29 @@ class StackBuffer
     static constexpr size_t entrySize = sizeof(FreeListEntry);
     static constexpr size_t buffer_size = LIBUNWIND_MAX_STACK_SIZE * entrySize;
     static char buffer[buffer_size];
-    static _Atomic size_t next_not_allocated_entry;
-    static void * _Atomic next_allocated_entry;
+    static std::atomic<size_t> next_not_allocated_entry;
+    static std::atomic<FreeListEntry *> next_allocated_entry;
 
 public:
     static FreeListEntry * alloc()
     {
         /// At first, try to get element from free list.
         {
-            void * expected = nullptr;
-            void * desired = nullptr;
-            while (!atomic_compare_exchange_weak(&next_allocated_entry, &expected, desired))
+            FreeListEntry * expected = nullptr;
+            FreeListEntry * desired = nullptr;
+            while (!next_allocated_entry.compare_exchange_weak(expected, desired))
             {
                 if (expected == nullptr)
                     break;
 
-                desired = static_cast<FreeListEntry *>(expected)->next;
+                desired = expected->next;
             }
 
             if (expected)
-                return static_cast<FreeListEntry *>(expected);
+                return expected;
         }
 
-        size_t prev = atomic_fetch_add(&next_not_allocated_entry, 1);
+        size_t prev = next_not_allocated_entry.fetch_add(1);
         if (prev >= buffer_size)
             abort();
 
@@ -116,12 +116,12 @@ class StackBuffer
 
     static void free(FreeListEntry * entry)
     {
-        void * expected = nullptr;
-        entry->next = nullptr;
+        FreeListEntry * expected = nullptr;
+        entry->next = expected;
 
-        while (!atomic_compare_exchange_weak(&next_allocated_entry, &expected, entry))
+        while (!next_allocated_entry.compare_exchange_weak(expected, entry))
         {
-            entry->next = static_cast<FreeListEntry *>(expected);
+            entry->next = expected;
         }
     }
 };
diff --git a/src/libunwind.cpp b/src/libunwind.cpp
@@ -306,8 +306,8 @@ int unw_backtrace(void **buffer, int size) {
 }
 
 char StackBuffer::buffer[];
-size_t _Atomic StackBuffer::next_not_allocated_entry = 0;
-void * _Atomic StackBuffer::next_allocated_entry = nullptr;
+std::atomic<size_t> StackBuffer::next_not_allocated_entry = 0;
+std::atomic<StackBuffer::FreeListEntry *> StackBuffer::next_allocated_entry = nullptr;
 
 
 // Add logging hooks in Debug builds only

Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,8 @@ int unw_backtrace(void **buffer, int size) {`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`char StackBuffer::buffer[];`
`309`		`-size_t _Atomic StackBuffer::next_not_allocated_entry = 0;`
`310`		`-void * _Atomic StackBuffer::next_allocated_entry = nullptr;`
	`309`	`+std::atomic<size_t> StackBuffer::next_not_allocated_entry = 0;`
	`310`	`+std::atomic<StackBuffer::FreeListEntry *> StackBuffer::next_allocated_entry = nullptr;`
`311`	`311`
`312`	`312`
`313`	`313`	`// Add logging hooks in Debug builds only`