[whitespace] ck_ring: style conformance.

ck_pring
Samy Al Bahra 8 years ago
parent 316e283e16
commit 4a8957f727

@ -178,43 +178,40 @@ _ck_ring_enqueue_mp(struct ck_ring *ring,
for (;;) {
/*
* The snapshot of producer must be up to date with
* respect to consumer.
* The snapshot of producer must be up to date with respect to
* consumer.
*/
ck_pr_fence_load();
consumer = ck_pr_load_uint(&ring->c_head);
delta = producer + 1;
/*
* Only try to CAS if the producer is not clearly
* stale (not less than consumer) and the buffer is
* definitely not full.
* Only try to CAS if the producer is not clearly stale (not
* less than consumer) and the buffer is definitely not full.
*/
if (CK_CC_LIKELY((producer - consumer) < mask)) {
if (ck_pr_cas_uint_value(&ring->p_head,
producer,
delta,
&producer)) {
producer, delta, &producer) == true) {
break;
}
} else {
unsigned int new_producer;
/*
* Slow path. Either the buffer is full or we
* have a stale snapshot of p_head. Execute a
* second read of p_read that must be ordered
* wrt the snapshot of c_head.
* Slow path. Either the buffer is full or we have a
* stale snapshot of p_head. Execute a second read of
* p_read that must be ordered wrt the snapshot of
* c_head.
*/
ck_pr_fence_load();
new_producer = ck_pr_load_uint(&ring->p_head);
/*
* Only fail if we haven't made forward
* progress in production: the buffer must
* have been full when we read new_producer
* (or we wrapped around UINT_MAX during this
* iteration).
* Only fail if we haven't made forward progress in
* production: the buffer must have been full when we
* read new_producer (or we wrapped around UINT_MAX
* during this iteration).
*/
if (producer == new_producer) {
r = false;
@ -222,8 +219,7 @@ _ck_ring_enqueue_mp(struct ck_ring *ring,
}
/*
* p_head advanced during this iteration. Try
* again.
* p_head advanced during this iteration. Try again.
*/
producer = new_producer;
}

Loading…
Cancel
Save