mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-02 20:28:14 +02:00
Code Issues Releases Wiki Activity

* Another getting-stuck protection for the pipeline.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-05-20 03:21:28 +02:00
parent 83b7de2d0b
commit 2cf8cd8b40
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libtomahawk/pipeline.cpp
View File

@@ -270,8 +270,11 @@ Pipeline::timeoutShunt( const query_ptr& q )
m_qidsTimeout.remove( q->id() ); m_qidsTimeout.remove( q->id() );
shunt( q ); shunt( q );
} }
/* else else
qDebug() << Q_FUNC_INFO << q->toString() << "Ignoring timeout";*/ {
qDebug() << "Reached end of pipeline for:" << q->toString();
setQIDState( q, 0 );
}
} }
@@ -284,12 +287,6 @@ Pipeline::shunt( const query_ptr& q )
// qDebug() << Q_FUNC_INFO << q->solved() << q->toString() << q->id(); // qDebug() << Q_FUNC_INFO << q->solved() << q->toString() << q->id();
unsigned int lastweight = 0; unsigned int lastweight = 0;
unsigned int lasttimeout = 0; unsigned int lasttimeout = 0;
int rc;
int thisResolver = 0;
{
QMutexLocker lock( &m_mut );
rc = m_resolvers.count();
}
if ( !q->resolvingFinished() ) if ( !q->resolvingFinished() )
{ {
@@ -313,7 +310,6 @@ Pipeline::shunt( const query_ptr& q )
lasttimeout = r->timeout(); lasttimeout = r->timeout();
qDebug() << "Dispatching to resolver" << r->name() << q->toString() << q->solved() << q->id(); qDebug() << "Dispatching to resolver" << r->name() << q->toString() << q->solved() << q->id();
thisResolver = i;
r->resolve( q ); r->resolve( q );
} }
else else
@@ -330,7 +326,6 @@ Pipeline::shunt( const query_ptr& q )
} }
else else
{ {
// reached end of pipeline
qDebug() << "Reached end of pipeline for:" << q->toString(); qDebug() << "Reached end of pipeline for:" << q->toString();
setQIDState( q, 0 ); setQIDState( q, 0 );
} }
@@ -362,7 +357,7 @@ Pipeline::setQIDState( const Tomahawk::query_ptr& query, int state )
else else
{ {
// qDebug() << Q_FUNC_INFO << "removing" << query->id() << state; // qDebug() << Q_FUNC_INFO << "removing" << query->id() << state;
m_qidsState.remove( query->id() ); if ( m_qidsState.remove( query->id() ) )
qDebug() << "Queries running:" << m_qidsState.count(); qDebug() << "Queries running:" << m_qidsState.count();
} }
} }
@@ -403,7 +398,7 @@ Pipeline::decQIDState( const Tomahawk::query_ptr& query )
else else
{ {
// qDebug() << Q_FUNC_INFO << "removing" << query->id() << state; // qDebug() << Q_FUNC_INFO << "removing" << query->id() << state;
m_qidsState.remove( query->id() ); if ( m_qidsState.remove( query->id() ) )
qDebug() << "Queries running:" << m_qidsState.count(); qDebug() << "Queries running:" << m_qidsState.count();
} }