mostly code cleanup

This commit is contained in:
mrkraimer
2016-07-06 10:49:22 -04:00
parent fac07c7f3a
commit d890ce28d8
21 changed files with 104 additions and 264 deletions

View File

@@ -9,7 +9,6 @@
* @date 2015.03
*/
#include <pv/standardField.h>
#include <pv/convert.h>
#include <epicsMath.h>
@@ -25,12 +24,6 @@ using namespace std;
namespace epics { namespace pvaClient {
static ConvertPtr convert = getConvert();
static FieldCreatePtr fieldCreate = getFieldCreate();
static PVDataCreatePtr pvDataCreate = getPVDataCreate();
static StandardFieldPtr standardField = getStandardField();
static CreateRequest::shared_pointer createRequest = CreateRequest::create();
PvaClientMultiPutDoublePtr PvaClientMultiPutDouble::create(
PvaClientMultiChannelPtr const &pvaMultiChannel,
@@ -48,8 +41,7 @@ PvaClientMultiPutDouble::PvaClientMultiPutDouble(
pvaClientChannelArray(pvaClientChannelArray),
nchannel(pvaClientChannelArray.size()),
pvaClientPut(std::vector<PvaClientPutPtr>(nchannel,PvaClientPutPtr())),
isPutConnected(false),
isDestroyed(false)
isPutConnected(false)
{
if(PvaClient::getDebug()) cout<< "PvaClientMultiPutDouble::PvaClientMultiPutDouble()\n";
}
@@ -59,12 +51,6 @@ PvaClientMultiPutDouble::PvaClientMultiPutDouble(
PvaClientMultiPutDouble::~PvaClientMultiPutDouble()
{
if(PvaClient::getDebug()) cout<< "PvaClientMultiPutDouble::~PvaClientMultiPutDouble()\n";
{
Lock xx(mutex);
if(isDestroyed) throw std::runtime_error("pvaClientMultiPutDouble was destroyed");
isDestroyed = true;
}
pvaClientChannelArray.clear();
}
@@ -103,7 +89,7 @@ void PvaClientMultiPutDouble::put(epics::pvData::shared_vector<double> const &da
if(isConnected[i]) {
PVStructurePtr pvTop = pvaClientPut[i]->getData()->getPVStructure();
PVScalarPtr pvValue = pvTop->getSubField<PVScalar>("value");
convert->fromDouble(pvValue,data[i]);
getConvert()->fromDouble(pvValue,data[i]);
pvaClientPut[i]->issuePut();
}
if(isConnected[i]) {