Skip to content

Commit

Permalink
seqlock: remove optional mutex
Browse files Browse the repository at this point in the history
This option is unused; besides, it bloats the struct when not needed.
Let's just let writers define their own locks elsewhere.

Reviewed-by: Sergey Fedorov <sergey.fedorov@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Message-Id: <1465412133-3029-3-git-send-email-cota@braap.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
  • Loading branch information
cota authored and rth7680 committed Jun 11, 2016
1 parent 911a4d2 commit ccdb3c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cpus.c
Expand Up @@ -621,7 +621,7 @@ int cpu_throttle_get_percentage(void)

void cpu_ticks_init(void)
{
seqlock_init(&timers_state.vm_clock_seqlock, NULL);
seqlock_init(&timers_state.vm_clock_seqlock);
vmstate_register(NULL, 0, &vmstate_timers, &timers_state);
throttle_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL_RT,
cpu_throttle_timer_tick, NULL);
Expand Down
10 changes: 1 addition & 9 deletions include/qemu/seqlock.h
Expand Up @@ -19,22 +19,17 @@
typedef struct QemuSeqLock QemuSeqLock;

struct QemuSeqLock {
QemuMutex *mutex;
unsigned sequence;
};

static inline void seqlock_init(QemuSeqLock *sl, QemuMutex *mutex)
static inline void seqlock_init(QemuSeqLock *sl)
{
sl->mutex = mutex;
sl->sequence = 0;
}

/* Lock out other writers and update the count. */
static inline void seqlock_write_lock(QemuSeqLock *sl)
{
if (sl->mutex) {
qemu_mutex_lock(sl->mutex);
}
++sl->sequence;

/* Write sequence before updating other fields. */
Expand All @@ -47,9 +42,6 @@ static inline void seqlock_write_unlock(QemuSeqLock *sl)
smp_wmb();

++sl->sequence;
if (sl->mutex) {
qemu_mutex_unlock(sl->mutex);
}
}

static inline unsigned seqlock_read_begin(QemuSeqLock *sl)
Expand Down

0 comments on commit ccdb3c1

Please sign in to comment.