crtools: Move proc parsing routines to one file

Start with /proc/pid/maps parser
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>

Makefile

@@ -63,6 +63,7 @@ export CC ECHO MAKE CFLAGS LIBS ARCH DEFINES
 all: $(PROGRAM)
 
 OBJS		+= crtools.o
+OBJS		+= proc_parse.o
 OBJS		+= parasite-syscall.o
 OBJS		+= cr-dump.o
 OBJS		+= cr-restore.o

cr-dump.c

@@ -28,7 +28,7 @@
 #include "sockets.h"
 
 #include "image.h"
-
+#include "proc_parse.h"
 #include "parasite-syscall.h"
 #include "parasite-blob.h"
 

cr-restore.c

@@ -33,7 +33,7 @@
 #include "sockets.h"
 #include "lock.h"
 #include "files.h"
-
+#include "proc_parse.h"
 #include "crtools.h"
 
 /*

include/proc_parse.h

+#ifndef __PROC_PARSE_H__
+#define __PROC_PARSE_H__
+int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files);
+#endif

include/util.h

@@ -163,7 +163,6 @@ extern void printk_vma(struct vma_area *vma_area);
 #define pr_info_siginfo(siginfo)	printk_siginfo(siginfo)
 
 extern int move_img_fd(int *img_fd, int want_fd);
-extern int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files);
 extern int close_safe(int *fd);
 
 extern int reopen_fd_as_safe(int new_fd, int old_fd, bool allow_reuse_fd);

proc_parse.c

+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include "crtools.h"
+#include "types.h"
+#include "list.h"
+#include "util.h"
+#include "proc_parse.h"
+
+int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files)
+{
+	struct vma_area *vma_area = NULL;
+	u64 start, end, pgoff;
+	char big_buffer[1024];
+	unsigned long ino;
+	char r,w,x,s;
+	int dev_maj, dev_min;
+	int ret = -1;
+
+	DIR *map_files_dir = NULL;
+	FILE *maps = NULL;
+
+	maps = fopen_proc(pid_dir, "maps");
+	if (!maps) {
+		pr_perror("Can't open %d's maps\n", pid);
+		goto err;
+	}
+
+	if (use_map_files) {
+		map_files_dir = opendir_proc(pid_dir, "map_files");
+		if (!map_files_dir) {
+			pr_err("Can't open %d's, old kernel?\n", pid);
+			goto err;
+		}
+	}
+
+	while (fgets(big_buffer, sizeof(big_buffer), maps)) {
+		struct stat st_buf;
+		int num;
+
+		num = sscanf(big_buffer, "%lx-%lx %c%c%c%c %lx %02x:%02x %lu",
+			     &start, &end, &r, &w, &x, &s, &pgoff, &dev_maj,
+			     &dev_min, &ino);
+		if (num != 10) {
+			pr_err("Can't parse: %s", big_buffer);
+			goto err;
+		}
+
+		vma_area = alloc_vma_area();
+		if (!vma_area)
+			goto err;
+
+		if (map_files_dir) {
+			char path[32];
+
+			/* Figure out if it's file mapping */
+			snprintf(path, sizeof(path), "%lx-%lx", start, end);
+
+			/*
+			 * Note that we "open" it in dumper process space
+			 * so later we might refer to it via /proc/self/fd/vm_file_fd
+			 * if needed.
+			 */
+			vma_area->vm_file_fd = openat(dirfd(map_files_dir), path, O_RDONLY);
+			if (vma_area->vm_file_fd < 0) {
+				if (errno != ENOENT) {
+					pr_perror("Failed opening %d's map %Lu\n", pid, start);
+					goto err;
+				}
+			}
+		}
+
+		vma_area->vma.start	= start;
+		vma_area->vma.end	= end;
+		vma_area->vma.pgoff	= pgoff;
+		vma_area->vma.prot	= PROT_NONE;
+
+		if (r == 'r')
+			vma_area->vma.prot |= PROT_READ;
+		if (w == 'w')
+			vma_area->vma.prot |= PROT_WRITE;
+		if (x == 'x')
+			vma_area->vma.prot |= PROT_EXEC;
+
+		if (s == 's')
+			vma_area->vma.flags = MAP_SHARED;
+		else if (s == 'p')
+			vma_area->vma.flags = MAP_PRIVATE;
+
+		if (strstr(big_buffer, "[stack]")) {
+			vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_STACK;
+			vma_area->vma.flags  |= MAP_GROWSDOWN;
+		} else if (strstr(big_buffer, "[vsyscall]")) {
+			vma_area->vma.status |= VMA_AREA_VSYSCALL;
+		} else if (strstr(big_buffer, "[vdso]")) {
+			vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_VDSO;
+		} else if (strstr(big_buffer, "[heap]")) {
+			vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_HEAP;
+		} else {
+			vma_area->vma.status = VMA_AREA_REGULAR;
+		}
+
+		/*
+		 * Some mapping hints for restore, we save this on
+		 * disk and restore might need to analyze it.
+		 */
+		if (vma_area->vm_file_fd >= 0) {
+
+			if (fstat(vma_area->vm_file_fd, &st_buf) < 0) {
+				pr_perror("Failed fstat on %d's map %Lu\n", pid, start);
+				goto err;
+			}
+			if (!S_ISREG(st_buf.st_mode)) {
+				pr_err("Can't handle non-regular mapping on %d's map %Lu\n", pid, start);
+				goto err;
+			}
+
+			/*
+			 * /dev/zero stands for anon-shared mapping
+			 * otherwise it's some file mapping.
+			 */
+			if (MAJOR(st_buf.st_dev) == 0) {
+				if (!(vma_area->vma.flags & MAP_SHARED))
+					goto err_bogus_mapping;
+				vma_area->vma.flags  |= MAP_ANONYMOUS;
+				vma_area->vma.status |= VMA_ANON_SHARED;
+				vma_area->shmid = st_buf.st_ino;
+			} else {
+				if (vma_area->vma.flags & MAP_PRIVATE)
+					vma_area->vma.status |= VMA_FILE_PRIVATE;
+				else
+					vma_area->vma.status |= VMA_FILE_SHARED;
+			}
+		} else {
+			/*
+			 * No file but mapping -- anonymous one.
+			 */
+			if (vma_area->vma.flags & MAP_SHARED) {
+				vma_area->vma.status |= VMA_ANON_SHARED;
+				vma_area->shmid = ino;
+			} else {
+				vma_area->vma.status |= VMA_ANON_PRIVATE;
+			}
+			vma_area->vma.flags  |= MAP_ANONYMOUS;
+		}
+
+		list_add_tail(&vma_area->list, vma_area_list);
+	}
+
+	vma_area = NULL;
+	ret = 0;
+
+err:
+	if (maps)
+		fclose(maps);
+
+	if (map_files_dir)
+		closedir(map_files_dir);
+
+	xfree(vma_area);
+	return ret;
+
+err_bogus_mapping:
+	pr_err("Bogus mapping %lx-%lx (flags: %x vm_file_fd: %d)\n",
+	       vma_area->vma.start, vma_area->vma.end,
+	       vma_area->vma.flags, vma_area->vm_file_fd);
+	goto err;
+}
+

util.c

@@ -158,166 +158,6 @@ int move_img_fd(int *img_fd, int want_fd)
 	return 0;
 }
 
-int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files)
-{
-	struct vma_area *vma_area = NULL;
-	u64 start, end, pgoff;
-	char big_buffer[1024];
-	unsigned long ino;
-	char r,w,x,s;
-	int dev_maj, dev_min;
-	int ret = -1;
-
-	DIR *map_files_dir = NULL;
-	FILE *maps = NULL;
-
-	maps = fopen_proc(pid_dir, "maps");
-	if (!maps) {
-		pr_perror("Can't open %d's maps\n", pid);
-		goto err;
-	}
-
-	if (use_map_files) {
-		map_files_dir = opendir_proc(pid_dir, "map_files");
-		if (!map_files_dir) {
-			pr_err("Can't open %d's, old kernel?\n", pid);
-			goto err;
-		}
-	}
-
-	while (fgets(big_buffer, sizeof(big_buffer), maps)) {
-		struct stat st_buf;
-		int num;
-
-		num = sscanf(big_buffer, "%lx-%lx %c%c%c%c %lx %02x:%02x %lu",
-			     &start, &end, &r, &w, &x, &s, &pgoff, &dev_maj,
-			     &dev_min, &ino);
-		if (num != 10) {
-			pr_err("Can't parse: %s", big_buffer);
-			goto err;
-		}
-
-		vma_area = alloc_vma_area();
-		if (!vma_area)
-			goto err;
-
-		if (map_files_dir) {
-			char path[32];
-
-			/* Figure out if it's file mapping */
-			snprintf(path, sizeof(path), "%lx-%lx", start, end);
-
-			/*
-			 * Note that we "open" it in dumper process space
-			 * so later we might refer to it via /proc/self/fd/vm_file_fd
-			 * if needed.
-			 */
-			vma_area->vm_file_fd = openat(dirfd(map_files_dir), path, O_RDONLY);
-			if (vma_area->vm_file_fd < 0) {
-				if (errno != ENOENT) {
-					pr_perror("Failed opening %d's map %Lu\n", pid, start);
-					goto err;
-				}
-			}
-		}
-
-		vma_area->vma.start	= start;
-		vma_area->vma.end	= end;
-		vma_area->vma.pgoff	= pgoff;
-		vma_area->vma.prot	= PROT_NONE;
-
-		if (r == 'r')
-			vma_area->vma.prot |= PROT_READ;
-		if (w == 'w')
-			vma_area->vma.prot |= PROT_WRITE;
-		if (x == 'x')
-			vma_area->vma.prot |= PROT_EXEC;
-
-		if (s == 's')
-			vma_area->vma.flags = MAP_SHARED;
-		else if (s == 'p')
-			vma_area->vma.flags = MAP_PRIVATE;
-
-		if (strstr(big_buffer, "[stack]")) {
-			vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_STACK;
-			vma_area->vma.flags  |= MAP_GROWSDOWN;
-		} else if (strstr(big_buffer, "[vsyscall]")) {
-			vma_area->vma.status |= VMA_AREA_VSYSCALL;
-		} else if (strstr(big_buffer, "[vdso]")) {
-			vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_VDSO;
-		} else if (strstr(big_buffer, "[heap]")) {
-			vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_HEAP;
-		} else {
-			vma_area->vma.status = VMA_AREA_REGULAR;
-		}
-
-		/*
-		 * Some mapping hints for restore, we save this on
-		 * disk and restore might need to analyze it.
-		 */
-		if (vma_area->vm_file_fd >= 0) {
-
-			if (fstat(vma_area->vm_file_fd, &st_buf) < 0) {
-				pr_perror("Failed fstat on %d's map %Lu\n", pid, start);
-				goto err;
-			}
-			if (!S_ISREG(st_buf.st_mode)) {
-				pr_err("Can't handle non-regular mapping on %d's map %Lu\n", pid, start);
-				goto err;
-			}
-
-			/*
-			 * /dev/zero stands for anon-shared mapping
-			 * otherwise it's some file mapping.
-			 */
-			if (MAJOR(st_buf.st_dev) == 0) {
-				if (!(vma_area->vma.flags & MAP_SHARED))
-					goto err_bogus_mapping;
-				vma_area->vma.flags  |= MAP_ANONYMOUS;
-				vma_area->vma.status |= VMA_ANON_SHARED;
-				vma_area->shmid = st_buf.st_ino;
-			} else {
-				if (vma_area->vma.flags & MAP_PRIVATE)
-					vma_area->vma.status |= VMA_FILE_PRIVATE;
-				else
-					vma_area->vma.status |= VMA_FILE_SHARED;
-			}
-		} else {
-			/*
-			 * No file but mapping -- anonymous one.
-			 */
-			if (vma_area->vma.flags & MAP_SHARED) {
-				vma_area->vma.status |= VMA_ANON_SHARED;
-				vma_area->shmid = ino;
-			} else {
-				vma_area->vma.status |= VMA_ANON_PRIVATE;
-			}
-			vma_area->vma.flags  |= MAP_ANONYMOUS;
-		}
-
-		list_add_tail(&vma_area->list, vma_area_list);
-	}
-
-	vma_area = NULL;
-	ret = 0;
-
-err:
-	if (maps)
-		fclose(maps);
-
-	if (map_files_dir)
-		closedir(map_files_dir);
-
-	xfree(vma_area);
-	return ret;
-
-err_bogus_mapping:
-	pr_err("Bogus mapping %lx-%lx (flags: %x vm_file_fd: %d)\n",
-	       vma_area->vma.start, vma_area->vma.end,
-	       vma_area->vma.flags, vma_area->vm_file_fd);
-	goto err;
-}
-
 int open_image_ro_nocheck(const char *fmt, int pid)
 {
 	char path[PATH_MAX];