mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 15:25:21 +00:00
Code Issues Releases Wiki Activity

kcmp: Make IDs tree work on abstract kid_tree, not fd_id_ rb and Co

Browse Source 
2nd step in making kid tree generic.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-04-09 17:54:35 +04:00
parent 14b04465a0
commit fe670c5a59
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
file-ids.c
View File

@@ -18,6 +18,19 @@
#include "image.h" #include "image.h"
#include "util.h" #include "util.h"
struct kid_tree {
struct rb_root root;
unsigned kcmp_type;
unsigned long subid;
};
static struct kid_tree fd_tree = {
.root = RB_ROOT,
.kcmp_type = KCMP_FILE,
.subid = 1,
};
/* /*
* We track shared files by global rbtree, where each node might * We track shared files by global rbtree, where each node might
* be a root for subtree. The reason for that is the nature of data * be a root for subtree. The reason for that is the nature of data
@@ -115,20 +128,16 @@ static void show_node(struct rb_node *node)
pr_info("\t--s\n"); pr_info("\t--s\n");
} }
static struct rb_root kid_root = RB_ROOT;
void fd_id_show_tree(void) void fd_id_show_tree(void)
{ {
struct rb_root *root = &kid_root; struct rb_root *root = &fd_tree.root;
pr_info("\tTree of file IDs\n"); pr_info("\tTree of file IDs\n");
if (root->rb_node) if (root->rb_node)
show_node(root->rb_node); show_node(root->rb_node);
} }
static unsigned long kid_entries_subid = 1; static struct kid_entry *alloc_kid_entry(struct kid_tree *tree, pid_t pid, struct fdinfo_entry *fe)
static struct kid_entry *alloc_kid_entry(pid_t pid, struct fdinfo_entry *fe)
{ {
struct kid_entry *e; struct kid_entry *e;
@@ -136,7 +145,7 @@ static struct kid_entry *alloc_kid_entry(pid_t pid, struct fdinfo_entry *fe)
if (!e) if (!e)
goto err; goto err;
e->subid = kid_entries_subid++; e->subid = tree->subid++;
e->genid = fe->id; e->genid = fe->id;
e->pid = pid; e->pid = pid;
e->fd = fe->fd; e->fd = fe->fd;
@@ -153,7 +162,7 @@ err:
return e; return e;
} }
static struct kid_entry *kid_generate_sub(struct kid_entry *e, static struct kid_entry *kid_generate_sub(struct kid_tree *tree, struct kid_entry *e,
pid_t pid, struct fdinfo_entry *fe, int *new_id) pid_t pid, struct fdinfo_entry *fe, int *new_id)
{ {
struct rb_node *node = e->subtree_root.rb_node; struct rb_node *node = e->subtree_root.rb_node;
@@ -166,7 +175,7 @@ static struct kid_entry *kid_generate_sub(struct kid_entry *e,
while (node) { while (node) {
struct kid_entry *this = rb_entry(node, struct kid_entry, subtree_node); struct kid_entry *this = rb_entry(node, struct kid_entry, subtree_node);
int ret = sys_kcmp(this->pid, pid, KCMP_FILE, this->fd, fe->fd); int ret = sys_kcmp(this->pid, pid, tree->kcmp_type, this->fd, fe->fd);
parent = *new; parent = *new;
if (ret < 0) if (ret < 0)
@@ -177,7 +186,7 @@ static struct kid_entry *kid_generate_sub(struct kid_entry *e,
return this; return this;
} }
sub = alloc_kid_entry(pid, fe); sub = alloc_kid_entry(tree, pid, fe);
if (!sub) if (!sub)
return NULL; return NULL;
@@ -186,13 +195,13 @@ static struct kid_entry *kid_generate_sub(struct kid_entry *e,
return sub; return sub;
} }
static struct kid_entry *kid_generate_gen(pid_t pid, static struct kid_entry *kid_generate_gen(struct kid_tree *tree,
struct fdinfo_entry *fe, int *new_id) pid_t pid, struct fdinfo_entry *fe, int *new_id)
{ {
struct rb_node *node = kid_root.rb_node; struct rb_node *node = tree->root.rb_node;
struct kid_entry *e = NULL; struct kid_entry *e = NULL;
struct rb_node **new = &kid_root.rb_node; struct rb_node **new = &tree->root.rb_node;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
while (node) { while (node) {
@@ -204,14 +213,14 @@ static struct kid_entry *kid_generate_gen(pid_t pid,
else if (fe->id > this->genid) else if (fe->id > this->genid)
node = node->rb_right, new = &((*new)->rb_right); node = node->rb_right, new = &((*new)->rb_right);
else else
return kid_generate_sub(this, pid, fe, new_id); return kid_generate_sub(tree, this, pid, fe, new_id);
} }
e = alloc_kid_entry(pid, fe); e = alloc_kid_entry(tree, pid, fe);
if (!e) if (!e)
return NULL; return NULL;
rb_link_and_balance(&kid_root, &e->node, parent, new); rb_link_and_balance(&tree->root, &e->node, parent, new);
*new_id = 1; *new_id = 1;
return e; return e;
@@ -219,7 +228,7 @@ static struct kid_entry *kid_generate_gen(pid_t pid,
u32 fd_id_generate_special(void) u32 fd_id_generate_special(void)
{ {
return kid_entries_subid++; return fd_tree.subid++;
} }
int fd_id_generate(pid_t pid, struct fdinfo_entry *fe) int fd_id_generate(pid_t pid, struct fdinfo_entry *fe)
@@ -227,7 +236,7 @@ int fd_id_generate(pid_t pid, struct fdinfo_entry *fe)
struct kid_entry *fid; struct kid_entry *fid;
int new_id = 0; int new_id = 0;
fid = kid_generate_gen(pid, fe, &new_id); fid = kid_generate_gen(&fd_tree, pid, fe, &new_id);
if (!fid) if (!fid)
return -ENOMEM; return -ENOMEM;