[CRIU] [PATCH 6/6] collect: Rename children/threads collecting routines

Pavel Emelyanov xemul at parallels.com
Mon Nov 10 05:05:43 PST 2014


Make their name look similar.

Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 cr-dump.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/cr-dump.c b/cr-dump.c
index b5ccb2a..9f6923a 100644
--- a/cr-dump.c
+++ b/cr-dump.c
@@ -796,7 +796,7 @@ static inline bool child_collected(struct pstree_item *i, pid_t pid)
 }
 
 static int collect_task(struct pstree_item *item);
-static int get_children(struct pstree_item *item)
+static int collect_children(struct pstree_item *item)
 {
 	pid_t *ch;
 	int ret, i, nr_children, nr_inprogress;
@@ -900,7 +900,7 @@ static inline bool thread_collected(struct pstree_item *i, pid_t tid)
 	return false;
 }
 
-static int seize_threads(struct pstree_item *item)
+static int collect_threads(struct pstree_item *item)
 {
 	struct pid *threads = NULL;
 	int nr_threads = 0, i = 0, ret, nr_inprogress, nr_stopped = 0;
@@ -1005,21 +1005,16 @@ static int collect_loop(struct pstree_item *item,
 	return (nr_inprogress == 0) ? 0 : -1;
 }
 
-static int collect_threads(struct pstree_item *item)
-{
-	return collect_loop(item, seize_threads);
-}
-
 static int collect_task(struct pstree_item *item)
 {
 	int ret;
 
-	ret = collect_threads(item);
+	ret = collect_loop(item, collect_threads);
 	if (ret < 0)
 		goto err_close;
 
 	/* Depth-first search (DFS) is used for traversing a process tree. */
-	ret = collect_loop(item, get_children);
+	ret = collect_loop(item, collect_children);
 	if (ret < 0)
 		goto err_close;
 
-- 
1.8.4.2




More information about the CRIU mailing list