This bit of debug code to understand the progress of rpki-client is no
longer helpful. Most of the time this is a stuck rsync that causes delays
and those are now nicely handled by an internal timeout.
I propose to remove this.
--
:wq Claudio
Index: main.c
===================================================================
RCS file: /cvs/src/usr.sbin/rpki-client/main.c,v
retrieving revision 1.97
diff -u -p -r1.97 main.c
--- main.c 4 Feb 2021 14:32:01 -0000 1.97
+++ main.c 4 Feb 2021 17:44:30 -0000
@@ -738,7 +738,7 @@ main(int argc, char *argv[])
{
int rc = 1, c, proc, st, rsync,
fl = SOCK_STREAM | SOCK_CLOEXEC;
- size_t i, j, outsz = 0, talsz = 0;
+ size_t i, outsz = 0, talsz = 0;
pid_t procpid, rsyncpid;
int fd[2];
struct entityq q;
@@ -952,24 +952,10 @@ main(int argc, char *argv[])
if (procq.queued)
pfd[1].events = POLLOUT;
- if ((c = poll(pfd, 2, verbose ? 10000 : INFTIM)) == -1) {
+ if ((c = poll(pfd, 2, INFTIM)) == -1) {
if (errno == EINTR)
continue;
err(1, "poll");
- }
-
- /* Debugging: print some statistics if we stall. */
-
- if (c == 0) {
- for (i = j = 0; i < rt.reposz; i++)
- if (!rt.repos[i].loaded) {
- logx("pending repo %s",
- rt.repos[i].local);
- j++;
- }
- logx("period stats: %zu pending repos", j);
- logx("period stats: %zu pending entries", entity_queue);
- continue;
}
if ((pfd[0].revents & (POLLERR|POLLNVAL)) ||
