From 9b8a3e11c558877c09416991ff1ec840fea6d0ab Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sat, 2 Dec 2017 14:01:03 +0100 Subject: lib, tools: Rename application process and instance This refactors ouroboros to use "program" instead of "application process" and "process" instead of "application process instance" to align with current naming in current Operating Systems courses instead of the ISO nomenclature adopted by RINA. This change permeates through the entire implementation. Also contains some minor other refactors. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- include/ouroboros/ipcp-dev.h | 4 ++-- include/ouroboros/irm.h | 39 +++++++++++++++++++-------------------- include/ouroboros/np1_flow.h | 2 +- include/ouroboros/shm_flow_set.h | 2 +- include/ouroboros/shm_rbuff.h | 4 ++-- include/ouroboros/sockets.h | 2 +- 6 files changed, 26 insertions(+), 27 deletions(-) (limited to 'include') diff --git a/include/ouroboros/ipcp-dev.h b/include/ouroboros/ipcp-dev.h index 70c604eb..af771fc9 100644 --- a/include/ouroboros/ipcp-dev.h +++ b/include/ouroboros/ipcp-dev.h @@ -25,10 +25,10 @@ #ifndef OUROBOROS_IPCP_DEV_H #define OUROBOROS_IPCP_DEV_H -int ipcp_create_r(pid_t api, +int ipcp_create_r(pid_t pid, int result); -int ipcp_flow_req_arr(pid_t api, +int ipcp_flow_req_arr(pid_t pid, const uint8_t * dst, size_t len, qoscube_t cube); diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h index dc723fc0..514351b7 100644 --- a/include/ouroboros/irm.h +++ b/include/ouroboros/irm.h @@ -33,48 +33,47 @@ #define MGMT_AE "Management" /* Name binding options. */ -#define BIND_AP_AUTO 0x01 -#define BIND_AP_UNIQUE 0x02 +#define BIND_AUTO 0x01 __BEGIN_DECLS pid_t irm_create_ipcp(const char * name, enum ipcp_type ipcp_type); -int irm_destroy_ipcp(pid_t api); +int irm_destroy_ipcp(pid_t pid); -/* apis is an out-parameter */ +/* pids is an out-parameter */ ssize_t irm_list_ipcps(const char * name, - pid_t ** apis); + pid_t ** pids); -int irm_enroll_ipcp(pid_t api, +int irm_enroll_ipcp(pid_t pid, const char * dif_name); -int irm_bootstrap_ipcp(pid_t api, +int irm_bootstrap_ipcp(pid_t pid, const struct ipcp_config * conf); -int irm_connect_ipcp(pid_t api, +int irm_connect_ipcp(pid_t pid, const char * component, const char * dst); -int irm_disconnect_ipcp(pid_t api, +int irm_disconnect_ipcp(pid_t pid, const char * component, const char * dst); -int irm_bind_ap(const char * ap, - const char * name, - uint16_t opts, - int argc, - char ** argv); +int irm_bind_program(const char * prog, + const char * name, + uint16_t opts, + int argc, + char ** argv); -int irm_unbind_ap(const char * ap, - const char * name); +int irm_unbind_program(const char * progr, + const char * name); -int irm_bind_api(pid_t api, - const char * name); +int irm_bind_process(pid_t pid, + const char * name); -int irm_unbind_api(pid_t api, - const char * name); +int irm_unbind_process(pid_t pid, + const char * name); int irm_reg(const char * name, char ** difs, diff --git a/include/ouroboros/np1_flow.h b/include/ouroboros/np1_flow.h index 3231a397..c47f8e1f 100644 --- a/include/ouroboros/np1_flow.h +++ b/include/ouroboros/np1_flow.h @@ -27,7 +27,7 @@ #include -int np1_flow_alloc(pid_t n_api, +int np1_flow_alloc(pid_t n_pid, int port_id, qoscube_t qc); diff --git a/include/ouroboros/shm_flow_set.h b/include/ouroboros/shm_flow_set.h index be2f836b..ec9ef63d 100644 --- a/include/ouroboros/shm_flow_set.h +++ b/include/ouroboros/shm_flow_set.h @@ -33,7 +33,7 @@ struct shm_flow_set * shm_flow_set_create(void); void shm_flow_set_destroy(struct shm_flow_set * set); -struct shm_flow_set * shm_flow_set_open(pid_t api); +struct shm_flow_set * shm_flow_set_open(pid_t pid); void shm_flow_set_close(struct shm_flow_set * set); diff --git a/include/ouroboros/shm_rbuff.h b/include/ouroboros/shm_rbuff.h index af50aada..d33af473 100644 --- a/include/ouroboros/shm_rbuff.h +++ b/include/ouroboros/shm_rbuff.h @@ -34,10 +34,10 @@ struct shm_rbuff; -struct shm_rbuff * shm_rbuff_create(pid_t api, +struct shm_rbuff * shm_rbuff_create(pid_t pid, int port_id); -struct shm_rbuff * shm_rbuff_open(pid_t api, +struct shm_rbuff * shm_rbuff_open(pid_t pid, int port_id); void shm_rbuff_close(struct shm_rbuff * rb); diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h index c0f5d8c7..3f2e71aa 100644 --- a/include/ouroboros/sockets.h +++ b/include/ouroboros/sockets.h @@ -45,7 +45,7 @@ typedef IpcpMsg ipcp_msg_t; #define IPCP_MSG_BUF_SIZE IRM_MSG_BUF_SIZE /* Returns the full socket path of an IPCP */ -char * ipcp_sock_path(pid_t api); +char * ipcp_sock_path(pid_t pid); int server_socket_open(char * file_name); -- cgit v1.2.3