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>

5 files changed, 25 insertions, 25 deletions

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);