From 2a5a2003d6ddac692625d9d5d5eaf7f16f015aad Mon Sep 17 00:00:00 2001 From: "ben.franksen" <ben.franksen@online.de> Date: Mon, 28 Mar 2011 21:55:46 +0000 Subject: [PATCH] seq: added some debug messages (and fixed a few printfs to DEBUG) --- src/seq/seq_ca.c | 1 + src/seq/seq_if.c | 6 ++++-- src/seq/seq_task.c | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/seq/seq_ca.c b/src/seq/seq_ca.c index ea120041..2767ebc7 100644 --- a/src/seq/seq_ca.c +++ b/src/seq/seq_ca.c @@ -205,6 +205,7 @@ static void proc_db_events( DBCHAN *dbch = ch->dbch; assert(dbch != NULL); + DEBUG("proc_db_events: var=%s, pv=%s, type=%s, status=%d\n", ch->varName, dbch->dbName, event_type_name[evtype], status); diff --git a/src/seq/seq_if.c b/src/seq/seq_if.c index 93575f5b..8d8302db 100644 --- a/src/seq/seq_if.c +++ b/src/seq/seq_if.c @@ -211,9 +211,9 @@ static void anonymous_put(SS_ID ss, CHAN *ch) DEBUG("seq_pvPut: type=%d, size=%d, count=%d, value=%p, val_ptr=%p, buf_size=%d, q=%p\n", type, size, ch->count, value, pv_value_ptr(value, type), pv_size_n(type, ch->count), queue); - print_channel_value(printf, ch, var); + print_channel_value(DEBUG, ch, var); memcpy(pv_value_ptr(value, type), var, size * ch->count); - print_channel_value(printf, ch, pv_value_ptr(value, type)); + print_channel_value(DEBUG, ch, pv_value_ptr(value, type)); /* Copy whole message into queue */ full = seqQueuePut(queue, value); if (full) @@ -789,6 +789,8 @@ epicsShareFunc boolean epicsShareAPI seq_efTestAndClear(SS_ID ss, EV_ID ev_flag) isSet = bitTest(sp->evFlags, ev_flag); bitClear(sp->evFlags, ev_flag); + DEBUG("seq_efTestAndClear: ev_flag=%d, isSet=%d, ss=%d\n", ev_flag, isSet, (int)ssNum(ss)); + epicsMutexUnlock(sp->programLock); return isSet; diff --git a/src/seq/seq_task.c b/src/seq/seq_task.c index 00d2f007..aff0837d 100644 --- a/src/seq/seq_task.c +++ b/src/seq/seq_task.c @@ -470,9 +470,12 @@ void seqWakeup(SPROG *sp, unsigned eventNum) epicsMutexMustLock(sp->programLock); /* If event bit in mask is set, wake that state set */ + DEBUG("seqWakeup: eventNum=%d, mask=%u, state set=%d\n", eventNum, + ss->mask? *ss->mask : 0, (int)ssNum(ss)); if (eventNum == 0 || (ss->mask && bitTest(ss->mask, eventNum))) { + DEBUG("seqWakeup: waking up state set=%d\n", (int)ssNum(ss)); epicsEventSignal(ss->syncSemId); /* wake up ss thread */ } epicsMutexUnlock(sp->programLock); -- GitLab