Skip to content
Snippets Groups Projects
Commit e82d616f authored by git_yyx's avatar git_yyx
Browse files

fix acceptable

parent f555aed0
Branches v0.2.8_fix
No related merge requests found
......@@ -23,11 +23,6 @@ m_processPatience(5)
HOECProcessor::~HOECProcessor()
{
LogInfo<<"*************************The input l1id*********"<<std::endl;
for(auto num : m_l1idOrder){
LogInfo<<num<<" "<<std::endl;
}
m_mainThread->detach();
m_workerThread->detach();
......@@ -92,7 +87,7 @@ void HOECProcessor::mainThreadFunc(){
oec::OECRecEvt* _firstEvt = ((oec::OECRecEvt*)(*evtsPtr->begin()));
assert(_firstEvt->marker == 0x12345678);
LogInfo<<"*************************The l1id is "<<_firstEvt->l1id<<"**************"<<std::endl;
m_l1idOrder.push_back(_firstEvt->l1id);
m_newestTime = _firstEvt->sec;
m_fragmentPool.insertFrag(evtsPtr, _firstEvt->l1id, _firstEvt->sec, _firstEvt->nanoSec);
m_processPointer.locate = _firstEvt->l1id % m_processPointer.arrayLen;//初始化m_processPointer
......@@ -119,7 +114,7 @@ void HOECProcessor::mainThreadFunc(){
assert(_firstEvt->marker == 0x12345678);
LogInfo<<"*******************Mian thread insert one TF, TFid is "<<_firstEvt->l1id<<"**************"<<std::endl;
m_l1idOrder.push_back(_firstEvt->l1id);
m_fragmentPool.insertFrag(evtsPtr, _firstEvt->l1id, _firstEvt->sec, _firstEvt->nanoSec);
m_newestTime = std::max(m_newestTime, _firstEvt->sec);
......@@ -253,8 +248,9 @@ bool HOECProcessor::isAcceptable(oec::OECRecEvt* evt){
return false;
}
else{
if(locate >= rightBound || locate <= leftBound) return false;
return true;
if(locate > leftBound || locate <rightBound) return true;
LogFatal<<"leftBound: "<<leftBound<<" rightBound: "<<rightBound<<std::endl;
return false;
}
}
......
......@@ -27,7 +27,6 @@ public:
bool virtual put(const oec::EvsInTimeFragment&, oec::TimeoutInMs = 1000) override;
bool virtual get(oec::EvsInTimeFragment&, oec::TimeoutInMs = 1000) override;
std::vector<uint32_t> m_l1idOrder;//对功能无用,debug专用
private://成员变量的初始化顺序,依照此顺序
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment