Commit 67d57f92 authored by Pavel Vainerman's avatar Pavel Vainerman

Убрал в UniSetManager удаление "подчичённых объектов", приводящее

(периодически) к segfault.
parent a6f53638
...@@ -545,14 +545,17 @@ void MBSlave::execute_tcp() ...@@ -545,14 +545,17 @@ void MBSlave::execute_tcp()
catch(Exception& ex) catch(Exception& ex)
{ {
dcrit << myname dcrit << myname
<< "(execute_rtu): (askCount) " << ex << std::endl; << "(execute_tcp): (askCount) " << ex << std::endl;
} }
} }
for( auto &it: iomap ) for( auto &it: iomap )
IOBase::processingThreshold(&it.second,shm,force); IOBase::processingThreshold(&it.second,shm,force);
} }
catch(...){} catch( std::exception& ex)
{
dcrit << myname << "(execute_tcp): " << ex.what() << endl;
}
} }
dinfo << myname << "(execute_tcp): thread stopped.." << endl; dinfo << myname << "(execute_tcp): thread stopped.." << endl;
......
...@@ -119,6 +119,9 @@ UniSetManager::~UniSetManager() ...@@ -119,6 +119,9 @@ UniSetManager::~UniSetManager()
} }
catch(...){} catch(...){}
#if 0
# НЕ МЫ СОЗДАВАЛИ.. НЕ НАМ И УНИЧТОЖАТЬ!
# нужно перейти на shared_ptr<>..
for( auto& i: olist ) for( auto& i: olist )
{ {
try try
...@@ -136,7 +139,7 @@ UniSetManager::~UniSetManager() ...@@ -136,7 +139,7 @@ UniSetManager::~UniSetManager()
} }
catch(...){} catch(...){}
} }
#endif
olist.clear(); olist.clear();
mlist.clear(); mlist.clear();
} }
......
Markdown is supported
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