147 files changed, 55964 insertions, 55946 deletions
diff --git a/tvapi/libtv/tvutils/CMsgQueue.cpp b/tvapi/libtv/tvutils/CMsgQueue.cpp index 16da460..09627b5 100644 --- a/tvapi/libtv/tvutils/CMsgQueue.cpp +++ b/tvapi/libtv/tvutils/CMsgQueue.cpp @@ -3,8 +3,8 @@ #include <utils/Timers.h> CMessage::CMessage() { - mDelayMs = 0; - mWhenMs = 0; + mDelayMs = 0; + mWhenMs = 0; } CMessage::~CMessage() @@ -19,98 +19,98 @@ CMsgQueueThread::CMsgQueueThread() CMsgQueueThread::~CMsgQueueThread() { - //请求退出处理线程,并阻塞 - requestExitAndWait(); + //请求退出处理线程,并阻塞 + requestExitAndWait(); } nsecs_t CMsgQueueThread::getNowMs() { - return systemTime(SYSTEM_TIME_MONOTONIC) / 1000000; + return systemTime(SYSTEM_TIME_MONOTONIC) / 1000000; } void CMsgQueueThread::sendMsg(CMessage &msg) { - CMutex::Autolock _l(mLockQueue); - msg.mWhenMs = getNowMs() + msg.mDelayMs;// + CMutex::Autolock _l(mLockQueue); + msg.mWhenMs = getNowMs() + msg.mDelayMs;// - int i = 0; - while (i < m_v_msg.size() && m_v_msg[i].mWhenMs <= msg.mWhenMs) i++; //find the index that will insert(i) - m_v_msg.insertAt(msg, i);//insert at index i - CMessage msg1 = m_v_msg[0]; - LOGD("sendmsg now2 = %lld i = %d", getNowMs(), i); - LOGD("sendmsg now3 = %lld msg1 when = %lld", getNowMs(), msg1.mWhenMs); - // - //if(i == 0)// is empty or new whenMS is at index 0, low all ms in list. so ,need to wakeup loop, to get new delay time. - mGetMsgCondition.signal(); + int i = 0; + while(i < m_v_msg.size() && m_v_msg[i].mWhenMs <= msg.mWhenMs) i++;//find the index that will insert(i) + m_v_msg.insertAt(msg, i);//insert at index i + CMessage msg1 = m_v_msg[0]; + LOGD("sendmsg now2 = %lld i = %d", getNowMs(), i); + LOGD("sendmsg now3 = %lld msg1 when = %lld", getNowMs(), msg1.mWhenMs); + // + //if(i == 0)// is empty or new whenMS is at index 0, low all ms in list. so ,need to wakeup loop, to get new delay time. + mGetMsgCondition.signal(); } //有个缺陷，只能根据消息类型移除，同类型消息会全部移除,但足够用了 void CMsgQueueThread::removeMsg(CMessage &msg) { - CMutex::Autolock _l(mLockQueue); - int beforeSize = m_v_msg.size(); - for (int i = 0; i < m_v_msg.size(); i++) { - const CMessage &_msg = m_v_msg.itemAt(i); - if (_msg.mType == msg.mType) { - m_v_msg.removeAt(i); - } - } - //some msg removeed - if (beforeSize > m_v_msg.size()) - mGetMsgCondition.signal(); + CMutex::Autolock _l(mLockQueue); + int beforeSize = m_v_msg.size(); + for (int i = 0; i < m_v_msg.size(); i++) { + const CMessage &_msg = m_v_msg.itemAt(i); + if (_msg.mType == msg.mType) { + m_v_msg.removeAt(i); + } + } + //some msg removeed + if(beforeSize > m_v_msg.size()) + mGetMsgCondition.signal(); } int CMsgQueueThread::startMsgQueue() { - CMutex::Autolock _l(mLockQueue); - this->run(); - return 0; + CMutex::Autolock _l(mLockQueue); + this->run(); + return 0; } bool CMsgQueueThread::threadLoop() { - int sleeptime = 100;//ms + int sleeptime = 100;//ms - while (!exitPending()) { //requietexit() or requietexitWait() not call - mLockQueue.lock(); - while (m_v_msg.size() == 0) { //msg queue is empty - mGetMsgCondition.wait(mLockQueue);//first unlock,when return,lock again,so need,call unlock - } - mLockQueue.unlock(); - //get delay time - CMessage msg; - nsecs_t delayMs = 0, nowMS = 0; - do { //wait ,until , the lowest time msg's whentime is low nowtime, to go on - if (m_v_msg.size() <= 0) { - LOGD("msg size is 0, break"); - break; - } - mLockQueue.lock();//get msg ,first lock. - msg = m_v_msg[0];//get first - mLockQueue.unlock(); + while(!exitPending()) { //requietexit() or requietexitWait() not call + mLockQueue.lock(); + while(m_v_msg.size() == 0) { //msg queue is empty + mGetMsgCondition.wait(mLockQueue);//first unlock,when return,lock again,so need,call unlock + } + mLockQueue.unlock(); + //get delay time + CMessage msg; + nsecs_t delayMs = 0, nowMS = 0; + do { //wait ,until , the lowest time msg's whentime is low nowtime, to go on + if(m_v_msg.size() <= 0) { + LOGD("msg size is 0, break"); + break; + } + mLockQueue.lock();//get msg ,first lock. + msg = m_v_msg[0];//get first + mLockQueue.unlock(); - delayMs = msg.mWhenMs - getNowMs(); - LOGD("threadLoop now = %lld mswhen = %lld delayMs = %lld msg type = %d", getNowMs(), msg.mWhenMs, delayMs, msg.mType); - if (delayMs > 0) { - mLockQueue.lock();//get msg ,first lock. - int ret = mGetMsgCondition.waitRelative(mLockQueue, delayMs); - mLockQueue.unlock(); - LOGD("msg queue wait ret = %d", ret); - } else { - break; - } - } while (true); //msg[0], timeout + delayMs = msg.mWhenMs - getNowMs(); + LOGD("threadLoop now = %lld mswhen = %lld delayMs = %lld msg type = %d", getNowMs(), msg.mWhenMs, delayMs, msg.mType); + if(delayMs > 0) { + mLockQueue.lock();//get msg ,first lock. + int ret = mGetMsgCondition.waitRelative(mLockQueue, delayMs); + mLockQueue.unlock(); + LOGD("msg queue wait ret = %d", ret); + } else { + break; + } + } while(true); //msg[0], timeout - if (m_v_msg.size() > 0) { - mLockQueue.lock();// - msg = m_v_msg[0]; - m_v_msg.removeAt(0); - mLockQueue.unlock();// - //handle it - handleMessage(msg); - } + if(m_v_msg.size() > 0) { + mLockQueue.lock();// + msg = m_v_msg[0]; + m_v_msg.removeAt(0); + mLockQueue.unlock();// + //handle it + handleMessage(msg); + } - //usleep(sleeptime * 1000); - } - //exit - //return true, run again, return false,not run. - return false; + //usleep(sleeptime * 1000); + } + //exit + //return true, run again, return false,not run. + return false; } |