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

crtools: don't include restorer.h in proc_parse.h

Browse Source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2013-11-05 12:32:56 +04:00
committed by Pavel Emelyanov
parent 565eb01346
commit a6edbcf669
7 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cr-dump.c
View File

@@ -63,6 +63,7 @@
#include "mem.h"
#include "vdso.h"
#include "page-pipe.h"
#include "posix-timer.h"
#include "vdso.h"
#include "cr-service.h"

24
include/posix-timer.h Normal file
View File

@@ -0,0 +1,24 @@
#ifndef __CR_PROC_POSIX_TIMER_H__
#define __CR_PROC_POSIX_TIMER_H__
struct str_posix_timer {
long it_id;
int clock_id;
int si_signo;
int it_sigev_notify;
void * sival_ptr;
};
struct proc_posix_timer {
struct list_head list;
struct str_posix_timer spt;
};
struct proc_posix_timers_stat {
int timer_n;
struct list_head timers;
};
extern int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat * args);
#endif

13
include/proc_parse.h
View File

@@ -3,7 +3,6 @@
#include <sys/types.h>
#include "asm/types.h"
#include "restorer.h"
#include "image.h"
#include "list.h"
@@ -128,16 +127,6 @@ struct mount_info {
struct list_head postpone;
};
struct proc_posix_timer {
struct list_head list;
struct str_posix_timer spt;
};
struct proc_posix_timers_stat {
int timer_n;
struct list_head timers;
};
extern struct mount_info *mnt_entry_alloc();
extern void mnt_entry_free(struct mount_info *mi);
@@ -162,8 +151,6 @@ extern int parse_fdinfo(int fd, int type,
extern int parse_cpuinfo_features(int (*handler)(char *tok));
extern int parse_file_locks(void);
extern int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat * args);
struct pid;
extern int parse_threads(int pid, struct pid **_t, int *_n);

9
include/restorer.h
View File

@@ -14,6 +14,7 @@
#include "crtools.h"
#include "asm/restorer.h"
#include "posix-timer.h"
#include "vdso.h"
#include <time.h>
@@ -55,14 +56,6 @@ struct rst_sched_param {
int prio;
};
struct str_posix_timer {
long it_id;
int clock_id;
int si_signo;
int it_sigev_notify;
void * sival_ptr;
};
struct restore_posix_timer {
struct str_posix_timer spt;
struct itimerspec val;

1
parasite-syscall.c
View File

@@ -22,6 +22,7 @@
#include "namespaces.h"
#include "kerndat.h"
#include "pstree.h"
#include "posix-timer.h"
#include "net.h"
#include "mem.h"
#include "restorer.h"

1
proc_parse.c
View File

@@ -18,6 +18,7 @@
#include "file-lock.h"
#include "pstree.h"
#include "fsnotify.h"
#include "posix-timer.h"
#include "kerndat.h"
#include "vdso.h"

2
security.c
View File

@@ -3,6 +3,8 @@
#include "proc_parse.h"
#include "log.h"
#include "protobuf/creds.pb-c.h"
/*
* UID and GID of user requesting for C/R
*/