github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #414 from robertbaldyga/seq-cutoff-biggest-stream

Browse Source 
seq_cutoff: Always continue the biggest stream
This commit is contained in:
Robert Baldyga 2020-11-13 15:48:29 +01:00 committed by GitHub
commit ec723e15e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 161 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ocf_seq_cutoff.c
View File

@ -45,6 +45,21 @@ static int ocf_seq_cutoff_stream_cmp(struct ocf_rb_node *n1,
return 0; return 0;
} }
static struct ocf_rb_node *ocf_seq_cutoff_stream_list_find(
struct ocf_rb_node_list *node_list)
{
struct ocf_seq_cutoff_stream *stream, *max_stream = NULL;
struct ocf_rb_node *node;
ocf_rb_list_for_each_node(node_list, node) {
stream = container_of(node, struct ocf_seq_cutoff_stream, node);
if (!max_stream || stream->bytes > max_stream->bytes)
max_stream = stream;
}
return &max_stream->node;
}
void ocf_core_seq_cutoff_init(ocf_core_t core) void ocf_core_seq_cutoff_init(ocf_core_t core)
{ {
struct ocf_seq_cutoff_stream *stream; struct ocf_seq_cutoff_stream *stream;
@ -52,7 +67,8 @@ void ocf_core_seq_cutoff_init(ocf_core_t core)
ocf_core_log(core, log_info, "Seqential cutoff init\n"); ocf_core_log(core, log_info, "Seqential cutoff init\n");
env_rwlock_init(&core->seq_cutoff.lock); env_rwlock_init(&core->seq_cutoff.lock);
ocf_rb_tree_init(&core->seq_cutoff.tree, ocf_seq_cutoff_stream_cmp); ocf_rb_tree_init(&core->seq_cutoff.tree, ocf_seq_cutoff_stream_cmp,
ocf_seq_cutoff_stream_list_find);
INIT_LIST_HEAD(&core->seq_cutoff.lru); INIT_LIST_HEAD(&core->seq_cutoff.lru);
for (i = 0; i < OCF_SEQ_CUTOFF_MAX_STREAMS; i++) { for (i = 0; i < OCF_SEQ_CUTOFF_MAX_STREAMS; i++) {

193
src/utils/utils_rbtree.c
View File

@ -5,31 +5,31 @@
#include "utils_rbtree.h" #include "utils_rbtree.h"
void ocf_rb_tree_init(struct ocf_rb_tree *tree, ocf_rb_tree_node_cmp_cb cmp) static struct ocf_rb_node *ocf_rb_tree_list_find_first(
struct ocf_rb_node_list *node_list);
void ocf_rb_tree_init(struct ocf_rb_tree *tree, ocf_rb_tree_node_cmp_cb cmp,
ocf_rb_tree_list_find_cb find)
{ {
tree->root = NULL; tree->root = NULL;
tree->cmp = cmp; tree->cmp = cmp;
tree->find = find ?: ocf_rb_tree_list_find_first;
} }
static void ocf_rb_tree_update_parent(struct ocf_rb_tree *tree, static void ocf_rb_tree_update_parent(struct ocf_rb_tree *tree,
struct ocf_rb_node *node, struct ocf_rb_node *old_node, struct ocf_rb_node *parent, struct ocf_rb_node *old_node,
struct ocf_rb_node *new_node) struct ocf_rb_node *new_node)
{ {
if (!node->parent) if (!parent) {
tree->root = new_node; if (tree->root == old_node)
else if (old_node == node->parent->left) tree->root = new_node;
node->parent->left = new_node; return;
else if (old_node == node->parent->right) }
node->parent->right = new_node;
}
static void ocf_rb_tree_update_children(struct ocf_rb_node *node) if (parent->left == old_node)
{ parent->left = new_node;
if (node->left) else if (parent->right == old_node)
node->left->parent = node; parent->right = new_node;
if (node->right)
node->right->parent = node;
} }
static void ocf_rb_tree_rotate_left(struct ocf_rb_tree *tree, static void ocf_rb_tree_rotate_left(struct ocf_rb_tree *tree,
@ -44,7 +44,7 @@ static void ocf_rb_tree_rotate_left(struct ocf_rb_tree *tree,
right->parent = node->parent; right->parent = node->parent;
ocf_rb_tree_update_parent(tree, node, node, right); ocf_rb_tree_update_parent(tree, node->parent, node, right);
right->left = node; right->left = node;
node->parent = right; node->parent = right;
@ -62,7 +62,7 @@ static void ocf_rb_tree_rotate_right(struct ocf_rb_tree *tree,
left->parent = node->parent; left->parent = node->parent;
ocf_rb_tree_update_parent(tree, node, node, left); ocf_rb_tree_update_parent(tree, node->parent, node, left);
left->right = node; left->right = node;
node->parent = left; node->parent = left;
@ -139,8 +139,11 @@ void ocf_rb_tree_insert(struct ocf_rb_tree *tree, struct ocf_rb_node *node)
struct ocf_rb_node *iter, *new_iter; struct ocf_rb_node *iter, *new_iter;
int cmp; int cmp;
INIT_LIST_HEAD(&node->list);
node->left = NULL; node->left = NULL;
node->right = NULL; node->right = NULL;
node->parent = NULL;
if (!tree->root) { if (!tree->root) {
node->red = false; node->red = false;
@ -152,9 +155,16 @@ void ocf_rb_tree_insert(struct ocf_rb_tree *tree, struct ocf_rb_node *node)
for (new_iter = tree->root; new_iter;) { for (new_iter = tree->root; new_iter;) {
iter = new_iter; iter = new_iter;
cmp = tree->cmp(node, iter); cmp = tree->cmp(node, iter);
if (cmp == 0)
break;
new_iter = (cmp < 0) ? iter->left : iter->right; new_iter = (cmp < 0) ? iter->left : iter->right;
} }
if (cmp == 0) {
list_add_tail(&node->list, &iter->list);
return;
}
node->red = true; node->red = true;
node->parent = iter; node->parent = iter;
if (cmp < 0) if (cmp < 0)
@ -165,34 +175,51 @@ void ocf_rb_tree_insert(struct ocf_rb_tree *tree, struct ocf_rb_node *node)
ocf_rb_tree_fix_violation(tree, node); ocf_rb_tree_fix_violation(tree, node);
} }
static void ocf_rb_copy_node(struct ocf_rb_node *dst, struct ocf_rb_node *src)
{
dst->red = src->red;
dst->left = src->left;
dst->right = src->right;
dst->parent = src->parent;
}
static void ocf_rb_tree_update_children(struct ocf_rb_node *node)
{
if (node->left)
node->left->parent = node;
if (node->right)
node->right->parent = node;
}
static void ocf_rb_tree_swap(struct ocf_rb_tree *tree, static void ocf_rb_tree_swap(struct ocf_rb_tree *tree,
struct ocf_rb_node *node1, struct ocf_rb_node *node2) struct ocf_rb_node *node1, struct ocf_rb_node *node2)
{ {
struct ocf_rb_node tmp; struct ocf_rb_node tmp;
if (node1->left == node2) ocf_rb_copy_node(&tmp, node1);
node1->left = node1; ocf_rb_copy_node(node1, node2);
else if (node1->right == node2) ocf_rb_copy_node(node2, &tmp);
node1->right = node1;
else if (node1->parent == node2)
node1->parent = node1;
if (node2->left == node1) if (node1->parent == node1)
node2->left = node2; node1->parent = node2;
else if (node2->right == node1) else if (node1->left == node1)
node2->right = node2; node1->left = node2;
else if (node2->parent == node1) else if (node1->right == node1)
node2->parent = node2; node1->right = node2;
tmp = *node1; if (node2->parent == node2)
*node1 = *node2; node2->parent = node1;
*node2 = tmp; else if (node2->left == node2)
node2->left = node1;
ocf_rb_tree_update_parent(tree, node1, node2, node1); else if (node2->right == node2)
ocf_rb_tree_update_parent(tree, node2, node1, node2); node2->right = node1;
ocf_rb_tree_update_children(node1); ocf_rb_tree_update_children(node1);
ocf_rb_tree_update_children(node2); ocf_rb_tree_update_children(node2);
ocf_rb_tree_update_parent(tree, node2->parent, node1, node2);
ocf_rb_tree_update_parent(tree, node1->parent, node2, node1);
} }
static struct ocf_rb_node *ocf_rb_tree_successor(struct ocf_rb_node *node) static struct ocf_rb_node *ocf_rb_tree_successor(struct ocf_rb_node *node)
@ -318,7 +345,22 @@ void ocf_rb_tree_fix_double_black(struct ocf_rb_tree *tree,
void ocf_rb_tree_remove(struct ocf_rb_tree *tree, struct ocf_rb_node *node) void ocf_rb_tree_remove(struct ocf_rb_tree *tree, struct ocf_rb_node *node)
{ {
struct ocf_rb_node *sibling, *rep; struct ocf_rb_node *sibling, *rep, *next;
if (!list_empty(&node->list)) {
/* Node list is not empty */
if (!node->parent && node != tree->root) {
/* Node is in the middle of the list -> just remove */
list_del(&node->list);
return;
}
/* Node is at head of the list -> need to make new head */
next = list_first_entry(&node->list, struct ocf_rb_node, list);
ocf_rb_tree_swap(tree, node, next);
list_del(&node->list);
return;
}
while (true) { while (true) {
sibling = ocf_rb_tree_sibling(node); sibling = ocf_rb_tree_sibling(node);
@ -334,7 +376,8 @@ void ocf_rb_tree_remove(struct ocf_rb_tree *tree, struct ocf_rb_node *node)
else if (sibling) else if (sibling)
sibling->red = true; sibling->red = true;
ocf_rb_tree_update_parent(tree, node, node, NULL); ocf_rb_tree_update_parent(tree, node->parent,
node, NULL);
} }
break; break;
} }
@ -346,7 +389,8 @@ void ocf_rb_tree_remove(struct ocf_rb_tree *tree, struct ocf_rb_node *node)
if (!node->red) if (!node->red)
ocf_rb_tree_fix_double_black(tree, node); ocf_rb_tree_fix_double_black(tree, node);
ocf_rb_tree_update_parent(tree, node, node, NULL); ocf_rb_tree_update_parent(tree, node->parent,
node, NULL);
break; break;
} }
@ -359,44 +403,59 @@ bool ocf_rb_tree_can_update(struct ocf_rb_tree *tree,
struct ocf_rb_node *node, struct ocf_rb_node *new_node) struct ocf_rb_node *node, struct ocf_rb_node *new_node)
{ {
struct ocf_rb_node *iter = tree->root; struct ocf_rb_node *iter = tree->root;
int cmp = 0; int cmp = 0;
while (iter) { if (!list_empty(&node->list))
if (iter == node) return false;
break;
cmp = tree->cmp(new_node, iter); while (iter) {
iter = (cmp < 0) ? iter->left : iter->right; if (iter == node)
} break;
if (!iter) cmp = tree->cmp(new_node, iter);
return false; iter = (cmp < 0) ? iter->left : iter->right;
}
cmp = tree->cmp(new_node, iter); if (!iter)
return false;
if (cmp < 0) { cmp = tree->cmp(new_node, iter);
iter = ocf_rb_tree_predecessor(iter);
if (!iter)
return true;
cmp = tree->cmp(new_node, iter);
return (cmp > 0);
}
if (cmp > 0) { if (cmp < 0) {
iter = ocf_rb_tree_successor(iter); iter = ocf_rb_tree_predecessor(iter);
if (!iter) if (!iter)
return true; return true;
cmp = tree->cmp(new_node, iter); cmp = tree->cmp(new_node, iter);
return (cmp < 0); return (cmp > 0);
} }
return true; if (cmp > 0) {
iter = ocf_rb_tree_successor(iter);
if (!iter)
return true;
cmp = tree->cmp(new_node, iter);
return (cmp < 0);
}
return true;
}
static struct ocf_rb_node *ocf_rb_tree_list_find_first(
struct ocf_rb_node_list *node_list)
{
struct ocf_rb_node *node;
ocf_rb_list_for_each_node(node_list, node)
return node;
return NULL;
} }
struct ocf_rb_node *ocf_rb_tree_find(struct ocf_rb_tree *tree, struct ocf_rb_node *ocf_rb_tree_find(struct ocf_rb_tree *tree,
struct ocf_rb_node *node) struct ocf_rb_node *node)
{ {
struct ocf_rb_node *iter = tree->root; struct ocf_rb_node *iter = tree->root;
struct ocf_rb_node_list node_list;
int cmp = 0; int cmp = 0;
while (iter) { while (iter) {
@ -407,5 +466,11 @@ struct ocf_rb_node *ocf_rb_tree_find(struct ocf_rb_tree *tree,
iter = (cmp < 0) ? iter->left : iter->right; iter = (cmp < 0) ? iter->left : iter->right;
} }
if (!iter || list_empty(&iter->list))
return iter;
list_add_tail(&node_list.list, &iter->list);
iter = tree->find(&node_list);
list_del(&node_list.list);
return iter; return iter;
} }

15
src/utils/utils_rbtree.h
View File

@ -13,17 +13,30 @@ struct ocf_rb_node {
struct ocf_rb_node *left; struct ocf_rb_node *left;
struct ocf_rb_node *right; struct ocf_rb_node *right;
struct ocf_rb_node *parent; struct ocf_rb_node *parent;
struct list_head list;
}; };
struct ocf_rb_node_list {
struct list_head list;
};
#define ocf_rb_list_for_each_node(node_list, node) \
list_for_each_entry(node, &node_list->list, list)
typedef int (*ocf_rb_tree_node_cmp_cb)(struct ocf_rb_node *n1, typedef int (*ocf_rb_tree_node_cmp_cb)(struct ocf_rb_node *n1,
struct ocf_rb_node *n2); struct ocf_rb_node *n2);
typedef struct ocf_rb_node *(*ocf_rb_tree_list_find_cb)(
struct ocf_rb_node_list *node_list);
struct ocf_rb_tree { struct ocf_rb_tree {
struct ocf_rb_node *root; struct ocf_rb_node *root;
ocf_rb_tree_node_cmp_cb cmp; ocf_rb_tree_node_cmp_cb cmp;
ocf_rb_tree_list_find_cb find;
}; };
void ocf_rb_tree_init(struct ocf_rb_tree *tree, ocf_rb_tree_node_cmp_cb cmp); void ocf_rb_tree_init(struct ocf_rb_tree *tree, ocf_rb_tree_node_cmp_cb cmp,
ocf_rb_tree_list_find_cb find);
void ocf_rb_tree_insert(struct ocf_rb_tree *tree, struct ocf_rb_node *node); void ocf_rb_tree_insert(struct ocf_rb_tree *tree, struct ocf_rb_node *node);

2
tests/unit/tests/utils/utils_rbtree.c/utils_rbtree.c
View File

@ -77,7 +77,7 @@ void prepare(struct ocf_rb_tree *tree)
{ {
int i; int i;
ocf_rb_tree_init(tree, test_cmp); ocf_rb_tree_init(tree, test_cmp, NULL);
for (i = 0; i < nodes_number; i++) for (i = 0; i < nodes_number; i++)
ocf_rb_tree_insert(tree, &nodes[i].tree); ocf_rb_tree_insert(tree, &nodes[i].tree);