Commit 114d89cc authored by Cyrill Gorcunov's avatar Cyrill Gorcunov

restore: Use pipeid in pipe_info to match pipe_entry

To have similar naming scheme.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@gmail.com>
parent c3a05afa
...@@ -45,7 +45,7 @@ struct shmem_info { ...@@ -45,7 +45,7 @@ struct shmem_info {
}; };
struct pipe_info { struct pipe_info {
unsigned int id; unsigned int pipeid;
int pid; int pid;
int real_pid; int real_pid;
int read_fd; int read_fd;
...@@ -91,8 +91,8 @@ static void show_saved_pipes(void) ...@@ -91,8 +91,8 @@ static void show_saved_pipes(void)
pr_info("\tSaved pipes:\n"); pr_info("\tSaved pipes:\n");
for (i = 0; i < nr_pipes; i++) for (i = 0; i < nr_pipes; i++)
pr_info("\t\tid: %x -> pid: %d -> users: %d\n", pr_info("\t\tpipeid: %x -> pid: %d -> users: %d\n",
pipes[i].id, pipes[i].pipeid,
pipes[i].pid, pipes[i].pid,
pipes[i].users); pipes[i].users);
} }
...@@ -118,7 +118,7 @@ static struct pipe_info *find_pipe(unsigned int pipeid) ...@@ -118,7 +118,7 @@ static struct pipe_info *find_pipe(unsigned int pipeid)
for (i = 0; i < nr_pipes; i++) { for (i = 0; i < nr_pipes; i++) {
pi = pipes + i; pi = pipes + i;
if (pi->id == pipeid) if (pi->pipeid == pipeid)
return pi; return pi;
} }
...@@ -219,7 +219,7 @@ static int collect_pipe(int pid, struct pipe_entry *e, int p_fd) ...@@ -219,7 +219,7 @@ static int collect_pipe(int pid, struct pipe_entry *e, int p_fd)
* will be attached. * will be attached.
*/ */
for (i = 0; i < nr_pipes; i++) { for (i = 0; i < nr_pipes; i++) {
if (pipes[i].id != e->pipeid) if (pipes[i].pipeid != e->pipeid)
continue; continue;
if (pipes[i].pid > pid) if (pipes[i].pid > pid)
...@@ -237,7 +237,7 @@ static int collect_pipe(int pid, struct pipe_entry *e, int p_fd) ...@@ -237,7 +237,7 @@ static int collect_pipe(int pid, struct pipe_entry *e, int p_fd)
memset(&pipes[nr_pipes], 0, sizeof(pipes[nr_pipes])); memset(&pipes[nr_pipes], 0, sizeof(pipes[nr_pipes]));
pipes[nr_pipes].id = e->pipeid; pipes[nr_pipes].pipeid = e->pipeid;
pipes[nr_pipes].pid = pid; pipes[nr_pipes].pid = pid;
pipes[nr_pipes].users = 1; pipes[nr_pipes].users = 1;
......
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