From 059830718619d1826d0a67454d67e0bfb2eefda9 Mon Sep 17 00:00:00 2001 From: Samy Al Bahra Date: Sat, 9 Feb 2013 14:19:52 -0500 Subject: [PATCH] whitespace: Various style changes. --- include/ck_barrier.h | 18 ++++++++---------- include/ck_hp.h | 2 +- include/ck_ring.h | 4 ++-- include/ck_spinlock.h | 9 +++++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/ck_barrier.h b/include/ck_barrier.h index 24751e5..a962ccf 100644 --- a/include/ck_barrier.h +++ b/include/ck_barrier.h @@ -45,8 +45,7 @@ typedef struct ck_barrier_centralized_state ck_barrier_centralized_state_t; #define CK_BARRIER_CENTRALIZED_STATE_INITIALIZER {0} void ck_barrier_centralized(ck_barrier_centralized_t *, - ck_barrier_centralized_state_t *, - unsigned int); + ck_barrier_centralized_state_t *, unsigned int); struct ck_barrier_combining_group { unsigned int k; @@ -75,12 +74,11 @@ typedef struct ck_barrier_combining ck_barrier_combining_t; void ck_barrier_combining_init(ck_barrier_combining_t *, ck_barrier_combining_group_t *); void ck_barrier_combining_group_init(ck_barrier_combining_t *, - ck_barrier_combining_group_t *, - unsigned int); + ck_barrier_combining_group_t *, unsigned int); void ck_barrier_combining(ck_barrier_combining_t *, - ck_barrier_combining_group_t *, - ck_barrier_combining_state_t *); + ck_barrier_combining_group_t *, + ck_barrier_combining_state_t *); struct ck_barrier_dissemination_flag { unsigned int tflag; @@ -95,6 +93,7 @@ struct ck_barrier_dissemination { struct ck_barrier_dissemination_flag *flags[2]; }; typedef struct ck_barrier_dissemination ck_barrier_dissemination_t; + struct ck_barrier_dissemination_state { int parity; unsigned int sense; @@ -103,16 +102,15 @@ struct ck_barrier_dissemination_state { typedef struct ck_barrier_dissemination_state ck_barrier_dissemination_state_t; void ck_barrier_dissemination_init(ck_barrier_dissemination_t *, - ck_barrier_dissemination_flag_t **, - unsigned int); + ck_barrier_dissemination_flag_t **, unsigned int); void ck_barrier_dissemination_subscribe(ck_barrier_dissemination_t *, - ck_barrier_dissemination_state_t *); + ck_barrier_dissemination_state_t *); unsigned int ck_barrier_dissemination_size(unsigned int); void ck_barrier_dissemination(ck_barrier_dissemination_t *, - ck_barrier_dissemination_state_t *); + ck_barrier_dissemination_state_t *); struct ck_barrier_tournament_round { int role; diff --git a/include/ck_hp.h b/include/ck_hp.h index 755fda0..2544b07 100644 --- a/include/ck_hp.h +++ b/include/ck_hp.h @@ -69,7 +69,7 @@ struct ck_hp_record { unsigned int n_pending; ck_stack_entry_t global_entry; unsigned int n_peak; - uint64_t n_reclamations; + uint64_t n_reclamations; } CK_CC_CACHELINE; typedef struct ck_hp_record ck_hp_record_t; diff --git a/include/ck_ring.h b/include/ck_ring.h index c11b916..ffd06f1 100644 --- a/include/ck_ring.h +++ b/include/ck_ring.h @@ -104,14 +104,14 @@ producer = ck_pr_load_uint(&ring->p_tail); \ \ if (consumer == producer) \ - return (false); \ + return false; \ \ ck_pr_fence_load(); \ *data = ring->ring[consumer & mask]; \ ck_pr_fence_store(); \ ck_pr_store_uint(&ring->c_head, consumer + 1); \ \ - return (true); \ + return true; \ } \ CK_CC_INLINE static bool \ ck_ring_enqueue_spmc_##name(struct ck_ring_##name *ring, void *entry) \ diff --git a/include/ck_spinlock.h b/include/ck_spinlock.h index 1b3a258..1c3ce74 100644 --- a/include/ck_spinlock.h +++ b/include/ck_spinlock.h @@ -73,8 +73,8 @@ typedef struct ck_spinlock_anderson ck_spinlock_anderson_t; CK_CC_INLINE static void ck_spinlock_anderson_init(struct ck_spinlock_anderson *lock, - struct ck_spinlock_anderson_thread *slots, - unsigned int count) + struct ck_spinlock_anderson_thread *slots, + unsigned int count) { unsigned int i; @@ -106,7 +106,7 @@ ck_spinlock_anderson_init(struct ck_spinlock_anderson *lock, CK_CC_INLINE static void ck_spinlock_anderson_lock(struct ck_spinlock_anderson *lock, - struct ck_spinlock_anderson_thread **slot) + struct ck_spinlock_anderson_thread **slot) { unsigned int position, next; unsigned int count = lock->count; @@ -150,7 +150,7 @@ ck_spinlock_anderson_lock(struct ck_spinlock_anderson *lock, CK_CC_INLINE static void ck_spinlock_anderson_unlock(struct ck_spinlock_anderson *lock, - struct ck_spinlock_anderson_thread *slot) + struct ck_spinlock_anderson_thread *slot) { unsigned int position; @@ -681,3 +681,4 @@ ck_spinlock_clh_unlock(struct ck_spinlock_clh **thread) #endif /* CK_F_SPINLOCK_CLH */ #endif /* _CK_SPINLOCK_H */ +