Michael Davidsaver
afafa09547
ioc: check for mis-matched onStartSubscription()/onDisableSubscription() ioc: fix subscription lifetime ioc: catch exceptions in dbEvent callbacks ioc: avoid unnecessary virtual ioc: minor ioc: fix qsrv -S ioc: qsrvGroupSourceInit() catch+log ioc: runOnServer avoid std::function ioc: cleanup and simplifications. Avoid some redundant std::map lookups. Make Group partially const to prevent implicit ctor. ioc: avoid typedefs only used once ioc: overhaul Group::show(). shows triggers ioc: MappingType ioc: pvxsgl -> pvxgl ioc: separate group config singleton from server singleton ioc: remove unnecessary forward declarations ioc: restructure pvxsInitHook ioc: qsrv runtime disable by default ioc: compat w/ older Base ioc: link pvxsIoc w/ DB libs ioc: Channel proper detection of invalid PV ioc: no need to keep vector<dbCommon*> around ioc: fix initial group update for mappings w/o dbChannel ioc: redo testing split out group tests, only run with Base >= 7.0 ioc: minor ioc: loc_bad_alloc ioc: avoid symbol/DTYP clash with pva2pva ioc: test record alias in group json ioc: test put failure when SPC_NOMOD and DISP=1 ioc: test channel filters ioc: unnecessary capture ioc: avoid sharing Value between multiple subscriptions It is possible to create two subscriptions through the same channel. ioc: group subscription include queueSize ioc: eliminate unused atomicMonitor ioc: consolidate GroupSource::get() avoid some indirection ioc: pvRequest override of atomicPutGet ioc: fix group non-atomic put ioc: test asTrap hooks ioc: test putOrder also sets field order ioc: simplify GroupConfigProcessor::loadConfigFiles() Also ensure that groupMapMutex is held ioc: testqgroup cover JSON def. ioc: dbLoadGroup() use macros ioc: pvxsl() take integer argument ioc: display.form and info(Q:form ioc: "NO_ALARM" -> "" ioc: use dbServer at least for informational callbacks. ioc: consolidate createRequestAndSubscriptionHandlers() ioc: eliminate ChannelAndLock properties dbChannel doesn't need a separate DBManyLock ioc: test that putOrder also controls field order ioc: MappingType -> MappingInfo Handle info(Q:time:tag Add +type:"const" ioc: cleanup includes ioc: test dbNotifyCancel() ioc: inline checkForTrailingCommentsAtEnd()
85 lines
1.8 KiB
C++
85 lines
1.8 KiB
C++
/*
|
|
* Copyright - See the COPYRIGHT that is included with this distribution.
|
|
* pvxs is distributed subject to a Software License Agreement found
|
|
* in file LICENSE that is included with this distribution.
|
|
*
|
|
* Author George S. McIntyre <george@level-n.com>, 2023
|
|
*
|
|
*/
|
|
|
|
#ifndef PVXS_GROUP_H
|
|
#define PVXS_GROUP_H
|
|
|
|
#include <fstream>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <list>
|
|
#include <stdexcept>
|
|
|
|
#include <pvxs/data.h>
|
|
|
|
#include <macLib.h>
|
|
|
|
#include "dbmanylocker.h"
|
|
#include "field.h"
|
|
|
|
namespace pvxs {
|
|
namespace ioc {
|
|
|
|
class ChannelLocks {
|
|
public:
|
|
std::vector<dbCommon*> channels;
|
|
DBManyLock lock;
|
|
ChannelLocks() = default;
|
|
};
|
|
|
|
class Group {
|
|
private:
|
|
public:
|
|
const std::string name;
|
|
const bool atomicPutGet;
|
|
std::vector<Field> fields;
|
|
Value valueTemplate;
|
|
ChannelLocks value;
|
|
ChannelLocks properties;
|
|
|
|
void show(int level) const;
|
|
Field& operator[](const std::string& fieldName);
|
|
|
|
Group(const std::string& name, bool atomicPutGet)
|
|
:name(name)
|
|
,atomicPutGet(atomicPutGet)
|
|
{}
|
|
Group(const Group&) = delete;
|
|
};
|
|
|
|
struct IOCGroupConfig {
|
|
static
|
|
IOCGroupConfig& instance();
|
|
|
|
std::map<std::string, Group> groupMap;
|
|
struct JFile {
|
|
struct DeleteMac {
|
|
void operator()(MAC_HANDLE *handle) { (void)macDeleteHandle(handle); }
|
|
};
|
|
|
|
std::unique_ptr<std::ifstream> jf;
|
|
std::string fname;
|
|
std::string macros;
|
|
std::unique_ptr<MAC_HANDLE, DeleteMac> handle;
|
|
JFile(decltype(jf)&& jf, const std::string& fname, const std::string& macros,
|
|
decltype(handle)&& handle)
|
|
:jf(std::move(jf)), fname(fname), macros(macros), handle(std::move(handle))
|
|
{}
|
|
};
|
|
std::list<JFile> groupConfigFiles;
|
|
|
|
// For locking access to groupMap
|
|
epicsMutex groupMapMutex{};
|
|
};
|
|
|
|
} // pvxs
|
|
} // ioc
|
|
|
|
#endif //PVXS_GROUP_H
|