mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

fifo: Generate unique ID for satellite regfile entry

Browse Source 
The plan is to have all file entries have unique ID. Fifo
generates a reg file entry to reuse the whole reg-files
c/r-ing engine (ghosts, open-by-path, etc.) and right now
ID for this entry is the same as for fifo entry.

Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov 2017-07-10 12:39:05 +03:00
parent 73a1f362fe
commit c0e929abc5
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
criu/fifo.c
View File

@ -8,6 +8,7 @@
#include "image.h" #include "image.h"
#include "files.h" #include "files.h"
#include "files-reg.h" #include "files-reg.h"
#include "file-ids.h"
#include "pipes.h" #include "pipes.h"
#include "fifo.h" #include "fifo.h"
@ -43,13 +44,16 @@ static int dump_one_fifo(int lfd, u32 id, const struct fd_parms *p)
struct cr_img *img = img_from_set(glob_imgset, CR_FD_FILES); struct cr_img *img = img_from_set(glob_imgset, CR_FD_FILES);
FileEntry fe = FILE_ENTRY__INIT; FileEntry fe = FILE_ENTRY__INIT;
FifoEntry e = FIFO_ENTRY__INIT; FifoEntry e = FIFO_ENTRY__INIT;
u32 rf_id;
fd_id_generate_special(NULL, &rf_id);
/* /*
* It's a trick here, we use regular files dumping * It's a trick here, we use regular files dumping
* code to save path to a fifo, then we reuse it * code to save path to a fifo, then we reuse it
* on restore. * on restore.
*/ */
if (dump_one_reg_file(lfd, id, p)) if (dump_one_reg_file(lfd, rf_id, p))
return -1; return -1;
pr_info("Dumping fifo %d with id %#x pipe_id %#x\n", pr_info("Dumping fifo %d with id %#x pipe_id %#x\n",
@ -57,6 +61,8 @@ static int dump_one_fifo(int lfd, u32 id, const struct fd_parms *p)
e.id = id; e.id = id;
e.pipe_id = pipe_id(p); e.pipe_id = pipe_id(p);
e.has_regf_id = true;
e.regf_id = rf_id;
fe.type = FD_TYPES__FIFO; fe.type = FD_TYPES__FIFO;
fe.id = e.id; fe.id = e.id;
@ -116,8 +122,10 @@ static int open_fifo_fd(struct file_desc *d, int *new_fd)
struct file_desc *reg_d; struct file_desc *reg_d;
int fd; int fd;
reg_d = find_file_desc_raw(FD_TYPES__REG, info->fe->id); reg_d = collect_special_file(info->fe->has_regf_id ?
BUG_ON(!reg_d); info->fe->regf_id : info->fe->id);
if (!reg_d)
return -1;
fd = open_path(reg_d, do_open_fifo, info); fd = open_path(reg_d, do_open_fifo, info);
if (fd < 0) if (fd < 0)

1
images/fifo.proto
View File

@ -3,4 +3,5 @@ syntax = "proto2";
message fifo_entry { message fifo_entry {
required uint32 id = 1; required uint32 id = 1;
required uint32 pipe_id = 2; required uint32 pipe_id = 2;
optional uint32 regf_id = 3;
} }