From 8a605fc20180a114a0de5ddc9343a8afd5835d90 Mon Sep 17 00:00:00 2001 From: kozubal Date: Thu, 13 Feb 1992 16:43:47 +0000 Subject: [PATCH] Removed extraneous logMsg & seqLog calls. --- src/sequencer/Version | 2 +- src/sequencer/seq_ca.c | 9 +++++++++ src/sequencer/seq_task.c | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/sequencer/Version b/src/sequencer/Version index 732738298..38af70180 100755 --- a/src/sequencer/Version +++ b/src/sequencer/Version @@ -1,2 +1,2 @@ -1.7.9 +1.7.10 diff --git a/src/sequencer/seq_ca.c b/src/sequencer/seq_ca.c index 8fd2a67c6..c3e02cbb6 100644 --- a/src/sequencer/seq_ca.c +++ b/src/sequencer/seq_ca.c @@ -29,6 +29,7 @@ * ----------------- * .01 07-03-91 ajk . * .02 12-11-91 ajk Cosmetic changes (comments & names) + * .03 02-13-92 ajk All seqLog() calls compile only if DEBUG is defined. */ #include "seq.h" @@ -168,18 +169,24 @@ struct connection_handler_args args; { pDB->connected = FALSE; pSP->conn_count--; +#ifdef DEBUG seq_log(pSP, "Channel \"%s\" disconnected\n", pDB->db_name); +#endif DEBUG } else { pDB->connected = TRUE; pSP->conn_count++; +#ifdef DEBUG seq_log(pSP, "Channel \"%s\" connected\n", pDB->db_name); +#endif DEBUG if (pDB->count > ca_element_count(args.chid)) { pDB->count = ca_element_count(args.chid); +#ifdef DEBUG seq_log(pSP, "\"%s\": reset count to %d\n", pDB->db_name, pDB->count); +#endif DEBUG } } @@ -342,10 +349,12 @@ CHAN *pDB; /* ptr to channel struct */ pDB->chid, pDB->var); if (status != ECA_NORMAL) { +#ifdef DEBUG seq_log(pSP, "pvPut on \"%s\" failed (%d)\n", pDB->db_name, status); seq_log(pSP, " put_type=%d\n", pDB->put_type); seq_log(pSP, " size=%d, count=%d\n", pDB->size, pDB->count); +#endif DEBUG } return status; diff --git a/src/sequencer/seq_task.c b/src/sequencer/seq_task.c index 298fefe03..f2f12eb77 100644 --- a/src/sequencer/seq_task.c +++ b/src/sequencer/seq_task.c @@ -308,13 +308,17 @@ TCBX *pTcbX; /* ptr to TCB of task to be deleted */ /* Suspend all state set tasks except self */ pSS = pSP->sscb; +#ifdef DEBUG logMsg(" Suspending state set tasks:\n"); +#endif DEBUG for (nss = 0; nss < pSP->nss; nss++, pSS++) { tid_ss = pSS->task_id; if ( (tid_ss > 0) && (tid != tid_ss) ) { +#ifdef DEBUG logMsg(" suspend task: tid=%d\n", tid_ss); +#endif DEBUG taskSuspend(tid_ss); } } @@ -322,14 +326,18 @@ TCBX *pTcbX; /* ptr to TCB of task to be deleted */ /* Call user exit routine (only if task has run) */ if (pSP->sscb->task_id > 0) { +#ifdef DEBUG logMsg(" Call exit function\n"); +#endif DEBUG pSP->exit_func(pSP, pSP->user_area); } /* Close the log file */ if (pSP->logFd > 0 && pSP->logFd != ioGlobalStdGet(1)) { +#ifdef DEBUG logMsg("Closing log fd=%d\n", pSP->logFd); +#endif DEBUG close(pSP->logFd); pSP->logFd = ioGlobalStdGet(1); } @@ -346,7 +354,9 @@ TCBX *pTcbX; /* ptr to TCB of task to be deleted */ { if ( (tid != tid_ss) && (tid_ss > 0) ) { +#ifdef DEBUG logMsg(" delete ss task: tid=%d\n", tid_ss); +#endif DEBUG taskDelete(tid_ss); } semDelete(pSS->syncSemId); @@ -359,7 +369,9 @@ TCBX *pTcbX; /* ptr to TCB of task to be deleted */ semDelete(pSP->caSemId); /* Free the memory that was allocated for the task area */ +#ifdef DEBUG logMsg("free pSP->dyn_ptr=0x%x\n", pSP->dyn_ptr); +#endif DEBUG taskDelay(5); free(pSP->dyn_ptr);