Commit f5b10023 authored by Yuelong Yu's avatar Yuelong Yu
Browse files

Merge branch '9-server-crashed' into 'master'

Resolve "server crashed"

Closes #9

See merge request !10
parents cafed2e4 f8ad69e3
Pipeline #28328 passed with stage
in 1 minute and 6 seconds
......@@ -4,7 +4,7 @@ enable_testing()
set(MAJOR_VERSION 0)
set(MINOR_VERSION 10)
set(MINOR_VERSION 11)
set(LIBRARY_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
set(SO_VERSION ${LIBRARY_VERSION})
......
......@@ -35,6 +35,7 @@ namespace AGIPDCtrlNS
m_acq_counter(0),
m_mtx(),
m_exit(false),
m_running(false),
m_rs(SC)
{
LOG_TRACE(__FUNCTION__);
......@@ -52,7 +53,12 @@ namespace AGIPDCtrlNS
AGIPDMetaData::~AGIPDMetaData()
{
LOG_TRACE(__FUNCTION__);
m_exit = true;
m_exit = true;
m_tcp->Disconnect();
while(m_running)
{
this_thread::sleep_for(std::chrono::seconds(1));
}
}
void AGIPDMetaData::Reboot()
......
......@@ -37,6 +37,7 @@ namespace TestNS
void MetaDataTest::TearDown()
{
EXPECT_CALL(*m_tcp, Disconnect());
m_agipd.reset();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment