Changeset 377

Timestamp:

01/20/07 11:03:10 (16 years ago)

Author:

wagi

Message:

libfreebobavc: output reformated so it looks nice again (debugmodule used instead of
plain printfs)
debugmodule: use stdout instead of sterr.
DebugModuleManager?: print register and unregister only in higher debug levels

Files:

• trunk/libfreebob/src/debugmodule/debugmodule.cpp (modified) (8 diffs)
• trunk/libfreebob/src/libfreebobavc/avc_generic.cpp (modified) (5 diffs)
• trunk/libfreebob/src/libfreebobavc/ieee1394service.cpp (modified) (5 diffs)

trunk/libfreebob/src/debugmodule/debugmodule.cpp

@@ -54 +54 @@
-DebugModule::~DebugModule()
-{
-
-
-
-
+
+
+
+
+
+
-    if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
-        cerr << "Could not unregister DebugModule at DebugModuleManager"
-             << endl;
-    }
-
+
-}
-
@@ -79 +81 @@
-
-    DebugModuleManager::instance()->va_print( format, arg );
-
+
-    va_end( arg );
-}
@@ -175 +177 @@
-        if (mb_initialized)
-                return true;
-
-
+
+
+
-
-        pthread_mutex_init(&mb_write_lock, NULL);
@@ -255 +258 @@
-        /* called WITHOUT the mb_write_lock */
-        while (mb_outbuffer != mb_inbuffer) {
-err
+out
-                mb_outbuffer = MB_NEXT(mb_outbuffer);
-        }
@@ -265 +268 @@
-
-    DebugModuleManager *m=static_cast<DebugModuleManager *>(arg);
-
+
-        /* The mutex is only to eliminate collisions between multiple
-         * writer threads and protect the condition variable. */
@@ -272 +275 @@
-        while (m->mb_initialized) {
-                pthread_cond_wait(&m->mb_ready_cond, &m->mb_write_lock);
-
+
-                /* releasing the mutex reduces contention */
-                pthread_mutex_unlock(&m->mb_write_lock);
@@ -284 +287 @@
-}
-
- 
+
-DebugModuleManager::print(const char *fmt, ...)
-{
@@ -315 +318 @@
-
-
- 
+
-DebugModuleManager::va_print (const char *fmt, va_list ap)
-{
-        char msg[MB_BUFFERSIZE];
-
+
-        /* format the message first, to reduce lock contention */
-        vsnprintf(msg, MB_BUFFERSIZE, fmt, ap);

trunk/libfreebob/src/libfreebobavc/avc_generic.cpp

@@ -174 +174 @@
-
-    if (getDebugLevel() >= DEBUG_LEVEL_VERY_VERBOSE) {
-
-( DEBUG_LEVEL_VERY_VERBOSE,  "  Request:
+Short
+Short( DEBUG_LEVEL_VERY_VERBOSE,  "  Request:\n
-        showFcpFrame( m_fcpFrame, fcpFrameSize );
-
@@ -181 +181 @@
-        serialize( se_dbg );
-
-
+\n
-                         se_dbg.getString().c_str());
-    }
@@ -206 +206 @@
-            result = deserialize( de );
-
-( DEBUG_LEVEL_VERY_VERBOSE,"  Response:
+Short( DEBUG_LEVEL_VERY_VERBOSE,"  Response:\n
-            showFcpFrame( buf, de.getNrOfConsumedBytes() );
-
@@ -212 +212 @@
-            serialize( se_dbg );
-
-
+\n
-                             se_dbg.getString().c_str());
-        }
@@ -218 +218 @@
-        default:
-            debugWarning( "unexpected response received (0x%x)\n", m_eResponse );
-( DEBUG_LEVEL_VERY_VERBOSE,"  Response:
+Short( DEBUG_LEVEL_VERY_VERBOSE,"  Response:\n
-
-            BufferDeserialize de( buf, resp_len );

trunk/libfreebob/src/libfreebobavc/ieee1394service.cpp

@@ -1 @@
-tempat
-
+ieee1394servic
+,07
- *
- * This file is part of FreeBoB.
@@ -111 +111 @@
-            "read: node 0x%X, addr = 0x%016X, length = %d\n",
-            nodeId, addr, length);
-        
+
-        #endif
-
@@ -190 +190 @@
-
-    #ifdef DEBUG
-(DEBUG_LEVEL_VERY_VERBOSE, "
+Short(DEBUG_LEVEL_VERY_VERBOSE, "  
-    printBuffer( len, buf );
-    #endif
@@ -203 +203 @@
-
-    #ifdef DEBUG
-(DEBUG_LEVEL_VERY_VERBOSE, "
+Short(DEBUG_LEVEL_VERY_VERBOSE, "  
-    printBuffer( *resp_len, result );
-    #endif
@@ -244 +244 @@
-                debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE,"\n");
-            }
-
+ 
-        }
-        debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE,"%08X ",buffer[i]);