From e911721e5b72fa35c30e035ffc402945f603419c Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Tue, 12 Feb 2002 22:42:09 +0000 Subject: [PATCH] Removed some debug logging --- ChangeLog | 3 + mbtask/mbtask.c | 157 +++++++++++++++++++++++------------------------ mbtask/outstat.c | 2 +- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fbaa5d4..c0bf8e34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4608,3 +4608,6 @@ v0.33.20 10-Feb-2002 Will not crash anymore when it needs more then 10 minutes to create the allfiles and newfiles lists. + mbtask: + Removed some debug logging. + diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c index 902c3551..1d956b01 100644 --- a/mbtask/mbtask.c +++ b/mbtask/mbtask.c @@ -679,92 +679,91 @@ int runtasktype(int tasktype) */ int checktasks(int onsig) { - int i, j, rc, count = 0, first = TRUE, status, do_outstat = FALSE; + int i, j, rc, count = 0, first = TRUE, status, do_outstat = FALSE; - for (i = 0; i < MAXTASKS; i++) { - if (strlen(task[i].name)) { + for (i = 0; i < MAXTASKS; i++) { + if (strlen(task[i].name)) { - if (onsig) { - if (kill(task[i].pid, onsig) == 0) - tasklog('+', "%s to %s (pid %d) succeeded", SigName[onsig], task[i].name, task[i].pid); - else - tasklog('+', "%s to %s (pid %d) failed", SigName[onsig], task[i].name, task[i].pid); + if (onsig) { + if (kill(task[i].pid, onsig) == 0) + tasklog('+', "%s to %s (pid %d) succeeded", SigName[onsig], task[i].name, task[i].pid); + else + tasklog('+', "%s to %s (pid %d) failed", SigName[onsig], task[i].name, task[i].pid); + } + + task[i].rc = wait4(task[i].pid, &status, WNOHANG | WUNTRACED, NULL); + if (task[i].rc) { + task[i].running = FALSE; + if (task[i].tasktype == CM_POTS || task[i].tasktype == CM_ISDN || task[i].tasktype == CM_INET) + do_outstat = TRUE; + ptimer = PAUSETIME; + } + + if (first && task[i].rc) { + first = FALSE; + tasklog('t', "Task Type pid stat status rc status"); + tasklog('t', "---------------- ------- ----- ---- ----------- ----- --------"); + for (j = 0; j < MAXTASKS; j++) + if (strlen(task[j].name)) + tasklog('t', "%-16s %s %5d %s %-11d %5d %08x", task[j].name, callmode(task[j].tasktype), + task[j].pid, task[j].running?"runs":"stop", task[j].status, task[j].rc, task[j].status); + } + + switch (task[i].rc) { + case -1: + if (errno == ECHILD) + tasklog('+', "Task %d \"%s\" is ready", i, task[i].name); + else + tasklog('+', "Task %d \"%s\" is ready, error: %s", i, task[i].name, strerror(errno)); + break; + case 0: + /* + * Update last known status when running. + */ + task[i].status = status; + count++; + break; + default: + tasklog('+', "errno=%d %s", errno, strerror(errno)); + if (WIFEXITED(task[i].status)) { + rc = WEXITSTATUS(task[i].status); + if (rc) + tasklog('+', "Task %s is ready, error=%d", task[i].name, rc); + else + tasklog('+', "Task %s is ready", task[i].name); + } else if (WIFSIGNALED(task[i].status)) { + rc = WTERMSIG(task[i].status); + if (rc <= 31) + tasklog('+', "Task %s terminated on signal %s (%d)", task[i].name, SigName[rc], rc); + else + tasklog('+', "Task %s terminated with error nr %d", task[i].name, rc); + } else if (WIFSTOPPED(task[i].status)) { + rc = WSTOPSIG(task[i].status); + tasklog('+', "Task %s stopped on signal %s (%d)", task[i].name, SigName[rc], rc); + } else { + tasklog('+', "FIXME: 1"); } + break; + } - task[i].rc = wait4(task[i].pid, &status, WNOHANG | WUNTRACED, NULL); - if (task[i].rc) { - task[i].running = FALSE; - if (task[i].tasktype == CM_POTS || task[i].tasktype == CM_ISDN || task[i].tasktype == CM_INET) - do_outstat = TRUE; - ptimer = PAUSETIME; - } - - if (first && task[i].rc) { - first = FALSE; - tasklog('t', "Task Type pid stat status rc status"); - tasklog('t', "---------------- ------- ----- ---- ----------- ----- --------"); - for (j = 0; j < MAXTASKS; j++) - if (strlen(task[j].name)) - tasklog('t', "%-16s %s %5d %s %-11d %5d %08x", task[j].name, - callmode(task[j].tasktype), task[j].pid, task[j].running?"runs":"stop", - task[j].status, task[j].rc, task[j].status); - } - - switch (task[i].rc) { - case -1: - if (errno == ECHILD) - tasklog('+', "Task %d \"%s\" is ready", i, task[i].name); - else - tasklog('+', "Task %d \"%s\" is ready, error: %s", i, task[i].name, strerror(errno)); - break; - case 0: - /* - * Update last known status when running. - */ - task[i].status = status; - count++; - break; - default: - tasklog('+', "errno=%d %s", errno, strerror(errno)); - if (WIFEXITED(task[i].status)) { - rc = WEXITSTATUS(task[i].status); - if (rc) - tasklog('+', "Task %s is ready, error=%d", task[i].name, rc); - else - tasklog('+', "Task %s is ready", task[i].name); - } else if (WIFSIGNALED(task[i].status)) { - rc = WTERMSIG(task[i].status); - if (rc <= 31) - tasklog('+', "Task %s terminated on signal %s (%d)", task[i].name, SigName[rc], rc); - else - tasklog('+', "Task %s terminated with error nr %d", task[i].name, rc); - } else if (WIFSTOPPED(task[i].status)) { - rc = WSTOPSIG(task[i].status); - tasklog('+', "Task %s stopped on signal %s (%d)", task[i].name, SigName[rc], rc); - } else { - tasklog('+', "FIXME: 1"); - } - break; - } - - if (!task[i].running) { - for (j = 0; j < MAXTASKS; j++) { - if (calllist[j].taskpid == task[i].pid) { - calllist[j].calling = FALSE; - calllist[j].taskpid = 0; - } - } - memset(&task[i], 0, sizeof(onetask)); - } + if (!task[i].running) { + for (j = 0; j < MAXTASKS; j++) { + if (calllist[j].taskpid == task[i].pid) { + calllist[j].calling = FALSE; + calllist[j].taskpid = 0; + } } + memset(&task[i], 0, sizeof(onetask)); + } } + } - if (do_outstat) { - outstat(); - check_calllist(); - } + if (do_outstat) { + outstat(); + check_calllist(); + } - return count; + return count; } @@ -1034,8 +1033,6 @@ int ping_send(struct in_addr addr) to.sin_addr = addr; SET_SOCKA_LEN4(to); if (sendto(isock, &icmpd, ICMP4_ECHO_LEN, 0, (struct sockaddr *)&to, sizeof(to)) == -1) { -// if (icmp_errs < ICMP_MAX_ERRS) -// tasklog('?', "$icmp ping: sendto()"); return -2; } return 0; diff --git a/mbtask/outstat.c b/mbtask/outstat.c index 19b7502d..369dd1dc 100644 --- a/mbtask/outstat.c +++ b/mbtask/outstat.c @@ -237,7 +237,7 @@ int outstat() T_window = TRUE; } } - tasklog('o', "T_window=%s, iszmh=%s", T_window?"true":"false", iszmh?"true":"false"); +// tasklog('o', "T_window=%s, iszmh=%s", T_window?"true":"false", iszmh?"true":"false"); strcpy(flstr,"...... ... .."); /* * If the node has internet and we have internet available, check if we can send