Commit ab36e28d authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Andrei Vagin

files: Rename service_fd_rlim_cur to service_fd_base_cur

Next patches will make service fds numbers not connected
not rlimit. Change the name to better fit its goal.

Also, leave service_fd_rlim_cur variable to have cached
access to rlimit value.
Signed-off-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>

v2: More comments
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 71ccb4a0
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
struct vma_area; struct vma_area;
struct list_head; struct list_head;
extern int service_fd_rlim_cur;
extern void pr_vma(unsigned int loglevel, const struct vma_area *vma_area); extern void pr_vma(unsigned int loglevel, const struct vma_area *vma_area);
#define pr_info_vma(vma_area) pr_vma(LOG_INFO, vma_area) #define pr_info_vma(vma_area) pr_vma(LOG_INFO, vma_area)
......
...@@ -434,7 +434,11 @@ int do_open_proc(pid_t pid, int flags, const char *fmt, ...) ...@@ -434,7 +434,11 @@ int do_open_proc(pid_t pid, int flags, const char *fmt, ...)
return openat(dirfd, path, flags); return openat(dirfd, path, flags);
} }
static int service_fd_rlim_cur; /* Max potentially possible fd to be open by criu process */
int service_fd_rlim_cur;
/* Base of current process service fds set */
static int service_fd_base;
/* Id of current process in shared fdt */
static int service_fd_id = 0; static int service_fd_id = 0;
int init_service_fd(void) int init_service_fd(void)
...@@ -452,14 +456,15 @@ int init_service_fd(void) ...@@ -452,14 +456,15 @@ int init_service_fd(void)
} }
service_fd_rlim_cur = (int)rlimit.rlim_cur; service_fd_rlim_cur = (int)rlimit.rlim_cur;
BUG_ON(service_fd_rlim_cur < SERVICE_FD_MAX); service_fd_base = service_fd_rlim_cur;
BUG_ON(service_fd_base < SERVICE_FD_MAX);
return 0; return 0;
} }
static int __get_service_fd(enum sfd_type type, int service_fd_id) static int __get_service_fd(enum sfd_type type, int service_fd_id)
{ {
return service_fd_rlim_cur - type - SERVICE_FD_MAX * service_fd_id; return service_fd_base - type - SERVICE_FD_MAX * service_fd_id;
} }
int service_fd_min_fd(struct pstree_item *item) int service_fd_min_fd(struct pstree_item *item)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment