mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

Merge branch '@xemul' into dev

Browse Source 
* @xemul:
  crtools: Collect dumping fd parameters into one place
  crtools: Toss dump_one_fd args around
  crtools: Rename fd to lfd in dump_one_fd
  crtools: Sanitize pstree construction
  crtools: Remove unused printk_registers and co
  crtools: Deduplicate file info showing code
  crtools: Merge pstree collecting into showing
  crtools: Remove unused and wrong arrays from pstree image
  crtools: Remove lseeks after prep_cr_ calls
  crtools: Cleanup collect_pstree in cr-show

Conflicts:
	cr-dump.c
	include/sockets.h
	sockets.c

The conflicts are mostly because of commit
995ef5eca3

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Cyrill Gorcunov
2012-01-13 21:39:14 +04:00
parent 81277f21a0 d7121ede0d
commit 1c96c5cff0
7 changed files with 107 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sockets.h
View File

@@ -6,7 +6,7 @@
#include <stdbool.h>
struct cr_fdset;
extern int try_dump_socket(pid_t pid, char *fd_name, struct cr_fdset *cr_fdset);
extern int try_dump_socket(pid_t pid, int fd, struct cr_fdset *cr_fdset);
extern int collect_sockets(void);
extern int prepare_sockets(int pid);