wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent use of #if VALGRIND

This commit is contained in:
A.J. Beamon 2019-05-10 15:55:06 -07:00 committed by Alex Miller
parent 436645e956
commit 60ce790a2b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flow/ThreadSafeQueue.h
View File

@ -52,7 +52,7 @@ class ThreadSafeQueue : NonCopyable {
BaseNode* popNode() {
BaseNode* tail = this->tail;
BaseNode* next = tail->next.load();
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_BEFORE(&tail->next);
#endif
if (tail == &this->stub) {
@ -62,7 +62,7 @@ class ThreadSafeQueue : NonCopyable {
this->tail = next;
tail = next;
next = next->next.load();
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_BEFORE(&next->next);
#endif
}
@ -71,19 +71,19 @@ class ThreadSafeQueue : NonCopyable {
return tail;
}
BaseNode* head = this->head.load();
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_BEFORE(&this->head);
#endif
if (tail != head) {
return nullptr;
}
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_AFTER(&this->stub.next);
#endif
this->stub.next.store(nullptr);
pushNode(&this->stub);
next = tail->next.load();
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_BEFORE(&tail->next);
#endif
if (next) {
@ -95,11 +95,11 @@ class ThreadSafeQueue : NonCopyable {
// Pushes n at the end of the queue and returns the node immediately before it
BaseNode* pushNode( BaseNode* n ) {
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_AFTER(&head);
#endif
BaseNode* prev = head.exchange(n);
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_BEFORE(&head);
ANNOTATE_HAPPENS_AFTER(&prev->next);
#endif
@ -108,7 +108,7 @@ class ThreadSafeQueue : NonCopyable {
}
public:
ThreadSafeQueue() {
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_AFTER(&this->head);
#endif
this->head.store(&this->stub);
@ -134,12 +134,12 @@ public:
return false; // We already have sleeping in the queue from a previous call to canSleep. Pop it and then maybe you can sleep!
}
if (this->tail != &stub || this->tail->next.load()) {
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_BEFORE(&this->tail->next);
#endif
return false; // There is definitely something in the queue. This is a rejection test not needed for correctness, but avoids calls to pushNode
}
#ifdef VALGRIND
#if VALGRIND
ANNOTATE_HAPPENS_BEFORE(&this->tail->next);
#endif
// sleeping is definitely not in the queue, so we can safely try...