Changeset 1859

Show
Ignore:
Timestamp:
06/19/10 11:34:16 (10 years ago)
Author:
arnonym
Message:

Result of several days of searching a bug (that turned out to be a pebkac): some modifications of the debug-strings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

    r1849 r1859  
    16291629    #ifdef DEBUG 
    16301630    if(m_last_cycle == -1) { 
    1631         debugOutput(DEBUG_LEVEL_VERBOSE, "Handler for %s SP %p is alive (cycle = %d)\n", getTypeString(), this, cycle); 
     1631        debugOutput(DEBUG_LEVEL_VERBOSE, "Handler for %s SP %p is alive. cycle=%d state=%i\n", getTypeString(), this, cycle, m_State); 
    16321632    } 
    16331633    #endif 
     
    18271827{ 
    18281828    if (m_State == eHS_Running) { 
    1829         debugError("Enable requested on enabled stream\n"); 
     1829        debugError("Enable requested on enabled stream '%s'\n", getTypeString()); 
    18301830        return false; 
    18311831    } 
    18321832    if (m_State != eHS_Stopped) { 
    1833         debugError("Enable requested on stream with state: %d\n", m_State); 
     1833        debugError("Enable requested on stream '%s' with state: %d\n", getTypeString(), m_State); 
    18341834        return false; 
    18351835    } 
  • trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

    r1765 r1859  
    780780    // note that only the wait state changes are synchronized with the cycles 
    781781    if(m_state != m_next_state) { 
    782         debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state from %s to %s\n", 
    783                                         ePSToString(m_state), ePSToString(m_next_state)); 
     782        debugOutput(DEBUG_LEVEL_VERBOSE, "Should update '%s' state from %s to %s\n", 
     783                                        getTypeString(), ePSToString(m_state), ePSToString(m_next_state)); 
    784784        // execute the requested change 
    785785        if (!updateState()) { // we are allowed to change the state directly 
  • trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

    r1763 r1859  
    397397{ 
    398398    debugOutput( DEBUG_LEVEL_VERBOSE, "Putting StreamProcessor streams into dry-running state...\n"); 
    399     debugOutput( DEBUG_LEVEL_VERBOSE, " Schedule start dry-running...\n"); 
    400399    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin(); 
    401400            it != m_TransmitProcessors.end(); 
     
    407406        if (!(*it)->isDryRunning()) { 
    408407            if(!(*it)->scheduleStartDryRunning(-1)) { 
    409                 debugError("Could not put SP %p into the dry-running state\n", *it); 
     408                debugError("Could not put '%s' SP %p into the dry-running state\n", (*it)->getTypeString(), *it); 
    410409                return false; 
    411410            } 
     
    423422        if (!(*it)->isDryRunning()) { 
    424423            if(!(*it)->scheduleStartDryRunning(-1)) { 
    425                 debugError("Could not put SP %p into the dry-running state\n", *it); 
     424                debugError("Could not put '%s' SP %p into the dry-running state\n", (*it)->getTypeString(), *it); 
    426425                return false; 
    427426            }