summaryrefslogtreecommitdiff
path: root/src/irmd
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@ugent.be>2017-12-02 14:01:03 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-12-02 14:56:20 +0100
commit9b8a3e11c558877c09416991ff1ec840fea6d0ab (patch)
treef2faf7a4ab45687782a010fb6e48829e8ee1bdeb /src/irmd
parentf43e5e2329fb798047d15dd0748e5eef3359c966 (diff)
downloadouroboros-9b8a3e11c558877c09416991ff1ec840fea6d0ab.tar.gz
ouroboros-9b8a3e11c558877c09416991ff1ec840fea6d0ab.zip
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 <dimitri.staessens@ugent.be> Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Diffstat (limited to 'src/irmd')
-rw-r--r--src/irmd/CMakeLists.txt4
-rw-r--r--src/irmd/api_table.h83
-rw-r--r--src/irmd/apn_table.h65
-rw-r--r--src/irmd/ipcp.c106
-rw-r--r--src/irmd/ipcp.h26
-rw-r--r--src/irmd/irm_flow.c16
-rw-r--r--src/irmd/irm_flow.h8
-rw-r--r--src/irmd/main.c603
-rw-r--r--src/irmd/proc_table.c (renamed from src/irmd/api_table.c)118
-rw-r--r--src/irmd/proc_table.h83
-rw-r--r--src/irmd/prog_table.c (renamed from src/irmd/apn_table.c)93
-rw-r--r--src/irmd/prog_table.h65
-rw-r--r--src/irmd/registry.c96
-rw-r--r--src/irmd/registry.h38
14 files changed, 707 insertions, 697 deletions
diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt
index 51b6f965..51423621 100644
--- a/src/irmd/CMakeLists.txt
+++ b/src/irmd/CMakeLists.txt
@@ -30,8 +30,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
set(SOURCE_FILES
# Add source files here
- api_table.c
- apn_table.c
+ proc_table.c
+ prog_table.c
ipcp.c
irm_flow.c
main.c
diff --git a/src/irmd/api_table.h b/src/irmd/api_table.h
deleted file mode 100644
index 1fb2e285..00000000
--- a/src/irmd/api_table.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * The IPC Resource Manager - Application Instance Table
- *
- * Dimitri Staessens <dimitri.staessens@ugent.be>
- * Sander Vrijders <sander.vrijders@ugent.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., http://www.fsf.org/about/contact/.
- */
-
-#ifndef OUROBOROS_IRMD_API_TABLE_H
-#define OUROBOROS_IRMD_API_TABLE_H
-
-#include "time.h"
-#include "utils.h"
-
-#include <unistd.h>
-#include <pthread.h>
-
-enum api_state {
- API_NULL = 0,
- API_INIT,
- API_SLEEP,
- API_WAKE,
- API_DESTROY
-};
-
-struct api_entry {
- struct list_head next;
- pid_t api;
- char * apn; /* application process instantiated */
- char * daf_name; /* DAF this AP-I belongs to */
- struct list_head names; /* names for which api accepts flows */
-
- struct reg_entry * re; /* reg_entry for which a flow arrived */
-
- /* The process will block on this */
- enum api_state state;
- pthread_cond_t cond;
- pthread_mutex_t lock;
-};
-
-struct api_entry * api_entry_create(pid_t api,
- char * apn);
-
-void api_entry_destroy(struct api_entry * e);
-
-int api_entry_sleep(struct api_entry * e,
- struct timespec * timeo);
-
-void api_entry_wake(struct api_entry * e,
- struct reg_entry * re);
-
-void api_entry_cancel(struct api_entry * e);
-
-int api_entry_add_name(struct api_entry * e,
- char * name);
-
-void api_entry_del_name(struct api_entry * e,
- const char * name);
-
-int api_table_add(struct list_head * api_table,
- struct api_entry * e);
-
-void api_table_del(struct list_head * api_table,
- pid_t api);
-
-struct api_entry * api_table_get(struct list_head * api_table,
- pid_t api);
-
-#endif /* OUROBOROS_IRMD_API_TABLE_H */
diff --git a/src/irmd/apn_table.h b/src/irmd/apn_table.h
deleted file mode 100644
index 0daff929..00000000
--- a/src/irmd/apn_table.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * The IPC Resource Manager - Application Process Names Table
- *
- * Dimitri Staessens <dimitri.staessens@ugent.be>
- * Sander Vrijders <sander.vrijders@ugent.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., http://www.fsf.org/about/contact/.
- */
-
-#ifndef OUROBOROS_IRMD_APN_TABLE_H
-#define OUROBOROS_IRMD_APN_TABLE_H
-
-#include <ouroboros/list.h>
-
-#include <unistd.h>
-#include <stdint.h>
-
-struct apn_entry {
- struct list_head next;
- char * apn; /* name for irmd */
- char * ap; /* name of binary */
- uint32_t flags;
- char ** argv;
- struct list_head names; /* names that all instances will listen for */
-};
-
-struct apn_entry * apn_entry_create(char * apn,
- char * ap,
- uint32_t flags,
- char ** argv);
-
-void apn_entry_destroy(struct apn_entry * e);
-
-int apn_entry_add_name(struct apn_entry * e,
- char * name);
-
-void apn_entry_del_name(struct apn_entry * e,
- char * name);
-
-int apn_table_add(struct list_head * apn_table,
- struct apn_entry * e);
-
-void apn_table_del(struct list_head * apn_table,
- char * ap);
-
-struct apn_entry * apn_table_get(struct list_head * apn_table,
- char * ap);
-
-struct apn_entry * apn_table_get_by_apn(struct list_head * apn_table,
- char * apn);
-
-#endif /* OUROBOROS_IRMD_APN_TABLE_H */
diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index 497bff9f..d2eaa947 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -48,7 +48,7 @@ static void close_ptr(void * o)
close(*(int *) o);
}
-ipcp_msg_t * send_recv_ipcp_msg(pid_t api,
+ipcp_msg_t * send_recv_ipcp_msg(pid_t pid,
ipcp_msg_t * msg)
{
int sockfd = 0;
@@ -58,10 +58,10 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t api,
ipcp_msg_t * recv_msg = NULL;
struct timeval tv;
- if (kill(api, 0) < 0)
+ if (kill(pid, 0) < 0)
return NULL;
- sock_path = ipcp_sock_path(api);
+ sock_path = ipcp_sock_path(pid);
if (sock_path == NULL)
return NULL;
@@ -128,10 +128,10 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t api,
pid_t ipcp_create(const char * name,
enum ipcp_type ipcp_type)
{
- pid_t api = -1;
+ pid_t pid = -1;
char * ipcp_dir = "/sbin/";
char * exec_name = NULL;
- char irmd_api[10];
+ char irmd_pid[10];
char full_name[256];
char * argv[5];
@@ -157,16 +157,16 @@ pid_t ipcp_create(const char * name,
return -1;
}
- sprintf(irmd_api, "%u", getpid());
+ sprintf(irmd_pid, "%u", getpid());
- api = fork();
- if (api == -1) {
+ pid = fork();
+ if (pid == -1) {
log_err("Failed to fork");
- return api;
+ return pid;
}
- if (api != 0)
- return api;
+ if (pid != 0)
+ return pid;
strcpy(full_name, INSTALL_PREFIX);
strcat(full_name, ipcp_dir);
@@ -174,7 +174,7 @@ pid_t ipcp_create(const char * name,
/* log_file to be placed at the end */
argv[0] = full_name;
- argv[1] = irmd_api;
+ argv[1] = irmd_pid;
argv[2] = (char *) name;
if (log_syslog)
argv[3] = "1";
@@ -190,9 +190,9 @@ pid_t ipcp_create(const char * name,
exit(EXIT_FAILURE);
}
-int ipcp_destroy(pid_t api)
+int ipcp_destroy(pid_t pid)
{
- if (kill(api, SIGTERM)) {
+ if (kill(pid, SIGTERM)) {
log_err("Failed to destroy IPCP");
return -1;
}
@@ -200,7 +200,7 @@ int ipcp_destroy(pid_t api)
return 0;
}
-int ipcp_bootstrap(pid_t api,
+int ipcp_bootstrap(pid_t pid,
ipcp_config_msg_t * conf,
struct dif_info * info)
{
@@ -214,11 +214,11 @@ int ipcp_bootstrap(pid_t api,
msg.code = IPCP_MSG_CODE__IPCP_BOOTSTRAP;
msg.conf = conf;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -243,7 +243,7 @@ int ipcp_bootstrap(pid_t api,
return ret;
}
-int ipcp_enroll(pid_t api,
+int ipcp_enroll(pid_t pid,
const char * dst,
struct dif_info * info)
{
@@ -257,11 +257,11 @@ int ipcp_enroll(pid_t api,
msg.code = IPCP_MSG_CODE__IPCP_ENROLL;
msg.dst_name = (char *) dst;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -285,7 +285,7 @@ int ipcp_enroll(pid_t api,
return 0;
}
-int ipcp_connect(pid_t api,
+int ipcp_connect(pid_t pid,
const char * dst,
const char * component)
{
@@ -296,14 +296,14 @@ int ipcp_connect(pid_t api,
msg.code = IPCP_MSG_CODE__IPCP_CONNECT;
msg.dst_name = (char *) dst;
msg.comp_name = (char *) component;
- msg.has_api = true;
- msg.api = api;
+ msg.has_pid = true;
+ msg.pid = pid;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -314,7 +314,7 @@ int ipcp_connect(pid_t api,
return ret;
}
-int ipcp_disconnect(pid_t api,
+int ipcp_disconnect(pid_t pid,
const char * dst,
const char * component)
{
@@ -325,14 +325,14 @@ int ipcp_disconnect(pid_t api,
msg.code = IPCP_MSG_CODE__IPCP_DISCONNECT;
msg.dst_name = (char *) dst;
msg.comp_name = (char *) component;
- msg.has_api = true;
- msg.api = api;
+ msg.has_pid = true;
+ msg.pid = pid;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -343,7 +343,7 @@ int ipcp_disconnect(pid_t api,
return ret;
}
-int ipcp_reg(pid_t api,
+int ipcp_reg(pid_t pid,
const uint8_t * hash,
size_t len)
{
@@ -358,11 +358,11 @@ int ipcp_reg(pid_t api,
msg.hash.len = len;
msg.hash.data = (uint8_t *)hash;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -373,7 +373,7 @@ int ipcp_reg(pid_t api,
return ret;
}
-int ipcp_unreg(pid_t api,
+int ipcp_unreg(pid_t pid,
const uint8_t * hash,
size_t len)
{
@@ -386,11 +386,11 @@ int ipcp_unreg(pid_t api,
msg.hash.len = len;
msg.hash.data = (uint8_t *) hash;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -401,7 +401,7 @@ int ipcp_unreg(pid_t api,
return ret;
}
-int ipcp_query(pid_t api,
+int ipcp_query(pid_t pid,
const uint8_t * hash,
size_t len)
{
@@ -414,11 +414,11 @@ int ipcp_query(pid_t api,
msg.hash.len = len;
msg.hash.data = (uint8_t *) hash;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -429,9 +429,9 @@ int ipcp_query(pid_t api,
return ret;
}
-int ipcp_flow_alloc(pid_t api,
+int ipcp_flow_alloc(pid_t pid,
int port_id,
- pid_t n_api,
+ pid_t n_pid,
const uint8_t * dst,
size_t len,
qoscube_t cube)
@@ -445,15 +445,15 @@ int ipcp_flow_alloc(pid_t api,
msg.code = IPCP_MSG_CODE__IPCP_FLOW_ALLOC;
msg.has_port_id = true;
msg.port_id = port_id;
- msg.has_api = true;
- msg.api = n_api;
+ msg.has_pid = true;
+ msg.pid = n_pid;
msg.has_hash = true;
msg.hash.len = len;
msg.hash.data = (uint8_t *) dst;
msg.has_qoscube = true;
msg.qoscube = cube;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
@@ -468,9 +468,9 @@ int ipcp_flow_alloc(pid_t api,
return ret;
}
-int ipcp_flow_alloc_resp(pid_t api,
+int ipcp_flow_alloc_resp(pid_t pid,
int port_id,
- pid_t n_api,
+ pid_t n_pid,
int response)
{
ipcp_msg_t msg = IPCP_MSG__INIT;
@@ -480,16 +480,16 @@ int ipcp_flow_alloc_resp(pid_t api,
msg.code = IPCP_MSG_CODE__IPCP_FLOW_ALLOC_RESP;
msg.has_port_id = true;
msg.port_id = port_id;
- msg.has_api = true;
- msg.api = n_api;
+ msg.has_pid = true;
+ msg.pid = n_pid;
msg.has_response = true;
msg.response = response;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return -EIPCP;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return -EIPCP;
}
@@ -500,7 +500,7 @@ int ipcp_flow_alloc_resp(pid_t api,
return ret;
}
-int ipcp_flow_dealloc(pid_t api,
+int ipcp_flow_dealloc(pid_t pid,
int port_id)
{
ipcp_msg_t msg = IPCP_MSG__INIT;
@@ -511,11 +511,11 @@ int ipcp_flow_dealloc(pid_t api,
msg.has_port_id = true;
msg.port_id = port_id;
- recv_msg = send_recv_ipcp_msg(api, &msg);
+ recv_msg = send_recv_ipcp_msg(pid, &msg);
if (recv_msg == NULL)
return 0;
- if (recv_msg->has_result == false) {
+ if (!recv_msg->has_result) {
ipcp_msg__free_unpacked(recv_msg, NULL);
return 0;
}
diff --git a/src/irmd/ipcp.h b/src/irmd/ipcp.h
index 9c861cde..3797e628 100644
--- a/src/irmd/ipcp.h
+++ b/src/irmd/ipcp.h
@@ -32,49 +32,49 @@
pid_t ipcp_create(const char * name,
enum ipcp_type ipcp_type);
-int ipcp_destroy(pid_t api);
+int ipcp_destroy(pid_t pid);
-int ipcp_enroll(pid_t api,
+int ipcp_enroll(pid_t pid,
const char * dst,
struct dif_info * info);
-int ipcp_bootstrap(pid_t api,
+int ipcp_bootstrap(pid_t pid,
ipcp_config_msg_t * conf,
struct dif_info * info);
-int ipcp_connect(pid_t api,
+int ipcp_connect(pid_t pid,
const char * dst,
const char * component);
-int ipcp_disconnect(pid_t api,
+int ipcp_disconnect(pid_t pid,
const char * dst,
const char * component);
-int ipcp_reg(pid_t api,
+int ipcp_reg(pid_t pid,
const uint8_t * hash,
size_t len);
-int ipcp_unreg(pid_t api,
+int ipcp_unreg(pid_t pid,
const uint8_t * hash,
size_t len);
-int ipcp_query(pid_t api,
+int ipcp_query(pid_t pid,
const uint8_t * hash,
size_t len);
-int ipcp_flow_alloc(pid_t api,
+int ipcp_flow_alloc(pid_t pid,
int port_id,
- pid_t n_api,
+ pid_t n_pid,
const uint8_t * dst,
size_t len,
qoscube_t qos);
-int ipcp_flow_alloc_resp(pid_t api,
+int ipcp_flow_alloc_resp(pid_t pid,
int port_id,
- pid_t n_api,
+ pid_t n_pid,
int response);
-int ipcp_flow_dealloc(pid_t api,
+int ipcp_flow_dealloc(pid_t pid,
int port_id);
#endif /* OUROBOROS_IRMD_IPCP_H */
diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c
index 2b7f8de7..cc7b91ab 100644
--- a/src/irmd/irm_flow.c
+++ b/src/irmd/irm_flow.c
@@ -36,8 +36,8 @@
#include <stdbool.h>
#include <assert.h>
-struct irm_flow * irm_flow_create(pid_t n_api,
- pid_t n_1_api,
+struct irm_flow * irm_flow_create(pid_t n_pid,
+ pid_t n_1_pid,
int port_id,
qoscube_t qc)
{
@@ -58,20 +58,20 @@ struct irm_flow * irm_flow_create(pid_t n_api,
if (pthread_mutex_init(&f->state_lock, NULL))
goto fail_mutex;
- f->n_api = n_api;
- f->n_1_api = n_1_api;
+ f->n_pid = n_pid;
+ f->n_1_pid = n_1_pid;
f->port_id = port_id;
f->qc = qc;
- f->n_rb = shm_rbuff_create(n_api, port_id);
+ f->n_rb = shm_rbuff_create(n_pid, port_id);
if (f->n_rb == NULL) {
- log_err("Could not create ringbuffer for AP-I %d.", n_api);
+ log_err("Could not create ringbuffer for process %d.", n_pid);
goto fail_n_rbuff;
}
- f->n_1_rb = shm_rbuff_create(n_1_api, port_id);
+ f->n_1_rb = shm_rbuff_create(n_1_pid, port_id);
if (f->n_1_rb == NULL) {
- log_err("Could not create ringbuffer for AP-I %d.", n_1_api);
+ log_err("Could not create ringbuffer for process %d.", n_1_pid);
goto fail_n_1_rbuff;
}
diff --git a/src/irmd/irm_flow.h b/src/irmd/irm_flow.h
index 3a302b02..906e5651 100644
--- a/src/irmd/irm_flow.h
+++ b/src/irmd/irm_flow.h
@@ -45,8 +45,8 @@ struct irm_flow {
int port_id;
qoscube_t qc;
- pid_t n_api;
- pid_t n_1_api;
+ pid_t n_pid;
+ pid_t n_1_pid;
struct shm_rbuff * n_rb;
struct shm_rbuff * n_1_rb;
@@ -58,8 +58,8 @@ struct irm_flow {
pthread_mutex_t state_lock;
};
-struct irm_flow * irm_flow_create(pid_t n_api,
- pid_t n_1_api,
+struct irm_flow * irm_flow_create(pid_t n_pid,
+ pid_t n_1_pid,
int port_id,
qoscube_t qc);
diff --git a/src/irmd/main.c b/src/irmd/main.c
index f9438b9b..7b4ad9d8 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -46,7 +46,7 @@
#include "utils.h"
#include "registry.h"
#include "irm_flow.h"
-#include "api_table.h"
+#include "proc_table.h"
#include "ipcp.h"
#include <sys/socket.h>
@@ -78,7 +78,7 @@ struct ipcp_entry {
struct list_head next;
char * name;
- pid_t api;
+ pid_t pid;
enum ipcp_type type;
enum hash_algo dir_hash_algo;
char * dif_name;
@@ -106,9 +106,9 @@ struct {
struct list_head ipcps; /* list of ipcps in system */
- struct list_head api_table; /* ap instances */
- struct list_head apn_table; /* ap names known */
- struct list_head spawned_apis; /* child ap instances */
+ struct list_head proc_table; /* processes */
+ struct list_head prog_table; /* programs known */
+ struct list_head spawned_pids; /* child processes */
pthread_rwlock_t reg_lock; /* lock for registration info */
struct bmp * port_ids; /* port_ids for flows */
@@ -181,13 +181,13 @@ static struct irm_flow * get_irm_flow(int port_id)
return NULL;
}
-static struct irm_flow * get_irm_flow_n(pid_t n_api)
+static struct irm_flow * get_irm_flow_n(pid_t n_pid)
{
struct list_head * pos = NULL;
list_for_each(pos, &irmd.irm_flows) {
struct irm_flow * e = list_entry(pos, struct irm_flow, next);
- if (e->n_api == n_api &&
+ if (e->n_pid == n_pid &&
irm_flow_get_state(e) == FLOW_ALLOC_PENDING)
return e;
}
@@ -229,13 +229,13 @@ static void ipcp_entry_destroy(struct ipcp_entry * e)
free(e);
}
-static struct ipcp_entry * get_ipcp_entry_by_api(pid_t api)
+static struct ipcp_entry * get_ipcp_entry_by_pid(pid_t pid)
{
struct list_head * p = NULL;
list_for_each(p, &irmd.ipcps) {
struct ipcp_entry * e = list_entry(p, struct ipcp_entry, next);
- if (api == e->api)
+ if (pid == e->pid)
return e;
}
@@ -261,13 +261,13 @@ static struct ipcp_entry * get_ipcp_by_dst_name(const char * name,
struct list_head * p;
struct list_head * h;
uint8_t * hash;
- pid_t api;
+ pid_t pid;
pthread_rwlock_rdlock(&irmd.reg_lock);
list_for_each_safe(p, h, &irmd.ipcps) {
struct ipcp_entry * e = list_entry(p, struct ipcp_entry, next);
- if (e->dif_name == NULL || e->api == src)
+ if (e->dif_name == NULL || e->pid == src)
continue;
hash = malloc(IPCP_HASH_LEN(e));
@@ -276,11 +276,11 @@ static struct ipcp_entry * get_ipcp_by_dst_name(const char * name,
str_hash(e->dir_hash_algo, hash, name);
- api = e->api;
+ pid = e->pid;
pthread_rwlock_unlock(&irmd.reg_lock);
- if (ipcp_query(api, hash, IPCP_HASH_LEN(e)) == 0) {
+ if (ipcp_query(pid, hash, IPCP_HASH_LEN(e)) == 0) {
free(hash);
return e;
}
@@ -298,7 +298,7 @@ static struct ipcp_entry * get_ipcp_by_dst_name(const char * name,
static pid_t create_ipcp(char * name,
enum ipcp_type ipcp_type)
{
- struct pid_el * api = NULL;
+ struct pid_el * ppid = NULL;
struct ipcp_entry * tmp = NULL;
struct list_head * p = NULL;
struct ipcp_entry * entry = NULL;
@@ -309,8 +309,8 @@ static pid_t create_ipcp(char * name,
(SOCKET_TIMEOUT % 1000) * MILLION};
pid_t ipcp_pid;
- api = malloc(sizeof(*api));
- if (api == NULL)
+ ppid = malloc(sizeof(*ppid));
+ if (ppid == NULL)
return -ENOMEM;
pthread_rwlock_wrlock(&irmd.reg_lock);
@@ -318,15 +318,15 @@ static pid_t create_ipcp(char * name,
entry = get_ipcp_entry_by_name(name);
if (entry != NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
- free(api);
+ free(ppid);
log_err("IPCP by that name already exists.");
return -1;
}
- api->pid = ipcp_create(name, ipcp_type);
- if (api->pid == -1) {
+ ppid->pid = ipcp_create(name, ipcp_type);
+ if (ppid->pid == -1) {
pthread_rwlock_unlock(&irmd.reg_lock);
- free(api);
+ free(ppid);
log_err("Failed to create IPCP.");
return -1;
}
@@ -334,17 +334,17 @@ static pid_t create_ipcp(char * name,
tmp = ipcp_entry_create();
if (tmp == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
- free(api);
+ free(ppid);
return -1;
}
list_head_init(&tmp->next);
tmp->name = strdup(name);
- if (tmp->name == NULL) {
+ if (tmp->name == NULL) {
ipcp_entry_destroy(tmp);
pthread_rwlock_unlock(&irmd.reg_lock);
- free(api);
+ free(ppid);
return -1;
}
@@ -359,12 +359,12 @@ static pid_t create_ipcp(char * name,
pthread_mutex_init(&tmp->init_lock, NULL);
- tmp->api = api->pid;
+ tmp->pid = ppid->pid;
tmp->dif_name = NULL;
tmp->type = ipcp_type;
tmp->init_state = IPCP_BOOT;
tmp->dir_hash_algo = -1;
- ipcp_pid = tmp->api;
+ ipcp_pid = tmp->pid;
list_for_each(p, &irmd.ipcps) {
struct ipcp_entry * e = list_entry(p, struct ipcp_entry, next);
@@ -374,7 +374,7 @@ static pid_t create_ipcp(char * name,
list_add_tail(&tmp->next, p);
- list_add(&api->next, &irmd.spawned_apis);
+ list_add(&ppid->next, &irmd.spawned_pids);
pthread_rwlock_unlock(&irmd.reg_lock);
@@ -389,7 +389,7 @@ static pid_t create_ipcp(char * name,
&dl);
if (ret == -ETIMEDOUT) {
- kill(tmp->api, SIGKILL);
+ kill(tmp->pid, SIGKILL);
tmp->init_state = IPCP_NULL;
pthread_cond_signal(&tmp->init_cond);
pthread_mutex_unlock(&tmp->init_lock);
@@ -404,7 +404,7 @@ static pid_t create_ipcp(char * name,
return ipcp_pid;
}
-static int create_ipcp_r(pid_t api,
+static int create_ipcp_r(pid_t pid,
int result)
{
struct list_head * pos = NULL;
@@ -418,7 +418,7 @@ static int create_ipcp_r(pid_t api,
struct ipcp_entry * e =
list_entry(pos, struct ipcp_entry, next);
- if (e->api == api) {
+ if (e->pid == pid) {
pthread_mutex_lock(&e->init_lock);
e->init_state = IPCP_LIVE;
pthread_cond_broadcast(&e->init_cond);
@@ -431,21 +431,21 @@ static int create_ipcp_r(pid_t api,
return 0;
}
-static void clear_spawned_api(pid_t api)
+static void clear_spawned_process(pid_t pid)
{
struct list_head * pos = NULL;
struct list_head * n = NULL;
- list_for_each_safe(pos, n, &(irmd.spawned_apis)) {
+ list_for_each_safe(pos, n, &(irmd.spawned_pids)) {
struct pid_el * a = list_entry(pos, struct pid_el, next);
- if (api == a->pid) {
+ if (pid == a->pid) {
list_del(&a->next);
free(a);
}
}
}
-static int destroy_ipcp(pid_t api)
+static int destroy_ipcp(pid_t pid)
{
struct list_head * pos = NULL;
struct list_head * n = NULL;
@@ -456,14 +456,14 @@ static int destroy_ipcp(pid_t api)
struct ipcp_entry * tmp =
list_entry(pos, struct ipcp_entry, next);
- if (api == tmp->api) {
- clear_spawned_api(api);
- if (ipcp_destroy(api))
+ if (pid == tmp->pid) {
+ clear_spawned_process(pid);
+ if (ipcp_destroy(pid))
log_err("Could not destroy IPCP.");
list_del(&tmp->next);
ipcp_entry_destroy(tmp);
- log_info("Destroyed IPCP %d.", api);
+ log_info("Destroyed IPCP %d.", pid);
}
}
@@ -472,7 +472,7 @@ static int destroy_ipcp(pid_t api)
return 0;
}
-static int bootstrap_ipcp(pid_t api,
+static int bootstrap_ipcp(pid_t pid,
ipcp_config_msg_t * conf)
{
struct ipcp_entry * entry = NULL;
@@ -480,7 +480,7 @@ static int bootstrap_ipcp(pid_t api,
pthread_rwlock_wrlock(&irmd.reg_lock);
- entry = get_ipcp_entry_by_api(api);
+ entry = get_ipcp_entry_by_pid(pid);
if (entry == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("No such IPCP.");
@@ -493,7 +493,7 @@ static int bootstrap_ipcp(pid_t api,
return -1;
}
- if (ipcp_bootstrap(entry->api, conf, &info)) {
+ if (ipcp_bootstrap(entry->pid, conf, &info)) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("Could not bootstrap IPCP.");
return -1;
@@ -511,12 +511,12 @@ static int bootstrap_ipcp(pid_t api,
pthread_rwlock_unlock(&irmd.reg_lock);
log_info("Bootstrapped IPCP %d in DIF %s.",
- api, conf->dif_info->dif_name);
+ pid, conf->dif_info->dif_name);
return 0;
}
-static int enroll_ipcp(pid_t api,
+static int enroll_ipcp(pid_t pid,
char * dst_name)
{
struct ipcp_entry * entry = NULL;
@@ -524,7 +524,7 @@ static int enroll_ipcp(pid_t api,
pthread_rwlock_wrlock(&irmd.reg_lock);
- entry = get_ipcp_entry_by_api(api);
+ entry = get_ipcp_entry_by_pid(pid);
if (entry == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("No such IPCP.");
@@ -539,14 +539,14 @@ static int enroll_ipcp(pid_t api,
pthread_rwlock_unlock(&irmd.reg_lock);
- if (ipcp_enroll(api, dst_name, &info) < 0) {
- log_err("Could not enroll IPCP %d.", api);
+ if (ipcp_enroll(pid, dst_name, &info) < 0) {
+ log_err("Could not enroll IPCP %d.", pid);
return -1;
}
pthread_rwlock_wrlock(&irmd.reg_lock);
- entry = get_ipcp_entry_by_api(api);
+ entry = get_ipcp_entry_by_pid(pid);
if (entry == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("No such IPCP.");
@@ -565,12 +565,12 @@ static int enroll_ipcp(pid_t api,
pthread_rwlock_unlock(&irmd.reg_lock);
log_info("Enrolled IPCP %d in DIF %s.",
- api, info.dif_name);
+ pid, info.dif_name);
return 0;
}
-static int connect_ipcp(pid_t api,
+static int connect_ipcp(pid_t pid,
const char * dst,
const char * component)
{
@@ -578,7 +578,7 @@ static int connect_ipcp(pid_t api,
pthread_rwlock_rdlock(&irmd.reg_lock);
- entry = get_ipcp_entry_by_api(api);
+ entry = get_ipcp_entry_by_pid(pid);
if (entry == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("No such IPCP.");
@@ -595,18 +595,18 @@ static int connect_ipcp(pid_t api,
log_dbg("Connecting %s to %s.", component, dst);
- if (ipcp_connect(api, dst, component)) {
+ if (ipcp_connect(pid, dst, component)) {
log_err("Could not connect IPCP.");
return -EPERM;
}
log_info("Established %s connection between IPCP %d and %s.",
- component, api, dst);
+ component, pid, dst);
return 0;
}
-static int disconnect_ipcp(pid_t api,
+static int disconnect_ipcp(pid_t pid,
const char * dst,
const char * component)
{
@@ -614,7 +614,7 @@ static int disconnect_ipcp(pid_t api,
pthread_rwlock_rdlock(&irmd.reg_lock);
- entry = get_ipcp_entry_by_api(api);
+ entry = get_ipcp_entry_by_pid(pid);
if (entry == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("No such IPCP.");
@@ -629,80 +629,80 @@ static int disconnect_ipcp(pid_t api,
pthread_rwlock_unlock(&irmd.reg_lock);
- if (ipcp_disconnect(api, dst, component)) {
+ if (ipcp_disconnect(pid, dst, component)) {
log_err("Could not disconnect IPCP.");
return -EPERM;
}
log_info("%s connection between IPCP %d and %s torn down.",
- component, api, dst);
+ component, pid, dst);
return 0;
}
-static int bind_ap(char * ap,
- char * name,
- uint16_t flags,
- int argc,
- char ** argv)
+static int bind_program(char * prog,
+ char * name,
+ uint16_t flags,
+ int argc,
+ char ** argv)
{
- char * aps;
- char * apn;
+ char * progs;
+ char * progn;
char ** argv_dup = NULL;
int i;
char * name_dup = NULL;
- struct apn_entry * e = NULL;
+ struct prog_entry * e = NULL;
struct reg_entry * re = NULL;
- if (ap == NULL || name == NULL)
+ if (prog == NULL || name == NULL)
return -EINVAL;
pthread_rwlock_wrlock(&irmd.reg_lock);
- e = apn_table_get(&irmd.apn_table, path_strip(ap));
+ e = prog_table_get(&irmd.prog_table, path_strip(prog));
if (e == NULL) {
- aps = strdup(path_strip(ap));
- if (aps == NULL) {
+ progs = strdup(path_strip(prog));
+ if (progs == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
return -ENOMEM;
}
- apn = strdup(name);
- if (apn == NULL) {
+ progn = strdup(name);
+ if (progn == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
- free(aps);
+ free(progs);
return -ENOMEM;
}
- if ((flags & BIND_AP_AUTO) && argc) {
- /* We need to duplicate argv and set argv[0] to ap. */
+ if ((flags & BIND_AUTO) && argc) {
+ /* We need to duplicate argv and set argv[0] to prog. */
argv_dup = malloc((argc + 2) * sizeof(*argv_dup));
- argv_dup[0] = strdup(ap);
+ argv_dup[0] = strdup(prog);
for (i = 1; i <= argc; ++i) {
argv_dup[i] = strdup(argv[i - 1]);
if (argv_dup[i] == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
argvfree(argv_dup);
- log_err("Failed to bind ap %s to %s.",
- ap, name);
- free(aps);
- free(apn);
+ log_err("Failed to bind program %s to %s.",
+ prog, name);
+ free(progs);
+ free(progn);
return -ENOMEM;
}
}
argv_dup[argc + 1] = NULL;
}
- e = apn_entry_create(apn, aps, flags, argv_dup);
+ e = prog_entry_create(progn, progs, flags, argv_dup);
if (e == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
- free(aps);
- free(apn);
+ free(progs);
+ free(progn);
argvfree(argv_dup);
return -ENOMEM;
}
- apn_table_add(&irmd.apn_table, e);
+ prog_table_add(&irmd.prog_table, e);
}
@@ -712,7 +712,7 @@ static int bind_ap(char * ap,
return -ENOMEM;
}
- if (apn_entry_add_name(e, name_dup)) {
+ if (prog_entry_add_name(e, name_dup)) {
log_err("Failed adding name.");
pthread_rwlock_unlock(&irmd.reg_lock);
free(name_dup);
@@ -720,21 +720,21 @@ static int bind_ap(char * ap,
}
re = registry_get_entry(&irmd.registry, name);
- if (re != NULL && reg_entry_add_apn(re, e) < 0)
- log_err("Failed adding AP %s for name %s.", ap, name);
+ if (re != NULL && reg_entry_add_prog(re, e) < 0)
+ log_err("Failed adding program %s for name %s.", prog, name);
pthread_rwlock_unlock(&irmd.reg_lock);
- log_info("Bound AP %s to name %s.", ap, name);
+ log_info("Bound program %s to name %s.", prog, name);
return 0;
}
-static int bind_api(pid_t api,
- char * name)
+static int bind_process(pid_t pid,
+ char * name)
{
char * name_dup = NULL;
- struct api_entry * e = NULL;
+ struct proc_entry * e = NULL;
struct reg_entry * re = NULL;
if (name == NULL)
@@ -742,9 +742,9 @@ static int bind_api(pid_t api,
pthread_rwlock_wrlock(&irmd.reg_lock);
- e = api_table_get(&irmd.api_table, api);
+ e = proc_table_get(&irmd.proc_table, pid);
if (e == NULL) {
- log_err("AP-I %d does not exist.", api);
+ log_err("Process %d does not exist.", pid);
pthread_rwlock_unlock(&irmd.reg_lock);
return -1;
}
@@ -755,85 +755,85 @@ static int bind_api(pid_t api,
return -ENOMEM;
}
- if (api_entry_add_name(e, name_dup)) {
+ if (proc_entry_add_name(e, name_dup)) {
pthread_rwlock_unlock(&irmd.reg_lock);
- log_err("Failed to add name %s to api %d.", name, api);
+ log_err("Failed to add name %s to process %d.", name, pid);
free(name_dup);
return -1;
}
re = registry_get_entry(&irmd.registry, name);
- if (re != NULL && reg_entry_add_api(re, api) < 0)
- log_err("Failed adding AP-I %d for name %s.", api, name);
+ if (re != NULL && reg_entry_add_pid(re, pid) < 0)
+ log_err("Failed adding process %d for name %s.", pid, name);
pthread_rwlock_unlock(&irmd.reg_lock);
- log_info("Bound AP-I %d to name %s.", api, name);
+ log_info("Bound process %d to name %s.", pid, name);
return 0;
}
-static int unbind_ap(char * ap,
- char * name)
+static int unbind_program(char * prog,
+ char * name)
{
struct reg_entry * e;
- if (ap == NULL)
+ if (prog == NULL)
return -EINVAL;
pthread_rwlock_wrlock(&irmd.reg_lock);
if (name == NULL)
- apn_table_del(&irmd.apn_table, ap);
+ prog_table_del(&irmd.prog_table, prog);
else {
- struct apn_entry * e = apn_table_get(&irmd.apn_table, ap);
- apn_entry_del_name(e, name);
+ struct prog_entry * e = prog_table_get(&irmd.prog_table, prog);
+ prog_entry_del_name(e, name);
}
e = registry_get_entry(&irmd.registry, name);
if (e != NULL)
- reg_entry_del_apn(e, ap);
+ reg_entry_del_prog(e, prog);
pthread_rwlock_unlock(&irmd.reg_lock);
- if (name == NULL)
- log_info("AP %s removed.", ap);
+ if (name == NULL)
+ log_info("Program %s unbound.", prog);
else
- log_info("All names matching %s cleared for %s.", name, ap);
+ log_info("All names matching %s unbound for %s.", name, prog);
return 0;
}
-static int unbind_api(pid_t api,
- const char * name)
+static int unbind_process(pid_t pid,
+ const char * name)
{
struct reg_entry * e;
pthread_rwlock_wrlock(&irmd.reg_lock);
if (name == NULL)
- api_table_del(&irmd.api_table, api);
+ proc_table_del(&irmd.proc_table, pid);
else {
- struct api_entry * e = api_table_get(&irmd.api_table, api);
- api_entry_del_name(e, name);
+ struct proc_entry * e = proc_table_get(&irmd.proc_table, pid);
+ proc_entry_del_name(e, name);
}
e = registry_get_entry(&irmd.registry, name);
if (e != NULL)
- reg_entry_del_api(e, api);
+ reg_entry_del_pid(e, pid);
pthread_rwlock_unlock(&irmd.reg_lock);
- if (name == NULL)
- log_info("AP-I %d removed.", api);
+ if (name == NULL)
+ log_info("Process %d unbound.", pid);
else
- log_info("All names matching %s cleared for %d.", name, api);
+ log_info("All names matching %s unbound for %d.", name, pid);
return 0;
}
static ssize_t list_ipcps(char * name,
- pid_t ** apis)
+ pid_t ** pids)
{
struct list_head * pos = NULL;
size_t count = 0;
@@ -853,8 +853,8 @@ static ssize_t list_ipcps(char * name,
return 0;
}
- *apis = malloc(count * sizeof(pid_t));
- if (*apis == NULL) {
+ *pids = malloc(count * sizeof(**pids));
+ if (*pids == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
return -1;
}
@@ -863,7 +863,7 @@ static ssize_t list_ipcps(char * name,
struct ipcp_entry * tmp =
list_entry(pos, struct ipcp_entry, next);
if (wildcard_match(name, tmp->name) == 0)
- (*apis)[i++] = tmp->api;
+ (*pids)[i++] = tmp->pid;
}
pthread_rwlock_unlock(&irmd.reg_lock);
@@ -900,28 +900,28 @@ static int name_reg(const char * name,
return -1;
}
- /* check the tables for client APs */
- list_for_each(p, &irmd.api_table) {
+ /* check the tables for client programs */
+ list_for_each(p, &irmd.proc_table) {
struct list_head * q;
- struct api_entry * e =
- list_entry(p, struct api_entry, next);
+ struct proc_entry * e =
+ list_entry(p, struct proc_entry, next);
list_for_each(q, &e->names) {
struct str_el * s =
list_entry(q, struct str_el, next);
if (!strcmp(s->str, name))
- reg_entry_add_api(re, e->api);
+ reg_entry_add_pid(re, e->pid);
}
}
- list_for_each(p, &irmd.apn_table) {
+ list_for_each(p, &irmd.prog_table) {
struct list_head * q;
- struct apn_entry * e =
- list_entry(p, struct apn_entry, next);
+ struct prog_entry * e =
+ list_entry(p, struct prog_entry, next);
list_for_each(q, &e->names) {
struct str_el * s =
list_entry(q, struct str_el, next);
if (!strcmp(s->str, name))
- reg_entry_add_apn(re, e);
+ reg_entry_add_prog(re, e);
}
}
}
@@ -933,7 +933,7 @@ static int name_reg(const char * name,
for (i = 0; i < len; ++i) {
uint8_t * hash;
- pid_t api;
+ pid_t pid;
size_t len;
if (wildcard_match(difs[i], e->dif_name))
@@ -945,15 +945,15 @@ static int name_reg(const char * name,
str_hash(e->dir_hash_algo, hash, name);
- api = e->api;
+ pid = e->pid;
len = IPCP_HASH_LEN(e);
pthread_rwlock_unlock(&irmd.reg_lock);
- if (ipcp_reg(api, hash, len)) {
+ if (ipcp_reg(pid, hash, len)) {
log_err("Could not register " HASH_FMT
" with IPCP %d.",
- HASH_VAL(hash), api);
+ HASH_VAL(hash), pid);
pthread_rwlock_wrlock(&irmd.reg_lock);
free(hash);
break;
@@ -1005,7 +1005,7 @@ static int name_unreg(const char * name,
for (i = 0; i < len; ++i) {
uint8_t * hash;
- pid_t api;
+ pid_t pid;
size_t len;
if (wildcard_match(difs[i], e->dif_name))
@@ -1017,14 +1017,14 @@ static int name_unreg(const char * name,
str_hash(e->dir_hash_algo, hash, name);
- api = e->api;
+ pid = e->pid;
len = IPCP_HASH_LEN(e);
pthread_rwlock_unlock(&irmd.reg_lock);
- if (ipcp_unreg(api, hash, len)) {
+ if (ipcp_unreg(pid, hash, len)) {
log_err("Could not unregister %s with IPCP %d.",
- name, api);
+ name, pid);
pthread_rwlock_wrlock(&irmd.reg_lock);
free(hash);
break;
@@ -1048,32 +1048,32 @@ static int name_unreg(const char * name,
return (ret > 0 ? 0 : -1);
}
-static int api_announce(pid_t api,
- char * apn)
+static int proc_announce(pid_t pid,
+ char * prog)
{
- struct api_entry * e = NULL;
- struct apn_entry * a = NULL;
- char * apn_dup;
- if (apn == NULL)
+ struct proc_entry * e = NULL;
+ struct prog_entry * a = NULL;
+ char * prog_dup;
+ if (prog == NULL)
return -EINVAL;
- apn_dup = strdup(apn);
- if (apn_dup == NULL) {
+ prog_dup = strdup(prog);
+ if (prog_dup == NULL) {
return -ENOMEM;
}
- e = api_entry_create(api, apn_dup);
+ e = proc_entry_create(pid, prog_dup);
if (e == NULL) {
return -ENOMEM;
}
pthread_rwlock_wrlock(&irmd.reg_lock);
- api_table_add(&irmd.api_table, e);
+ proc_table_add(&irmd.proc_table, e);
- /* Copy listen names from apn if it exists. */
+ /* Copy listen names from program if it exists. */
- a = apn_table_get(&irmd.apn_table, e->apn);
+ a = prog_table_get(&irmd.prog_table, e->prog);
if (a != NULL) {
struct list_head * p;
list_for_each(p, &a->names) {
@@ -1092,8 +1092,8 @@ static int api_announce(pid_t api,
}
list_add(&n->next, &e->names);
- log_dbg("AP-I %d inherits listen name %s from AP %s.",
- api, n->str, e->apn);
+ log_dbg("Process %d inherits name %s from program %s.",
+ pid, n->str, e->prog);
}
}
@@ -1102,43 +1102,43 @@ static int api_announce(pid_t api,
return 0;
}
-static int flow_accept(pid_t api,
+static int flow_accept(pid_t pid,
struct timespec * timeo,
struct irm_flow ** fl)
{
- struct irm_flow * f = NULL;
- struct api_entry * e = NULL;
- struct reg_entry * re = NULL;
- struct list_head * p = NULL;
+ struct irm_flow * f = NULL;
+ struct proc_entry * e = NULL;
+ struct reg_entry * re = NULL;
+ struct list_head * p = NULL;
- pid_t api_n1;
- pid_t api_n;
+ pid_t pid_n1;
+ pid_t pid_n;
int port_id;
int ret;
pthread_rwlock_wrlock(&irmd.reg_lock);
- e = api_table_get(&irmd.api_table, api);
+ e = proc_table_get(&irmd.proc_table, pid);
if (e == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
- log_err("Unknown instance %d calling accept.", api);
+ log_err("Unknown process %d calling accept.", pid);
return -EINVAL;
}
- log_dbg("New instance (%d) of %s added.", api, e->apn);
- log_dbg("This instance accepts flows for:");
+ log_dbg("New instance (%d) of %s added.", pid, e->prog);
+ log_dbg("This process accepts flows for:");
list_for_each(p, &e->names) {
struct str_el * s = list_entry(p, struct str_el, next);
log_dbg(" %s", s->str);
re = registry_get_entry(&irmd.registry, s->str);
if (re != NULL)
- reg_entry_add_api(re, api);
+ reg_entry_add_pid(re, pid);
}
pthread_rwlock_unlock(&irmd.reg_lock);
- ret = api_entry_sleep(e, timeo);
+ ret = proc_entry_sleep(e, timeo);
if (ret == -ETIMEDOUT)
return -ETIMEDOUT;
@@ -1152,28 +1152,28 @@ static int flow_accept(pid_t api,
pthread_rwlock_rdlock(&irmd.flows_lock);
- f = get_irm_flow_n(api);
+ f = get_irm_flow_n(pid);
if (f == NULL) {
pthread_rwlock_unlock(&irmd.flows_lock);
log_warn("Port_id was not created yet.");
return -EPERM;
}
- api_n = f->n_api;
- api_n1 = f->n_1_api;
+ pid_n = f->n_pid;
+ pid_n1 = f->n_1_pid;
port_id = f->port_id;
pthread_rwlock_unlock(&irmd.flows_lock);
pthread_rwlock_rdlock(&irmd.reg_lock);
- e = api_table_get(&irmd.api_table, api);
+ e = proc_table_get(&irmd.proc_table, pid);
if (e == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
pthread_rwlock_wrlock(&irmd.flows_lock);
list_del(&f->next);
bmp_release(irmd.port_ids, f->port_id);
pthread_rwlock_unlock(&irmd.flows_lock);
- ipcp_flow_alloc_resp(api_n1, port_id, api_n, -1);
+ ipcp_flow_alloc_resp(pid_n1, port_id, pid_n, -1);
clear_irm_flow(f);
irm_flow_set_state(f, FLOW_NULL);
irm_flow_destroy(f);
@@ -1193,7 +1193,7 @@ static int flow_accept(pid_t api,
list_del(&f->next);
bmp_release(irmd.port_ids, f->port_id);
pthread_rwlock_unlock(&irmd.flows_lock);
- ipcp_flow_alloc_resp(api_n1, port_id, api_n, -1);
+ ipcp_flow_alloc_resp(pid_n1, port_id, pid_n, -1);
clear_irm_flow(f);
irm_flow_set_state(f, FLOW_NULL);
irm_flow_destroy(f);
@@ -1201,11 +1201,11 @@ static int flow_accept(pid_t api,
return -EPERM;
}
- registry_del_api(&irmd.registry, api);
+ registry_del_process(&irmd.registry, pid);
pthread_rwlock_unlock(&irmd.reg_lock);
- if (ipcp_flow_alloc_resp(api_n1, port_id, api_n, 0)) {
+ if (ipcp_flow_alloc_resp(pid_n1, port_id, pid_n, 0)) {
pthread_rwlock_wrlock(&irmd.flows_lock);
list_del(&f->next);
pthread_rwlock_unlock(&irmd.flows_lock);
@@ -1225,7 +1225,7 @@ static int flow_accept(pid_t api,
return 0;
}
-static int flow_alloc(pid_t api,
+static int flow_alloc(pid_t pid,
const char * dst,
qoscube_t cube,
struct timespec * timeo,
@@ -1237,7 +1237,7 @@ static int flow_alloc(pid_t api,
int state;
uint8_t * hash;
- ipcp = get_ipcp_by_dst_name(dst, api);
+ ipcp = get_ipcp_by_dst_name(dst, pid);
if (ipcp == NULL) {
log_info("Destination %s unreachable.", dst);
return -1;
@@ -1251,7 +1251,7 @@ static int flow_alloc(pid_t api,
return -EBADF;
}
- f = irm_flow_create(api, ipcp->api, port_id, cube);
+ f = irm_flow_create(pid, ipcp->pid, port_id, cube);
if (f == NULL) {
bmp_release(irmd.port_ids, port_id);
pthread_rwlock_unlock(&irmd.flows_lock);
@@ -1272,7 +1272,7 @@ static int flow_alloc(pid_t api,
str_hash(ipcp->dir_hash_algo, hash, dst);
- if (ipcp_flow_alloc(ipcp->api, port_id, api, hash,
+ if (ipcp_flow_alloc(ipcp->pid, port_id, pid, hash,
IPCP_HASH_LEN(ipcp), cube)) {
/* sanitizer cleans this */
log_info("Flow_allocation failed.");
@@ -1302,10 +1302,10 @@ static int flow_alloc(pid_t api,
return 0;
}
-static int flow_dealloc(pid_t api,
+static int flow_dealloc(pid_t pid,
int port_id)
{
- pid_t n_1_api = -1;
+ pid_t n_1_pid = -1;
int ret = 0;
struct irm_flow * f = NULL;
@@ -1315,69 +1315,69 @@ static int flow_dealloc(pid_t api,
f = get_irm_flow(port_id);
if (f == NULL) {
pthread_rwlock_unlock(&irmd.flows_lock);
- log_dbg("Deallocate unknown port %d by %d.", port_id, api);
+ log_dbg("Deallocate unknown port %d by %d.", port_id, pid);
return 0;
}
- if (api == f->n_api) {
- f->n_api = -1;
- n_1_api = f->n_1_api;
- } else if (api == f->n_1_api) {
- f->n_1_api = -1;
+ if (pid == f->n_pid) {
+ f->n_pid = -1;
+ n_1_pid = f->n_1_pid;
+ } else if (pid == f->n_1_pid) {
+ f->n_1_pid = -1;
} else {
pthread_rwlock_unlock(&irmd.flows_lock);
- log_dbg("Dealloc called by wrong AP-I.");
+ log_dbg("Dealloc called by wrong process.");
return -EPERM;
}
if (irm_flow_get_state(f) == FLOW_DEALLOC_PENDING) {
list_del(&f->next);
- if ((kill(f->n_api, 0) < 0 && f->n_1_api == -1) ||
- (kill(f->n_1_api, 0) < 0 && f->n_api == -1))
+ if ((kill(f->n_pid, 0) < 0 && f->n_1_pid == -1) ||
+ (kill(f->n_1_pid, 0) < 0 && f->n_pid == -1))
irm_flow_set_state(f, FLOW_NULL);
clear_irm_flow(f);
irm_flow_destroy(f);
bmp_release(irmd.port_ids, port_id);
- log_info("Completed deallocation of port_id %d by AP-I %d.",
- port_id, api);
+ log_info("Completed deallocation of port_id %d by process %d.",
+ port_id, pid);
} else {
irm_flow_set_state(f, FLOW_DEALLOC_PENDING);
- log_dbg("Partial deallocation of port_id %d by AP-I %d.",
- port_id, api);
+ log_dbg("Partial deallocation of port_id %d by process %d.",
+ port_id, pid);
}
pthread_rwlock_unlock(&irmd.flows_lock);
- if (n_1_api != -1)
- ret = ipcp_flow_dealloc(n_1_api, port_id);
+ if (n_1_pid != -1)
+ ret = ipcp_flow_dealloc(n_1_pid, port_id);
return ret;
}
static pid_t auto_execute(char ** argv)
{
- pid_t api;
+ pid_t pid;
struct stat s;
if (stat(argv[0], &s) != 0) {
- log_warn("Application %s does not exist.", argv[0]);
+ log_warn("Program %s does not exist.", argv[0]);
return -1;
}
if (!(s.st_mode & S_IXUSR)) {
- log_warn("Application %s is not executable.", argv[0]);
+ log_warn("Program %s is not executable.", argv[0]);
return -1;
}
- api = fork();
- if (api == -1) {
+ pid = fork();
+ if (pid == -1) {
log_err("Failed to fork");
- return api;
+ return pid;
}
- if (api != 0) {
- log_info("Instantiated %s as AP-I %d.", argv[0], api);
- return api;
+ if (pid != 0) {
+ log_info("Instantiated %s as process %d.", argv[0], pid);
+ return pid;
}
execv(argv[0], argv);
@@ -1387,29 +1387,29 @@ static pid_t auto_execute(char ** argv)
exit(EXIT_FAILURE);
}
-static struct irm_flow * flow_req_arr(pid_t api,
+static struct irm_flow * flow_req_arr(pid_t pid,
const uint8_t * hash,
qoscube_t cube)
{
- struct reg_entry * re = NULL;
- struct apn_entry * a = NULL;
- struct api_entry * e = NULL;
- struct irm_flow * f = NULL;
+ struct reg_entry * re = NULL;
+ struct prog_entry * a = NULL;
+ struct proc_entry * e = NULL;
+ struct irm_flow * f = NULL;
- struct pid_el * c_api;
+ struct pid_el * c_pid;
struct ipcp_entry * ipcp;
- pid_t h_api = -1;
+ pid_t h_pid = -1;
int port_id = -1;
struct timespec wt = {IRMD_REQ_ARR_TIMEOUT / 1000,
(IRMD_REQ_ARR_TIMEOUT % 1000) * MILLION};
log_dbg("Flow req arrived from IPCP %d for " HASH_FMT ".",
- api, HASH_VAL(hash));
+ pid, HASH_VAL(hash));
pthread_rwlock_rdlock(&irmd.reg_lock);
- ipcp = get_ipcp_entry_by_api(api);
+ ipcp = get_ipcp_entry_by_pid(pid);
if (ipcp == NULL) {
log_err("IPCP died.");
return NULL;
@@ -1427,9 +1427,9 @@ static struct irm_flow * flow_req_arr(pid_t api,
pthread_rwlock_unlock(&irmd.reg_lock);
- /* Give the AP a bit of slop time to call accept */
+ /* Give the process a bit of slop time to call accept */
if (reg_entry_leave_state(re, REG_NAME_IDLE, &wt) == -1) {
- log_err("No APs for " HASH_FMT ".", HASH_VAL(hash));
+ log_err("No processes for " HASH_FMT ".", HASH_VAL(hash));
return NULL;
}
@@ -1438,29 +1438,29 @@ static struct irm_flow * flow_req_arr(pid_t api,
switch (reg_entry_get_state(re)) {
case REG_NAME_IDLE:
pthread_rwlock_unlock(&irmd.reg_lock);
- log_err("No APs for " HASH_FMT ".", HASH_VAL(hash));
+ log_err("No processes for " HASH_FMT ".", HASH_VAL(hash));
return NULL;
case REG_NAME_AUTO_ACCEPT:
- c_api = malloc(sizeof(*c_api));
- if (c_api == NULL) {
+ c_pid = malloc(sizeof(*c_pid));
+ if (c_pid == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
return NULL;
}
reg_entry_set_state(re, REG_NAME_AUTO_EXEC);
- a = apn_table_get_by_apn(&irmd.apn_table,
- reg_entry_get_apn(re));
+ a = prog_table_get_by_progn(&irmd.prog_table,
+ reg_entry_get_prog(re));
- if (a == NULL || (c_api->pid = auto_execute(a->argv)) < 0) {
+ if (a == NULL || (c_pid->pid = auto_execute(a->argv)) < 0) {
reg_entry_set_state(re, REG_NAME_AUTO_ACCEPT);
pthread_rwlock_unlock(&irmd.reg_lock);
- log_err("Could not get start apn for reg_entry %s.",
+ log_err("Could not start program for reg_entry %s.",
re->name);
- free(c_api);
+ free(c_pid);
return NULL;
}
- list_add(&c_api->next, &irmd.spawned_apis);
+ list_add(&c_pid->next, &irmd.spawned_pids);
pthread_rwlock_unlock(&irmd.reg_lock);
@@ -1470,10 +1470,10 @@ static struct irm_flow * flow_req_arr(pid_t api,
pthread_rwlock_wrlock(&irmd.reg_lock);
/* FALLTHRU */
case REG_NAME_FLOW_ACCEPT:
- h_api = reg_entry_get_api(re);
- if (h_api == -1) {
+ h_pid = reg_entry_get_pid(re);
+ if (h_pid == -1) {
pthread_rwlock_unlock(&irmd.reg_lock);
- log_err("Invalid api returned.");
+ log_err("Invalid process id returned.");
return NULL;
}
@@ -1492,7 +1492,7 @@ static struct irm_flow * flow_req_arr(pid_t api,
return NULL;
}
- f = irm_flow_create(h_api, api, port_id, cube);
+ f = irm_flow_create(h_pid, pid, port_id, cube);
if (f == NULL) {
bmp_release(irmd.port_ids, port_id);
pthread_rwlock_unlock(&irmd.flows_lock);
@@ -1507,7 +1507,7 @@ static struct irm_flow * flow_req_arr(pid_t api,
reg_entry_set_state(re, REG_NAME_FLOW_ARRIVED);
- e = api_table_get(&irmd.api_table, h_api);
+ e = proc_table_get(&irmd.proc_table, h_pid);
if (e == NULL) {
pthread_rwlock_unlock(&irmd.reg_lock);
pthread_rwlock_wrlock(&irmd.flows_lock);
@@ -1515,12 +1515,12 @@ static struct irm_flow * flow_req_arr(pid_t api,
bmp_release(irmd.port_ids, f->port_id);
list_del(&f->next);
pthread_rwlock_unlock(&irmd.flows_lock);
- log_err("Could not get api table entry for %d.", h_api);
+ log_err("Could not get process table entry for %d.", h_pid);
irm_flow_destroy(f);
return NULL;
}
- api_entry_wake(e, re);
+ proc_entry_wake(e, re);
pthread_rwlock_unlock(&irmd.reg_lock);
@@ -1580,26 +1580,26 @@ static void irm_fini(void)
ipcp_entry_destroy(e);
}
- list_for_each(p, &irmd.spawned_apis) {
+ list_for_each(p, &irmd.spawned_pids) {
struct pid_el * e = list_entry(p, struct pid_el, next);
if (kill(e->pid, SIGTERM))
log_dbg("Could not send kill signal to %d.", e->pid);
}
- list_for_each_safe(p, h, &irmd.spawned_apis) {
+ list_for_each_safe(p, h, &irmd.spawned_pids) {
struct pid_el * e = list_entry(p, struct pid_el, next);
int status;
if (waitpid(e->pid, &status, 0) < 0)
log_dbg("Error waiting for %d to exit.", e->pid);
list_del(&e->next);
- registry_del_api(&irmd.registry, e->pid);
+ registry_del_process(&irmd.registry, e->pid);
free(e);
}
- list_for_each_safe(p, h, &irmd.apn_table) {
- struct apn_entry * e = list_entry(p, struct apn_entry, next);
+ list_for_each_safe(p, h, &irmd.prog_table) {
+ struct prog_entry * e = list_entry(p, struct prog_entry, next);
list_del(&e->next);
- apn_entry_destroy(e);
+ prog_entry_destroy(e);
}
registry_destroy(&irmd.registry);
@@ -1667,13 +1667,13 @@ void * shm_sanitize(void * o)
list_for_each(p, &irmd.irm_flows) {
struct irm_flow * f =
list_entry(p, struct irm_flow, next);
- if (kill(f->n_api, 0) < 0) {
+ if (kill(f->n_pid, 0) < 0) {
while ((idx = shm_rbuff_read(f->n_rb)) >= 0)
shm_rdrbuff_remove(irmd.rdrb, idx);
continue;
}
- if (kill(f->n_1_api, 0) < 0) {
+ if (kill(f->n_1_pid, 0) < 0) {
while ((idx = shm_rbuff_read(f->n_1_rb)) >= 0)
shm_rdrbuff_remove(irmd.rdrb, idx);
continue;
@@ -1707,7 +1707,7 @@ void * irm_sanitize(void * o)
pthread_rwlock_wrlock(&irmd.reg_lock);
- list_for_each_safe(p, h, &irmd.spawned_apis) {
+ list_for_each_safe(p, h, &irmd.spawned_pids) {
struct pid_el * e = list_entry(p, struct pid_el, next);
waitpid(e->pid, &s, WNOHANG);
if (kill(e->pid, 0) >= 0)
@@ -1717,22 +1717,22 @@ void * irm_sanitize(void * o)
free(e);
}
- list_for_each_safe(p, h, &irmd.api_table) {
- struct api_entry * e =
- list_entry(p, struct api_entry, next);
- if (kill(e->api, 0) >= 0)
+ list_for_each_safe(p, h, &irmd.proc_table) {
+ struct proc_entry * e =
+ list_entry(p, struct proc_entry, next);
+ if (kill(e->pid, 0) >= 0)
continue;
- log_dbg("Dead AP-I removed: %d.", e->api);
+ log_dbg("Dead process removed: %d.", e->pid);
list_del(&e->next);
- api_entry_destroy(e);
+ proc_entry_destroy(e);
}
list_for_each_safe(p, h, &irmd.ipcps) {
struct ipcp_entry * e =
list_entry(p, struct ipcp_entry, next);
- if (kill(e->api, 0) >= 0)
+ if (kill(e->pid, 0) >= 0)
continue;
- log_dbg("Dead IPCP removed: %d.", e->api);
+ log_dbg("Dead IPCP removed: %d.", e->pid);
list_del(&e->next);
ipcp_entry_destroy(e);
}
@@ -1742,12 +1742,12 @@ void * irm_sanitize(void * o)
struct list_head * h2;
struct reg_entry * e =
list_entry(p, struct reg_entry, next);
- list_for_each_safe(p2, h2, &e->reg_apis) {
+ list_for_each_safe(p2, h2, &e->reg_pids) {
struct pid_el * a =
list_entry(p2, struct pid_el, next);
if (kill(a->pid, 0) >= 0)
continue;
- log_dbg("Dead AP-I removed from: %d %s.",
+ log_dbg("Dead process removed from: %d %s.",
a->pid, e->name);
reg_entry_del_pid_el(e, a);
}
@@ -1766,23 +1766,23 @@ void * irm_sanitize(void * o)
&& ts_diff_ms(&f->t0, &now) > IRMD_FLOW_TIMEOUT) {
log_dbg("Pending port_id %d timed out.",
f->port_id);
- f->n_api = -1;
+ f->n_pid = -1;
irm_flow_set_state(f, FLOW_DEALLOC_PENDING);
- ipcpi = f->n_1_api;
+ ipcpi = f->n_1_pid;
port_id = f->port_id;
continue;
}
- if (kill(f->n_api, 0) < 0) {
+ if (kill(f->n_pid, 0) < 0) {
struct shm_flow_set * set;
- log_dbg("AP-I %d gone, deallocating flow %d.",
- f->n_api, f->port_id);
- set = shm_flow_set_open(f->n_api);
+ log_dbg("Process %d gone, deallocating flow %d.",
+ f->n_pid, f->port_id);
+ set = shm_flow_set_open(f->n_pid);
if (set != NULL)
shm_flow_set_destroy(set);
- f->n_api = -1;
+ f->n_pid = -1;
irm_flow_set_state(f, FLOW_DEALLOC_PENDING);
- ipcpi = f->n_1_api;
+ ipcpi = f->n_1_pid;
port_id = f->port_id;
pthread_rwlock_unlock(&irmd.flows_lock);
ipcp_flow_dealloc(ipcpi, port_id);
@@ -1790,14 +1790,14 @@ void * irm_sanitize(void * o)
continue;
}
- if (kill(f->n_1_api, 0) < 0) {
+ if (kill(f->n_1_pid, 0) < 0) {
struct shm_flow_set * set;
log_err("IPCP %d gone, flow %d removed.",
- f->n_1_api, f->port_id);
- set = shm_flow_set_open(f->n_api);
+ f->n_1_pid, f->port_id);
+ set = shm_flow_set_open(f->n_pid);
if (set != NULL)
shm_flow_set_destroy(set);
- f->n_1_api = -1;
+ f->n_1_pid = -1;
irm_flow_set_state(f, FLOW_DEALLOC_PENDING);
}
}
@@ -1887,7 +1887,7 @@ static void * mainloop(void * o)
while (true) {
irm_msg_t ret_msg = IRM_MSG__INIT;
struct irm_flow * e = NULL;
- pid_t * apis = NULL;
+ pid_t * pids = NULL;
struct timespec * timeo = NULL;
struct timespec ts = {0, 0};
struct cmd * cmd;
@@ -1938,61 +1938,64 @@ static void * mainloop(void * o)
break;
case IRM_MSG_CODE__IPCP_CREATE_R:
ret_msg.has_result = true;
- ret_msg.result = create_ipcp_r(msg->api, msg->result);
+ ret_msg.result = create_ipcp_r(msg->pid, msg->result);
break;
case IRM_MSG_CODE__IRM_DESTROY_IPCP:
ret_msg.has_result = true;
- ret_msg.result = destroy_ipcp(msg->api);
+ ret_msg.result = destroy_ipcp(msg->pid);
break;
case IRM_MSG_CODE__IRM_BOOTSTRAP_IPCP:
ret_msg.has_result = true;
- ret_msg.result = bootstrap_ipcp(msg->api, msg->conf);
+ ret_msg.result = bootstrap_ipcp(msg->pid, msg->conf);
break;
case IRM_MSG_CODE__IRM_ENROLL_IPCP:
ret_msg.has_result = true;
- ret_msg.result = enroll_ipcp(msg->api,
+ ret_msg.result = enroll_ipcp(msg->pid,
msg->dif_name[0]);
break;
case IRM_MSG_CODE__IRM_CONNECT_IPCP:
ret_msg.has_result = true;
- ret_msg.result = connect_ipcp(msg->api,
+ ret_msg.result = connect_ipcp(msg->pid,
msg->dst_name,
msg->comp_name);
break;
case IRM_MSG_CODE__IRM_DISCONNECT_IPCP:
ret_msg.has_result = true;
- ret_msg.result = disconnect_ipcp(msg->api,
+ ret_msg.result = disconnect_ipcp(msg->pid,
msg->dst_name,
msg->comp_name);
break;
- case IRM_MSG_CODE__IRM_BIND_AP:
+ case IRM_MSG_CODE__IRM_BIND_PROGRAM:
ret_msg.has_result = true;
- ret_msg.result = bind_ap(msg->ap_name,
- msg->dst_name,
- msg->opts,
- msg->n_args,
- msg->args);
+ ret_msg.result = bind_program(msg->prog_name,
+ msg->dst_name,
+ msg->opts,
+ msg->n_args,
+ msg->args);
break;
- case IRM_MSG_CODE__IRM_UNBIND_AP:
+ case IRM_MSG_CODE__IRM_UNBIND_PROGRAM:
ret_msg.has_result = true;
- ret_msg.result = unbind_ap(msg->ap_name, msg->dst_name);
+ ret_msg.result = unbind_program(msg->prog_name,
+ msg->dst_name);
break;
- case IRM_MSG_CODE__IRM_API_ANNOUNCE:
+ case IRM_MSG_CODE__IRM_PROC_ANNOUNCE:
ret_msg.has_result = true;
- ret_msg.result = api_announce(msg->api, msg->ap_name);
+ ret_msg.result = proc_announce(msg->pid,
+ msg->prog_name);
break;
- case IRM_MSG_CODE__IRM_BIND_API:
+ case IRM_MSG_CODE__IRM_BIND_PROCESS:
ret_msg.has_result = true;
- ret_msg.result = bind_api(msg->api, msg->dst_name);
+ ret_msg.result = bind_process(msg->pid, msg->dst_name);
break;
- case IRM_MSG_CODE__IRM_UNBIND_API:
+ case IRM_MSG_CODE__IRM_UNBIND_PROCESS:
ret_msg.has_result = true;
- ret_msg.result = unbind_api(msg->api, msg->dst_name);
+ ret_msg.result = unbind_process(msg->pid,
+ msg->dst_name);
break;
case IRM_MSG_CODE__IRM_LIST_IPCPS:
ret_msg.has_result = true;
- ret_msg.n_apis = list_ipcps(msg->dst_name, &apis);
- ret_msg.apis = apis;
+ ret_msg.n_pids = list_ipcps(msg->dst_name, &pids);
+ ret_msg.pids = pids;
break;
case IRM_MSG_CODE__IRM_REG:
ret_msg.has_result = true;
@@ -2008,33 +2011,33 @@ static void * mainloop(void * o)
break;
case IRM_MSG_CODE__IRM_FLOW_ACCEPT:
ret_msg.has_result = true;
- ret_msg.result = flow_accept(msg->api, timeo, &e);
+ ret_msg.result = flow_accept(msg->pid, timeo, &e);
if (ret_msg.result == 0) {
ret_msg.has_port_id = true;
ret_msg.port_id = e->port_id;
- ret_msg.has_api = true;
- ret_msg.api = e->n_1_api;
+ ret_msg.has_pid = true;
+ ret_msg.pid = e->n_1_pid;
ret_msg.has_qoscube = true;
ret_msg.qoscube = e->qc;
}
break;
case IRM_MSG_CODE__IRM_FLOW_ALLOC:
ret_msg.has_result = true;
- ret_msg.result = flow_alloc(msg->api, msg->dst_name,
+ ret_msg.result = flow_alloc(msg->pid, msg->dst_name,
msg->qoscube, timeo, &e);
if (ret_msg.result == 0) {
ret_msg.has_port_id = true;
ret_msg.port_id = e->port_id;
- ret_msg.has_api = true;
- ret_msg.api = e->n_1_api;
+ ret_msg.has_pid = true;
+ ret_msg.pid = e->n_1_pid;
}
break;
case IRM_MSG_CODE__IRM_FLOW_DEALLOC:
ret_msg.has_result = true;
- ret_msg.result = flow_dealloc(msg->api, msg->port_id);
+ ret_msg.result = flow_dealloc(msg->pid, msg->port_id);
break;
case IRM_MSG_CODE__IPCP_FLOW_REQ_ARR:
- e = flow_req_arr(msg->api,
+ e = flow_req_arr(msg->pid,
msg->hash.data,
msg->qoscube);
ret_msg.has_result = true;
@@ -2044,8 +2047,8 @@ static void * mainloop(void * o)
}
ret_msg.has_port_id = true;
ret_msg.port_id = e->port_id;
- ret_msg.has_api = true;
- ret_msg.api = e->n_api;
+ ret_msg.has_pid = true;
+ ret_msg.pid = e->n_pid;
break;
case IRM_MSG_CODE__IPCP_FLOW_ALLOC_REPLY:
ret_msg.has_result = true;
@@ -2069,8 +2072,8 @@ static void * mainloop(void * o)
buffer.len = irm_msg__get_packed_size(&ret_msg);
if (buffer.len == 0) {
log_err("Failed to calculate length of reply message.");
- if (apis != NULL)
- free(apis);
+ if (pids != NULL)
+ free(pids);
close(sfd);
tpm_inc(irmd.tpm);
continue;
@@ -2078,8 +2081,8 @@ static void * mainloop(void * o)
buffer.data = malloc(buffer.len);
if (buffer.data == NULL) {
- if (apis != NULL)
- free(apis);
+ if (pids != NULL)
+ free(pids);
close(sfd);
tpm_inc(irmd.tpm);
continue;
@@ -2087,8 +2090,8 @@ static void * mainloop(void * o)
irm_msg__pack(&ret_msg, buffer.data);
- if (apis != NULL)
- free(apis);
+ if (pids != NULL)
+ free(pids);
pthread_cleanup_push(close_ptr, &sfd);
@@ -2152,9 +2155,9 @@ static int irm_init(void)
pthread_condattr_destroy(&cattr);
list_head_init(&irmd.ipcps);
- list_head_init(&irmd.api_table);
- list_head_init(&irmd.apn_table);
- list_head_init(&irmd.spawned_apis);
+ list_head_init(&irmd.proc_table);
+ list_head_init(&irmd.prog_table);
+ list_head_init(&irmd.spawned_pids);
list_head_init(&irmd.registry);
list_head_init(&irmd.irm_flows);
list_head_init(&irmd.cmds);
diff --git a/src/irmd/api_table.c b/src/irmd/proc_table.c
index a244f3a2..76fd5864 100644
--- a/src/irmd/api_table.c
+++ b/src/irmd/proc_table.c
@@ -1,7 +1,7 @@
/*
* Ouroboros - Copyright (C) 2016 - 2017
*
- * The IPC Resource Manager - Application Instance Table
+ * The IPC Resource Manager - Process Table
*
* Dimitri Staessens <dimitri.staessens@ugent.be>
* Sander Vrijders <sander.vrijders@ugent.be>
@@ -28,7 +28,7 @@
#include <ouroboros/errno.h>
#include <ouroboros/time_utils.h>
-#include "api_table.h"
+#include "proc_table.h"
#include "registry.h"
#include <stdlib.h>
@@ -36,13 +36,13 @@
#include <limits.h>
#include <assert.h>
-struct api_entry * api_entry_create(pid_t api,
- char * apn)
+struct proc_entry * proc_entry_create(pid_t pid,
+ char * prog)
{
- struct api_entry * e;
- pthread_condattr_t cattr;
+ struct proc_entry * e;
+ pthread_condattr_t cattr;
- assert(apn);
+ assert(prog);
e = malloc(sizeof(*e));
if (e == NULL)
@@ -51,13 +51,13 @@ struct api_entry * api_entry_create(pid_t api,
list_head_init(&e->next);
list_head_init(&e->names);
- e->api = api;
- e->apn = apn;
+ e->pid = pid;
+ e->prog = prog;
e->daf_name = NULL;
e->re = NULL;
- e->state = API_INIT;
+ e->state = PROC_INIT;
if (pthread_condattr_init(&cattr)) {
free(e);
@@ -83,16 +83,16 @@ struct api_entry * api_entry_create(pid_t api,
return e;
}
-void cancel_api_entry(void * o)
+static void cancel_proc_entry(void * o)
{
- struct api_entry * e = (struct api_entry *) o;
+ struct proc_entry * e = (struct proc_entry *) o;
- e->state = API_NULL;
+ e->state = PROC_NULL;
pthread_mutex_unlock(&e->lock);
}
-void api_entry_destroy(struct api_entry * e)
+void proc_entry_destroy(struct proc_entry * e)
{
struct list_head * p;
struct list_head * h;
@@ -101,19 +101,19 @@ void api_entry_destroy(struct api_entry * e)
pthread_mutex_lock(&e->lock);
- if (e->state == API_DESTROY) {
+ if (e->state == PROC_DESTROY) {
pthread_mutex_unlock(&e->lock);
return;
}
- if (e->state == API_SLEEP)
- e->state = API_DESTROY;
+ if (e->state == PROC_SLEEP)
+ e->state = PROC_DESTROY;
pthread_cond_signal(&e->cond);
- pthread_cleanup_push(cancel_api_entry, e);
+ pthread_cleanup_push(cancel_proc_entry, e);
- while (e->state != API_INIT)
+ while (e->state != PROC_INIT)
pthread_cond_wait(&e->cond, &e->lock);
pthread_cleanup_pop(false);
@@ -123,8 +123,8 @@ void api_entry_destroy(struct api_entry * e)
pthread_cond_destroy(&e->cond);
pthread_mutex_destroy(&e->lock);
- if (e->apn != NULL)
- free(e->apn);
+ if (e->prog != NULL)
+ free(e->prog);
list_for_each_safe(p, h, &e->names) {
struct str_el * n = list_entry(p, struct str_el, next);
@@ -137,8 +137,8 @@ void api_entry_destroy(struct api_entry * e)
free(e);
}
-int api_entry_add_name(struct api_entry * e,
- char * name)
+int proc_entry_add_name(struct proc_entry * e,
+ char * name)
{
struct str_el * s;
@@ -155,8 +155,8 @@ int api_entry_add_name(struct api_entry * e,
return 0;
}
-void api_entry_del_name(struct api_entry * e,
- const char * name)
+void proc_entry_del_name(struct proc_entry * e,
+ const char * name)
{
struct list_head * p = NULL;
struct list_head * h = NULL;
@@ -175,8 +175,8 @@ void api_entry_del_name(struct api_entry * e,
}
}
-int api_entry_sleep(struct api_entry * e,
- struct timespec * timeo)
+int proc_entry_sleep(struct proc_entry * e,
+ struct timespec * timeo)
{
struct timespec dl;
@@ -191,12 +191,12 @@ int api_entry_sleep(struct api_entry * e,
pthread_mutex_lock(&e->lock);
- if (e->state != API_WAKE && e->state != API_DESTROY)
- e->state = API_SLEEP;
+ if (e->state != PROC_WAKE && e->state != PROC_DESTROY)
+ e->state = PROC_SLEEP;
- pthread_cleanup_push(cancel_api_entry, e);
+ pthread_cleanup_push(cancel_proc_entry, e);
- while (e->state == API_SLEEP && ret != -ETIMEDOUT)
+ while (e->state == PROC_SLEEP && ret != -ETIMEDOUT)
if (timeo)
ret = -pthread_cond_timedwait(&e->cond, &e->lock, &dl);
else
@@ -204,13 +204,13 @@ int api_entry_sleep(struct api_entry * e,
pthread_cleanup_pop(false);
- if (e->state == API_DESTROY) {
+ if (e->state == PROC_DESTROY) {
if (e->re != NULL)
- reg_entry_del_api(e->re, e->api);
+ reg_entry_del_pid(e->re, e->pid);
ret = -1;
}
- e->state = API_INIT;
+ e->state = PROC_INIT;
pthread_cond_broadcast(&e->cond);
pthread_mutex_unlock(&e->lock);
@@ -218,76 +218,76 @@ int api_entry_sleep(struct api_entry * e,
return ret;
}
-void api_entry_wake(struct api_entry * e,
- struct reg_entry * re)
+void proc_entry_wake(struct proc_entry * e,
+ struct reg_entry * re)
{
assert(e);
assert(re);
pthread_mutex_lock(&e->lock);
- if (e->state != API_SLEEP) {
+ if (e->state != PROC_SLEEP) {
pthread_mutex_unlock(&e->lock);
return;
}
- e->state = API_WAKE;
+ e->state = PROC_WAKE;
e->re = re;
pthread_cond_broadcast(&e->cond);
- pthread_cleanup_push(cancel_api_entry, e);
+ pthread_cleanup_push(cancel_proc_entry, e);
- while (e->state == API_WAKE)
+ while (e->state == PROC_WAKE)
pthread_cond_wait(&e->cond, &e->lock);
pthread_cleanup_pop(false);
- if (e->state == API_DESTROY)
- e->state = API_INIT;
+ if (e->state == PROC_DESTROY)
+ e->state = PROC_INIT;
pthread_mutex_unlock(&e->lock);
}
-int api_table_add(struct list_head * api_table,
- struct api_entry * e)
+int proc_table_add(struct list_head * proc_table,
+ struct proc_entry * e)
{
- assert(api_table);
+ assert(proc_table);
assert(e);
- list_add(&e->next, api_table);
+ list_add(&e->next, proc_table);
return 0;
}
-void api_table_del(struct list_head * api_table,
- pid_t api)
+void proc_table_del(struct list_head * proc_table,
+ pid_t pid)
{
struct list_head * p;
struct list_head * h;
- assert(api_table);
+ assert(proc_table);
- list_for_each_safe(p, h, api_table) {
- struct api_entry * e = list_entry(p, struct api_entry, next);
- if (api == e->api) {
+ list_for_each_safe(p, h, proc_table) {
+ struct proc_entry * e = list_entry(p, struct proc_entry, next);
+ if (pid == e->pid) {
list_del(&e->next);
- api_entry_destroy(e);
+ proc_entry_destroy(e);
}
}
}
-struct api_entry * api_table_get(struct list_head * api_table,
- pid_t api)
+struct proc_entry * proc_table_get(struct list_head * proc_table,
+ pid_t pid)
{
struct list_head * h;
- assert(api_table);
+ assert(proc_table);
- list_for_each(h, api_table) {
- struct api_entry * e = list_entry(h, struct api_entry, next);
- if (api == e->api)
+ list_for_each(h, proc_table) {
+ struct proc_entry * e = list_entry(h, struct proc_entry, next);
+ if (pid == e->pid)
return e;
}
diff --git a/src/irmd/proc_table.h b/src/irmd/proc_table.h
new file mode 100644
index 00000000..f95649ba
--- /dev/null
+++ b/src/irmd/proc_table.h
@@ -0,0 +1,83 @@
+/*
+ * Ouroboros - Copyright (C) 2016 - 2017
+ *
+ * The IPC Resource Manager - Process Table
+ *
+ * Dimitri Staessens <dimitri.staessens@ugent.be>
+ * Sander Vrijders <sander.vrijders@ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
+ */
+
+#ifndef OUROBOROS_IRMD_PROC_TABLE_H
+#define OUROBOROS_IRMD_PROC_TABLE_H
+
+#include "time.h"
+#include "utils.h"
+
+#include <unistd.h>
+#include <pthread.h>
+
+enum proc_state {
+ PROC_NULL = 0,
+ PROC_INIT,
+ PROC_SLEEP,
+ PROC_WAKE,
+ PROC_DESTROY
+};
+
+struct proc_entry {
+ struct list_head next;
+ pid_t pid;
+ char * prog; /* program instantiated */
+ char * daf_name; /* DAF this process belongs to */
+ struct list_head names; /* names for which process accepts flows */
+
+ struct reg_entry * re; /* reg_entry for which a flow arrived */
+
+ /* The process will block on this */
+ enum proc_state state;
+ pthread_cond_t cond;
+ pthread_mutex_t lock;
+};
+
+struct proc_entry * proc_entry_create(pid_t proc,
+ char * prog);
+
+void proc_entry_destroy(struct proc_entry * e);
+
+int proc_entry_sleep(struct proc_entry * e,
+ struct timespec * timeo);
+
+void proc_entry_wake(struct proc_entry * e,
+ struct reg_entry * re);
+
+void proc_entry_cancel(struct proc_entry * e);
+
+int proc_entry_add_name(struct proc_entry * e,
+ char * name);
+
+void proc_entry_del_name(struct proc_entry * e,
+ const char * name);
+
+int proc_table_add(struct list_head * proc_table,
+ struct proc_entry * e);
+
+void proc_table_del(struct list_head * proc_table,
+ pid_t pid);
+
+struct proc_entry * proc_table_get(struct list_head * proc_table,
+ pid_t pid);
+
+#endif /* OUROBOROS_IRMD_PROC_TABLE_H */
diff --git a/src/irmd/apn_table.c b/src/irmd/prog_table.c
index da4f4da1..1aeb0982 100644
--- a/src/irmd/apn_table.c
+++ b/src/irmd/prog_table.c
@@ -1,7 +1,7 @@
/*
* Ouroboros - Copyright (C) 2016 - 2017
*
- * The IPC Resource Manager - Application Process Table
+ * The IPC Resource Manager - Program Table
*
* Dimitri Staessens <dimitri.staessens@ugent.be>
* Sander Vrijders <sander.vrijders@ugent.be>
@@ -23,20 +23,22 @@
#include <ouroboros/errno.h>
#include <ouroboros/irm.h>
-#include "apn_table.h"
+#include "prog_table.h"
#include "utils.h"
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
-struct apn_entry * apn_entry_create(char * apn,
- char * ap,
- uint32_t flags,
- char ** argv)
+struct prog_entry * prog_entry_create(char * progn,
+ char * prog,
+ uint32_t flags,
+ char ** argv)
{
- struct apn_entry * e;
- if (apn == NULL)
- return NULL;
+ struct prog_entry * e;
+
+ assert(progn);
+ assert(prog);
e = malloc(sizeof(*e));
if (e == NULL)
@@ -45,11 +47,11 @@ struct apn_entry * apn_entry_create(char * apn,
list_head_init(&e->next);
list_head_init(&e->names);
- e->apn = apn;
- e->ap = ap;
+ e->progn = progn;
+ e->prog = prog;
e->flags = flags;
- if (flags & BIND_AP_AUTO) {
+ if (flags & BIND_AUTO) {
e->argv = argv;
} else {
e->argv = NULL;
@@ -59,7 +61,7 @@ struct apn_entry * apn_entry_create(char * apn,
return e;
}
-void apn_entry_destroy(struct apn_entry * e)
+void prog_entry_destroy(struct prog_entry * e)
{
struct list_head * p = NULL;
struct list_head * h = NULL;
@@ -67,11 +69,11 @@ void apn_entry_destroy(struct apn_entry * e)
if (e == NULL)
return;
- if (e->apn != NULL)
- free(e->apn);
+ if (e->progn != NULL)
+ free(e->progn);
- if (e->ap != NULL)
- free(e->ap);
+ if (e->prog != NULL)
+ free(e->prog);
if (e->argv != NULL)
argvfree(e->argv);
@@ -87,7 +89,8 @@ void apn_entry_destroy(struct apn_entry * e)
free(e);
}
-int apn_entry_add_name(struct apn_entry * e, char * name)
+int prog_entry_add_name(struct prog_entry * e,
+ char * name)
{
struct str_el * s;
@@ -104,7 +107,8 @@ int apn_entry_add_name(struct apn_entry * e, char * name)
return 0;
}
-void apn_entry_del_name(struct apn_entry * e, char * name)
+void prog_entry_del_name(struct prog_entry * e,
+ char * name)
{
struct list_head * p = NULL;
struct list_head * h = NULL;
@@ -120,60 +124,63 @@ void apn_entry_del_name(struct apn_entry * e, char * name)
}
}
-int apn_table_add(struct list_head * apn_table, struct apn_entry * e)
+int prog_table_add(struct list_head * prog_table,
+ struct prog_entry * e)
{
- if (apn_table == NULL || e == NULL)
- return -EINVAL;
+ assert(prog_table);
+ assert(e);
- list_add(&e->next, apn_table);
+ list_add(&e->next, prog_table);
return 0;
}
-void apn_table_del(struct list_head * apn_table, char * ap)
+void prog_table_del(struct list_head * prog_table,
+ char * prog)
{
struct list_head * p;
struct list_head * h;
- if (apn_table == NULL || ap == NULL)
- return;
+ assert(prog_table);
+ assert(prog);
- list_for_each_safe(p, h, apn_table) {
- struct apn_entry * e = list_entry(p, struct apn_entry, next);
- if (!wildcard_match(ap, e->ap)) {
+ list_for_each_safe(p, h, prog_table) {
+ struct prog_entry * e = list_entry(p, struct prog_entry, next);
+ if (!wildcard_match(prog, e->prog)) {
list_del(&e->next);
- apn_entry_destroy(e);
+ prog_entry_destroy(e);
}
}
}
-struct apn_entry * apn_table_get(struct list_head * apn_table, char * ap)
+struct prog_entry * prog_table_get(struct list_head * prog_table,
+ char * prog)
{
struct list_head * p;
- if (apn_table == NULL || ap == NULL)
- return NULL;
+ assert(prog_table);
+ assert(prog);
- list_for_each(p, apn_table) {
- struct apn_entry * e = list_entry(p, struct apn_entry, next);
- if (!strcmp(e->ap, ap))
+ list_for_each(p, prog_table) {
+ struct prog_entry * e = list_entry(p, struct prog_entry, next);
+ if (!strcmp(e->prog, prog))
return e;
}
return NULL;
}
-struct apn_entry * apn_table_get_by_apn(struct list_head * apn_table,
- char * apn)
+struct prog_entry * prog_table_get_by_progn(struct list_head * prog_table,
+ char * progn)
{
struct list_head * p;
- if (apn_table == NULL || apn == NULL)
- return NULL;
+ assert(prog_table);
+ assert(progn);
- list_for_each(p, apn_table) {
- struct apn_entry * e = list_entry(p, struct apn_entry, next);
- if (!strcmp(e->apn, apn))
+ list_for_each(p, prog_table) {
+ struct prog_entry * e = list_entry(p, struct prog_entry, next);
+ if (!strcmp(e->progn, progn))
return e;
}
diff --git a/src/irmd/prog_table.h b/src/irmd/prog_table.h
new file mode 100644
index 00000000..f4692ce6
--- /dev/null
+++ b/src/irmd/prog_table.h
@@ -0,0 +1,65 @@
+/*
+ * Ouroboros - Copyright (C) 2016 - 2017
+ *
+ * The IPC Resource Manager - Program Table
+ *
+ * Dimitri Staessens <dimitri.staessens@ugent.be>
+ * Sander Vrijders <sander.vrijders@ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
+ */
+
+#ifndef OUROBOROS_IRMD_PROG_TABLE_H
+#define OUROBOROS_IRMD_PROG_TABLE_H
+
+#include <ouroboros/list.h>
+
+#include <unistd.h>
+#include <stdint.h>
+
+struct prog_entry {
+ struct list_head next;
+ char * progn; /* name for irmd */
+ char * prog; /* name of binary */
+ uint32_t flags;
+ char ** argv;
+ struct list_head names; /* names that all instances will listen for */
+};
+
+struct prog_entry * prog_entry_create(char * progn,
+ char * prog,
+ uint32_t flags,
+ char ** argv);
+
+void prog_entry_destroy(struct prog_entry * e);
+
+int prog_entry_add_name(struct prog_entry * e,
+ char * name);
+
+void prog_entry_del_name(struct prog_entry * e,
+ char * name);
+
+int prog_table_add(struct list_head * prog_table,
+ struct prog_entry * e);
+
+void prog_table_del(struct list_head * prog_table,
+ char * prog);
+
+struct prog_entry * prog_table_get(struct list_head * prog_table,
+ char * prog);
+
+struct prog_entry * prog_table_get_by_progn(struct list_head * prog_table,
+ char * progn);
+
+#endif /* OUROBOROS_IRMD_PROG_TABLE_H */
diff --git a/src/irmd/registry.c b/src/irmd/registry.c
index 21399118..61dcf655 100644
--- a/src/irmd/registry.c
+++ b/src/irmd/registry.c
@@ -70,8 +70,8 @@ static int reg_entry_init(struct reg_entry * e,
list_head_init(&e->next);
list_head_init(&e->difs);
- list_head_init(&e->reg_apns);
- list_head_init(&e->reg_apis);
+ list_head_init(&e->reg_progs);
+ list_head_init(&e->reg_pids);
e->name = name;
@@ -108,13 +108,13 @@ static void cancel_reg_entry_destroy(void * o)
if (e->name != NULL)
free(e->name);
- list_for_each_safe(p, h, &e->reg_apis) {
+ list_for_each_safe(p, h, &e->reg_pids) {
struct pid_el * pe = list_entry(p, struct pid_el, next);
list_del(&pe->next);
free(pe);
}
- list_for_each_safe(p, h, &e->reg_apns) {
+ list_for_each_safe(p, h, &e->reg_progs) {
struct str_el * a = list_entry(p, struct str_el, next);
list_del(&a->next);
free(a->str);
@@ -214,33 +214,33 @@ static void reg_entry_del_local_from_dif(struct reg_entry * e,
}
}
-static bool reg_entry_has_apn(struct reg_entry * e,
- const char * apn)
+static bool reg_entry_has_prog(struct reg_entry * e,
+ const char * prog)
{
struct list_head * p;
- list_for_each(p, &e->reg_apns) {
+ list_for_each(p, &e->reg_progs) {
struct str_el * e = list_entry(p, struct str_el, next);
- if (!strcmp(e->str, apn))
+ if (!strcmp(e->str, prog))
return true;
}
return false;
}
-int reg_entry_add_apn(struct reg_entry * e,
- struct apn_entry * a)
+int reg_entry_add_prog(struct reg_entry * e,
+ struct prog_entry * a)
{
struct str_el * n;
- if (reg_entry_has_apn(e, a->apn)) {
- log_warn("AP %s already accepting flows for %s.",
- a->apn, e->name);
+ if (reg_entry_has_prog(e, a->prog)) {
+ log_warn("Program %s already accepting flows for %s.",
+ a->prog, e->name);
return 0;
}
- if (!(a->flags & BIND_AP_AUTO)) {
- log_dbg("AP %s cannot be auto-instantiated.", a->apn);
+ if (!(a->flags & BIND_AUTO)) {
+ log_dbg("Program %s cannot be auto-instantiated.", a->prog);
return 0;
}
@@ -248,13 +248,13 @@ int reg_entry_add_apn(struct reg_entry * e,
if (n == NULL)
return -ENOMEM;
- n->str = strdup(a->apn);
+ n->str = strdup(a->prog);
if (n->str == NULL) {
free(n);
return -ENOMEM;
}
- list_add(&n->next, &e->reg_apns);
+ list_add(&n->next, &e->reg_progs);
pthread_mutex_lock(&e->state_lock);
@@ -266,15 +266,15 @@ int reg_entry_add_apn(struct reg_entry * e,
return 0;
}
-void reg_entry_del_apn(struct reg_entry * e,
- const char * apn)
+void reg_entry_del_prog(struct reg_entry * e,
+ const char * prog)
{
struct list_head * p = NULL;
struct list_head * h = NULL;
- list_for_each_safe(p, h, &e->reg_apns) {
+ list_for_each_safe(p, h, &e->reg_progs) {
struct str_el * e = list_entry(p, struct str_el, next);
- if (!wildcard_match(apn, e->str)) {
+ if (!wildcard_match(prog, e->str)) {
list_del(&e->next);
free(e->str);
free(e);
@@ -283,7 +283,7 @@ void reg_entry_del_apn(struct reg_entry * e,
pthread_mutex_lock(&e->state_lock);
- if (e->state == REG_NAME_AUTO_ACCEPT && list_is_empty(&e->reg_apns)) {
+ if (e->state == REG_NAME_AUTO_ACCEPT && list_is_empty(&e->reg_progs)) {
e->state = REG_NAME_IDLE;
pthread_cond_broadcast(&e->state_cond);
}
@@ -291,37 +291,37 @@ void reg_entry_del_apn(struct reg_entry * e,
pthread_mutex_unlock(&e->state_lock);
}
-char * reg_entry_get_apn(struct reg_entry * e)
+char * reg_entry_get_prog(struct reg_entry * e)
{
- if (!list_is_empty(&e->reg_apis) || list_is_empty(&e->reg_apns))
+ if (!list_is_empty(&e->reg_pids) || list_is_empty(&e->reg_progs))
return NULL;
- return list_first_entry(&e->reg_apns, struct str_el, next)->str;
+ return list_first_entry(&e->reg_progs, struct str_el, next)->str;
}
-static bool reg_entry_has_api(struct reg_entry * e,
- pid_t api)
+static bool reg_entry_has_pid(struct reg_entry * e,
+ pid_t pid)
{
struct list_head * p;
- list_for_each(p, &e->reg_apns) {
+ list_for_each(p, &e->reg_progs) {
struct pid_el * e = list_entry(p, struct pid_el, next);
- if (e->pid == api)
+ if (e->pid == pid)
return true;
}
return false;
}
-int reg_entry_add_api(struct reg_entry * e,
- pid_t api)
+int reg_entry_add_pid(struct reg_entry * e,
+ pid_t pid)
{
struct pid_el * i;
assert(e);
- if (reg_entry_has_api(e, api)) {
- log_dbg("Instance already registered with this name.");
+ if (reg_entry_has_pid(e, pid)) {
+ log_dbg("Process already registered with this name.");
return -EPERM;
}
@@ -339,9 +339,9 @@ int reg_entry_add_api(struct reg_entry * e,
return -ENOMEM;
}
- i->pid = api;
+ i->pid = pid;
- list_add(&i->next, &e->reg_apis);
+ list_add(&i->next, &e->reg_pids);
if (e->state == REG_NAME_IDLE ||
e->state == REG_NAME_AUTO_ACCEPT ||
@@ -365,8 +365,8 @@ static void reg_entry_check_state(struct reg_entry * e)
return;
}
- if (list_is_empty(&e->reg_apis)) {
- if (!list_is_empty(&e->reg_apns))
+ if (list_is_empty(&e->reg_pids)) {
+ if (!list_is_empty(&e->reg_progs))
e->state = REG_NAME_AUTO_ACCEPT;
else
e->state = REG_NAME_IDLE;
@@ -389,8 +389,8 @@ void reg_entry_del_pid_el(struct reg_entry * e,
reg_entry_check_state(e);
}
-void reg_entry_del_api(struct reg_entry * e,
- pid_t api)
+void reg_entry_del_pid(struct reg_entry * e,
+ pid_t pid)
{
struct list_head * p;
struct list_head * h;
@@ -400,9 +400,9 @@ void reg_entry_del_api(struct reg_entry * e,
if (e == NULL)
return;
- list_for_each_safe(p, h, &e->reg_apis) {
+ list_for_each_safe(p, h, &e->reg_pids) {
struct pid_el * a = list_entry(p, struct pid_el, next);
- if (a->pid == api) {
+ if (a->pid == pid) {
list_del(&a->next);
free(a);
}
@@ -411,15 +411,15 @@ void reg_entry_del_api(struct reg_entry * e,
reg_entry_check_state(e);
}
-pid_t reg_entry_get_api(struct reg_entry * e)
+pid_t reg_entry_get_pid(struct reg_entry * e)
{
if (e == NULL)
return -1;
- if (list_is_empty(&e->reg_apis))
+ if (list_is_empty(&e->reg_pids))
return -1;
- return list_first_entry(&e->reg_apis, struct pid_el, next)->pid;
+ return list_first_entry(&e->reg_pids, struct pid_el, next)->pid;
}
enum reg_name_state reg_entry_get_state(struct reg_entry * e)
@@ -618,19 +618,19 @@ void registry_del_name(struct list_head * registry,
return;
}
-void registry_del_api(struct list_head * registry,
- pid_t api)
+void registry_del_process(struct list_head * registry,
+ pid_t pid)
{
struct list_head * p;
assert(registry);
- assert(api > 0);
+ assert(pid > 0);
list_for_each(p, registry) {
struct reg_entry * e = list_entry(p, struct reg_entry, next);
pthread_mutex_lock(&e->state_lock);
assert(e);
- reg_entry_del_api(e, api);
+ reg_entry_del_pid(e, pid);
pthread_mutex_unlock(&e->state_lock);
}
diff --git a/src/irmd/registry.h b/src/irmd/registry.h
index 486843a2..f1f52b9e 100644
--- a/src/irmd/registry.h
+++ b/src/irmd/registry.h
@@ -28,8 +28,8 @@
#include <ouroboros/list.h>
#include <ouroboros/qoscube.h>
-#include "api_table.h"
-#include "apn_table.h"
+#include "proc_table.h"
+#include "prog_table.h"
#include <stdint.h>
#include <stdbool.h>
@@ -57,35 +57,35 @@ struct reg_entry {
/* DIFs in which this name is registered */
struct list_head difs;
- /* APs that can be instantiated by the irmd */
- struct list_head reg_apns;
- /* Instances that are listening for this name */
- struct list_head reg_apis;
+ /* Programs that can be instantiated by the irmd */
+ struct list_head reg_progs;
+ /* Processes that are listening for this name */
+ struct list_head reg_pids;
enum reg_name_state state;
pthread_cond_t state_cond;
pthread_mutex_t state_lock;
};
-int reg_entry_add_apn(struct reg_entry * e,
- struct apn_entry * a);
+int reg_entry_add_prog(struct reg_entry * e,
+ struct prog_entry * a);
-void reg_entry_del_apn(struct reg_entry * e,
- const char * apn);
+void reg_entry_del_prog(struct reg_entry * e,
+ const char * prog);
-char * reg_entry_get_apn(struct reg_entry * e);
+char * reg_entry_get_prog(struct reg_entry * e);
-int reg_entry_add_api(struct reg_entry * e,
- pid_t api);
+int reg_entry_add_pid(struct reg_entry * e,
+ pid_t pid);
-void reg_entry_del_api(struct reg_entry * e,
- pid_t api);
+void reg_entry_del_pid(struct reg_entry * e,
+ pid_t pid);
void reg_entry_del_pid_el(struct reg_entry * e,
struct pid_el * a);
-pid_t reg_entry_get_api(struct reg_entry * e);
+pid_t reg_entry_get_pid(struct reg_entry * e);
enum reg_name_state reg_entry_get_state(struct reg_entry * e);
@@ -106,10 +106,10 @@ struct reg_entry * registry_add_name(struct list_head * registry,
void registry_del_name(struct list_head * registry,
const char * name);
-void registry_del_api(struct list_head * registry,
- pid_t api);
+void registry_del_process(struct list_head * registry,
+ pid_t pid);
-void registry_sanitize_apis(struct list_head * registry);
+void registry_sanitize_pids(struct list_head * registry);
struct reg_entry * registry_get_entry(struct list_head * registry,
const char * name);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 00:04:41 +0000