Changeset 1046

Timestamp:

04/26/08 09:42:39 (4 years ago)

Author:

ppalmers

Message:

debug message cleanup. move #defines into config.h.in.

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/src/debugmodule/debugmodule.cpp (modified) (20 diffs)
• trunk/libffado/src/debugmodule/debugmodule.h (modified) (9 diffs)
• trunk/libffado/src/ffado.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/ARMHandler.cpp (modified) (5 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (6 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (3 diffs)

trunk/libffado/config.h.in

@@ -39 +39 @@
-#define HAVE_LRINTF $HAVE_LRINTF
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// make this zero to disable the most extreme
-// debug logging in the critical sections
-#define DEBUG_EXTREME_ENABLE        0
-
-// use a RT-safe message buffer for debug output
-// useful to disable this when the code aborts/segfaults to
-// not lose debug output. should be enabled though.
-#define DEBUG_USE_MESSAGE_BUFFER    1
-
-// watchdog

trunk/libffado/src/debugmodule/debugmodule.cpp

@@ -92 +92 @@
-
-    // bypass for performance
-def IMPLEMENT_BACKLOG
+ DEBUG_BACKLOG_SUPPORT
-    if (level > BACKLOG_MIN_LEVEL 
-        && level > m_level) {
@@ -124 +124 @@
-    }
-
-def IMPLEMENT_BACKLOG
+ DEBUG_BACKLOG_SUPPORT
-    // print to backlog if necessary
-    if (level <= BACKLOG_MIN_LEVEL) {
@@ -146 +146 @@
-{
-    // bypass for performance
-def IMPLEMENT_BACKLOG
+ DEBUG_BACKLOG_SUPPORT
-    if (level > BACKLOG_MIN_LEVEL 
-        && level > m_level) {
@@ -203 +203 @@
-    }
-
-def IMPLEMENT_BACKLOG
+ DEBUG_BACKLOG_SUPPORT
-    // print to backlog if necessary
-    if (level <= BACKLOG_MIN_LEVEL) {
@@ -240 +240 @@
-DebugModuleManager::DebugModuleManager()
-    : mb_initialized(0)
+#if DEBUG_USE_MESSAGE_BUFFER
-    , mb_inbuffer(0)
-    , mb_outbuffer(0)
-    , mb_overruns(0)
+#endif
+#if DEBUG_BACKTRACE_SUPPORT
-    , m_backtrace_buffer_nb_seen(0)
-
+
+
-    , bl_mb_inbuffer(0)
-#endif
@@ -266 +270 @@
-        return;
-
+#if DEBUG_USE_MESSAGE_BUFFER
-    pthread_mutex_lock(&mb_write_lock);
-    mb_initialized = 0;
@@ -273 +278 @@
-    pthread_join(mb_writer_thread, NULL);
-    mb_flush();
-
+
+
+
-    pthread_mutex_lock(&m_backtrace_lock);
-    // print a list of the symbols seen in a backtrace
@@ -287 +294 @@
-    }
-    pthread_mutex_unlock(&m_backtrace_lock);
-
+
+
+
-    if (mb_overruns)
-        fprintf(stderr, "WARNING: %d message buffer overruns!\n",
@@ -296 +305 @@
-    pthread_mutex_destroy(&mb_write_lock);
-    pthread_cond_destroy(&mb_ready_cond);
-
+
+
+
-    pthread_mutex_destroy(&m_backtrace_lock);
-
-
+
+
+
-    pthread_mutex_destroy(&bl_mb_write_lock);
-#endif
@@ -314 +326 @@
-        //         cout << "DebugModuleManager init..." << endl;
-
+#if DEBUG_USE_MESSAGE_BUFFER
+    pthread_mutex_init(&mb_flush_lock, NULL);
-    pthread_mutex_init(&mb_write_lock, NULL);
-    pthread_mutex_init(&mb_flush_lock, NULL);
-    pthread_cond_init(&mb_ready_cond, NULL);
-
-    pthread_mutex_init(&m_backtrace_lock, NULL);
-
-    mb_overruns = 0;
-    mb_initialized = 1;
-
-#ifdef IMPLEMENT_BACKLOG
-    pthread_mutex_init(&bl_mb_write_lock, NULL);
-#endif
-
-    if (pthread_create(&mb_writer_thread, NULL, &mb_thread_func, (void *)this) != 0)
-         mb_initialized = 0;
+#endif
+
+#if DEBUG_BACKTRACE_SUPPORT
+    pthread_mutex_init(&m_backtrace_lock, NULL);
+#endif
+
+#if DEBUG_BACKLOG_SUPPORT
+    pthread_mutex_init(&bl_mb_write_lock, NULL);
+#endif
-
-    return true;
@@ -413 +429 @@
-DebugModuleManager::flush()
-{
-def
+
-    mb_flush();
-#else
@@ -420 +436 @@
-}
-
+#if DEBUG_USE_MESSAGE_BUFFER
-void
-DebugModuleManager::mb_flush()
@@ -439 +456 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-void
-DebugModuleManager::showBackLog()
@@ -491 +533 @@
-    pthread_mutex_unlock(&m->mb_flush_lock);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-void
-DebugModuleManager::backlog_print(const char *msg)
@@ -543 +559 @@
-DebugModuleManager::print(const char *msg)
-{
-def
+
-    unsigned int ntries;
-    struct timespec wait = {0,50000};
-#endif
-
-    if (!mb_initialized) {
@@ -556 +571 @@
-    }
-
-#ifdef DEBUG_USE_MESSAGE_BUFFER
-    ntries=1;
-    while (ntries) { // try a few times
@@ -580 +594 @@
-}
-
+#if DEBUG_BACKTRACE_SUPPORT
-void
-DebugModuleManager::printBacktrace(int len)
@@ -586 +601 @@
-    int chars_written=0;
-
->MAX_BACKTRACE_SIZE
-MAX_BACKTRACE_SIZE
+ > DEBUG_MAX_BACKTRACE_LENGTH
+DEBUG_MAX_BACKTRACE_LENGTH
-    }
-
@@ -609 +624 @@
-        seen = false;
-        int j;
-
+DEBUG_
-            if(m_backtrace_buffer_seen[j] == m_backtrace_buffer[i]) {
-                seen = true;
@@ -625 +640 @@
-    pthread_mutex_unlock(&m_backtrace_lock);
-}
+#endif
-
-//----------------------------------------

trunk/libffado/src/debugmodule/debugmodule.h

@@ -46 +46 @@
-#define DEBUG_LEVEL_ULTRA_VERBOSE  8
-
-#define DEBUG_MAX_MESSAGE_LENGTH 512
-
-#define MAX_BACKTRACE_SIZE 32
-#define MAX_BACKTRACE_FUNCTIONS_SEEN 128
-
-/* MB_NEXT() relies on the fact that MB_BUFFERS is a power of two */
-
-
-
-
+
-#define MB_BUFFERSIZE       DEBUG_MAX_MESSAGE_LENGTH
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-// the backlog is a similar buffer as the message buffer
-
-
-
-
+
+
-
-#define debugFatal( format, args... )                               \
@@ -155 +150 @@
-#define flushDebugOutput()      DebugModuleManager::instance()->flush()
-
-def IMPLEMENT_BACKLOG
+ DEBUG_BACKLOG_SUPPORT
-
-#define debugShowBackLog() \
@@ -249 +244 @@
-
-/*
+ * Backtrace support
+ */
+#ifdef DEBUG
+    #if DEBUG_BACKTRACE_SUPPORT
+        #define debugPrintBacktrace( _SIZE_ )                       \
+            DebugModuleManager::instance()->printBacktrace( _SIZE_ );
+    #endif
+#else
+    #define debugPrintBacktrace( _SIZE_ )
+#endif
+
+/*
- * helper functions
- */
@@ -313 +320 @@
-    void flush();
-
+#if DEBUG_BACKLOG_SUPPORT
-    // the backlog is a ringbuffer of all the messages
-    // that have been recorded using the debugPrint
@@ -321 +329 @@
-    void showBackLog();
-    void showBackLog(int nblines);
-
+
+
+
-    void printBacktrace(int len);
+#endif
+
-protected:
-    bool registerModule( DebugModule& debugModule );
@@ -330 +342 @@
-
-    void print(const char *msg);
+
+#if DEBUG_BACKLOG_SUPPORT
-    void backlog_print(const char *msg);
+#endif
-
-private:
@@ -338 +353 @@
-    typedef std::vector< DebugModule* >::iterator DebugModuleVectorIterator;
-
-    char mb_buffers[MB_BUFFERS][MB_BUFFERSIZE];
-    unsigned int mb_initialized;
+
+#if DEBUG_USE_MESSAGE_BUFFER
+    char mb_buffers[DEBUG_MB_BUFFERS][MB_BUFFERSIZE];
-    unsigned int mb_inbuffer;
-    unsigned int mb_outbuffer;
@@ -347 +364 @@
-    pthread_mutex_t mb_flush_lock;
-    pthread_cond_t mb_ready_cond;
-
+
+
+
-    pthread_mutex_t m_backtrace_lock;
-    char m_backtrace_strbuffer[MB_BUFFERSIZE];
-MAX_BACKTRACE_SIZE
-
+DEBUG_MAX_BACKTRACE_LENGTH
+DEBUG_
-    int m_backtrace_buffer_nb_seen;
-
+
+
-    static void *mb_thread_func(void *arg);
-    void mb_flush();
-
-def IMPLEMENT_BACKLOG
+ DEBUG_BACKLOG_SUPPORT
-    // the backlog
-
+DEBUG_
-    unsigned int bl_mb_inbuffer;
-    pthread_mutex_t bl_mb_write_lock;
@@ -368 +388 @@
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

trunk/libffado/src/ffado.cpp

@@ -97 +97 @@
-    struct _ffado_device *dev = new struct _ffado_device;
-
-debugWarning
+printMessage
-
-    if(!dev) {
@@ -248 +248 @@
-        return ffado_wait_ok;
-    } else if (result == DeviceManager::eWR_Xrun) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-        xruns++;
-        return ffado_wait_xrun;

trunk/libffado/src/libieee1394/ARMHandler.cpp

@@ -24 +24 @@
-#include "ARMHandler.h"
-
-VERBOSE
+NORMAL
-/**
- * @param start          identifies addressrange
@@ -68 +68 @@
-
-bool ARMHandler::handleRead(struct raw1394_arm_request *req) {
-
+ 
-    printRequest(req);
-    return true;
@@ -74 +74 @@
-
-bool ARMHandler::handleWrite(struct raw1394_arm_request *req) {
-
+ 
-    printRequest(req);
-    return true;
@@ -80 +80 @@
-
-bool ARMHandler::handleLock(struct raw1394_arm_request *req) {
-
+ 
-    printRequest(req);
-    return true;
@@ -109 +109 @@
-
-void ARMHandler::printRequest(struct raw1394_arm_request *arm_req) {
-
-
+ 
+ 
-        arm_req->source_nodeid, arm_req->destination_nodeid);
-
+ 
-        arm_req->tlabel, arm_req->tcode, arm_req->extended_transaction_code);
-
+ 
-        arm_req->generation);
-
+ 
-        arm_req->buffer_length);
-    printBufferBytes(DEBUG_LEVEL_VERBOSE, arm_req->buffer_length, arm_req->buffer);

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -421 +421 @@
-    } else {
-        #ifdef DEBUG
-
-
+
+
+
-        #endif
-        return false;

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -429 +429 @@
-        if (dropped_cycles < 0) {
-            debugWarning("(%p) dropped < 1 (%d), cycle: %d, last_cycle: %d, dropped: %d, 'skipped'=%u\n", 
-
+ 
-        }
-        if (dropped_cycles > 0) {
-
-
+
+
+
-            m_dropped += dropped_cycles;
-        }
@@ -537 +538 @@
-        #ifdef DEBUG
-        if(skipped) {
-
-
+
+
+
-        }
-        if (dropped_cycles < 0) { 
@@ -545 +547 @@
-        }
-        if (dropped_cycles > 0) {
-
-
-
+
+
+
+
-        }
-        #endif

trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

@@ -352 +352 @@
-            // this is an xrun situation
-            m_in_xrun = true;
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            m_cycle_to_switch_state = CYCLE_TIMER_GET_CYCLES(pkt_ctr) + 1; // switch in the next cycle
-            m_next_state = ePS_WaitingForStreamDisable;
@@ -391 +391 @@
-            // they represent a discontinuity in the timestamps, and hence are
-            // to be dealt with
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            m_data_buffer->setBufferTailTimestamp(substractTicks(m_last_timestamp,
-                                                                 (uint64_t)(getNominalFramesPerPacket()
@@ -439 +439 @@
-        // allow for the xrun to be picked up
-        if (result2 == eCRV_XRun) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            m_in_xrun = true;
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to data xrun\n");
@@ -497 +497 @@
-        if(m_state == ePS_Running) {
-            debugShowBackLogLines(200);
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to dropped packets xrun\n");
-            m_cycle_to_switch_state = CYCLE_TIMER_GET_CYCLES(pkt_ctr) + 1;
@@ -623 +623 @@
-            // allow for the xrun to be picked up
-            if (result2 == eCRV_XRun) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-                m_in_xrun = true;
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to data xrun\n");
@@ -661 +661 @@
-            }
-        } else if (result == eCRV_XRun) { // pick up the possible xruns
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            m_in_xrun = true;
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to header xrun\n");

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -149 +149 @@
-        if (result == ETIMEDOUT) {
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-pthread_cond
+sem
-                        this, result);
-            return eAR_Timeout;
-        } else if (result == EINTR) {
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-pthread_cond
+sem
-                        this, result);
-            return eAR_Interrupted;
-        } else {
-pthread_cond
+sem
-                        this, result);
-            debugError("(%p) timeout_sec=%d timeout_nsec=%lld ts.sec=%d ts.nsec=%lld\n", 
@@ -1002 +1002 @@
-
-        if ((*it)->xrunOccurred()) {
-
+
+
-            (*it)->dumpInfo();
-        }
-        if (!((*it)->canClientTransferFrames(m_period))) {
-
+
+
-            (*it)->dumpInfo();
-        }
@@ -1014 +1016 @@
-          ++it ) {
-        if ((*it)->xrunOccurred()) {
-
+
+
-        }
-        if (!((*it)->canClientTransferFrames(m_period))) {
-
+
+
-        }
-    }
-#endif
-
-    m_nbperiods++;
-
-    // now we can signal the client that we are (should be) ready
-    return !xrun_occurred;