From 809abada865727ea986d69afcf2a9a3b00df560a Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@ugent.be>
Date: Tue, 25 Jul 2017 19:54:39 +0200
Subject: lib: Add threadpool manager

This adds a threadpool manager component in the library that is used
in the IRMd and IPCPs. The threadpool manager now doesn't detach
threads but does a join when they exit. This solves a data race in the
previous implementation where some threads were not completely finished
upon release of some resources.
---
 include/ouroboros/config.h.in | 12 ++++-------
 include/ouroboros/tpm.h       | 47 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 include/ouroboros/tpm.h

(limited to 'include')

diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index 1b8e0db6..736ba5b3 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -51,20 +51,16 @@
 #define SHM_FLOW_SET_PREFIX    "/ouroboros.sets."
 #define IRMD_MAX_FLOWS         4096
 /* IRMD dynamic threadpooling */
-#define IRMD_MIN_AV_THREADS    16
-#define IRMD_MAX_AV_THREADS    64
-#define IRMD_MAX_THREADS       256
+#define IRMD_MIN_THREADS       16
+#define IRMD_ADD_THREADS       32
 /* IPCP dynamic threadpooling */
-#define IPCP_MIN_AV_THREADS    4
-#define IPCP_MAX_AV_THREADS    32
-#define IPCP_MAX_THREADS       64
+#define IPCP_MIN_THREADS       4
+#define IPCP_ADD_THREADS       16
 
 #define IPCPD_MAX_CONNS        IRMD_MAX_FLOWS
 #define PTHREAD_COND_CLOCK     CLOCK_MONOTONIC
 #define PFT_SIZE               1 << 12
 /* Timeout values */
-#define IRMD_TPM_TIMEOUT       1000
-#define IPCP_TPM_TIMEOUT       1000
 #define IRMD_ACCEPT_TIMEOUT    100
 #define IRMD_REQ_ARR_TIMEOUT   500
 #define IRMD_FLOW_TIMEOUT      5000
diff --git a/include/ouroboros/tpm.h b/include/ouroboros/tpm.h
new file mode 100644
index 00000000..d34f06f3
--- /dev/null
+++ b/include/ouroboros/tpm.h
@@ -0,0 +1,47 @@
+/*
+ * Ouroboros - Copyright (C) 2016 - 2017
+ *
+ * Threadpool management
+ *
+ *    Dimitri Staessens <dimitri.staessens@ugent.be>
+ *    Sander Vrijders   <sander.vrijders@ugent.be>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef OUROBOROS_LIB_TPM_H
+#define OUROBOROS_LIB_TPM_H
+
+#include <stdbool.h>
+
+int  tpm_init(size_t    min,
+              size_t    inc,
+              void * (* func)(void *));
+
+int  tpm_start(void);
+
+void tpm_stop(void);
+
+void tpm_fini(void);
+
+bool tpm_check(void);
+
+void tpm_exit(void);
+
+void tpm_dec(void);
+
+void tpm_inc(void);
+
+#endif /* OUROBOROS_LIB_TPM_H */
-- 
cgit v1.2.3