peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-01 13:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: Remove core hooks

Browse Source 
Not needed anymore, the configuration change is sequential in change_cb.
This commit is contained in:
Mattias Walström
2025-10-30 13:14:49 +01:00
parent 5cdcf1f4fe
commit 98b30d7d45
2 changed files with 17 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/core.c
+16 -66
View File
@@ -8,16 +8,16 @@
struct confd confd;
uint32_t core_hook_prio(void)
{
static uint32_t hook_prio = CB_PRIO_PASSIVE;
return hook_prio--;
}
int core_startup_save(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
const char *xpath, sr_event_t event, unsigned request_id, void *priv)
{
sr_event_t last_event = -1;
static unsigned int last_request = -1;
if (last_event == event && last_request == request_id)
return SR_ERR_OK;
last_event = event;
last_request = request_id;
/* skip in bootstrap, triggered by load script to initialize startup datastore */
if (systemf("runlevel >/dev/null 2>&1"))
return SR_ERR_OK;
@@ -28,59 +28,6 @@ int core_startup_save(sr_session_ctx_t *session, uint32_t sub_id, const char *mo
return SR_ERR_OK;
}
static const char *ev2str(sr_event_t ev)
{
switch (ev) {
case SR_EV_UPDATE: return "UPDATE";
case SR_EV_CHANGE: return "CHANGE";
case SR_EV_DONE: return "DONE";
case SR_EV_ABORT: return "ABORT";
case SR_EV_ENABLED: return "ENABLED";
case SR_EV_RPC: return "ABORT";
default:
break;
}
return "UNKNOWN";
}
int core_pre_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
const char *xpath, sr_event_t event, unsigned request_id, void *priv)
{
return 0;
}
/*
* Run on UPDATE to see how many modules have changes in the inbound changeset
* Run on DONE, after the last module callback has run, to activate changes.
* For details, see https://github.com/sysrepo/sysrepo/issues/2188
*/
int core_post_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
const char *xpath, sr_event_t event, unsigned request_id, void *priv)
{
static size_t num_changes = 0;
switch (event) {
case SR_EV_CHANGE:
num_changes++;
return SR_ERR_OK;
case SR_EV_ABORT:
num_changes = 0;
return SR_ERR_OK;
case SR_EV_DONE:
num_changes--;
if (num_changes > 0)
return SR_ERR_OK;
break;
default:
ERROR("core_post_hook() should not be called with event %s", ev2str(event));
return SR_ERR_SYS;
}
return SR_ERR_OK;
}
static confd_dependency_t add_dependencies(struct lyd_node **diff, const char *xpath, const char *value)
{
struct lyd_node *new_node = NULL;
@@ -204,17 +151,17 @@ static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
const char *xpath, sr_event_t event, uint32_t request_id, void *_confd)
{
struct lyd_node *diff = NULL, *config = NULL;
static uint32_t last_event = -1;
static sr_event_t last_event = -1;
struct confd *confd = _confd;
static uint32_t last_id = 0;
static uint32_t last_request = 0;
confd_dependency_t result;
sr_data_t *cfg = NULL;
int rc = SR_ERR_OK;
int max_dep = 10;
if (request_id == last_id && last_event == event)
if (request_id == last_request && last_event == event)
return SR_ERR_OK;
last_id = request_id;
last_request = request_id;
last_event = event;
if (event == SR_EV_CHANGE || event == SR_EV_DONE) {
@@ -316,8 +263,11 @@ free_diff:
return rc;
}
static int subscribe_module(char *model, struct confd *confd, int flags) {
return sr_module_change_subscribe(confd->session, model, "//.", change_cb, confd, CB_PRIO_PRIMARY, SR_SUBSCR_CHANGE_ALL_MODULES | SR_SUBSCR_DEFAULT | flags, &confd->sub);
static inline int subscribe_module(char *model, struct confd *confd, int flags) {
return sr_module_change_subscribe(confd->session, model, "//.", change_cb, confd,
CB_PRIO_PRIMARY, SR_SUBSCR_CHANGE_ALL_MODULES | SR_SUBSCR_DEFAULT | flags, &confd->sub) &&
sr_module_change_subscribe(confd->startup, model, "//.", core_startup_save, NULL,
CB_PRIO_PASSIVE, SR_SUBSCR_PASSIVE | SR_SUBSCR_CHANGE_ALL_MODULES, &confd->sub);
}
int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
src/confd/src/core.h
+1 -31
View File
@@ -135,48 +135,18 @@ struct confd {
struct dagger netdag;
};
uint32_t core_hook_prio (void);
int core_pre_hook (sr_session_ctx_t *, uint32_t, const char *, const char *, sr_event_t, unsigned, void *);
int core_post_hook (sr_session_ctx_t *, uint32_t, const char *, const char *, sr_event_t, unsigned, void *);
int core_startup_save (sr_session_ctx_t *, uint32_t, const char *, const char *, sr_event_t, unsigned, void *);
int core_wait_change (sr_session_ctx_t *, uint32_t, const char *, const char *, sr_event_t, unsigned, void *);
static inline int register_change(sr_session_ctx_t *session, const char *module, const char *xpath,
int flags, sr_module_change_cb cb, void *arg, sr_subscription_ctx_t **sub)
{
struct confd *ptr = (struct confd *)arg;
bool need_core_hooks;
int rc;
/*
* For standard subscribtions we hook into the callback chain
* for all modules to figure out, per changeset, which of the
* callbacks is the last one. This is where we want to call the
* global commit-done hook for candidate -> running changes and
* the startup-save hook for running -> startup copying.
*/
need_core_hooks = !(flags & SR_SUBSCR_UPDATE);
if (need_core_hooks) {
sr_module_change_subscribe(ptr->session, module, xpath, core_pre_hook, NULL,
0, SR_SUBSCR_PASSIVE, sub);
}
rc = sr_module_change_subscribe(session, module, xpath, cb, arg,
int rc = sr_module_change_subscribe(session, module, xpath, cb, arg,
CB_PRIO_PRIMARY, flags | SR_SUBSCR_DEFAULT, sub);
if (rc) {
ERROR("failed subscribing to changes of %s: %s", xpath, sr_strerror(rc));
return rc;
}
if (need_core_hooks) {
sr_module_change_subscribe(ptr->session, module, xpath, core_post_hook, NULL,
core_hook_prio(), SR_SUBSCR_PASSIVE, sub);
sr_module_change_subscribe(ptr->startup, module, xpath, core_startup_save, NULL,
core_hook_prio(), SR_SUBSCR_PASSIVE, sub);
}
return 0;
}