Commit cd0075ab authored by Pavel Emelyanov's avatar Pavel Emelyanov

dump: Don't push parasite-ctl into fns needing pid only

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent c2dec75b
...@@ -463,12 +463,11 @@ err: ...@@ -463,12 +463,11 @@ err:
return ret; return ret;
} }
static int dump_task_mm(struct parasite_ctl *ctl, const struct proc_pid_stat *stat, static int dump_task_mm(pid_t pid, const struct proc_pid_stat *stat,
const struct parasite_dump_misc *misc, const struct cr_fdset *fdset) const struct parasite_dump_misc *misc, const struct cr_fdset *fdset)
{ {
MmEntry mme = MM_ENTRY__INIT; MmEntry mme = MM_ENTRY__INIT;
int ret = -1; int ret = -1;
pid_t pid = ctl->pid.real;
mme.mm_start_code = stat->start_code; mme.mm_start_code = stat->start_code;
mme.mm_end_code = stat->end_code; mme.mm_end_code = stat->end_code;
...@@ -644,15 +643,13 @@ int dump_thread_core(int pid, CoreEntry *core, const struct parasite_dump_thread ...@@ -644,15 +643,13 @@ int dump_thread_core(int pid, CoreEntry *core, const struct parasite_dump_thread
return ret; return ret;
} }
static int dump_task_core_all(struct parasite_ctl *ctl, static int dump_task_core_all(pid_t pid, CoreEntry *core,
CoreEntry *core,
const struct proc_pid_stat *stat, const struct proc_pid_stat *stat,
const struct parasite_dump_misc *misc, const struct parasite_dump_misc *misc,
const struct cr_fdset *cr_fdset) const struct cr_fdset *cr_fdset)
{ {
int fd_core = fdset_fd(cr_fdset, CR_FD_CORE); int fd_core = fdset_fd(cr_fdset, CR_FD_CORE);
int ret = -1; int ret = -1;
pid_t pid = ctl->pid.real;
pr_info("\n"); pr_info("\n");
pr_info("Dumping core (pid: %d)\n", pid); pr_info("Dumping core (pid: %d)\n", pid);
...@@ -1500,13 +1497,13 @@ static int dump_one_task(struct pstree_item *item) ...@@ -1500,13 +1497,13 @@ static int dump_one_task(struct pstree_item *item)
goto err_cure; goto err_cure;
} }
ret = dump_task_mm(parasite_ctl, &pps_buf, &misc, cr_fdset); ret = dump_task_mm(pid, &pps_buf, &misc, cr_fdset);
if (ret) { if (ret) {
pr_err("Dump mm (pid: %d) failed with %d\n", pid, ret); pr_err("Dump mm (pid: %d) failed with %d\n", pid, ret);
goto err_cure; goto err_cure;
} }
ret = dump_task_core_all(parasite_ctl, item->core[0], &pps_buf, &misc, cr_fdset); ret = dump_task_core_all(pid, item->core[0], &pps_buf, &misc, cr_fdset);
if (ret) { if (ret) {
pr_err("Dump core (pid: %d) failed with %d\n", pid, ret); pr_err("Dump core (pid: %d) failed with %d\n", pid, ret);
goto err_cure; goto err_cure;
......
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