Changeset 839

Show
Ignore:
Timestamp:
01/13/08 07:21:29 (16 years ago)
Author:
ppalmers
Message:

fix shutdown segfault

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/libstreaming/generic/PortManager.cpp

    r833 r839  
    4747        debugOutput( DEBUG_LEVEL_VERBOSE, "deleting port %s at %p\n", (*it)->getName().c_str(), *it); 
    4848        flushDebugOutput(); 
    49         delete *it; //FIXME 
     49        delete *it; 
    5050    } 
    5151} 

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

    r833 r839  
    910910StreamProcessor::waitForSignal() 
    911911{ 
    912     debugOutput(DEBUG_LEVEL_VERBOSE, "(%p, %s) wait ...\n", this, getTypeString()); 
     912    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "(%p, %s) wait ...\n", this, getTypeString()); 
    913913    int result; 
    914914    if(m_state == ePS_Running && m_next_state == ePS_Running) { 

  • trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

    r833 r839  
    580580    } 
    581581    if(cnt==0) { 
    582         debugOutput(DEBUG_LEVEL_VERBOSE, " Timeout waiting for the SP's to start dry-running\n"); 
     582        debugWarning(" Timeout waiting for the SP's to start dry-running\n"); 
    583583        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin(); 
    584584            it != m_ReceiveProcessors.end(); 
    …… 
    611611        } 
    612612    } 
    613     // wait for the SP's to get into the running state 
    614     cnt = 200; 
     613    // wait for the SP's to get into the stopped state 
     614    cnt = 2000; 
    615615    ready = false; 
    616616    while (!ready && cnt) { 
    …… 
    630630    } 
    631631    if(cnt==0) { 
    632         debugOutput(DEBUG_LEVEL_VERBOSE, " Timeout waiting for the SP's to stop\n"); 
     632        debugWarning(" Timeout waiting for the SP's to stop\n"); 
     633        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin(); 
     634            it != m_ReceiveProcessors.end(); 
     635            ++it ) { 
     636            (*it)->dumpInfo(); 
     637        } 
     638        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin(); 
     639            it != m_TransmitProcessors.end(); 
     640            ++it ) { 
     641            (*it)->dumpInfo(); 
     642        } 
    633643        return false; 
    634644    }