summaryrefslogtreecommitdiff
path: root/src/irmd/reg/flow.h
diff options
context:
space:
mode:
authorDimitri Staessens <[email protected]>2024-02-17 10:19:46 +0100
committerSander Vrijders <[email protected]>2024-02-19 11:49:07 +0100
commit06ee3370998f965b469d1c2859e3e34159c71e20 (patch)
tree93881747a4f1e99f6932231b0cb2358941cb9741 /src/irmd/reg/flow.h
parent7bb8aed15c7f29de4d9719acf8db7fdf73731af5 (diff)
downloadouroboros-06ee3370998f965b469d1c2859e3e34159c71e20.tar.gz
ouroboros-06ee3370998f965b469d1c2859e3e34159c71e20.zip
irmd: Revise IRMd internals
This is a full revision of the IRMd internal implementation. The registry is now a proper subcomponent managing its own internal lock (a single mutex). Some tests are added for the registry and its data structures. Some macros for tests are added in <ouroboros/test.h>. Flow allocation is now more symmetric between the client side (alloc) and server size (accept). Each will create a flow in pending state (ALLOC_PENDING/ACCEPT_PENDING) that is potentially fulfilled by an IPCP using respond_alloc and respond_accept primitives. Deallocation is split in flow_dealloc (application side) and ipcp_flow_dealloc (IPCP side) to get the flow in DEALLOC_PENDING and DEALLOCATED state. Cleanup of failed flow allocation is now properly handled instead of relying on the sanitizer thread. The new sanitizer only needs to monitor crashed processes. On shutdown, the IRMd will now detect hanging processes and SIGKILL them and clean up their fuse mountpoints if needed. A lot of other things have been cleaned up and shuffled around a bit. Signed-off-by: Dimitri Staessens <[email protected]> Signed-off-by: Sander Vrijders <[email protected]>
Diffstat (limited to 'src/irmd/reg/flow.h')
-rw-r--r--src/irmd/reg/flow.h41
1 files changed, 15 insertions, 26 deletions
diff --git a/src/irmd/reg/flow.h b/src/irmd/reg/flow.h
index 22e191be..75ada971 100644
--- a/src/irmd/reg/flow.h
+++ b/src/irmd/reg/flow.h
@@ -24,51 +24,40 @@
#define OUROBOROS_IRMD_REG_FLOW_H
#include <ouroboros/list.h>
+#include <ouroboros/flow.h>
+#include <ouroboros/pthread.h>
#include <ouroboros/qos.h>
#include <ouroboros/shm_rbuff.h>
#include <ouroboros/utils.h>
#include <sys/types.h>
-#include <pthread.h>
#include <time.h>
struct reg_flow {
- struct list_head next;
+ struct list_head next;
- int flow_id;
+ struct flow_info info;
- pid_t n_pid;
- pid_t n_1_pid;
-
- qosspec_t qs;
- time_t mpl;
- buffer_t data;
+ buffer_t data;
+ struct timespec t0;
struct shm_rbuff * n_rb;
struct shm_rbuff * n_1_rb;
-
- struct timespec t0;
-
- enum flow_state state;
- pthread_cond_t cond;
- pthread_mutex_t mtx;
};
-struct reg_flow * reg_flow_create(pid_t n_pid,
- pid_t n_1_pid,
- int flow_id,
- qosspec_t qs);
+struct reg_flow * reg_flow_create(const struct flow_info * info);
-void reg_flow_destroy(struct reg_flow * f);
+void reg_flow_destroy(struct reg_flow * flow);
-enum flow_state reg_flow_get_state(struct reg_flow * f);
+int reg_flow_update(struct reg_flow * flow,
+ struct flow_info * info);
+void reg_flow_set_data(struct reg_flow * flow,
+ const buffer_t * buf);
-void reg_flow_set_state(struct reg_flow * f,
- enum flow_state state);
+void reg_flow_get_data(struct reg_flow * flow,
+ buffer_t * buf);
-int reg_flow_wait_state(struct reg_flow * f,
- enum flow_state state,
- struct timespec * timeo);
+void reg_flow_free_data(struct reg_flow * flow);
#endif /* OUROBOROS_IRMD_REG_FLOW_H */