summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/Printer.h7
-rw-r--r--src/Task.cc6
2 files changed, 9 insertions, 4 deletions
diff --git a/includes/Printer.h b/includes/Printer.h
index f1897d3..ad7ba17 100644
--- a/includes/Printer.h
+++ b/includes/Printer.h
@@ -63,7 +63,12 @@ class Printer {
static void vprint(const char * fmt, va_list ap) printfwarning(1, 0) { getPrinter()->_print(fmt, ap); }
#ifdef FULLDEBUG
- static void elog(uint32_t engine, const char * fmt, ...) printfwarning(2, 3) { va_list ap; va_start(ap, fmt); getPrinter()->_log(M_ENGINE_DEBUG, fmt, ap); }
+ static void elog(uint32_t engine, const char * fmt, ...) printfwarning(2, 3) {
+ va_list ap;
+ va_start(ap, fmt);
+ getPrinter()->_log(M_ENGINE_DEBUG, fmt, ap);
+ va_end(ap);
+ }
#else
static void elog(uint32_t engine, const char * fmt, ...) { }
#endif
diff --git a/src/Task.cc b/src/Task.cc
index 9b15062..85cdafe 100644
--- a/src/Task.cc
+++ b/src/Task.cc
@@ -222,12 +222,12 @@ void Balau::Task::sleep(double timeout) {
}
void Balau::Events::BaseEvent::doSignal() {
- Printer::elog(E_TASK, "Event at %p (%s) is signaled with cb %p and task %p", this, ClassName(this).c_str(), m_cb, m_task);
+ Printer::elog(E_EVENT, "Event at %p (%s) is signaled with cb %p and task %p", this, ClassName(this).c_str(), m_cb, m_task);
m_signal = true;
if (m_cb)
m_cb->gotEvent(this);
if (m_task) {
- Printer::elog(E_TASK, "Signaling task %p (%s - %s)", m_task, m_task->getName(), ClassName(m_task).c_str());
+ Printer::elog(E_EVENT, "Signaling task %p (%s - %s)", m_task, m_task->getName(), ClassName(m_task).c_str());
m_task->getTaskMan()->signalTask(m_task);
}
}
@@ -285,7 +285,7 @@ void Balau::Events::TaskEvent::ack() {
break;
}
}
- Printer::elog(E_TASK, "TaskEvent at %p being ack; removing from the 'waited by' list of %p (%s - %s); deleted = %s", this, t, t->getName(), ClassName(t).c_str(), deleted ? "true" : "false");
+ Printer::elog(E_EVENT, "TaskEvent at %p being ack; removing from the 'waited by' list of %p (%s - %s); deleted = %s", this, t, t->getName(), ClassName(t).c_str(), deleted ? "true" : "false");
t->m_eventLock.leave();
t = NULL;
IAssert(deleted, "We didn't find task %p in the waitedBy lists... ?", this);