Commit 09de5428 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Rename CPUAffinity class names: System -> Global, Proc -> System

parent c4406a65
......@@ -100,16 +100,16 @@ bool operator !=(const CPUAffinity& a, const CPUAffinity& b)
}
class ProcCPUAffinityMgr
class SystemCPUAffinityMgr
{
DEB_CLASS_NAMESPC(DebModCamera, "ProcCPUAffinityMgr", "SlsDetector");
DEB_CLASS_NAMESPC(DebModCamera, "SystemCPUAffinityMgr", "SlsDetector");
public:
enum Filter {
All, MatchAffinity, NoMatchAffinity, ThisProc=0x10,
};
ProcCPUAffinityMgr();
~ProcCPUAffinityMgr();
SystemCPUAffinityMgr();
~SystemCPUAffinityMgr();
static ProcList getProcList(Filter filter = All,
CPUAffinity cpu_affinity = 0);
......@@ -122,7 +122,7 @@ class ProcCPUAffinityMgr
class WatchDog
{
DEB_CLASS_NAMESPC(DebModCamera, "WatchDog",
"SlsDetector::ProcCPUAffinityMgr");
"SlsDetector::SystemCPUAffinityMgr");
public:
WatchDog();
~WatchDog();
......@@ -213,26 +213,26 @@ bool operator !=(const NetDevGroupCPUAffinity& a,
typedef std::vector<NetDevGroupCPUAffinity> NetDevGroupCPUAffinityList;
struct SystemCPUAffinity {
struct GlobalCPUAffinity {
RecvCPUAffinity recv;
CPUAffinity lima;
CPUAffinity other;
NetDevGroupCPUAffinityList netdev;
};
typedef std::map<PixelDepth, SystemCPUAffinity> PixelDepthCPUAffinityMap;
typedef std::map<PixelDepth, GlobalCPUAffinity> PixelDepthCPUAffinityMap;
class SystemCPUAffinityMgr
class GlobalCPUAffinityMgr
{
DEB_CLASS_NAMESPC(DebModCamera, "SystemCPUAffinityMgr",
DEB_CLASS_NAMESPC(DebModCamera, "GlobalCPUAffinityMgr",
"SlsDetector");
public:
class ProcessingFinishedEvent
{
DEB_CLASS_NAMESPC(DebModCamera, "ProcessingFinishedEvent",
"SlsDetector::SystemCPUAffinityMgr");
"SlsDetector::GlobalCPUAffinityMgr");
public:
ProcessingFinishedEvent(SystemCPUAffinityMgr *mgr);
ProcessingFinishedEvent(GlobalCPUAffinityMgr *mgr);
~ProcessingFinishedEvent();
void processingFinished();
......@@ -240,7 +240,7 @@ class SystemCPUAffinityMgr
void registerStatusCallback(CtControl *ct_control);
private:
friend class SystemCPUAffinityMgr;
friend class GlobalCPUAffinityMgr;
class ImageStatusCallback :
public CtControl::ImageStatusCallback
......@@ -267,7 +267,7 @@ class SystemCPUAffinityMgr
void imageStatusChanged(const CtControl::ImageStatus& status);
SystemCPUAffinityMgr *m_mgr;
GlobalCPUAffinityMgr *m_mgr;
ImageStatusCallback m_cb;
CtControl *m_ct;
int m_nb_frames;
......@@ -277,10 +277,10 @@ class SystemCPUAffinityMgr
Timestamp m_last_cb_ts;
};
SystemCPUAffinityMgr(Camera *cam = NULL);
~SystemCPUAffinityMgr();
GlobalCPUAffinityMgr(Camera *cam = NULL);
~GlobalCPUAffinityMgr();
void applyAndSet(const SystemCPUAffinity& o);
void applyAndSet(const GlobalCPUAffinity& o);
void updateRecvRestart();
ProcessingFinishedEvent *getProcessingFinishedEvent();
......@@ -308,9 +308,9 @@ class SystemCPUAffinityMgr
Camera *m_cam;
ProcList m_lima_tids;
SystemCPUAffinity m_curr;
SystemCPUAffinity m_set;
AutoPtr<ProcCPUAffinityMgr> m_proc_mgr;
GlobalCPUAffinity m_curr;
GlobalCPUAffinity m_set;
AutoPtr<SystemCPUAffinityMgr> m_system_mgr;
Cond m_cond;
State m_state;
ProcessingFinishedEvent *m_proc_finished;
......@@ -319,7 +319,7 @@ class SystemCPUAffinityMgr
std::ostream& operator <<(std::ostream& os, const CPUAffinity& a);
std::ostream& operator <<(std::ostream& os, const RecvCPUAffinity& a);
std::ostream& operator <<(std::ostream& os, const SystemCPUAffinity& a);
std::ostream& operator <<(std::ostream& os, const GlobalCPUAffinity& a);
std::ostream& operator <<(std::ostream& os, const PixelDepthCPUAffinityMap& m);
} // namespace SlsDetector
......
......@@ -167,7 +167,7 @@ public:
void setPixelDepthCPUAffinityMap(PixelDepthCPUAffinityMap aff_map);
void getPixelDepthCPUAffinityMap(PixelDepthCPUAffinityMap& aff_map);
SystemCPUAffinityMgr::ProcessingFinishedEvent *
GlobalCPUAffinityMgr::ProcessingFinishedEvent *
getProcessingFinishedEvent();
private:
......@@ -318,7 +318,7 @@ private:
};
friend class Model;
friend class SystemCPUAffinityMgr;
friend class GlobalCPUAffinityMgr;
void setModel(Model *model);
......@@ -401,7 +401,7 @@ private:
std::vector<PortStats> m_port_stats;
TimeRangesChangedCallback *m_time_ranges_cb;
PixelDepthCPUAffinityMap m_cpu_affinity_map;
SystemCPUAffinityMgr m_system_cpu_affinity_mgr;
GlobalCPUAffinityMgr m_global_cpu_affinity_mgr;
};
} // namespace SlsDetector
......
......@@ -97,7 +97,7 @@ typedef vector<NetDevGroupCPUAffinity> CPP_SeqType;
// namespace SlsDetector
// {
// typedef std::map<PixelDepth, SystemCPUAffinity> PixelDepthCPUAffinityMap;
// typedef std::map<PixelDepth, GlobalCPUAffinity> PixelDepthCPUAffinityMap;
// };
%MappedType SlsDetector::PixelDepthCPUAffinityMap
......@@ -112,9 +112,9 @@ using namespace lima;
using namespace lima::SlsDetector;
typedef PixelDepth CPP_KeyType;
typedef SystemCPUAffinity CPP_ValueType;
typedef GlobalCPUAffinity CPP_ValueType;
typedef PixelDepthCPUAffinityMap CPP_MapType;
#define SIP_ValueType sipType_SlsDetector_SystemCPUAffinity
#define SIP_ValueType sipType_SlsDetector_GlobalCPUAffinity
%End
%ConvertToTypeCode
......@@ -219,23 +219,23 @@ public:
static std::string getTaskProcDir(int task, bool is_thread);
};
class ProcCPUAffinityMgr
class SystemCPUAffinityMgr
{
public:
ProcCPUAffinityMgr();
~ProcCPUAffinityMgr();
SystemCPUAffinityMgr();
~SystemCPUAffinityMgr();
enum Filter {
All, MatchAffinity, NoMatchAffinity, ThisProc=0x10
};
static std::vector<int> getProcList(
SlsDetector::ProcCPUAffinityMgr::Filter filter
= SlsDetector::ProcCPUAffinityMgr::All,
SlsDetector::SystemCPUAffinityMgr::Filter filter
= SlsDetector::SystemCPUAffinityMgr::All,
SlsDetector::CPUAffinity cpu_affinity = 0);
static std::vector<int> getThreadList(
SlsDetector::ProcCPUAffinityMgr::Filter filter
= SlsDetector::ProcCPUAffinityMgr::All,
SlsDetector::SystemCPUAffinityMgr::Filter filter
= SlsDetector::SystemCPUAffinityMgr::All,
SlsDetector::CPUAffinity cpu_affinity = 0);
void setOtherCPUAffinity(
......@@ -258,23 +258,23 @@ struct NetDevGroupCPUAffinity {
// typedef std::vector<SlsDetector::NetDevGroupCPUAffinity>
// NetDevGroupCPUAffinityList;
struct SystemCPUAffinity {
struct GlobalCPUAffinity {
SlsDetector::RecvCPUAffinity recv;
SlsDetector::CPUAffinity lima;
SlsDetector::CPUAffinity other;
SlsDetector::NetDevGroupCPUAffinityList netdev;
};
// typedef std::map<SlsDetector::PixelDepth, SlsDetector::SystemCPUAffinity>
// typedef std::map<SlsDetector::PixelDepth, SlsDetector::GlobalCPUAffinity>
// PixelDepthCPUAffinityMap;
class SystemCPUAffinityMgr
class GlobalCPUAffinityMgr
{
public:
class ProcessingFinishedEvent
{
public:
ProcessingFinishedEvent(SlsDetector::SystemCPUAffinityMgr *mgr);
ProcessingFinishedEvent(SlsDetector::GlobalCPUAffinityMgr *mgr);
~ProcessingFinishedEvent();
void processingFinished();
......@@ -282,13 +282,13 @@ public:
void registerStatusCallback(CtControl *ct_control);
};
SystemCPUAffinityMgr(SlsDetector::Camera *cam = NULL);
~SystemCPUAffinityMgr();
GlobalCPUAffinityMgr(SlsDetector::Camera *cam = NULL);
~GlobalCPUAffinityMgr();
void applyAndSet(const SlsDetector::SystemCPUAffinity& o);
void applyAndSet(const SlsDetector::GlobalCPUAffinity& o);
void updateRecvRestart();
SlsDetector::SystemCPUAffinityMgr::
SlsDetector::GlobalCPUAffinityMgr::
ProcessingFinishedEvent *getProcessingFinishedEvent();
void prepareAcq();
......
......@@ -129,7 +129,7 @@ public:
void getPixelDepthCPUAffinityMap(
SlsDetector::PixelDepthCPUAffinityMap& aff_map /Out/);
SlsDetector::SystemCPUAffinityMgr::ProcessingFinishedEvent *
SlsDetector::GlobalCPUAffinityMgr::ProcessingFinishedEvent *
getProcessingFinishedEvent();
};
......
......@@ -407,7 +407,7 @@ static const char *CPUAffinityNetDevSetQueueRpsSrcCList[] = {
const StringList CPUAffinity::NetDevSetQueueRpsSrc(
C_LIST_ITERS(CPUAffinityNetDevSetQueueRpsSrcCList));
ProcCPUAffinityMgr::WatchDog::WatchDog()
SystemCPUAffinityMgr::WatchDog::WatchDog()
{
DEB_CONSTRUCTOR();
......@@ -435,7 +435,7 @@ ProcCPUAffinityMgr::WatchDog::WatchDog()
}
}
ProcCPUAffinityMgr::WatchDog::~WatchDog()
SystemCPUAffinityMgr::WatchDog::~WatchDog()
{
DEB_DESTRUCTOR();
......@@ -445,16 +445,16 @@ ProcCPUAffinityMgr::WatchDog::~WatchDog()
}
}
void ProcCPUAffinityMgr::WatchDog::sigTermHandler(int /*signo*/)
void SystemCPUAffinityMgr::WatchDog::sigTermHandler(int /*signo*/)
{
}
bool ProcCPUAffinityMgr::WatchDog::childEnded()
bool SystemCPUAffinityMgr::WatchDog::childEnded()
{
return (waitpid(m_child_pid, NULL, WNOHANG) != 0);
}
void ProcCPUAffinityMgr::WatchDog::sendChildCmd(Cmd cmd, Arg arg)
void SystemCPUAffinityMgr::WatchDog::sendChildCmd(Cmd cmd, Arg arg)
{
DEB_MEMBER_FUNCT();
DEB_PARAM() << DEB_VAR2(cmd, DebHex(arg));
......@@ -474,8 +474,8 @@ void ProcCPUAffinityMgr::WatchDog::sendChildCmd(Cmd cmd, Arg arg)
DEB_TRACE() << "Watchdog child acknowledged Ok";
}
ProcCPUAffinityMgr::WatchDog::Packet
ProcCPUAffinityMgr::WatchDog::readParentCmd()
SystemCPUAffinityMgr::WatchDog::Packet
SystemCPUAffinityMgr::WatchDog::readParentCmd()
{
DEB_MEMBER_FUNCT();
Packet packet;
......@@ -487,13 +487,13 @@ ProcCPUAffinityMgr::WatchDog::readParentCmd()
return packet;
}
void ProcCPUAffinityMgr::WatchDog::ackParentCmd()
void SystemCPUAffinityMgr::WatchDog::ackParentCmd()
{
DEB_MEMBER_FUNCT();
m_res_pipe.write(string(1, Ok));
}
void ProcCPUAffinityMgr::WatchDog::childFunction()
void SystemCPUAffinityMgr::WatchDog::childFunction()
{
DEB_MEMBER_FUNCT();
......@@ -533,7 +533,7 @@ void ProcCPUAffinityMgr::WatchDog::childFunction()
}
void
ProcCPUAffinityMgr::WatchDog::affinitySetter(CPUAffinity cpu_affinity)
SystemCPUAffinityMgr::WatchDog::affinitySetter(CPUAffinity cpu_affinity)
{
DEB_MEMBER_FUNCT();
DEB_PARAM() << DEB_VAR1(cpu_affinity);
......@@ -551,7 +551,7 @@ ProcCPUAffinityMgr::WatchDog::affinitySetter(CPUAffinity cpu_affinity)
}
ProcList
ProcCPUAffinityMgr::WatchDog::getOtherProcList(CPUAffinity cpu_affinity)
SystemCPUAffinityMgr::WatchDog::getOtherProcList(CPUAffinity cpu_affinity)
{
DEB_MEMBER_FUNCT();
......@@ -568,25 +568,25 @@ ProcCPUAffinityMgr::WatchDog::getOtherProcList(CPUAffinity cpu_affinity)
}
void
ProcCPUAffinityMgr::WatchDog::setOtherCPUAffinity(CPUAffinity cpu_affinity)
SystemCPUAffinityMgr::WatchDog::setOtherCPUAffinity(CPUAffinity cpu_affinity)
{
DEB_MEMBER_FUNCT();
DEB_PARAM() << DEB_VAR1(cpu_affinity);
sendChildCmd(SetAffinity, cpu_affinity);
}
ProcCPUAffinityMgr::ProcCPUAffinityMgr()
SystemCPUAffinityMgr::SystemCPUAffinityMgr()
{
DEB_CONSTRUCTOR();
}
ProcCPUAffinityMgr::~ProcCPUAffinityMgr()
SystemCPUAffinityMgr::~SystemCPUAffinityMgr()
{
DEB_DESTRUCTOR();
}
ProcList
ProcCPUAffinityMgr::getProcList(Filter filter, CPUAffinity cpu_affinity)
SystemCPUAffinityMgr::getProcList(Filter filter, CPUAffinity cpu_affinity)
{
DEB_STATIC_FUNCT();
DEB_PARAM() << DEB_VAR2(filter, cpu_affinity);
......@@ -639,7 +639,7 @@ ProcCPUAffinityMgr::getProcList(Filter filter, CPUAffinity cpu_affinity)
ProcList
ProcCPUAffinityMgr::getThreadList(Filter filter,
SystemCPUAffinityMgr::getThreadList(Filter filter,
CPUAffinity cpu_affinity)
{
DEB_STATIC_FUNCT();
......@@ -647,7 +647,7 @@ ProcCPUAffinityMgr::getThreadList(Filter filter,
return getProcList(Filter(filter | ThisProc), cpu_affinity);
}
void ProcCPUAffinityMgr::setOtherCPUAffinity(CPUAffinity cpu_affinity)
void SystemCPUAffinityMgr::setOtherCPUAffinity(CPUAffinity cpu_affinity)
{
DEB_MEMBER_FUNCT();
......@@ -660,8 +660,8 @@ void ProcCPUAffinityMgr::setOtherCPUAffinity(CPUAffinity cpu_affinity)
m_watchdog = NULL;
}
SystemCPUAffinityMgr::
ProcessingFinishedEvent::ProcessingFinishedEvent(SystemCPUAffinityMgr *mgr)
GlobalCPUAffinityMgr::
ProcessingFinishedEvent::ProcessingFinishedEvent(GlobalCPUAffinityMgr *mgr)
: m_mgr(mgr), m_cb(this), m_ct(NULL)
{
DEB_CONSTRUCTOR();
......@@ -673,7 +673,7 @@ ProcessingFinishedEvent::ProcessingFinishedEvent(SystemCPUAffinityMgr *mgr)
m_last_cb_ts = Timestamp::now();
}
SystemCPUAffinityMgr::
GlobalCPUAffinityMgr::
ProcessingFinishedEvent::~ProcessingFinishedEvent()
{
DEB_DESTRUCTOR();
......@@ -681,7 +681,7 @@ ProcessingFinishedEvent::~ProcessingFinishedEvent()
m_mgr->m_proc_finished = NULL;
}
void SystemCPUAffinityMgr::ProcessingFinishedEvent::prepareAcq()
void GlobalCPUAffinityMgr::ProcessingFinishedEvent::prepareAcq()
{
DEB_MEMBER_FUNCT();
if (!m_ct)
......@@ -731,20 +731,20 @@ void SystemCPUAffinityMgr::ProcessingFinishedEvent::prepareAcq()
m_stopped = false;
}
void SystemCPUAffinityMgr::ProcessingFinishedEvent::stopAcq()
void GlobalCPUAffinityMgr::ProcessingFinishedEvent::stopAcq()
{
DEB_MEMBER_FUNCT();
m_stopped = true;
}
void SystemCPUAffinityMgr::ProcessingFinishedEvent::processingFinished()
void GlobalCPUAffinityMgr::ProcessingFinishedEvent::processingFinished()
{
DEB_MEMBER_FUNCT();
if (m_mgr)
m_mgr->limaFinished();
}
void SystemCPUAffinityMgr::
void GlobalCPUAffinityMgr::
ProcessingFinishedEvent::registerStatusCallback(CtControl *ct)
{
DEB_MEMBER_FUNCT();
......@@ -755,7 +755,7 @@ ProcessingFinishedEvent::registerStatusCallback(CtControl *ct)
m_ct = ct;
}
void SystemCPUAffinityMgr::
void GlobalCPUAffinityMgr::
ProcessingFinishedEvent::limitUpdateRate()
{
Timestamp next_ts = m_last_cb_ts + Timestamp(1.0 / 10);
......@@ -764,19 +764,19 @@ ProcessingFinishedEvent::limitUpdateRate()
Sleep(remaining);
}
void SystemCPUAffinityMgr::
void GlobalCPUAffinityMgr::
ProcessingFinishedEvent::updateLastCallbackTimestamp()
{
m_last_cb_ts = Timestamp::now();
}
Timestamp SystemCPUAffinityMgr::
Timestamp GlobalCPUAffinityMgr::
ProcessingFinishedEvent::getLastCallbackTimestamp()
{
return m_last_cb_ts;
}
void SystemCPUAffinityMgr::
void GlobalCPUAffinityMgr::
ProcessingFinishedEvent::imageStatusChanged(
const CtControl::ImageStatus& status)
{
......@@ -796,7 +796,7 @@ ProcessingFinishedEvent::imageStatusChanged(
processingFinished();
}
SystemCPUAffinityMgr::SystemCPUAffinityMgr(Camera *cam)
GlobalCPUAffinityMgr::GlobalCPUAffinityMgr(Camera *cam)
: m_cam(cam), m_proc_finished(NULL),
m_lima_finished_timeout(3)
{
......@@ -805,7 +805,7 @@ SystemCPUAffinityMgr::SystemCPUAffinityMgr(Camera *cam)
m_state = Ready;
}
SystemCPUAffinityMgr::~SystemCPUAffinityMgr()
GlobalCPUAffinityMgr::~GlobalCPUAffinityMgr()
{
DEB_DESTRUCTOR();
......@@ -815,7 +815,7 @@ SystemCPUAffinityMgr::~SystemCPUAffinityMgr()
m_proc_finished->m_mgr = NULL;
}
void SystemCPUAffinityMgr::applyAndSet(const SystemCPUAffinity& o)
void GlobalCPUAffinityMgr::applyAndSet(const GlobalCPUAffinity& o)
{
DEB_MEMBER_FUNCT();
DEB_PARAM() << DEB_VAR1(o);
......@@ -833,16 +833,16 @@ void SystemCPUAffinityMgr::applyAndSet(const SystemCPUAffinity& o)
setRecvAffinity(o.recv);
setNetDevAffinity(o.netdev);
if (!m_proc_mgr)
m_proc_mgr = new ProcCPUAffinityMgr();
if (!m_system_mgr)
m_system_mgr = new SystemCPUAffinityMgr();
m_proc_mgr->setOtherCPUAffinity(o.other);
m_system_mgr->setOtherCPUAffinity(o.other);
m_curr.other = o.other;
m_set = o;
}
void SystemCPUAffinityMgr::setLimaAffinity(CPUAffinity lima_affinity)
void GlobalCPUAffinityMgr::setLimaAffinity(CPUAffinity lima_affinity)
{
DEB_MEMBER_FUNCT();
......@@ -862,7 +862,7 @@ void SystemCPUAffinityMgr::setLimaAffinity(CPUAffinity lima_affinity)
m_curr.lima = lima_affinity;
}
void SystemCPUAffinityMgr::setRecvAffinity(const RecvCPUAffinity& recv_affinity)
void GlobalCPUAffinityMgr::setRecvAffinity(const RecvCPUAffinity& recv_affinity)
{
DEB_MEMBER_FUNCT();
......@@ -873,7 +873,7 @@ void SystemCPUAffinityMgr::setRecvAffinity(const RecvCPUAffinity& recv_affinity)
m_curr.recv = recv_affinity;
}
void SystemCPUAffinityMgr::setNetDevAffinity(
void GlobalCPUAffinityMgr::setNetDevAffinity(
const NetDevGroupCPUAffinityList& netdev_list)
{
DEB_MEMBER_FUNCT();
......@@ -897,14 +897,14 @@ void SystemCPUAffinityMgr::setNetDevAffinity(
m_curr.netdev = netdev_list;
}
void SystemCPUAffinityMgr::updateRecvRestart()
void GlobalCPUAffinityMgr::updateRecvRestart()
{
DEB_MEMBER_FUNCT();
m_curr.recv = m_curr.lima;
}
SystemCPUAffinityMgr::ProcessingFinishedEvent *
SystemCPUAffinityMgr::getProcessingFinishedEvent()
GlobalCPUAffinityMgr::ProcessingFinishedEvent *
GlobalCPUAffinityMgr::getProcessingFinishedEvent()
{
DEB_MEMBER_FUNCT();
if (!m_proc_finished)
......@@ -912,33 +912,33 @@ SystemCPUAffinityMgr::getProcessingFinishedEvent()
return m_proc_finished;
}
void SystemCPUAffinityMgr::prepareAcq()
void GlobalCPUAffinityMgr::prepareAcq()
{
DEB_MEMBER_FUNCT();
AutoMutex l = lock();
if (m_state != Ready)
THROW_HW_ERROR(Error) << "SystemCPUAffinityMgr is not Ready: "
THROW_HW_ERROR(Error) << "GlobalCPUAffinityMgr is not Ready: "
<< "missing ProcessingFinishedEvent";
if (m_proc_finished)
m_proc_finished->prepareAcq();
m_lima_tids.clear();
}
void SystemCPUAffinityMgr::startAcq()
void GlobalCPUAffinityMgr::startAcq()
{
DEB_MEMBER_FUNCT();
AutoMutex l = lock();
m_state = Acquiring;
}
void SystemCPUAffinityMgr::stopAcq()
void GlobalCPUAffinityMgr::stopAcq()
{
DEB_MEMBER_FUNCT();
if (m_proc_finished)
m_proc_finished->stopAcq();
}
void SystemCPUAffinityMgr::recvFinished()
void GlobalCPUAffinityMgr::recvFinished()
{
DEB_MEMBER_FUNCT();
......@@ -951,9 +951,9 @@ void SystemCPUAffinityMgr::recvFinished()
if (m_curr.lima != m_curr.recv.all()) {
m_state = Changing;
AutoMutexUnlock u(l);
ProcCPUAffinityMgr::Filter filter;
filter = ProcCPUAffinityMgr::MatchAffinity;
m_lima_tids = ProcCPUAffinityMgr::getThreadList(filter,
SystemCPUAffinityMgr::Filter filter;
filter = SystemCPUAffinityMgr::MatchAffinity;
m_lima_tids = SystemCPUAffinityMgr::getThreadList(filter,
m_curr.lima);
DEB_ALWAYS() << "Lima TIDs: " << PrettyIntList(m_lima_tids);
CPUAffinity lima_affinity = (uint64_t(m_curr.lima) |
......@@ -967,7 +967,7 @@ void SystemCPUAffinityMgr::recvFinished()
m_cond.broadcast();
}
void SystemCPUAffinityMgr::limaFinished()
void GlobalCPUAffinityMgr::limaFinished()
{
DEB_MEMBER_FUNCT();
......@@ -992,7 +992,7 @@ void SystemCPUAffinityMgr::limaFinished()
m_cond.broadcast();
}
void SystemCPUAffinityMgr::waitLimaFinished()
void GlobalCPUAffinityMgr::waitLimaFinished()
{
DEB_MEMBER_FUNCT();
......@@ -1029,7 +1029,7 @@ ostream& lima::SlsDetector::operator <<(ostream& os, const RecvCPUAffinity& a)
return os << ">";
}
ostream& lima::SlsDetector::operator <<(ostream& os, const SystemCPUAffinity& a)
ostream& lima::SlsDetector::operator <<(ostream& os, const GlobalCPUAffinity& a)
{
os << "<";
os << "recv=" << a.recv << ", lima=" << a.lima << ", other=" << a.other;
......
......@@ -350,7 +350,7 @@ void Camera::AcqThread::threadFunction()
multiSlsDetector *det = m_cam->m_det;
AutoMutex l = m_cam->lock();
m_cam->m_system_cpu_affinity_mgr.startAcq();
m_cam->m_global_cpu_affinity_mgr.startAcq();
{
AutoMutexUnlock u(l);
DEB_TRACE() << "calling startReceiver";
......@@ -422,8 +422,8 @@ void Camera::AcqThread::threadFunction()
if (had_frames) {
AutoMutexUnlock u(l);
m_cam->m_system_cpu_affinity_mgr.recvFinished();
m_cam->m_system_cpu_affinity_mgr.waitLimaFinished();
m_cam->m_global_cpu_affinity_mgr.recvFinished();
m_cam->m_global_cpu_affinity_mgr.waitLimaFinished();
}
m_state =