Changeset 698

Timestamp:

11/04/07 03:19:01 (16 years ago)

Author:

ppalmers

Message:

- make backlog a compile time option
- do some performance optimization on the debugging code

Files:

• trunk/libffado/src/debugmodule/debugmodule.cpp (modified) (11 diffs)
• trunk/libffado/src/debugmodule/debugmodule.h (modified) (4 diffs)

trunk/libffado/src/debugmodule/debugmodule.cpp

@@ -84 +84 @@
-                         ... ) const
-{
+
+    // bypass for performance
+#ifdef IMPLEMENT_BACKLOG
+    if (level > BACKLOG_MIN_LEVEL 
+        && level > m_level) {
+        return;
+    }
+#else
+    if ( level >m_level ) {
+        return;
+    }
+#endif
+
-    const char *warning = "WARNING: message truncated!\n";
-    const int warning_size = 32;
@@ -105 +118 @@
-    }
-
+#ifdef IMPLEMENT_BACKLOG
-    // print to backlog if necessary
-    if (level <= BACKLOG_MIN_LEVEL) {
-        DebugModuleManager::instance()->backlog_print( msg );
-    }
+#endif
-
-    // print to stderr if necessary
@@ -124 +139 @@
-                    ... ) const
-{
+    // bypass for performance
+#ifdef IMPLEMENT_BACKLOG
+    if (level > BACKLOG_MIN_LEVEL 
+        && level > m_level) {
+        return;
+    }
+#else
+    if ( level >m_level ) {
+        return;
+    }
+#endif
+
-    const char *warning = "WARNING: message truncated!\n";
-    const int warning_size = 32;
@@ -170 +197 @@
-    }
-
+#ifdef IMPLEMENT_BACKLOG
-    // print to backlog if necessary
-    if (level <= BACKLOG_MIN_LEVEL) {
-        DebugModuleManager::instance()->backlog_print( msg );
-    }
+#endif
-
-    // print to stderr if necessary
@@ -208 +237 @@
-    , mb_outbuffer(0)
-    , mb_overruns(0)
+#ifdef IMPLEMENT_BACKLOG
-    , bl_mb_inbuffer(0)
+#endif
-{
-
@@ -245 +276 @@
-    pthread_cond_destroy(&mb_ready_cond);
-
+#ifdef IMPLEMENT_BACKLOG
+    pthread_mutex_destroy(&bl_mb_write_lock);
+#endif
+
-}
-
@@ -263 +298 @@
-    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)
@@ -377 +414 @@
-}
-
+#ifdef IMPLEMENT_BACKLOG
-void
-DebugModuleManager::showBackLog()
@@ -400 +438 @@
-}
-
+void
+DebugModuleManager::showBackLog(int nblines)
+{
+     DebugModuleManager *m=DebugModuleManager::instance();
+    // locking the flush lock ensures that the backlog is
+    // printed as one entity
+    pthread_mutex_lock(&m->mb_flush_lock);
+    fprintf(stderr, "=====================================================\n");
+    fprintf(stderr, "* BEGIN OF BACKLOG PRINT\n");
+    fprintf(stderr, "=====================================================\n");
+
+    int lines_to_skip = BACKLOG_MB_BUFFERS - nblines;
+    if (lines_to_skip < 0) lines_to_skip = 0;
+    for (unsigned int i=0; i<BACKLOG_MB_BUFFERS;i++) {
+        if (lines_to_skip-- < 0) {
+            unsigned int idx=(i+bl_mb_inbuffer)%BACKLOG_MB_BUFFERS;
+            fputs(bl_mb_buffers[idx], stderr);
+        }
+    }
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "=====================================================\n");
+    fprintf(stderr, "* END OF BACKLOG PRINT\n");
+    fprintf(stderr, "=====================================================\n");
+    pthread_mutex_unlock(&m->mb_flush_lock);
+}
+#endif
+
-void *
-DebugModuleManager::mb_thread_func(void *arg)
@@ -424 +490 @@
-}
-
+#ifdef IMPLEMENT_BACKLOG
-void
-DebugModuleManager::backlog_print(const char *msg)
@@ -444 +511 @@
-    // just bail out should it have failed
-}
+#endif
-
-void

trunk/libffado/src/debugmodule/debugmodule.h

@@ -52 +52 @@
-#define MB_BUFFERSIZE       DEBUG_MAX_MESSAGE_LENGTH
-
+// #define IMPLEMENT_BACKLOG
+#ifdef IMPLEMENT_BACKLOG
-// the backlog is a similar buffer as the message buffer
-#define BACKLOG_MB_BUFFERS      (256)
-#define BACKLOG_MB_NEXT(index)  (((index)+1) & (BACKLOG_MB_BUFFERS-1))
-Y_VER
-
+
+
-
-#define debugFatal( format, args... )                               \
@@ -119 +121 @@
-
-#define flushDebugOutput()      DebugModuleManager::instance()->flush()
-
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef DEBUG
@@ -229 +241 @@
-    // much output in normal operation
-    void showBackLog();
+    void showBackLog(int nblines);
-
-protected:
@@ -258 +271 @@
-    void mb_flush();
-
+#ifdef IMPLEMENT_BACKLOG
-    // the backlog
-    char bl_mb_buffers[BACKLOG_MB_BUFFERS][MB_BUFFERSIZE];
-    unsigned int bl_mb_inbuffer;
-    pthread_mutex_t bl_mb_write_lock;
+#endif
-
-    static DebugModuleManager* m_instance;