summaryrefslogtreecommitdiff
path: root/src/ipcpd/ipcp-data.h
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-05-07 16:11:09 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-05-07 16:11:09 +0200
commiteb9f44379d5316e7f7e9311d7a66d2041eca743a (patch)
tree2489605a42bb2c9582c0c4e912c2de0c40512b2a /src/ipcpd/ipcp-data.h
parentde8f2015cbd015b1cced366cb12c054be62c23b1 (diff)
downloadouroboros-eb9f44379d5316e7f7e9311d7a66d2041eca743a.tar.gz
ouroboros-eb9f44379d5316e7f7e9311d7a66d2041eca743a.zip
irmd: flow allocation and fast path
This commit has a first implementation of flow allocation (the "slow path") and read/write (the "fast path") for ouroboros. It provides basic but unstable communications over the shared memory. It required a lot of changes all over the stack, and fixes a number of previously undetected issues. This PR still need heavy revision regarding data model, locking and cleanup. lib/dev: modifications to the API. It now uses an ap_init() call to set the AP name and sets the Instance ID to the pid of the process. It also binds the AP to the shared memory and creates tables for mappings in the fast path. A call to ap_fini() releases the resources. lib/shm_ap_rbuff: added ring buffer for data exchange between processes in the fast path. It passes an index in the shm_du_map. lib/shm_du_map: rewrote API to work with calls from dev.c. Garbage collector added. Tests updated to new API. ipcpd/ipcp-data: removed everything related to flows, as these are universal for all ap's and kept in ap_data (dev.c), or similar structs for shim ipcps. shim-udp: added flow allocator and read/write functions and shm elements. irmd: revised data model and structures necessary for flow allocation. tools: echo updated to new dev.h API. messaging system was updated to comply with new flow allocation messages. All exchanges use pid and port_id to bootstrap the fast path.
Diffstat (limited to 'src/ipcpd/ipcp-data.h')
-rw-r--r--src/ipcpd/ipcp-data.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/ipcpd/ipcp-data.h b/src/ipcpd/ipcp-data.h
index 1dea8c3c..2e86ba11 100644
--- a/src/ipcpd/ipcp-data.h
+++ b/src/ipcpd/ipcp-data.h
@@ -34,17 +34,11 @@
#include "flow.h"
struct ipcp_data {
- instance_name_t * iname;
enum ipcp_type type;
- struct shm_du_map * dum;
-
struct list_head registry;
pthread_mutex_t reg_lock;
- struct list_head flows;
- pthread_mutex_t flow_lock;
-
struct list_head directory;
pthread_mutex_t dir_lock;
@@ -53,7 +47,6 @@ struct ipcp_data {
struct ipcp_data * ipcp_data_create();
struct ipcp_data * ipcp_data_init(struct ipcp_data * dst,
- const char * ipcp_name,
enum ipcp_type ipcp_type);
void ipcp_data_destroy(struct ipcp_data * data);
@@ -73,13 +66,4 @@ bool ipcp_data_is_in_directory(struct ipcp_data * data,
const char * ap_name);
uint64_t ipcp_data_get_addr(struct ipcp_data * data,
const char * ap_name);
-bool ipcp_data_has_flow(struct ipcp_data * data,
- uint32_t port_id);
-flow_t * ipcp_data_find_flow(struct ipcp_data * data,
- uint32_t port_id);
-int ipcp_data_add_flow(struct ipcp_data * data,
- flow_t * flow);
-int ipcp_data_del_flow(struct ipcp_data * data,
- uint32_t port_id);
-
#endif /* IPCPD_IPCP_DATA_H */