Show
Ignore:
Timestamp:
04/26/08 09:42:39 (16 years ago)
Author:
ppalmers
Message:

debug message cleanup. move #defines into config.h.in.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

    r1036 r1046  
    352352            // this is an xrun situation 
    353353            m_in_xrun = true; 
    354             debugWarning("Should update state to WaitingForStreamDisable due to dropped packet xrun\n"); 
     354            debugOutput(DEBUG_LEVEL_NORMAL, "Should update state to WaitingForStreamDisable due to dropped packet xrun\n"); 
    355355            m_cycle_to_switch_state = CYCLE_TIMER_GET_CYCLES(pkt_ctr) + 1; // switch in the next cycle 
    356356            m_next_state = ePS_WaitingForStreamDisable; 
     
    391391            // they represent a discontinuity in the timestamps, and hence are 
    392392            // to be dealt with 
    393             debugWarning("(%p) Correcting timestamp for dropped cycles, discarding packet...\n", this); 
     393            debugOutput(DEBUG_LEVEL_NORMAL, "(%p) Correcting timestamp for dropped cycles, discarding packet...\n", this); 
    394394            m_data_buffer->setBufferTailTimestamp(substractTicks(m_last_timestamp, 
    395395                                                                 (uint64_t)(getNominalFramesPerPacket() 
     
    439439        // allow for the xrun to be picked up 
    440440        if (result2 == eCRV_XRun) { 
    441             debugWarning("processPacketData xrun\n"); 
     441            debugOutput(DEBUG_LEVEL_NORMAL, "processPacketData xrun\n"); 
    442442            m_in_xrun = true; 
    443443            debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to data xrun\n"); 
     
    497497        if(m_state == ePS_Running) { 
    498498            debugShowBackLogLines(200); 
    499             debugWarning("dropped packets xrun\n"); 
     499            debugOutput(DEBUG_LEVEL_NORMAL, "dropped packets xrun\n"); 
    500500            debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to dropped packets xrun\n"); 
    501501            m_cycle_to_switch_state = CYCLE_TIMER_GET_CYCLES(pkt_ctr) + 1; 
     
    623623            // allow for the xrun to be picked up 
    624624            if (result2 == eCRV_XRun) { 
    625                 debugWarning("generatePacketData xrun\n"); 
     625                debugOutput(DEBUG_LEVEL_NORMAL, "generatePacketData xrun\n"); 
    626626                m_in_xrun = true; 
    627627                debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to data xrun\n"); 
     
    661661            } 
    662662        } else if (result == eCRV_XRun) { // pick up the possible xruns 
    663             debugWarning("generatePacketHeader xrun\n"); 
     663            debugOutput(DEBUG_LEVEL_NORMAL, "generatePacketHeader xrun\n"); 
    664664            m_in_xrun = true; 
    665665            debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to header xrun\n"); 
  • trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

    r1045 r1046  
    149149        if (result == ETIMEDOUT) { 
    150150            debugOutput(DEBUG_LEVEL_VERBOSE, 
    151                         "(%p) pthread_cond_timedwait() timed out (result=%d)\n", 
     151                        "(%p) sem_timedwait() timed out (result=%d)\n", 
    152152                        this, result); 
    153153            return eAR_Timeout; 
    154154        } else if (result == EINTR) { 
    155155            debugOutput(DEBUG_LEVEL_VERBOSE, 
    156                         "(%p) pthread_cond_[timed]wait() interrupted by signal (result=%d)\n", 
     156                        "(%p) sem_[timed]wait() interrupted by signal (result=%d)\n", 
    157157                        this, result); 
    158158            return eAR_Interrupted; 
    159159        } else { 
    160             debugError("(%p) pthread_cond_[timed]wait error (result=%d)\n",  
     160            debugError("(%p) sem_[timed]wait error (result=%d)\n",  
    161161                        this, result); 
    162162            debugError("(%p) timeout_sec=%d timeout_nsec=%lld ts.sec=%d ts.nsec=%lld\n",  
     
    10021002 
    10031003        if ((*it)->xrunOccurred()) { 
    1004             debugWarning("Xrun on RECV SP %p due to ISO side xrun\n",*it); 
     1004            debugOutput(DEBUG_LEVEL_NORMAL, 
     1005                        "Xrun on RECV SP %p due to ISO side xrun\n", *it); 
    10051006            (*it)->dumpInfo(); 
    10061007        } 
    10071008        if (!((*it)->canClientTransferFrames(m_period))) { 
    1008             debugWarning("Xrun on RECV SP %p due to buffer side xrun\n",*it); 
     1009            debugOutput(DEBUG_LEVEL_NORMAL, 
     1010                        "Xrun on RECV SP %p due to buffer side xrun\n", *it); 
    10091011            (*it)->dumpInfo(); 
    10101012        } 
     
    10141016          ++it ) { 
    10151017        if ((*it)->xrunOccurred()) { 
    1016             debugWarning("Xrun on XMIT SP %p due to ISO side xrun\n",*it); 
     1018            debugOutput(DEBUG_LEVEL_NORMAL, 
     1019                        "Xrun on XMIT SP %p due to ISO side xrun\n", *it); 
    10171020        } 
    10181021        if (!((*it)->canClientTransferFrames(m_period))) { 
    1019             debugWarning("Xrun on XMIT SP %p due to buffer side xrun\n",*it); 
     1022            debugOutput(DEBUG_LEVEL_NORMAL, 
     1023                        "Xrun on XMIT SP %p due to buffer side xrun\n", *it); 
    10201024        } 
    10211025    } 
    10221026#endif 
    1023  
    10241027    m_nbperiods++; 
    1025  
    10261028    // now we can signal the client that we are (should be) ready 
    10271029    return !xrun_occurred;