std.atomic - use AtomicOrder.SeqCst for everything

andrewrk · andrewrk · commit c186cd187e9b · 2018-05-02T20:19:26.000-04:00
also use less memory for the tests
diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig
@@ -31,10 +31,10 @@ pub fn Queue(comptime T: type) type {
         }
 
         pub fn get(self: &Self) ?&Node {
-            var head = @atomicLoad(&Node, &self.head, AtomicOrder.Acquire);
+            var head = @atomicLoad(&Node, &self.head, AtomicOrder.SeqCst);
             while (true) {
                 const node = head.next ?? return null;
-                head = @cmpxchgWeak(&Node, &self.head, head, node, AtomicOrder.Release, AtomicOrder.Acquire) ?? return node;
+                head = @cmpxchgWeak(&Node, &self.head, head, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return node;
             }
         }
     };
@@ -56,7 +56,7 @@ test "std.atomic.queue" {
     var direct_allocator = std.heap.DirectAllocator.init();
     defer direct_allocator.deinit();
 
-    var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 64 * 1024 * 1024);
+    var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 600 * 1024);
     defer direct_allocator.allocator.free(plenty_of_memory);
 
     var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory);
diff --git a/std/atomic/stack.zig b/std/atomic/stack.zig
@@ -35,7 +35,7 @@ pub fn Stack(comptime T: type) type {
         }
 
         pub fn pop(self: &Self) ?&Node {
-            var root = @atomicLoad(?&Node, &self.root, AtomicOrder.Acquire);
+            var root = @atomicLoad(?&Node, &self.root, AtomicOrder.SeqCst);
             while (true) {
                 root = @cmpxchgWeak(?&Node, &self.root, root, (root ?? return null).next, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return root;
             }
@@ -63,7 +63,7 @@ test "std.atomic.stack" {
     var direct_allocator = std.heap.DirectAllocator.init();
     defer direct_allocator.deinit();
 
-    var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 64 * 1024 * 1024);
+    var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 600 * 1024);
     defer direct_allocator.allocator.free(plenty_of_memory);
 
     var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory);

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ pub fn Queue(comptime T: type) type {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`pub fn get(self: &Self) ?&Node {`
`34`		`- var head = @atomicLoad(&Node, &self.head, AtomicOrder.Acquire);`
	`34`	`+ var head = @atomicLoad(&Node, &self.head, AtomicOrder.SeqCst);`
`35`	`35`	`while (true) {`
`36`	`36`	`const node = head.next ?? return null;`
`37`		`- head = @cmpxchgWeak(&Node, &self.head, head, node, AtomicOrder.Release, AtomicOrder.Acquire) ?? return node;`
	`37`	`+ head = @cmpxchgWeak(&Node, &self.head, head, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return node;`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`};`
`@@ -56,7 +56,7 @@ test "std.atomic.queue" {`
`56`	`56`	`var direct_allocator = std.heap.DirectAllocator.init();`
`57`	`57`	`defer direct_allocator.deinit();`
`58`	`58`
`59`		`- var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 64 * 1024 * 1024);`
	`59`	`+ var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 600 * 1024);`
`60`	`60`	`defer direct_allocator.allocator.free(plenty_of_memory);`
`61`	`61`
`62`	`62`	`var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ pub fn Stack(comptime T: type) type {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`pub fn pop(self: &Self) ?&Node {`
`38`		`- var root = @atomicLoad(?&Node, &self.root, AtomicOrder.Acquire);`
	`38`	`+ var root = @atomicLoad(?&Node, &self.root, AtomicOrder.SeqCst);`
`39`	`39`	`while (true) {`
`40`	`40`	`root = @cmpxchgWeak(?&Node, &self.root, root, (root ?? return null).next, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return root;`
`41`	`41`	`}`
`@@ -63,7 +63,7 @@ test "std.atomic.stack" {`
`63`	`63`	`var direct_allocator = std.heap.DirectAllocator.init();`
`64`	`64`	`defer direct_allocator.deinit();`
`65`	`65`
`66`		`- var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 64 * 1024 * 1024);`
	`66`	`+ var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 600 * 1024);`
`67`	`67`	`defer direct_allocator.allocator.free(plenty_of_memory);`
`68`	`68`
`69`	`69`	`var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory);`