RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logger: replace rwlock by rwsem

This commit is contained in:
Thomas Schoebel-Theuer 2017-12-10 22:37:21 +01:00 committed by Thomas Schoebel-Theuer
parent 2fef63b72a
commit d2786079f6
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/mars_trans_logger.c
View File

@ -108,7 +108,7 @@ int trans_logger_replay_timeout = 1; // in s
EXPORT_SYMBOL_GPL(trans_logger_replay_timeout); EXPORT_SYMBOL_GPL(trans_logger_replay_timeout);
struct writeback_group global_writeback = { struct writeback_group global_writeback = {
.lock = __RW_LOCK_UNLOCKED(global_writeback.lock), .mutex = __RWSEM_INITIALIZER(global_writeback.mutex),
.group_anchor = LIST_HEAD_INIT(global_writeback.group_anchor), .group_anchor = LIST_HEAD_INIT(global_writeback.group_anchor),
.until_percent = 30, .until_percent = 30,
}; };
@ -117,22 +117,18 @@ EXPORT_SYMBOL_GPL(global_writeback);
static static
void add_to_group(struct writeback_group *gr, struct trans_logger_brick *brick) void add_to_group(struct writeback_group *gr, struct trans_logger_brick *brick)
{ {
unsigned long flags; down_write(&gr->mutex);
write_lock_irqsave(&gr->lock, flags);
list_add_tail(&brick->group_head, &gr->group_anchor); list_add_tail(&brick->group_head, &gr->group_anchor);
write_unlock_irqrestore(&gr->lock, flags); up_write(&gr->mutex);
} }
static static
void remove_from_group(struct writeback_group *gr, struct trans_logger_brick *brick) void remove_from_group(struct writeback_group *gr, struct trans_logger_brick *brick)
{ {
unsigned long flags; down_write(&gr->mutex);
write_lock_irqsave(&gr->lock, flags);
list_del_init(&brick->group_head); list_del_init(&brick->group_head);
gr->leader = NULL; gr->leader = NULL;
write_unlock_irqrestore(&gr->lock, flags); up_write(&gr->mutex);
} }
static static
@ -140,7 +136,6 @@ struct trans_logger_brick *elect_leader(struct writeback_group *gr)
{ {
struct trans_logger_brick *res = gr->leader; struct trans_logger_brick *res = gr->leader;
struct list_head *tmp; struct list_head *tmp;
unsigned long flags;
if (res && gr->until_percent >= 0) { if (res && gr->until_percent >= 0) {
loff_t used = atomic64_read(&res->shadow_mem_used); loff_t used = atomic64_read(&res->shadow_mem_used);
@ -148,7 +143,8 @@ struct trans_logger_brick *elect_leader(struct writeback_group *gr)
goto done; goto done;
} }
read_lock_irqsave(&gr->lock, flags); /* FIXME: use O(log n) data structure instead */
down_read(&gr->mutex);
for (tmp = gr->group_anchor.next; tmp != &gr->group_anchor; tmp = tmp->next) { for (tmp = gr->group_anchor.next; tmp != &gr->group_anchor; tmp = tmp->next) {
struct trans_logger_brick *test = container_of(tmp, struct trans_logger_brick, group_head); struct trans_logger_brick *test = container_of(tmp, struct trans_logger_brick, group_head);
loff_t new_used = atomic64_read(&test->shadow_mem_used); loff_t new_used = atomic64_read(&test->shadow_mem_used);
@ -158,7 +154,7 @@ struct trans_logger_brick *elect_leader(struct writeback_group *gr)
gr->biggest = new_used; gr->biggest = new_used;
} }
} }
read_unlock_irqrestore(&gr->lock, flags); up_read(&gr->mutex);
gr->leader = res; gr->leader = res;

2
kernel/mars_trans_logger.h
View File

@ -53,7 +53,7 @@ extern atomic_t global_mshadow_count;
extern atomic64_t global_mshadow_used; extern atomic64_t global_mshadow_used;
struct writeback_group { struct writeback_group {
rwlock_t lock; struct rw_semaphore mutex;
struct trans_logger_brick *leader; struct trans_logger_brick *leader;
loff_t biggest; loff_t biggest;
struct list_head group_anchor; struct list_head group_anchor;