From 2676b5acdfa52545a967423fd53bad99ac585aab Mon Sep 17 00:00:00 2001
From: Vftdan <vftdan@gmail.com>
Date: Sat, 17 Aug 2024 11:02:26 +0200
Subject: [PATCH] Wrap constant and predicate registries into a single
 environment type

---
 config.c        | 12 ++++++++++++
 config.cfg      |  2 +-
 config.h        | 23 +++++++++++++++++++++--
 graph.c         |  4 ++--
 graph.h         |  4 ++--
 main.c          |  2 +-
 nodes/evdev.c   |  4 ++--
 nodes/getchar.c |  4 ++--
 nodes/print.c   |  4 ++--
 nodes/tee.c     |  4 ++--
 10 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/config.c b/config.c
index a78e8d2..37548fc 100644
--- a/config.c
+++ b/config.c
@@ -449,3 +449,15 @@ resolve_event_predicate(EventPredicateHandleRegistry * registry, const ConstantR
 	}
 	return load_single_predicate(setting, registry, constants);
 }
+
+long long
+env_resolve_constant_or(InitializationEnvironment * env, const config_setting_t * setting, long long dflt)
+{
+	return resolve_constant_or(&env->constants, setting, dflt);
+}
+
+EventPredicateHandle
+env_resolve_event_predicate(InitializationEnvironment * env, const config_setting_t * setting)
+{
+	return resolve_event_predicate(&env->predicates, &env->constants, setting);
+}
diff --git a/config.cfg b/config.cfg
index 2d19af2..b5df3f7 100644
--- a/config.cfg
+++ b/config.cfg
@@ -18,7 +18,7 @@ predicates = {
 				max = "event_type.KEY";
 			}
 		);
-	}
+	};
 };
 
 nodes = {
diff --git a/config.h b/config.h
index 68e6248..b73f973 100644
--- a/config.h
+++ b/config.h
@@ -31,12 +31,21 @@ typedef struct {
 
 typedef TYPED_HASH_TABLE(long long) ConstantRegistry;
 typedef TYPED_HASH_TABLE(EventPredicateHandle) EventPredicateHandleRegistry;
+typedef struct initialization_environment InitializationEnvironment;
 
 typedef struct {
 	GraphNodeConfigSection nodes;
 	GraphChannelConfigSection channels;
-	ConstantRegistry constants;
-	EventPredicateHandleRegistry predicates;
+	union {
+		struct {
+			ConstantRegistry constants;
+			EventPredicateHandleRegistry predicates;
+		};
+		struct initialization_environment {
+			const ConstantRegistry constants;
+			EventPredicateHandleRegistry predicates;
+		} environment;
+	};
 } FullConfig;
 
 bool load_config(const config_setting_t *config_root, FullConfig *config);
@@ -44,10 +53,20 @@ void reset_config(FullConfig *config);
 long long resolve_constant_or(const ConstantRegistry * registry, const config_setting_t * setting, long long dflt);
 EventPredicateHandle resolve_event_predicate(EventPredicateHandleRegistry * registry, const ConstantRegistry * constants, const config_setting_t * setting);
 
+// These are not inline to make non-breaking ABI changes
+long long env_resolve_constant_or(InitializationEnvironment * env, const config_setting_t * setting, long long dflt);
+EventPredicateHandle env_resolve_event_predicate(InitializationEnvironment * env, const config_setting_t * setting);
+
 __attribute__((unused)) inline static long long
 resolve_constant(const ConstantRegistry * registry, const config_setting_t * setting)
 {
 	return resolve_constant_or(registry, setting, 0);
 }
 
+__attribute__((unused)) inline static long long
+env_resolve_constant(InitializationEnvironment * env, const config_setting_t * setting)
+{
+	return env_resolve_constant_or(env, setting, 0);
+}
+
 #endif /* end of include guard: CONFIG_H_ */
diff --git a/graph.c b/graph.c
index 45694eb..e3c980d 100644
--- a/graph.c
+++ b/graph.c
@@ -88,12 +88,12 @@ graph_channel_init(GraphChannel * ch, GraphNode * start, size_t start_idx, Graph
 }
 
 GraphNode *
-graph_node_new(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRegistry * constants)
+graph_node_new(GraphNodeSpecification * spec, GraphNodeConfig * config, InitializationEnvironment * env)
 {
 	if (!spec || !spec->create) {
 		return NULL;
 	}
-	return spec->create(spec, config, constants);
+	return spec->create(spec, config, env);
 }
 
 void
diff --git a/graph.h b/graph.h
index b66e52f..79815e3 100644
--- a/graph.h
+++ b/graph.h
@@ -29,14 +29,14 @@ struct graph_channel {
 };
 
 struct graph_node_specification {
-	GraphNode * (*create)(GraphNodeSpecification * self, GraphNodeConfig * config, const ConstantRegistry * constants);
+	GraphNode * (*create)(GraphNodeSpecification * self, GraphNodeConfig * config, InitializationEnvironment * env);
 	void (*destroy)(GraphNodeSpecification * self, GraphNode * target);
 	void (*register_io)(GraphNodeSpecification * self, GraphNode * target, ProcessingState * state);
 	char *name;
 };
 
 void graph_channel_init(GraphChannel * ch, GraphNode * start, size_t start_idx, GraphNode * end, size_t end_idx);
-GraphNode *graph_node_new(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRegistry * constants);
+GraphNode *graph_node_new(GraphNodeSpecification * spec, GraphNodeConfig * config, InitializationEnvironment * env);
 void graph_node_delete(GraphNode * self);
 void graph_node_register_io(GraphNode * self, ProcessingState * state);
 void graph_channel_list_init(GraphChannelList * lst);
diff --git a/main.c b/main.c
index 388dc08..7997767 100644
--- a/main.c
+++ b/main.c
@@ -39,7 +39,7 @@ main(int argc, char ** argv)
 			fprintf(stderr, "Unknown node type \"%s\" for node %ld \"%s\"\n", type_name, i, loaded_config.nodes.items[i].name);
 			exit(1);
 		}
-		if (!(nodes[i] = graph_node_new(spec, &loaded_config.nodes.items[i], &loaded_config.constants))) {
+		if (!(nodes[i] = graph_node_new(spec, &loaded_config.nodes.items[i], &loaded_config.environment))) {
 			perror("Failed to create node");
 			fprintf(stderr, "%ld \"%s\"\n", i, loaded_config.nodes.items[i].name);
 			exit(1);
diff --git a/nodes/evdev.c b/nodes/evdev.c
index e4ae62b..f8aeeec 100644
--- a/nodes/evdev.c
+++ b/nodes/evdev.c
@@ -69,7 +69,7 @@ handle_io(EventPositionBase * self, int fd, bool is_output)
 }
 
 static GraphNode *
-create(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRegistry * constants)
+create(GraphNodeSpecification * spec, GraphNodeConfig * config, InitializationEnvironment * env)
 {
 	EvdevGraphNode * node = T_ALLOC(1, EvdevGraphNode);
 	if (!node) {
@@ -77,7 +77,7 @@ create(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRe
 	}
 	const char *filename = NULL;
 	if (config) {
-		node->namespace = resolve_constant(constants, config_setting_get_member(config->options, "namespace"));
+		node->namespace = env_resolve_constant(env, config_setting_get_member(config->options, "namespace"));
 		config_setting_lookup_string(config->options, "file", &filename);
 	}
 	if (filename == NULL) {
diff --git a/nodes/getchar.c b/nodes/getchar.c
index 967a916..a633651 100644
--- a/nodes/getchar.c
+++ b/nodes/getchar.c
@@ -49,7 +49,7 @@ handle_io(EventPositionBase * self, int fd, bool is_output)
 }
 
 static GraphNode *
-create(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRegistry * constants)
+create(GraphNodeSpecification * spec, GraphNodeConfig * config, InitializationEnvironment * env)
 {
 	GetcharGraphNode * node = T_ALLOC(1, GetcharGraphNode);
 	if (!node) {
@@ -70,7 +70,7 @@ create(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRe
 			.handle_io = handle_io,
 			.enabled = true,
 		},
-		.namespace = resolve_constant(constants, config_setting_get_member(config->options, "namespace")),
+		.namespace = env_resolve_constant(env, config_setting_get_member(config->options, "namespace")),
 	};
 	return &node->as_GraphNode;
 }
diff --git a/nodes/print.c b/nodes/print.c
index 13e0f60..7c3234f 100644
--- a/nodes/print.c
+++ b/nodes/print.c
@@ -28,10 +28,10 @@ handle_event(EventPositionBase * self, EventNode * event)
 }
 
 static GraphNode *
-create(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRegistry * constants)
+create(GraphNodeSpecification * spec, GraphNodeConfig * config, InitializationEnvironment * env)
 {
 	(void) config;
-	(void) constants;
+	(void) env;
 	GraphNode * node = T_ALLOC(1, GraphNode);
 	if (!node) {
 		return node;
diff --git a/nodes/tee.c b/nodes/tee.c
index 067ad9d..e675573 100644
--- a/nodes/tee.c
+++ b/nodes/tee.c
@@ -21,10 +21,10 @@ handle_event(EventPositionBase * self, EventNode * event)
 }
 
 static GraphNode *
-create(GraphNodeSpecification * spec, GraphNodeConfig * config, const ConstantRegistry * constants)
+create(GraphNodeSpecification * spec, GraphNodeConfig * config, InitializationEnvironment * env)
 {
 	(void) config;
-	(void) constants;
+	(void) env;
 	GraphNode * node = T_ALLOC(1, GraphNode);
 	if (!node) {
 		return node;