mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only call pv_watchfd_loop() from main, so that eventually pv_watchpid_loop() can be removed and multiple "-d" values supported (#12).

Browse Source
This commit is contained in:
Andrew Wood
2025-09-24 22:11:44 +01:00
parent 8a8e6d71a4
commit 0b2f9ec397
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/main.c
+2 -7
View File
@@ -547,13 +547,8 @@ int main(int argc, char **argv)
pv_remote_fini();
break;
case PV_ACTION_WATCHFD:
if ((opts->watchfd_count > 0) && (NULL != opts->watchfd_fd) && (-1 == opts->watchfd_fd[0])) {
/* "Watch all file descriptors of another process" mode. */
retcode = pv_watchpid_loop(state);
} else if ((opts->watchfd_count > 0) && (NULL != opts->watchfd_fd) && (-1 != opts->watchfd_fd[0])) {
/* "Watch a specific file descriptor of another process" mode. */
retcode = pv_watchfd_loop(state);
}
/* "Watch file descriptor(s) of another process" mode. */
retcode = pv_watchfd_loop(state);
break;
}
src/pv/loop.c
+6
View File
@@ -591,6 +591,7 @@ int pv_main_loop(pvstate_t state)
* Returns nonzero on error.
*
* TODO: unify this with pv_watchpid_loop.
* TODO: watch more than one fd, if watchfd.count > 1.
*/
int pv_watchfd_loop(pvstate_t state)
{
@@ -609,6 +610,11 @@ int pv_watchfd_loop(pvstate_t state)
if (NULL == state->watchfd.fd)
return PV_ERROREXIT_MEMORY;
/* Call pv_watchpid_loop() instead if no specific fd was given. */
if (-1 == state->watchfd.fd[0]) {
return pv_watchpid_loop(state);
}
memset(&info, 0, sizeof(info));
info.watch_pid = state->watchfd.pid[0];
info.watch_fd = state->watchfd.fd[0];