lib: Rename PROG_* config to PROC_*

Per-process flow / fd / fqueue limits are properties of a process, not
a program; align the naming. Mechanical rename of PROG_MAX_FLOWS,
PROG_RES_FDS, and PROG_MAX_FQUEUES to PROC_*.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

10 files changed, 51 insertions, 51 deletions

diff --git a/cmake/config/lib.cmake b/cmake/config/lib.cmake
index aba580f1..7e685ce0 100644
--- a/cmake/config/lib.cmake
+++ b/cmake/config/lib.cmake
@@ -4,11 +4,11 @@
 # Flow limits
 set(SYS_MAX_FLOWS 10240 CACHE STRING
   "Maximum number of total flows for this system")
-set(PROG_MAX_FLOWS 4096 CACHE STRING
+set(PROC_MAX_FLOWS 4096 CACHE STRING
   "Maximum number of flows in an application")
-set(PROG_RES_FDS 64 CACHE STRING
+set(PROC_RES_FDS 64 CACHE STRING
   "Number of reserved flow descriptors per application")
-set(PROG_MAX_FQUEUES 32 CACHE STRING
+set(PROC_MAX_FQUEUES 32 CACHE STRING
   "Maximum number of flow sets per application")
 
 # Threading
diff --git a/src/ipcpd/config.h.in b/src/ipcpd/config.h.in
index c0b6363e..37ee2c5e 100644
--- a/src/ipcpd/config.h.in
+++ b/src/ipcpd/config.h.in
@@ -23,8 +23,8 @@
 #define PTHREAD_COND_CLOCK  @PTHREAD_COND_CLOCK@
 
 #define SYS_MAX_FLOWS       @SYS_MAX_FLOWS@
-#define PROG_RES_FDS        @PROG_RES_FDS@
-#define PROG_MAX_FLOWS      @PROG_MAX_FLOWS@
+#define PROC_RES_FDS        @PROC_RES_FDS@
+#define PROC_MAX_FLOWS      @PROC_MAX_FLOWS@
 
 #define SOCKET_TIMEOUT      @SOCKET_TIMEOUT@
 #define CONNECT_TIMEOUT     @CONNECT_TIMEOUT@
diff --git a/src/ipcpd/unicast/dt.c b/src/ipcpd/unicast/dt.c
index 252477f4..9f51b41f 100644
--- a/src/ipcpd/unicast/dt.c
+++ b/src/ipcpd/unicast/dt.c
@@ -168,12 +168,12 @@ struct {
                 size_t          f_nhp_pkt[QOS_CUBE_MAX];
                 size_t          f_nhp_bytes[QOS_CUBE_MAX];
                 pthread_mutex_t lock;
-        } stat[PROG_MAX_FLOWS];
+        } stat[PROC_MAX_FLOWS];
 
         size_t             n_flows;
 #endif
         struct bmp *       res_fds;
-        struct comp_info   comps[PROG_RES_FDS];
+        struct comp_info   comps[PROC_RES_FDS];
         pthread_rwlock_t   lock;
 
         pthread_t          listener;
@@ -220,7 +220,7 @@ static int dt_rib_read(const char * path,
         tm = gmtime(&dt.stat[fd].stamp);
         strftime(tmstr, sizeof(tmstr), RIB_TM_FORMAT, tm);
 
-        if (fd >= PROG_RES_FDS) {
+        if (fd >= PROC_RES_FDS) {
                 fccntl(fd, FLOWGRXQLEN, &rxqlen);
                 fccntl(fd, FLOWGTXQLEN, &txqlen);
         }
@@ -296,7 +296,7 @@ static int dt_rib_readdir(char *** buf)
         if (*buf == NULL)
                 goto fail_entries;
 
-        for (i = 0; i < PROG_MAX_FLOWS; ++i) {
+        for (i = 0; i < PROC_MAX_FLOWS; ++i) {
                 pthread_mutex_lock(&dt.stat[i].lock);
 
                 if (dt.stat[i].stamp == 0) {
@@ -514,7 +514,7 @@ static void packet_handler(int                  fd,
 #endif
         } else {
                 dt_pci_shrink(spb);
-                if (dt_pci.eid >= PROG_RES_FDS) {
+                if (dt_pci.eid >= PROC_RES_FDS) {
                         uint8_t ecn = *(head + dt_pci_info.ecn_o);
                         fa_np1_rcv(dt_pci.eid, ecn, spb);
                         return;
@@ -636,13 +636,13 @@ int dt_init(struct dt_config cfg)
                 goto fail_rwlock_init;
         }
 
-        dt.res_fds = bmp_create(PROG_RES_FDS, 0);
+        dt.res_fds = bmp_create(PROC_RES_FDS, 0);
         if (dt.res_fds == NULL)
                 goto fail_res_fds;
 #ifdef IPCP_FLOW_STATS
         memset(dt.stat, 0, sizeof(dt.stat));
 
-        for (i = 0; i < PROG_MAX_FLOWS; ++i)
+        for (i = 0; i < PROC_MAX_FLOWS; ++i)
                 if (pthread_mutex_init(&dt.stat[i].lock, NULL)) {
                         log_err("Failed to init mutex for flow %d.", i);
                         for (j = 0; j < i; ++j)
@@ -662,7 +662,7 @@ int dt_init(struct dt_config cfg)
 
  fail_rib_reg:
 #ifdef IPCP_FLOW_STATS
-        for (i = 0; i < PROG_MAX_FLOWS; ++i)
+        for (i = 0; i < PROC_MAX_FLOWS; ++i)
                 pthread_mutex_destroy(&dt.stat[i].lock);
  fail_stat_lock:
 #endif
@@ -691,7 +691,7 @@ void dt_fini(void)
         sprintf(dtstr, "%s.%" PRIu64, DT, dt.addr);
         rib_unreg(dtstr);
 #ifdef IPCP_FLOW_STATS
-        for (i = 0; i < PROG_MAX_FLOWS; ++i)
+        for (i = 0; i < PROC_MAX_FLOWS; ++i)
                 pthread_mutex_destroy(&dt.stat[i].lock);
 #endif
         bmp_destroy(dt.res_fds);
@@ -791,7 +791,7 @@ int dt_reg_comp(void * comp,
 
 void dt_unreg_comp(int eid)
 {
-        assert(eid >= 0 && eid < PROG_RES_FDS);
+        assert(eid >= 0 && eid < PROC_RES_FDS);
 
         pthread_rwlock_wrlock(&dt.lock);
 
@@ -823,7 +823,7 @@ int dt_write_packet(uint64_t             dst_addr,
 #ifdef IPCP_FLOW_STATS
         len = ssm_pk_buff_len(spb);
 
-        if (eid < PROG_RES_FDS) {
+        if (eid < PROC_RES_FDS) {
                 pthread_mutex_lock(&dt.stat[eid].lock);
 
                 ++dt.stat[eid].lcl_r_pkt[qc];
@@ -837,7 +837,7 @@ int dt_write_packet(uint64_t             dst_addr,
                 log_dbg("Could not get nhop for " ADDR_FMT32 ".",
                         ADDR_VAL32(&dst_addr));
 #ifdef IPCP_FLOW_STATS
-                if (eid < PROG_RES_FDS) {
+                if (eid < PROC_RES_FDS) {
                         pthread_mutex_lock(&dt.stat[eid].lock);
 
                         ++dt.stat[eid].lcl_r_pkt[qc];
@@ -876,7 +876,7 @@ int dt_write_packet(uint64_t             dst_addr,
 #ifdef IPCP_FLOW_STATS
         pthread_mutex_lock(&dt.stat[fd].lock);
 
-        if (dt_pci.eid < PROG_RES_FDS) {
+        if (dt_pci.eid < PROC_RES_FDS) {
                 ++dt.stat[fd].lcl_w_pkt[qc];
                 dt.stat[fd].lcl_w_bytes[qc] += len;
         }
@@ -891,7 +891,7 @@ int dt_write_packet(uint64_t             dst_addr,
 #ifdef IPCP_FLOW_STATS
         pthread_mutex_lock(&dt.stat[fd].lock);
 
-        if (eid < PROG_RES_FDS) {
+        if (eid < PROC_RES_FDS) {
                 ++dt.stat[fd].lcl_w_pkt[qc];
                 dt.stat[fd].lcl_w_bytes[qc] += len;
         }
diff --git a/src/ipcpd/unicast/fa.c b/src/ipcpd/unicast/fa.c
index f398d317..39928ab2 100644
--- a/src/ipcpd/unicast/fa.c
+++ b/src/ipcpd/unicast/fa.c
@@ -111,7 +111,7 @@ struct fa_flow {
 
 struct {
         pthread_rwlock_t flows_lock;
-        struct fa_flow   flows[PROG_MAX_FLOWS];
+        struct fa_flow   flows[PROC_MAX_FLOWS];
 #ifdef IPCP_FLOW_STATS
         size_t           n_flows;
 #endif
@@ -145,7 +145,7 @@ static int fa_rib_read(const char * path,
 
         fd = atoi(entry);
 
-        if (fd < 0 || fd >= PROG_MAX_FLOWS)
+        if (fd < 0 || fd >= PROC_MAX_FLOWS)
                 return -1;
 
         if (len < 1536)
@@ -225,7 +225,7 @@ static int fa_rib_readdir(char *** buf)
         if (*buf == NULL)
                 goto fail_entries;
 
-        for (i = 0; i < PROG_MAX_FLOWS; ++i) {
+        for (i = 0; i < PROC_MAX_FLOWS; ++i) {
                 struct fa_flow * flow;
 
                 flow = &fa.flows[i];
@@ -306,7 +306,7 @@ static int eid_to_fd(uint64_t eid)
 
         fd = eid & 0xFFFFFFFF;
 
-        if (fd < 0 || fd >= PROG_MAX_FLOWS)
+        if (fd < 0 || fd >= PROC_MAX_FLOWS)
                 return -1;
 
         flow = &fa.flows[fd];
diff --git a/src/ipcpd/unicast/routing/graph.c b/src/ipcpd/unicast/routing/graph.c
index 0226c762..c168eb7d 100644
--- a/src/ipcpd/unicast/routing/graph.c
+++ b/src/ipcpd/unicast/routing/graph.c
@@ -603,9 +603,9 @@ static int graph_routing_table_lfa(struct graph *     graph,
                                    struct list_head * table,
                                    int **             dist)
 {
-        int *              n_dist[PROG_MAX_FLOWS];
-        uint64_t           addrs[PROG_MAX_FLOWS];
-        int                n_index[PROG_MAX_FLOWS];
+        int *              n_dist[PROC_MAX_FLOWS];
+        uint64_t           addrs[PROC_MAX_FLOWS];
+        int                n_index[PROC_MAX_FLOWS];
         struct list_head * p;
         struct list_head * q;
         struct vertex *    v;
@@ -618,7 +618,7 @@ static int graph_routing_table_lfa(struct graph *     graph,
         if (graph_routing_table_simple(graph, s_addr, table, dist))
                 goto fail_table;
 
-        for (j = 0; j < PROG_MAX_FLOWS; j++) {
+        for (j = 0; j < PROC_MAX_FLOWS; j++) {
                 n_dist[j] = NULL;
                 n_index[j] = -1;
                 addrs[j] = -1;
diff --git a/src/ipcpd/unicast/routing/link-state.c b/src/ipcpd/unicast/routing/link-state.c
index 051dd98d..c4ea9e1c 100644
--- a/src/ipcpd/unicast/routing/link-state.c
+++ b/src/ipcpd/unicast/routing/link-state.c
@@ -415,7 +415,7 @@ static void calculate_pff(struct routing_i * instance)
         struct list_head   table;
         struct list_head * p;
         struct list_head * q;
-        int                fds[PROG_MAX_FLOWS];
+        int                fds[PROC_MAX_FLOWS];
 
         assert(instance);
 
diff --git a/src/lib/config.h.in b/src/lib/config.h.in
index d1ae97ef..9376c902 100644
--- a/src/lib/config.h.in
+++ b/src/lib/config.h.in
@@ -64,9 +64,9 @@
 
 #define PTHREAD_COND_CLOCK  @PTHREAD_COND_CLOCK@
 
-#define PROG_MAX_FLOWS      @PROG_MAX_FLOWS@
-#define PROG_RES_FDS        @PROG_RES_FDS@
-#define PROG_MAX_FQUEUES    @PROG_MAX_FQUEUES@
+#define PROC_MAX_FLOWS      @PROC_MAX_FLOWS@
+#define PROC_RES_FDS        @PROC_RES_FDS@
+#define PROC_MAX_FQUEUES    @PROC_MAX_FQUEUES@
 
 /* Default Delta-t parameters */
 #cmakedefine                FRCT_LINUX_RTT_ESTIMATOR
diff --git a/src/lib/dev.c b/src/lib/dev.c
index ff63b818..bf09c8a4 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -655,13 +655,13 @@ static void init(int     argc,
                 gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
         }
 #endif
-        proc.fds = bmp_create(PROG_MAX_FLOWS - PROG_RES_FDS, PROG_RES_FDS);
+        proc.fds = bmp_create(PROC_MAX_FLOWS - PROC_RES_FDS, PROC_RES_FDS);
         if (proc.fds == NULL) {
                 fprintf(stderr, "FATAL: Could not create fd bitmap.\n");
                 goto fail_fds;
         }
 
-        proc.fqueues = bmp_create(PROG_MAX_FQUEUES, 0);
+        proc.fqueues = bmp_create(PROC_MAX_FQUEUES, 0);
         if (proc.fqueues == NULL) {
                 fprintf(stderr, "FATAL: Could not create fqueue bitmap.\n");
                 goto fail_fqueues;
@@ -677,13 +677,13 @@ static void init(int     argc,
                 goto fail_rdrb;
         }
 
-        proc.flows = malloc(sizeof(*proc.flows) * PROG_MAX_FLOWS);
+        proc.flows = malloc(sizeof(*proc.flows) * PROC_MAX_FLOWS);
         if (proc.flows == NULL) {
                 fprintf(stderr, "FATAL: Could not malloc flows.\n");
                 goto fail_flows;
         }
 
-        for (i = 0; i < PROG_MAX_FLOWS; ++i)
+        for (i = 0; i < PROC_MAX_FLOWS; ++i)
                 flow_clear(i);
 
         proc.id_to_fd = malloc(sizeof(*proc.id_to_fd) * SYS_MAX_FLOWS);
@@ -794,7 +794,7 @@ static void fini(void)
 
         pthread_rwlock_wrlock(&proc.lock);
 
-        for (i = 0; i < PROG_MAX_FLOWS; ++i) {
+        for (i = 0; i < PROC_MAX_FLOWS; ++i) {
                 struct flow * flow = &proc.flows[i];
                 if (flow->info.id != -1) {
                         ssize_t idx;
@@ -1337,7 +1337,7 @@ ssize_t flow_write(int          fd,
         if (buf == NULL && count != 0)
                 return -EINVAL;
 
-        if (fd < 0 || fd >= PROG_MAX_FLOWS)
+        if (fd < 0 || fd >= PROC_MAX_FLOWS)
                 return -EBADF;
 
         flow = &proc.flows[fd];
@@ -1446,7 +1446,7 @@ ssize_t flow_read(int    fd,
         bool                 block;
         bool                 partrd;
 
-        if (fd < 0 || fd >= PROG_MAX_FLOWS)
+        if (fd < 0 || fd >= PROC_MAX_FLOWS)
                 return -EBADF;
 
         flow = &proc.flows[fd];
diff --git a/src/lib/ssm/flow_set.c b/src/lib/ssm/flow_set.c
index 73d0db55..cb38e6fd 100644
--- a/src/lib/ssm/flow_set.c
+++ b/src/lib/ssm/flow_set.c
@@ -58,9 +58,9 @@
 #define QUEUESIZE ((SSM_RBUFF_SIZE) * sizeof(struct flowevent))
 
 #define SSM_FSET_FILE_SIZE (SYS_MAX_FLOWS * sizeof(ssize_t)             \
-                            + PROG_MAX_FQUEUES * sizeof(size_t)         \
-                            + PROG_MAX_FQUEUES * sizeof(pthread_cond_t) \
-                            + PROG_MAX_FQUEUES * QUEUESIZE              \
+                            + PROC_MAX_FQUEUES * sizeof(size_t)         \
+                            + PROC_MAX_FQUEUES * sizeof(pthread_cond_t) \
+                            + PROC_MAX_FQUEUES * QUEUESIZE              \
                             + sizeof(pthread_mutex_t))
 
 #define fqueue_ptr(fs, idx) (fs->fqueues + (SSM_RBUFF_SIZE) * idx)
@@ -104,10 +104,10 @@ static struct ssm_flow_set * flow_set_create(pid_t pid,
 
         set->mtable  = shm_base;
         set->heads   = (size_t *) (set->mtable + SYS_MAX_FLOWS);
-        set->conds   = (pthread_cond_t *)(set->heads + PROG_MAX_FQUEUES);
-        set->fqueues = (struct flowevent *) (set->conds + PROG_MAX_FQUEUES);
+        set->conds   = (pthread_cond_t *)(set->heads + PROC_MAX_FQUEUES);
+        set->fqueues = (struct flowevent *) (set->conds + PROC_MAX_FQUEUES);
         set->lock    = (pthread_mutex_t *)
-                (set->fqueues + PROG_MAX_FQUEUES * (SSM_RBUFF_SIZE));
+                (set->fqueues + PROC_MAX_FQUEUES * (SSM_RBUFF_SIZE));
 
         return set;
 
@@ -164,7 +164,7 @@ struct ssm_flow_set * ssm_flow_set_create(pid_t pid)
         if (pthread_condattr_setclock(&cattr, PTHREAD_COND_CLOCK))
                 goto fail_condattr_set;
 #endif
-        for (i = 0; i < PROG_MAX_FQUEUES; ++i) {
+        for (i = 0; i < PROC_MAX_FQUEUES; ++i) {
                 set->heads[i] = 0;
                 if (pthread_cond_init(&set->conds[i], &cattr))
                         goto fail_init;
@@ -222,7 +222,7 @@ void ssm_flow_set_zero(struct ssm_flow_set * set,
         ssize_t i = 0;
 
         assert(set);
-        assert(idx < PROG_MAX_FQUEUES);
+        assert(idx < PROC_MAX_FQUEUES);
 
         pthread_mutex_lock(set->lock);
 
@@ -242,7 +242,7 @@ int ssm_flow_set_add(struct ssm_flow_set * set,
 {
         assert(set);
         assert(!(flow_id < 0) && flow_id < SYS_MAX_FLOWS);
-        assert(idx < PROG_MAX_FQUEUES);
+        assert(idx < PROC_MAX_FQUEUES);
 
         pthread_mutex_lock(set->lock);
 
@@ -264,7 +264,7 @@ void ssm_flow_set_del(struct ssm_flow_set * set,
 {
         assert(set);
         assert(!(flow_id < 0) && flow_id < SYS_MAX_FLOWS);
-        assert(idx < PROG_MAX_FQUEUES);
+        assert(idx < PROC_MAX_FQUEUES);
 
         pthread_mutex_lock(set->lock);
 
@@ -282,7 +282,7 @@ int ssm_flow_set_has(struct ssm_flow_set * set,
 
         assert(set);
         assert(!(flow_id < 0) && flow_id < SYS_MAX_FLOWS);
-        assert(idx < PROG_MAX_FQUEUES);
+        assert(idx < PROC_MAX_FQUEUES);
 
         pthread_mutex_lock(set->lock);
 
@@ -332,7 +332,7 @@ ssize_t ssm_flow_set_wait(const struct ssm_flow_set * set,
         ssize_t ret = 0;
 
         assert(set);
-        assert(idx < PROG_MAX_FQUEUES);
+        assert(idx < PROC_MAX_FQUEUES);
         assert(fqueue);
 
 #ifndef HAVE_ROBUST_MUTEX
diff --git a/src/lib/timerwheel.c b/src/lib/timerwheel.c
index 3cfb77e8..d0f5c05c 100644
--- a/src/lib/timerwheel.c
+++ b/src/lib/timerwheel.c
@@ -56,7 +56,7 @@ struct {
         struct list_head rxms[RXMQ_LVLS][RXMQ_SLOTS];
 
         struct list_head acks[ACKQ_SLOTS];
-        bool             map[ACKQ_SLOTS][PROG_MAX_FLOWS];
+        bool             map[ACKQ_SLOTS][PROC_MAX_FLOWS];
 
         size_t           prv_rxm[RXMQ_LVLS]; /* Last processed rxm slots. */
         size_t           prv_ack;            /* Last processed ack slot.  */