glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up pid2tcb usage

Browse Source 
* strace.c (pid2tcb): Always match pid.  Fail for argument <= 0.
[USE_PROCFS] (first_used_tcb): New function.
[USE_PROCFS] (trace): Use that instead of pid2tcb(0).
This commit is contained in:
Roland McGrath 2010-09-14 18:59:20 -07:00
parent 1ed5d80ed8
commit 54e931fb85
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
strace.c
View File

@ -1337,24 +1337,37 @@ proc_open(struct tcb *tcp, int attaching)
#endif /* USE_PROCFS */
struct tcb *
pid2tcb(pid)
int pid;
pid2tcb(int pid)
{
int i;
if (pid <= 0)
return NULL;
for (i = 0; i < tcbtabsize; i++) {
struct tcb *tcp = tcbtab[i];
if (tcp->pid == pid && (tcp->flags & TCB_INUSE))
return tcp;
}
return NULL;
}
#ifdef USE_PROCFS
static struct tcb *
first_used_tcb(void)
{
int i;
struct tcb *tcp;
for (i = 0; i < tcbtabsize; i++) {
tcp = tcbtab[i];
if (pid && tcp->pid != pid)
continue;
if (tcp->flags & TCB_INUSE)
return tcp;
}
return NULL;
}
#ifdef USE_PROCFS
static struct tcb *
pfd2tcb(pfd)
int pfd;
@ -1992,7 +2005,7 @@ trace()
#ifndef HAVE_POLLABLE_PROCFS
if (proc_poll_pipe[0] == -1) {
#endif
tcp = pid2tcb(0);
tcp = first_used_tcb();
if (!tcp)
continue;
pfd = tcp->pfd;