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

crtools: A few style update on proc_parse

Browse Source 
No func changes.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Cyrill Gorcunov
2012-01-14 01:48:29 +04:00
parent 3202d72f85
commit 1e073d05eb
2 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
include/proc_parse.h
View File

@@ -1,58 +1,59 @@
#ifndef __PROC_PARSE_H__ #ifndef PROC_PARSE_H__
#define __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);
#define TASK_COMM_LEN 16 #define TASK_COMM_LEN 16
struct proc_pid_stat { struct proc_pid_stat {
int pid; int pid;
char comm[TASK_COMM_LEN]; char comm[TASK_COMM_LEN];
char state; char state;
int ppid; int ppid;
int pgid; int pgid;
int sid; int sid;
int tty_nr; int tty_nr;
int tty_pgrp; int tty_pgrp;
unsigned int flags; unsigned int flags;
unsigned long min_flt; unsigned long min_flt;
unsigned long cmin_flt; unsigned long cmin_flt;
unsigned long maj_flt; unsigned long maj_flt;
unsigned long cmaj_flt; unsigned long cmaj_flt;
unsigned long utime; unsigned long utime;
unsigned long stime; unsigned long stime;
long cutime; long cutime;
long cstime; long cstime;
long priority; long priority;
long nice; long nice;
int num_threads; int num_threads;
int zero0; int zero0;
unsigned long long start_time; unsigned long long start_time;
unsigned long vsize; unsigned long vsize;
long mm_rss; long mm_rss;
unsigned long rsslim; unsigned long rsslim;
unsigned long start_code; unsigned long start_code;
unsigned long end_code; unsigned long end_code;
unsigned long start_stack; unsigned long start_stack;
unsigned long esp; unsigned long esp;
unsigned long eip; unsigned long eip;
unsigned long sig_pending; unsigned long sig_pending;
unsigned long sig_blocked; unsigned long sig_blocked;
unsigned long sig_ignored; unsigned long sig_ignored;
unsigned long sig_handled; unsigned long sig_handled;
unsigned long wchan; unsigned long wchan;
unsigned long zero1; unsigned long zero1;
unsigned long zero2; unsigned long zero2;
int exit_signal; int exit_signal;
int task_cpu; int task_cpu;
unsigned int rt_priority; unsigned int rt_priority;
unsigned int policy; unsigned int policy;
unsigned long long delayacct_blkio_ticks; unsigned long long delayacct_blkio_ticks;
unsigned long gtime; unsigned long gtime;
long cgtime; long cgtime;
unsigned long start_data; unsigned long start_data;
unsigned long end_data; unsigned long end_data;
unsigned long start_brk; unsigned long start_brk;
}; };
int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s); extern int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s);
#endif extern int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files);
#endif /* PROC_PARSE_H__ */

10
proc_parse.c
View File

@@ -6,10 +6,12 @@
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "crtools.h"
#include "types.h" #include "types.h"
#include "list.h" #include "list.h"
#include "util.h" #include "util.h"
#include "crtools.h"
#include "proc_parse.h" #include "proc_parse.h"
int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files) int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files)
@@ -183,7 +185,10 @@ int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s)
} }
memset(s, 0, sizeof(*s)); memset(s, 0, sizeof(*s));
fscanf(f, "%d (%s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %d %d %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu", fscanf(f,
"%d (%s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu %ld %ld %ld "
"%ld %d %d %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu "
"%lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu",
&s->pid, &s->pid,
s->comm, s->comm,
&s->state, &s->state,
@@ -234,5 +239,6 @@ int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s)
s->comm[strlen(s->comm) - 1] = '\0'; /* trim the ending ) */ s->comm[strlen(s->comm) - 1] = '\0'; /* trim the ending ) */
fclose(f); fclose(f);
return 0; return 0;
} }