epics/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

minor changes

Browse Source
This commit is contained in:
Marty Kraimer
2013-06-17 07:49:55 -04:00
parent ea0e2cd570
commit a39bef15bb
9 changed files with 52 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/database/pvDatabase.cpp
View File

@ -13,7 +13,6 @@
using std::tr1::static_pointer_cast;
using namespace epics::pvData;
using namespace epics::pvAccess;
using namespace std;
namespace epics { namespace pvDatabase {

2
src/database/pvDatabase.h
View File

@ -15,7 +15,7 @@
#include <map>
#include <deque>
#include <pv/pvAccess.h>
#include <pv/pvData.h>
#include <pv/convert.h>
namespace epics { namespace pvDatabase {

1
src/database/pvRecord.cpp
View File

@ -13,7 +13,6 @@
using std::tr1::static_pointer_cast;
using namespace epics::pvData;
using namespace epics::pvAccess;
using namespace std;
namespace epics { namespace pvDatabase {

6
src/database/recordList.cpp
View File

@ -13,7 +13,6 @@
using std::tr1::static_pointer_cast;
using namespace epics::pvData;
using namespace epics::pvAccess;
using namespace std;
namespace epics { namespace pvDatabase {
@ -91,7 +90,10 @@ bool RecordListRecord::init()
void RecordListRecord::process()
{
PVStringArrayPtr pvNames = PVDatabase::getMaster()->getRecordNames();
names->replace(pvNames->viewUnsafe());
std::vector<String> const & xxx = pvNames->getVector();
size_t n = xxx.size();
names->put(0,n,xxx,0);
// names->replace(pvNames->viewUnsafe()); for pvDataCPP-md
String message("");
if(database->get().compare("master")!=0) {
message += " can only access master ";

98
src/pvAccess/channelProviderLocal.cpp
View File

@ -21,85 +21,39 @@ using namespace std;
static String providerName("local");
class LocalChannelCTX;
typedef std::tr1::shared_ptr<LocalChannelCTX> LocalChannelCTXPtr;
class LocalChannelProviderFactory;
typedef std::tr1::shared_ptr<LocalChannelProviderFactory> LocalChannelProviderFactoryPtr;
class LocalChannelCTX :
public epics::pvData::Runnable,
public std::tr1::enable_shared_from_this<LocalChannelCTX>
class LocalChannelProviderFactory : public ChannelProviderFactory
{
public:
POINTER_DEFINITIONS(LocalChannelCTX);
static LocalChannelCTXPtr create(
ChannelProviderLocalPtr const &channelProvider);
ChannelProviderLocalPtr getChannelProviderLocal() {return channelProvider;}
virtual ~LocalChannelCTX();
virtual void run();
private:
LocalChannelCTX(
ChannelProviderLocalPtr const &channelProvider);
shared_pointer getPtrSelf()
POINTER_DEFINITIONS(LocalChannelProviderFactory);
virtual String getFactoryName() { return providerName;}
static LocalChannelProviderFactoryPtr create(
ChannelProviderLocalPtr const &channelProvider)
{
return shared_from_this();
LocalChannelProviderFactoryPtr xxx(
new LocalChannelProviderFactory(channelProvider));
registerChannelProviderFactory(xxx);
return xxx;
}
epics::pvData::Event event;
virtual ChannelProvider::shared_pointer sharedInstance()
{
return channelProvider;
}
virtual ChannelProvider::shared_pointer newInstance()
{
return channelProvider;
}
private:
LocalChannelProviderFactory(
ChannelProviderLocalPtr const &channelProvider)
: channelProvider(channelProvider)
{}
ChannelProviderLocalPtr channelProvider;
epics::pvAccess::ServerContextImpl::shared_pointer ctx;
epics::pvData::Thread *thread;
};
LocalChannelCTXPtr LocalChannelCTX::create(
ChannelProviderLocalPtr const & channelProvider)
{
static LocalChannelCTXPtr pvServiceChannelCTX;
static Mutex mutex;
Lock xx(mutex);
if(pvServiceChannelCTX.get()==0) {
pvServiceChannelCTX = LocalChannelCTXPtr(
new LocalChannelCTX(channelProvider));
}
return pvServiceChannelCTX;
}
LocalChannelCTX::LocalChannelCTX(
ChannelProviderLocalPtr const &channelProvider)
:
channelProvider(channelProvider),
ctx(ServerContextImpl::create()),
thread(new Thread(
String("pvServiceChannel"),
lowerPriority,
this,
epicsThreadStackBig))
{}
LocalChannelCTX::~LocalChannelCTX()
{
std::cout << "LocalChannelCTX::~LocalChannelCTX()" << std::endl;
ctx->shutdown();
// we need thead.waitForCompletion()
event.wait();
epicsThreadSleep(1.0);
std::cout << "LocalChannelCTX::run() calling channelProvider->destroy()" << std::endl;
if(channelProvider!=NULL) channelProvider->destroy();
ctx.reset();
channelProvider.reset();
delete thread;
}
void LocalChannelCTX::run()
{
registerChannelProvider(channelProvider);
String providerName = channelProvider->getProviderName();
ctx->setChannelProviderName(providerName);
ctx->initialize(getChannelAccess());
ctx->printInfo();
ctx->run(0);
ctx->destroy();
event.signal();
}
ChannelProviderLocalPtr getChannelProviderLocal()
{
static ChannelProviderLocalPtr channelProviderLocal;
@ -108,7 +62,7 @@ ChannelProviderLocalPtr getChannelProviderLocal()
if(channelProviderLocal.get()==NULL) {
channelProviderLocal = ChannelProviderLocalPtr(
new ChannelProviderLocal());
LocalChannelCTX::create(channelProviderLocal);
LocalChannelProviderFactory::create(channelProviderLocal);
}
return channelProviderLocal;
}

5
src/pvAccess/pvCopy.h
View File

@ -14,11 +14,8 @@
#include <stdexcept>
#include <memory>
#include <pv/pvType.h>
#include <pv/pvIntrospect.h>
#include <pv/pvData.h>
#include <pv/pvDatabase.h>
#include <pv/pvAccess.h>
namespace epics { namespace pvDatabase {

16
test/pvCopy/testPVCopy.cpp
View File

@ -194,15 +194,18 @@ static void testPVScalarArray(
BitSetPtr bitSet;
String builder;
size_t offset;
ConvertPtr convert = getConvert();
size_t n = 5;
shared_vector<double> values(n);
DoubleArray values(n);
// shared_vector<double> values(n);
pvRecord->lock_guard();
cout << endl;
pvStructureRecord = pvRecord->getPVRecordStructure()->getPVStructure();
pvValueRecord = pvStructureRecord->getScalarArrayField(valueNameRecord,scalarType);
for(size_t i=0; i<n; i++) values[i] = i;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
StructureConstPtr structure = pvCopy->getStructure();
builder.clear(); structure->toString(&builder);
cout << "structure from copy" << endl << builder << endl;
@ -214,7 +217,8 @@ static void testPVScalarArray(
cout << "after initCopy pvValueCopy " << builder << endl;
cout << endl;
for(size_t i=0; i<n; i++) values[i] = i + .06;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet,true);
builder.clear(); pvValueCopy->toString(&builder);
cout << "after put(i+ .06) pvValueCopy " << builder << endl;
@ -233,7 +237,8 @@ static void testPVScalarArray(
cout << endl;
bitSet->clear();
for(size_t i=0; i<n; i++) values[i] = i + 1.0;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
builder.clear();
bitSet->toString(&builder);
cout << "before updateCopyFromBitSet";
@ -257,7 +262,8 @@ static void testPVScalarArray(
cout << " bitSet " << builder;
cout << endl;
for(size_t i=0; i<n; i++) values[i] = i + 2.0;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
bitSet->set(0);
cout << "before updateRecord";
builder.clear(); pvValueRecord->toString(&builder);

2
test/server/exampleCounterMain.cpp
View File

@ -22,6 +22,7 @@
#include <pv/standardPVField.h>
#include <pv/exampleCounter.h>
#include <pv/channelProviderLocal.h>
#include <pv/serverContext.h>
using namespace std;
using std::tr1::static_pointer_cast;
@ -39,6 +40,7 @@ int main(int argc,char *argv[])
bool result = master->addRecord(pvRecord);
cout << "result of addRecord " << recordName << " " << result << endl;
pvRecord.reset();
startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
cout << "exampleServer\n";
string str;
while(true) {

7
test/server/testExampleServerMain.cpp
View File

@ -24,6 +24,7 @@
#include <pv/powerSupplyRecordTest.h>
#include <pv/channelProviderLocal.h>
#include <pv/recordList.h>
#include <pv/serverContext.h>
using namespace std;
using std::tr1::static_pointer_cast;
@ -83,6 +84,7 @@ int main(int argc,char *argv[])
pvRecord->process();
}
result = master->addRecord(pvRecord);
if(!result) cout<< "record " << recordName << " not added" << endl;
recordName = "exampleDoubleArray";
pvStructure = standardPVField->scalarArray(scalarType,properties);
pvRecord = PVRecord::create(recordName,pvStructure);
@ -91,6 +93,7 @@ int main(int argc,char *argv[])
pvRecord->process();
}
result = master->addRecord(pvRecord);
if(!result) cout<< "record " << recordName << " not added" << endl;
recordName = "examplePowerSupply";
pvStructure = createPowerSupply();
PowerSupplyRecordTestPtr psr =
@ -101,8 +104,11 @@ int main(int argc,char *argv[])
}
result = master->addRecord(psr);
recordName = "laptoprecordListPGRPC";
if(!result) cout<< "record " << recordName << " not added" << endl;
pvRecord = RecordListRecord::create(recordName);
result = master->addRecord(pvRecord);
ServerContext::shared_pointer ctx =
startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
cout << "exampleServer\n";
PVStringArrayPtr pvNames = master->getRecordNames();
String buffer;
@ -115,6 +121,7 @@ int main(int argc,char *argv[])
if(str.compare("exit")==0) break;
}
ctx->destroy();
return 0;
}