projects
/
model-checker-benchmarks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes
[model-checker-benchmarks.git]
/
mpmc-queue
/
mpmc-queue.h
diff --git
a/mpmc-queue/mpmc-queue.h
b/mpmc-queue/mpmc-queue.h
index dc2b5618771774238c1c16f97efa87262da182a4..fa5f37a1cf054634bdb4d9c152ef7299ed7f6b63 100644
(file)
--- a/
mpmc-queue/mpmc-queue.h
+++ b/
mpmc-queue/mpmc-queue.h
@@
-27,6
+27,8
@@
public:
//-----------------------------------------------------
t_element * read_fetch() {
//-----------------------------------------------------
t_element * read_fetch() {
+ // FIXME: We can have a relaxed for sure here since the next CAS
+ // will fix the problem
unsigned int rdwr = m_rdwr.load(mo_acquire);
unsigned int rd,wr;
for(;;) {
unsigned int rdwr = m_rdwr.load(mo_acquire);
unsigned int rd,wr;
for(;;) {
@@
-34,10
+36,12
@@
public:
wr = rdwr & 0xFFFF;
if ( wr == rd ) // empty
wr = rdwr & 0xFFFF;
if ( wr == rd ) // empty
- return
false
;
-
+ return
NULL
;
+
if ( m_rdwr.compare_exchange_weak(rdwr,rdwr+(1<<16),mo_acq_rel) )
break;
if ( m_rdwr.compare_exchange_weak(rdwr,rdwr+(1<<16),mo_acq_rel) )
break;
+ else
+ thrd_yield();
}
// (*1)
}
// (*1)
@@
-58,6
+62,8
@@
public:
//-----------------------------------------------------
t_element * write_prepare() {
//-----------------------------------------------------
t_element * write_prepare() {
+ // FIXME: We can have a relaxed for sure here since the next CAS
+ // will fix the problem
unsigned int rdwr = m_rdwr.load(mo_acquire);
unsigned int rd,wr;
for(;;) {
unsigned int rdwr = m_rdwr.load(mo_acquire);
unsigned int rd,wr;
for(;;) {
@@
-69,6
+75,8
@@
public:
if ( m_rdwr.compare_exchange_weak(rdwr,(rd<<16) | ((wr+1)&0xFFFF),mo_acq_rel) )
break;
if ( m_rdwr.compare_exchange_weak(rdwr,(rd<<16) | ((wr+1)&0xFFFF),mo_acq_rel) )
break;
+ else
+ thrd_yield();
}
// (*1)
}
// (*1)