From: <tr...@ff...> - 2008-03-26 21:40:13
|
Author: ppalmers Date: 2008-03-26 14:33:31 -0700 (Wed, 26 Mar 2008) New Revision: 982 Modified: trunk/libffado/src/libieee1394/CycleTimerHelper.cpp trunk/libffado/src/libieee1394/ieee1394service.cpp Log: small extra debug info Modified: trunk/libffado/src/libieee1394/CycleTimerHelper.cpp =================================================================== --- trunk/libffado/src/libieee1394/CycleTimerHelper.cpp 2008-03-24 23:00:49 UTC (rev 981) +++ trunk/libffado/src/libieee1394/CycleTimerHelper.cpp 2008-03-26 21:33:31 UTC (rev 982) @@ -155,7 +155,7 @@ bool CycleTimerHelper::initValues() { - debugOutput( DEBUG_LEVEL_VERBOSE, "Init values...\n" ); + debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) Init values...\n", this ); pthread_mutex_lock(&mb_update_lock); // initialize the 'prev ctr' values uint64_t local_time; @@ -302,7 +302,7 @@ m_next_time_usecs = m_current_time_usecs + m_usecs_per_update; m_current_time_ticks = CYCLE_TIMER_TO_TICKS( cycle_timer ); m_next_time_ticks = addTicks( (uint64_t)m_current_time_ticks, (uint64_t)m_dll_e2); - debugOutput(DEBUG_LEVEL_VERBOSE, " First run\n"); + debugOutput(DEBUG_LEVEL_VERBOSE, " (%p) First run\n", this); debugOutput(DEBUG_LEVEL_VERBOSE, " usecs/update: %lu, ticks/update: %lu, m_dll_e2: %f\n", m_usecs_per_update, m_ticks_per_update, m_dll_e2); @@ -379,8 +379,8 @@ // check for unrealistic CTR reads (NEC controller does that sometimes) if(diff_ticks < -((double)TICKS_PER_HALFCYCLE)) { debugOutput(DEBUG_LEVEL_VERBOSE, - "have to retry CTR read, diff unrealistic: diff: %f, max: %f\n", - diff_ticks, -((double)TICKS_PER_HALFCYCLE)); + "(%p) have to retry CTR read, diff unrealistic: diff: %f, max: %f\n", + this, diff_ticks, -((double)TICKS_PER_HALFCYCLE)); } } while( diff_ticks < -((double)TICKS_PER_HALFCYCLE) Modified: trunk/libffado/src/libieee1394/ieee1394service.cpp =================================================================== --- trunk/libffado/src/libieee1394/ieee1394service.cpp 2008-03-24 23:00:49 UTC (rev 981) +++ trunk/libffado/src/libieee1394/ieee1394service.cpp 2008-03-26 21:33:31 UTC (rev 982) @@ -1122,6 +1122,8 @@ debugOutput( DEBUG_LEVEL_VERBOSE, "Port: %d\n", getPort() ); debugOutput( DEBUG_LEVEL_VERBOSE, " Name: %s\n", getPortName().c_str() ); + debugOutput( DEBUG_LEVEL_VERBOSE, " CycleTimerHelper: %p, IsoManager: %p, WatchDog: %p\n", + m_pCTRHelper, m_pIsoManager, m_pWatchdog ); debugOutput( DEBUG_LEVEL_VERBOSE, " Time: %011llu (%03us %04ucy %04uticks)\n", ctr, (unsigned int)TICKS_TO_SECS( ctr ), |