[whitespace] ck_ec: small style(9)-knit.

Ran across small style knits while reviewing for upcoming project
and OCD took over.
awsm
Samy Al Bahra 6 years ago
parent 9bd98ad96a
commit 5d2c5bb519

@ -31,7 +31,8 @@ static const struct timespec final_wait_time = {
.tv_sec = 1 .tv_sec = 1
}; };
void ck_ec32_wake(struct ck_ec32 *ec, const struct ck_ec_ops *ops) void
ck_ec32_wake(struct ck_ec32 *ec, const struct ck_ec_ops *ops)
{ {
/* Spurious wake-ups are OK. Clear the flag before futexing. */ /* Spurious wake-ups are OK. Clear the flag before futexing. */
ck_pr_and_32(&ec->counter, (1U << 31) - 1); ck_pr_and_32(&ec->counter, (1U << 31) - 1);
@ -39,36 +40,40 @@ void ck_ec32_wake(struct ck_ec32 *ec, const struct ck_ec_ops *ops)
return; return;
} }
int ck_ec32_wait_slow(struct ck_ec32 *ec, int
const struct ck_ec_ops *ops, ck_ec32_wait_slow(struct ck_ec32 *ec,
uint32_t old_value, const struct ck_ec_ops *ops,
const struct timespec *deadline) uint32_t old_value,
const struct timespec *deadline)
{ {
return ck_ec32_wait_pred_slow(ec, ops, old_value, return ck_ec32_wait_pred_slow(ec, ops, old_value,
NULL, NULL, deadline); NULL, NULL, deadline);
} }
#ifdef CK_F_EC64 #ifdef CK_F_EC64
void ck_ec64_wake(struct ck_ec64 *ec, const struct ck_ec_ops *ops) void
ck_ec64_wake(struct ck_ec64 *ec, const struct ck_ec_ops *ops)
{ {
ck_pr_and_64(&ec->counter, ~1); ck_pr_and_64(&ec->counter, ~1);
ops->wake64(ops, &ec->counter); ops->wake64(ops, &ec->counter);
return; return;
} }
int ck_ec64_wait_slow(struct ck_ec64 *ec, int
const struct ck_ec_ops *ops, ck_ec64_wait_slow(struct ck_ec64 *ec,
uint64_t old_value, const struct ck_ec_ops *ops,
const struct timespec *deadline) uint64_t old_value,
const struct timespec *deadline)
{ {
return ck_ec64_wait_pred_slow(ec, ops, old_value, return ck_ec64_wait_pred_slow(ec, ops, old_value,
NULL, NULL, deadline); NULL, NULL, deadline);
} }
#endif #endif
int ck_ec_deadline_impl(struct timespec *new_deadline, int
const struct ck_ec_ops *ops, ck_ec_deadline_impl(struct timespec *new_deadline,
const struct timespec *timeout) const struct ck_ec_ops *ops,
const struct timespec *timeout)
{ {
struct timespec now; struct timespec now;
int r; int r;
@ -94,8 +99,10 @@ int ck_ec_deadline_impl(struct timespec *new_deadline,
* Returns a timespec value for deadline_ptr. If deadline_ptr is NULL, * Returns a timespec value for deadline_ptr. If deadline_ptr is NULL,
* returns a timespec far in the future. * returns a timespec far in the future.
*/ */
static struct timespec canonical_deadline(const struct timespec *deadline_ptr) static struct timespec
canonical_deadline(const struct timespec *deadline_ptr)
{ {
if (deadline_ptr == NULL) { if (deadline_ptr == NULL) {
return (struct timespec) { .tv_sec = TIME_MAX }; return (struct timespec) { .tv_sec = TIME_MAX };
} }
@ -115,15 +122,15 @@ static struct timespec canonical_deadline(const struct timespec *deadline_ptr)
* TODO: add some form of randomisation to the intermediate timeout * TODO: add some form of randomisation to the intermediate timeout
* values. * values.
*/ */
static int exponential_backoff( static int
struct ck_ec_wait_state *wait_state, exponential_backoff(struct ck_ec_wait_state *wait_state,
bool (*sleep)(const void *sleep_state, bool (*sleep)(const void *sleep_state,
const struct ck_ec_wait_state *wait_state, const struct ck_ec_wait_state *wait_state,
const struct timespec *partial_deadline), const struct timespec *partial_deadline),
const void *sleep_state, const void *sleep_state,
int (*pred)(const struct ck_ec_wait_state *state, int (*pred)(const struct ck_ec_wait_state *state,
struct timespec *deadline), struct timespec *deadline),
const struct timespec *deadline) const struct timespec *deadline)
{ {
struct timespec begin; struct timespec begin;
struct timespec stop_backoff; struct timespec stop_backoff;
@ -262,9 +269,10 @@ DEF_UPGRADE(64)
* eventcount's value has changed. If partial_deadline is NULL, wait * eventcount's value has changed. If partial_deadline is NULL, wait
* forever. * forever.
*/ */
static bool ck_ec32_wait_slow_once(const void *vstate, static bool
const struct ck_ec_wait_state *wait_state, ck_ec32_wait_slow_once(const void *vstate,
const struct timespec *partial_deadline) const struct ck_ec_wait_state *wait_state,
const struct timespec *partial_deadline)
{ {
const struct ck_ec32_slow_path_state *state = vstate; const struct ck_ec32_slow_path_state *state = vstate;
const struct ck_ec32 *ec = state->ec; const struct ck_ec32 *ec = state->ec;
@ -276,9 +284,10 @@ static bool ck_ec32_wait_slow_once(const void *vstate,
} }
#ifdef CK_F_EC64 #ifdef CK_F_EC64
static bool ck_ec64_wait_slow_once(const void *vstate, static bool
const struct ck_ec_wait_state *wait_state, ck_ec64_wait_slow_once(const void *vstate,
const struct timespec *partial_deadline) const struct ck_ec_wait_state *wait_state,
const struct timespec *partial_deadline)
{ {
const struct ck_ec64_slow_path_state *state = vstate; const struct ck_ec64_slow_path_state *state = vstate;
const struct ck_ec64 *ec = state->ec; const struct ck_ec64 *ec = state->ec;
@ -371,13 +380,14 @@ static bool ck_ec64_wait_slow_once(const void *vstate,
} \ } \
} while (0) } while (0)
int ck_ec32_wait_pred_slow(struct ck_ec32 *ec, int
const struct ck_ec_ops *ops, ck_ec32_wait_pred_slow(struct ck_ec32 *ec,
uint32_t old_value, const struct ck_ec_ops *ops,
int (*pred)(const struct ck_ec_wait_state *state, uint32_t old_value,
struct timespec *deadline), int (*pred)(const struct ck_ec_wait_state *state,
void *data, struct timespec *deadline),
const struct timespec *deadline_ptr) void *data,
const struct timespec *deadline_ptr)
{ {
const uint32_t unflagged_word = old_value; const uint32_t unflagged_word = old_value;
const uint32_t flagged_word = old_value | (1UL << 31); const uint32_t flagged_word = old_value | (1UL << 31);
@ -391,13 +401,14 @@ int ck_ec32_wait_pred_slow(struct ck_ec32 *ec,
} }
#ifdef CK_F_EC64 #ifdef CK_F_EC64
int ck_ec64_wait_pred_slow(struct ck_ec64 *ec, int
const struct ck_ec_ops *ops, ck_ec64_wait_pred_slow(struct ck_ec64 *ec,
uint64_t old_value, const struct ck_ec_ops *ops,
int (*pred)(const struct ck_ec_wait_state *state, uint64_t old_value,
struct timespec *deadline), int (*pred)(const struct ck_ec_wait_state *state,
void *data, struct timespec *deadline),
const struct timespec *deadline_ptr) void *data,
const struct timespec *deadline_ptr)
{ {
const uint64_t unflagged_word = old_value << 1; const uint64_t unflagged_word = old_value << 1;
const uint64_t flagged_word = unflagged_word | 1; const uint64_t flagged_word = unflagged_word | 1;

Loading…
Cancel
Save