epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ioc: Update group and single subscriptions to bind contexts to subscription not client connection

Browse Source
This commit is contained in:
george-mcintyre
2023-05-09 10:17:32 -07:00
committed by Michael Davidsaver
parent d2dcad708c
commit 019784bd3a
4 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/testioc.cpp
+52 -21
View File
@@ -279,9 +279,9 @@ static std::initializer_list<void (*)()> tests = {
auto subscription = subscribe(event, pvName);
clientContext.hurryUp();
testThrows<client::Connected>([&subscription, &event]() {
waitForUpdate(subscription, event);
});
// Wait for initial update
waitForUpdate(subscription, event);
uint64_t expectedValue = 10L;
clientContext.put(pvName)
@@ -304,9 +304,8 @@ static std::initializer_list<void (*)()> tests = {
auto subscription = subscribe(event, pvGroupName);
clientContext.hurryUp();
testThrows<client::Connected>([&subscription, &event]() {
waitForUpdate(subscription, event);
});
waitForUpdate(subscription, event);
testDiag("Got Initial Update!");
auto pvName = "test:longExample";
uint64_t expectedValue = 12L;
@@ -314,6 +313,7 @@ static std::initializer_list<void (*)()> tests = {
.set("value", expectedValue)
.exec()
->wait(5.0);
testDiag("Issued Put!");
auto subFieldName = "sa[0].long.value";
auto updatedValue = waitForUpdate(subscription, event);
@@ -332,9 +332,8 @@ static std::initializer_list<void (*)()> tests = {
auto subscription = subscribe(event, pvGroupName);
clientContext.hurryUp();
testThrows<client::Connected>([&subscription, &event]() {
waitForUpdate(subscription, event);
});
waitForUpdate(subscription, event);
testDiag("Got Initial Update!");
auto pvName = "test:vectorExampleD2";
shared_array<const double> expectedValue({ 3.1, 3.2, 3.3, 3.4, 3.5 });
@@ -345,6 +344,7 @@ static std::initializer_list<void (*)()> tests = {
})
.exec()->wait(5.0);
testDiag("Issued Put!");
auto subFieldName = "value.B";
auto updatedValue = waitForUpdate(subscription, event);
if (updatedValue) {
@@ -361,18 +361,18 @@ static std::initializer_list<void (*)()> tests = {
auto subscription = subscribe(event, pvGroupName);
clientContext.hurryUp();
testThrows<client::Connected>([&subscription, &event]() {
waitForUpdate(subscription, event);
});
waitForUpdate(subscription, event);
testDiag("Got Initial Update!");
auto pvName = "test:longExample";
uint64_t expectedValue = 12L;
uint64_t expectedValue = 13L;
clientContext.put(pvName)
.set("value", expectedValue)
.exec()
->wait(5.0);
testDiag("Issued Put!");
auto subFieldName = "sa[0].long.value";
auto subFieldName = "sa[0].any";
auto updatedValue = waitForUpdate(subscription, event);
if (updatedValue) {
auto actualValue = updatedValue[subFieldName].as<uint64_t>();
@@ -388,9 +388,8 @@ static std::initializer_list<void (*)()> tests = {
auto subscription = subscribe(event, pvGroupName);
clientContext.hurryUp();
testThrows<client::Connected>([&subscription, &event]() {
waitForUpdate(subscription, event);
});
waitForUpdate(subscription, event);
testDiag("Got Initial Update!");
auto pvName = "test:vectorExampleD2";
shared_array<const double> expectedValue({ 3.1, 3.2, 3.3, 3.4, 3.5 });
@@ -400,6 +399,7 @@ static std::initializer_list<void (*)()> tests = {
return putVal;
})
.exec()->wait(5.0);
testDiag("Issued Put!");
auto subFieldName = "value.jB";
auto updatedValue = waitForUpdate(subscription, event);
@@ -409,6 +409,38 @@ static std::initializer_list<void (*)()> tests = {
}
subscription->cancel();
},
[]() {
epicsEvent event;
// Subscribe for changes to Group PV
auto pvGroupName = "test:tableExample";
auto subscription = subscribe(event, pvGroupName);
clientContext.hurryUp();
waitForUpdate(subscription, event);
testDiag("Got Initial Update!");
auto pvName = "test:tableExample";
shared_array<const double> expectedA({ 4.1, 4.2, 4.3, 4.4, 4.5 });
shared_array<const double> expectedB({ 5.1, 5.2, 5.3, 5.4, 5.5 });
clientContext.put(pvName).build([&expectedA, &expectedB](Value&& prototype) -> Value {
auto putVal = prototype.cloneEmpty();
putVal["value.A"] = expectedA;
putVal["value.B"] = expectedB;
return putVal;
})
.exec()->wait(5.0);
testDiag("Issued Put!");
auto updatedValue = waitForUpdate(subscription, event);
if (updatedValue) {
auto actualAValue = updatedValue["value.A"].as<shared_array<const double>>();
auto actualBValue = updatedValue["value.B"].as<shared_array<const double>>();
testArrEq(expectedA, actualAValue);
testArrEq(expectedB, actualBValue);
}
subscription->cancel();
},
};
/**
@@ -418,8 +450,7 @@ static std::initializer_list<void (*)()> tests = {
*/
MAIN(testioc) {
auto testNum = 0;
auto nMonitorTests = 5;
testPlan((int)tests.size() + nMonitorTests);
testPlan((int)tests.size() + 1);
testSetup();
testdbPrepare();
@@ -460,8 +491,8 @@ static void boxLeft() {
*/
static std::shared_ptr<pvxs::client::Subscription> subscribe(epicsEvent& event, const char* pvName) {
return clientContext.monitor(pvName)
.maskConnected(false)
.maskDisconnected(false)
.maskConnected(true)
.maskDisconnected(true)
.event([&event, pvName](client::Subscription& subscription) {
testDiag("%s update event occurred", pvName);
event.signal();