packages/libevhtp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 update libevhtp

Browse Source 
Merge pull request !2 from lifeng_isula/master
This commit is contained in:
openeuler-ci-bot 2020-04-24 15:09:40 +08:00 committed by Gitee
commit 49b5b6141f
8 changed files with 258 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-decrease-numbers-of-fd-for-shared-pipe-mode.patch Normal file
View File

@ -0,0 +1,36 @@
From a1626a39c9413b9bf9aa08086351c8119cc051e6 Mon Sep 17 00:00:00 2001
From: chenxin <kepler.chenxin@huawei.com>
Date: Wed, 4 Sep 2019 14:59:51 +0800
Subject: [PATCH 1/4] decrease numbers of fd for shared pipe mode
Change-Id: I635aa2db9bdab028e3781b0ac392ab4c56b46dae
Signed-off-by: tanyifeng <tanyifeng1@huawei.com>
Signed-off-by: chenxin <kepler.chenxin@huawei.com>
---
thread.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/thread.c b/thread.c
index dfddc7e..96065df 100644
--- a/thread.c
+++ b/thread.c
@@ -328,6 +328,16 @@ evthr_pool_free(evthr_pool_t * pool)
evthr_free(thread);
}
+#ifdef EVTHR_SHARED_PIPE
+ if (pool->rdr > 0) {
+ close(pool->rdr);
+ }
+
+ if (pool->wdr > 0) {
+ close(pool->wdr);
+ }
+#endif
+
free(pool);
}
--
1.8.3.1

20
0002-close-openssl.patch
View File

@ -1,20 +0,0 @@
diff --git a/cmake/options.cmake b/cmake/options.cmake
index c874461..4d2b909 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -1,5 +1,5 @@
# -DEVHTP_DISABLE_SSL:STRING=ON
-option (EVHTP_DISABLE_SSL "Disable ssl support" OFF)
+option (EVHTP_DISABLE_SSL "Disable ssl support" ON)
# -DEVHTP_DISABLE_EVTHR:STRING=ON
option (EVHTP_DISABLE_EVTHR "Disable evthread support" OFF)
@@ -8,7 +8,7 @@ option (EVHTP_DISABLE_EVTHR "Disable evthread support" OFF)
option (EVHTP_DISABLE_REGEX "Disable regex support" OFF)
# -DEVHTP_BUILD_SHARED:STRING=ON
-option (EVHTP_BUILD_SHARED "Build shared library too" OFF)
+option (EVHTP_BUILD_SHARED "Build shared library too" ON)
# -DEVHTP_DEBUG:STRING=ON
option (EVHTP_DEBUG "Enable verbose debug logging" OFF)

279
0001-support-dynamic-threads.patch → 0002-evhtp-enable-dynamic-thread-pool.patch
View File

@ -1,8 +1,39 @@
From b3733e9fe70d9ac101a2ac79ee4568942a3dd874 Mon Sep 17 00:00:00 2001
From: chenxin <kepler.chenxin@huawei.com>
Date: Wed, 4 Sep 2019 15:52:20 +0800
Subject: [PATCH 2/4] evhtp: enable dynamic thread pool
Signed-off-by: tanyifeng <tanyifeng1@huawei.com>
Signed-off-by: chenxin <kepler.chenxin@huawei.com>
Conflicts:
thread.c
Change-Id: If3f154de82448d002f0e3c90efaaf73394d6734b
---
evhtp.c | 47 ++++++
include/evhtp/evhtp.h | 22 +++
include/evhtp/thread.h | 6 +
thread.c | 415 ++++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 487 insertions(+), 3 deletions(-)
diff --git a/evhtp.c b/evhtp.c diff --git a/evhtp.c b/evhtp.c
index 6eaf319..220c044 100644 index 8d34676..2ecb619 100644
--- a/evhtp.c --- a/evhtp.c
+++ b/evhtp.c +++ b/evhtp.c
@@ -4595,6 +4595,37 @@ htp__use_threads_(evhtp_t * htp, @@ -2824,6 +2824,11 @@ htp__accept_cb_(struct evconnlistener * serv, int fd, struct sockaddr * s, int s
log_debug("fd = %d, conn = %p", fd, connection);
+ if (evhtp_unlikely(sl <= 0)) {
+ evhtp_safe_free(connection, evhtp_connection_free);
+ return;
+ }
+
connection->saddr = htp__malloc_(sl);
if (evhtp_unlikely(connection->saddr == NULL)) {
@@ -4590,6 +4595,37 @@ htp__use_threads_(evhtp_t * htp,
return 0; return 0;
} }
@ -40,7 +71,7 @@ index 6eaf319..220c044 100644
int int
evhtp_use_threads(evhtp_t * htp, evhtp_thread_init_cb init_cb, evhtp_use_threads(evhtp_t * htp, evhtp_thread_init_cb init_cb,
int nthreads, void * arg) int nthreads, void * arg)
@@ -4611,6 +4642,17 @@ evhtp_use_threads_wexit(evhtp_t * htp, @@ -4606,6 +4642,17 @@ evhtp_use_threads_wexit(evhtp_t * htp,
return htp__use_threads_(htp, init_cb, exit_cb, nthreads, arg); return htp__use_threads_(htp, init_cb, exit_cb, nthreads, arg);
} }
@ -59,14 +90,13 @@ index 6eaf319..220c044 100644
#ifndef EVHTP_DISABLE_EVTHR #ifndef EVHTP_DISABLE_EVTHR
diff --git a/include/evhtp/evhtp.h b/include/evhtp/evhtp.h diff --git a/include/evhtp/evhtp.h b/include/evhtp/evhtp.h
index 344f58c..8061bba 100644 index 9bcee44..fbe79ba 100644
--- a/include/evhtp/evhtp.h --- a/include/evhtp/evhtp.h
+++ b/include/evhtp/evhtp.h +++ b/include/evhtp/evhtp.h
@@ -880,6 +880,28 @@ EVHTP_EXPORT int evhtp_use_threads_wexit(evhtp_t *, @@ -871,6 +871,28 @@ EVHTP_EXPORT int evhtp_use_threads_wexit(evhtp_t *,
evhtp_thread_exit_cb,
int nthreads, void * arg); int nthreads, void * arg);
+/** /**
+ * @brief Enable dynamic thread-pool support for an evhtp_t context. Every connection is + * @brief Enable dynamic thread-pool support for an evhtp_t context. Every connection is
+ * distributed to a thread. An optional "on-start" callback can + * distributed to a thread. An optional "on-start" callback can
+ * be set which allows you to manipulate the thread-specific inforation + * be set which allows you to manipulate the thread-specific inforation
@ -88,9 +118,10 @@ index 344f58c..8061bba 100644
+ int nthreads_keep, int nthreads_limit, + int nthreads_keep, int nthreads_limit,
+ int nrequest_limit, void * arg); + int nrequest_limit, void * arg);
+ +
/** +/**
* @brief generates all the right information for a reply to be sent to the client * @brief generates all the right information for a reply to be sent to the client
* *
* @param request
diff --git a/include/evhtp/thread.h b/include/evhtp/thread.h diff --git a/include/evhtp/thread.h b/include/evhtp/thread.h
index 7479aa8..61058a1 100644 index 7479aa8..61058a1 100644
--- a/include/evhtp/thread.h --- a/include/evhtp/thread.h
@ -129,7 +160,7 @@ index 7479aa8..61058a1 100644
#ifdef __cplusplus #ifdef __cplusplus
} }
diff --git a/thread.c b/thread.c diff --git a/thread.c b/thread.c
index 7659cee..37bdeaa 100644 index 96065df..1570b69 100644
--- a/thread.c --- a/thread.c
+++ b/thread.c +++ b/thread.c
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
@ -140,11 +171,7 @@ index 7659cee..37bdeaa 100644
#include <limits.h> #include <limits.h>
#ifndef WIN32 #ifndef WIN32
#include <sys/queue.h> #include <sys/queue.h>
@@ -15,9 +16,11 @@ @@ -19,6 +20,7 @@
#include "internal.h"
#include "evhtp/thread.h"
+#include "log.h"
typedef struct evthr_cmd evthr_cmd_t; typedef struct evthr_cmd evthr_cmd_t;
typedef struct evthr_pool_slist evthr_pool_slist_t; typedef struct evthr_pool_slist evthr_pool_slist_t;
@ -152,7 +179,7 @@ index 7659cee..37bdeaa 100644
struct evthr_cmd { struct evthr_cmd {
uint8_t stop; uint8_t stop;
@@ -26,6 +29,13 @@ struct evthr_cmd { @@ -27,6 +29,13 @@ struct evthr_cmd {
} __attribute__((packed)); } __attribute__((packed));
TAILQ_HEAD(evthr_pool_slist, evthr); TAILQ_HEAD(evthr_pool_slist, evthr);
@ -166,7 +193,7 @@ index 7659cee..37bdeaa 100644
struct evthr_pool { struct evthr_pool {
#ifdef EVTHR_SHARED_PIPE #ifdef EVTHR_SHARED_PIPE
@@ -34,6 +44,28 @@ struct evthr_pool { @@ -35,6 +44,28 @@ struct evthr_pool {
#endif #endif
int nthreads; int nthreads;
evthr_pool_slist_t threads; evthr_pool_slist_t threads;
@ -195,7 +222,7 @@ index 7659cee..37bdeaa 100644
}; };
struct evthr { struct evthr {
@@ -53,6 +85,7 @@ struct evthr { @@ -54,6 +85,7 @@ struct evthr {
int pool_rdr; int pool_rdr;
struct event * shared_pool_ev; struct event * shared_pool_ev;
#endif #endif
@ -203,7 +230,7 @@ index 7659cee..37bdeaa 100644
TAILQ_ENTRY(evthr) next; TAILQ_ENTRY(evthr) next;
}; };
@@ -91,7 +124,7 @@ _evthr_loop(void * args) { @@ -94,7 +126,7 @@ _evthr_loop(void * args)
evthr_t * thread; evthr_t * thread;
if (!(thread = (evthr_t *)args)) { if (!(thread = (evthr_t *)args)) {
@ -212,14 +239,15 @@ index 7659cee..37bdeaa 100644
} }
if (thread == NULL || thread->thr == NULL) { if (thread == NULL || thread->thr == NULL) {
@@ -133,6 +166,92 @@ _evthr_loop(void * args) { @@ -139,6 +171,112 @@ _evthr_loop(void * args)
pthread_exit(NULL); pthread_exit(NULL);
} /* _evthr_loop */ } /* _evthr_loop */
+static void * +static void *
+_evthr_dynamic_loop(void * args) { +_evthr_dynamic_loop(void * args) {
+ evthr_t * thread = NULL; + evthr_t * thread;
+ evthr_pool_t * pool = NULL; + evthr_pool_t * pool;
+ int ret;
+ +
+ if (!(thread = (evthr_t *)args)) { + if (!(thread = (evthr_t *)args)) {
+ pthread_exit(NULL); + pthread_exit(NULL);
@ -237,13 +265,19 @@ index 7659cee..37bdeaa 100644
+ +
+ event_add(thread->event, NULL); + event_add(thread->event, NULL);
+ +
+ pthread_mutex_lock(&thread->lock); + ret = pthread_mutex_lock(&thread->lock);
+ if (ret < 0) {
+ pthread_exit(NULL);
+ }
+ if (thread->init_cb != NULL) { + if (thread->init_cb != NULL) {
+ (thread->init_cb)(thread, thread->arg); + (thread->init_cb)(thread, thread->arg);
+ } + }
+ pthread_mutex_unlock(&thread->lock); + pthread_mutex_unlock(&thread->lock);
+ +
+ pthread_mutex_lock(&pool->lock); + ret = pthread_mutex_lock(&pool->lock);
+ if (ret < 0) {
+ pthread_exit(NULL);
+ }
+ +
+ for (;;) { + for (;;) {
+ int retval = 0; + int retval = 0;
@ -255,6 +289,7 @@ index 7659cee..37bdeaa 100644
+ } + }
+ pool->nthreads_wait++; + pool->nthreads_wait++;
+ TAILQ_INSERT_TAIL(&pool->wait_threads, thread, next); + TAILQ_INSERT_TAIL(&pool->wait_threads, thread, next);
+ //fprintf(stderr, "wait %p\n", thread);
+ pthread_cond_wait(&pool->wait_cv, &pool->lock); + pthread_cond_wait(&pool->wait_cv, &pool->lock);
+ pool->nthreads_wait--; + pool->nthreads_wait--;
+ } + }
@ -266,15 +301,22 @@ index 7659cee..37bdeaa 100644
+ pool->nrequest--; + pool->nrequest--;
+ pthread_mutex_unlock(&pool->lock); + pthread_mutex_unlock(&pool->lock);
+ +
+ //fprintf(stderr, "send cb %p\n", cb);
+ evthr_pool_callback_defer(thread, cb->func, cb->arg); + evthr_pool_callback_defer(thread, cb->func, cb->arg);
+ free(cb); + free(cb);
+ +
+ //fprintf(stderr, "exec %p\n", thread);
+ while(!retval && cnt != 1) { + while(!retval && cnt != 1) {
+ retval = event_base_loop(thread->evbase, EVLOOP_ONCE); + retval = event_base_loop(thread->evbase, EVLOOP_ONCE);
+ //cnt++;
+ cnt = event_base_get_num_events(thread->evbase, EVENT_BASE_COUNT_ADDED); + cnt = event_base_get_num_events(thread->evbase, EVENT_BASE_COUNT_ADDED);
+ //fprintf(stderr, "thread:%p, retval:%d, cnt:%d\n", thread, retval, cnt);
+ } + }
+ +
+ pthread_mutex_lock(&pool->lock); + ret = pthread_mutex_lock(&pool->lock);
+ if (ret < 0) {
+ pthread_exit(NULL);
+ }
+ } + }
+ +
+ if (pool->shutdown) { + if (pool->shutdown) {
@ -284,12 +326,16 @@ index 7659cee..37bdeaa 100644
+ +
+ pool->nthreads_now--; + pool->nthreads_now--;
+ +
+ pthread_mutex_lock(&thread->lock); + ret = pthread_mutex_lock(&thread->lock);
+ if (ret <0 ) {
+ goto skip_exit_cb;
+ }
+ if (thread->exit_cb != NULL) { + if (thread->exit_cb != NULL) {
+ (thread->exit_cb)(thread, thread->arg); + (thread->exit_cb)(thread, thread->arg);
+ } + }
+ pthread_mutex_unlock(&thread->lock); + pthread_mutex_unlock(&thread->lock);
+ +
+skip_exit_cb:
+ if (thread->err == 1) { + if (thread->err == 1) {
+ fprintf(stderr, "FATAL ERROR!\n"); + fprintf(stderr, "FATAL ERROR!\n");
+ } + }
@ -298,14 +344,15 @@ index 7659cee..37bdeaa 100644
+ TAILQ_INSERT_TAIL(&pool->dead_threads, thread, next); + TAILQ_INSERT_TAIL(&pool->dead_threads, thread, next);
+ +
+ pthread_mutex_unlock(&pool->lock); + pthread_mutex_unlock(&pool->lock);
+ //fprintf(stderr, "thread exit:%p\n", thread);
+ +
+ pthread_exit(NULL); + pthread_exit(NULL);
+} /* _evthr_loop */ +} /* _evthr_loop */
+ +
evthr_res evthr_res
evthr_defer(evthr_t * thread, evthr_cb cb, void * arg) { evthr_defer(evthr_t * thread, evthr_cb cb, void * arg)
evthr_cmd_t cmd = { {
@@ -258,6 +377,28 @@ evthr_start(evthr_t * thread) { @@ -275,6 +413,28 @@ evthr_start(evthr_t * thread)
return 0; return 0;
} }
@ -332,19 +379,22 @@ index 7659cee..37bdeaa 100644
+} +}
+ +
void void
evthr_free(evthr_t * thread) { evthr_free(evthr_t * thread)
if (thread == NULL) { {
@@ -280,35 +421,73 @@ evthr_free(evthr_t * thread) { @@ -284,10 +444,12 @@ evthr_free(evthr_t * thread)
event_free(thread->event);
if (thread->rdr > 0) {
close(thread->rdr);
+ thread->rdr = -1;
} }
+#ifdef EVTHR_SHARED_PIPE if (thread->wdr > 0) {
+ if (thread->shared_pool_ev) { close(thread->wdr);
+ event_free(thread->shared_pool_ev); + thread->wdr = -1;
+ } }
+#endif
+ if (thread->thr) {
if (thread->evbase) { @@ -309,6 +471,8 @@ evthr_free(evthr_t * thread)
event_base_free(thread->evbase); event_base_free(thread->evbase);
} }
@ -353,14 +403,14 @@ index 7659cee..37bdeaa 100644
free(thread); free(thread);
} /* evthr_free */ } /* evthr_free */
void @@ -316,25 +480,46 @@ void
evthr_pool_free(evthr_pool_t * pool) { evthr_pool_free(evthr_pool_t * pool)
- evthr_t * thread; {
evthr_t * thread;
- evthr_t * save; - evthr_t * save;
+ evthr_t * thread = NULL; + evthr_t * thread_save;
+ evthr_t * thread_save = NULL; + evthr_pool_cb_t * callback;
+ evthr_pool_cb_t * callback = NULL; + evthr_pool_cb_t * callback_save;
+ evthr_pool_cb_t * callback_save = NULL;
if (pool == NULL) { if (pool == NULL) {
return; return;
@ -390,45 +440,36 @@ index 7659cee..37bdeaa 100644
+ pthread_mutex_destroy(&pool->lock); + pthread_mutex_destroy(&pool->lock);
+ } + }
+ +
+#ifdef EVTHR_SHARED_PIPE #ifdef EVTHR_SHARED_PIPE
+ if (pool->rdr > 0) { if (pool->rdr > 0) {
+ close(pool->rdr); close(pool->rdr);
+ } + pool->rdr = -1;
+ }
+ if (pool->wdr > 0) {
+ close(pool->wdr);
+ }
+#endif
+
free(pool);
}
evthr_res if (pool->wdr > 0) {
evthr_pool_stop(evthr_pool_t * pool) { close(pool->wdr);
- evthr_t * thr; + pool->wdr = -1;
- evthr_t * save; }
+ evthr_t * thr = NULL; #endif
+ evthr_t * save = NULL;
+ struct timespec sleeptime;
if (pool == NULL) { @@ -355,6 +540,31 @@ evthr_pool_stop(evthr_pool_t * pool)
return EVTHR_RES_FATAL;
@@ -318,6 +497,29 @@ evthr_pool_stop(evthr_pool_t * pool) {
evthr_stop(thr); evthr_stop(thr);
} }
+ if (pool->dynamic) { + if (pool->dynamic) {
+ pthread_mutex_lock(&pool->lock); + if (pthread_mutex_lock(&pool->lock) < 0) {
+ return EVTHR_RES_FATAL;
+ }
+ pool->shutdown = 1; + pool->shutdown = 1;
+ pthread_cond_broadcast(&pool->wait_cv); + pthread_cond_broadcast(&pool->wait_cv);
+ pthread_cond_broadcast(&pool->shutdown_cv); + pthread_cond_broadcast(&pool->shutdown_cv);
+ pthread_mutex_unlock(&pool->lock); + pthread_mutex_unlock(&pool->lock);
+ +
+wait_for_exit: +wait_for_exit:
+ sleeptime.tv_sec = 0; + usleep(100 * 1000);
+ sleeptime.tv_nsec = 100 * 1000 * 1000; + if (pthread_mutex_lock(&pool->lock) < 0) {
+ (void)nanosleep(&sleeptime, NULL); + return EVTHR_RES_FATAL;
+ pthread_mutex_lock(&pool->lock); + }
+ if (pool->nthreads_now != 0) { + if (pool->nthreads_now != 0) {
+ pthread_mutex_unlock(&pool->lock); + pthread_mutex_unlock(&pool->lock);
+ goto wait_for_exit; + goto wait_for_exit;
@ -443,7 +484,7 @@ index 7659cee..37bdeaa 100644
return EVTHR_RES_OK; return EVTHR_RES_OK;
} }
@@ -330,12 +532,17 @@ evthr_pool_defer(evthr_pool_t * pool, evthr_cb cb, void * arg) { @@ -378,6 +588,10 @@ evthr_pool_defer(evthr_pool_t * pool, evthr_cb cb, void * arg)
.stop = 0 .stop = 0
}; };
@ -454,29 +495,18 @@ index 7659cee..37bdeaa 100644
if (evhtp_unlikely(send(pool->wdr, &cmd, sizeof(cmd), 0) == -1)) { if (evhtp_unlikely(send(pool->wdr, &cmd, sizeof(cmd), 0) == -1)) {
return EVTHR_RES_RETRY; return EVTHR_RES_RETRY;
} }
@@ -396,6 +610,9 @@ evthr_pool_defer(evthr_pool_t * pool, evthr_cb cb, void * arg)
return EVTHR_RES_OK;
#else
+
evthr_t * thr = NULL;
if (pool == NULL) {
@@ -346,16 +553,75 @@ evthr_pool_defer(evthr_pool_t * pool, evthr_cb cb, void * arg) {
return EVTHR_RES_NOCB; return EVTHR_RES_NOCB;
} }
+ if (pool->dynamic) { + if (pool->dynamic) {
+ return evthr_pool_dynamic_add(pool, cb, arg); + return evthr_pool_dynamic_add(pool, cb, arg);
+ } + }
+
thr = TAILQ_FIRST(&pool->threads);
TAILQ_REMOVE(&pool->threads, thr, next); TAILQ_FOREACH(thread, &pool->threads, next) {
TAILQ_INSERT_TAIL(&pool->threads, thr, next); int backlog = get_backlog_(thread);
@@ -414,6 +631,66 @@ evthr_pool_defer(evthr_pool_t * pool, evthr_cb cb, void * arg)
- return evthr_defer(min_thread, cb, arg);
return evthr_defer(thr, cb, arg);
#endif
} /* evthr_pool_defer */ } /* evthr_pool_defer */
+evthr_res +evthr_res
@ -494,8 +524,8 @@ index 7659cee..37bdeaa 100644
+ +
+static void clear_dead_threads(evthr_pool_t *pool) +static void clear_dead_threads(evthr_pool_t *pool)
+{ +{
+ evthr_t * thread = NULL; + evthr_t * thread;
+ evthr_t * save = NULL; + evthr_t * save;
+ +
+ TAILQ_FOREACH_SAFE(thread, &pool->dead_threads, next, save) { + TAILQ_FOREACH_SAFE(thread, &pool->dead_threads, next, save) {
+ TAILQ_REMOVE(&pool->dead_threads, thread, next); + TAILQ_REMOVE(&pool->dead_threads, thread, next);
@ -515,7 +545,10 @@ index 7659cee..37bdeaa 100644
+ } + }
+ +
+ for(;;) { + for(;;) {
+ pthread_mutex_lock(&pool->lock); + if (pthread_mutex_lock(&pool->lock) < 0) {
+ sleep(1);
+ continue;
+ }
+ +
+ if (clock_gettime(CLOCK_REALTIME, &ts) == -1) { + if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
+ break; + break;
@ -532,32 +565,23 @@ index 7659cee..37bdeaa 100644
+ +
+ pthread_mutex_unlock(&pool->lock); + pthread_mutex_unlock(&pool->lock);
+ } + }
+ //fprintf(stderr, "exit time clear thread\n");
+ pthread_exit(NULL); + pthread_exit(NULL);
+} +}
+ +
static evthr_pool_t * static evthr_pool_t *
_evthr_pool_new(int nthreads, _evthr_pool_new(int nthreads,
evthr_init_cb init_cb, evthr_init_cb init_cb,
@@ -392,7 +658,7 @@ _evthr_pool_new(int nthreads, @@ -469,6 +746,67 @@ _evthr_pool_new(int nthreads,
#endif
for (i = 0; i < nthreads; i++) {
- evthr_t * thread;
+ evthr_t * thread = NULL;
if (!(thread = evthr_wexit_new(init_cb, exit_cb, shared))) {
evthr_pool_free(pool);
@@ -409,6 +675,67 @@ _evthr_pool_new(int nthreads,
return pool;
} /* _evthr_pool_new */ } /* _evthr_pool_new */
+evthr_pool_t * evthr_pool_t *
+_evthr_pool_dynamic_new(int nthreads_keep, +_evthr_pool_dynamic_new(int nthreads_keep,
+ int nthreads_limit, int nrequest_limit, + int nthreads_limit, int nrequest_limit,
+ evthr_init_cb init_cb, evthr_exit_cb exit_cb, + evthr_init_cb init_cb, evthr_exit_cb exit_cb,
+ void * shared) + void * shared)
+{ +{
+ evthr_pool_t * pool = NULL; + evthr_pool_t * pool;
+ int i; + int i;
+ +
+ if (!(pool = calloc(sizeof(evthr_pool_t), 1))) { + if (!(pool = calloc(sizeof(evthr_pool_t), 1))) {
@ -585,7 +609,7 @@ index 7659cee..37bdeaa 100644
+ TAILQ_INIT(&pool->wait_threads); + TAILQ_INIT(&pool->wait_threads);
+ TAILQ_INIT(&pool->dead_threads); + TAILQ_INIT(&pool->dead_threads);
+ TAILQ_INIT(&pool->callbacks); + TAILQ_INIT(&pool->callbacks);
+ +
+ if (pthread_mutex_init(&pool->lock, NULL)) { + if (pthread_mutex_init(&pool->lock, NULL)) {
+ evthr_pool_free(pool); + evthr_pool_free(pool);
+ return NULL; + return NULL;
@ -612,10 +636,11 @@ index 7659cee..37bdeaa 100644
+ return pool; + return pool;
+} +}
+ +
evthr_pool_t * +evthr_pool_t *
evthr_pool_new(int nthreads, evthr_init_cb init_cb, void * shared) { evthr_pool_new(int nthreads, evthr_init_cb init_cb, void * shared)
{
return _evthr_pool_new(nthreads, init_cb, NULL, shared); return _evthr_pool_new(nthreads, init_cb, NULL, shared);
@@ -421,6 +748,15 @@ evthr_pool_wexit_new(int nthreads, @@ -482,6 +820,15 @@ evthr_pool_wexit_new(int nthreads,
return _evthr_pool_new(nthreads, init_cb, exit_cb, shared); return _evthr_pool_new(nthreads, init_cb, exit_cb, shared);
} }
@ -629,23 +654,25 @@ index 7659cee..37bdeaa 100644
+} +}
+ +
int int
evthr_pool_start(evthr_pool_t * pool) { evthr_pool_start(evthr_pool_t * pool)
evthr_t * evthr = NULL; {
@@ -439,3 +775,56 @@ evthr_pool_start(evthr_pool_t * pool) { @@ -501,3 +848,65 @@ evthr_pool_start(evthr_pool_t * pool)
return 0; return 0;
} }
+ +
+evthr_res +evthr_res
+evthr_pool_dynamic_add(evthr_pool_t * pool, evthr_cb cb, void * arg) { +evthr_pool_dynamic_add(evthr_pool_t * pool, evthr_cb cb, void * arg) {
+ evthr_pool_cb_t * callback = NULL; + evthr_pool_cb_t *callback;
+ evthr_t * thread = NULL; + evthr_t * thread;
+ +
+ if (pool == NULL) { + if (pool == NULL) {
+ return EVTHR_RES_FATAL; + return EVTHR_RES_FATAL;
+ } + }
+ +
+ pthread_mutex_lock(&pool->lock); + if (pthread_mutex_lock(&pool->lock) < 0) {
+ return EVTHR_RES_FATAL;
+ }
+ +
+ if (pool->nrequest >= pool->nrequest_limit) { + if (pool->nrequest >= pool->nrequest_limit) {
+ pthread_mutex_unlock(&pool->lock); + pthread_mutex_unlock(&pool->lock);
@ -666,18 +693,16 @@ index 7659cee..37bdeaa 100644
+ +
+ if (pool->nthreads_wait == 0 && pool->nthreads_now < pool->nthreads_limit) { + if (pool->nthreads_wait == 0 && pool->nthreads_now < pool->nthreads_limit) {
+ if (!(thread = evthr_wexit_new(pool->init_cb, pool->exit_cb, pool->shared))) { + if (!(thread = evthr_wexit_new(pool->init_cb, pool->exit_cb, pool->shared))) {
+ pthread_mutex_unlock(&pool->lock); + goto release_out;
+ return EVTHR_RES_FATAL;
+ } + }
+ +
+ thread->pool = pool; + thread->pool = pool;
+ +
+ if (evthr_dynamic_start(thread) < 0) { + if (evthr_dynamic_start(thread) < 0) {
+ evthr_free(thread); + goto release_out;
+ pthread_mutex_unlock(&pool->lock);
+ return EVTHR_RES_FATAL;
+ } + }
+ pool->nthreads_now++; + pool->nthreads_now++;
+ //fprintf(stderr, "create thread:%d,%p\n", pool->nthreads_now, thread);
+ } else { + } else {
+ pthread_cond_signal(&pool->wait_cv); + pthread_cond_signal(&pool->wait_cv);
+ } + }
@ -686,5 +711,17 @@ index 7659cee..37bdeaa 100644
+ +
+ pthread_mutex_unlock(&pool->lock); + pthread_mutex_unlock(&pool->lock);
+ return EVTHR_RES_OK; + return EVTHR_RES_OK;
+release_out:
+ evthr_free(thread);
+ TAILQ_REMOVE(&pool->callbacks, callback, next);
+ pool->nrequest--;
+ callback->func = NULL;
+ callback->arg = NULL;
+ free(callback);
+ pthread_mutex_unlock(&pool->lock);
+ return EVTHR_RES_FATAL;
+} +}
+ +
--
1.8.3.1

25
0003-close-open-ssl.-we-do-NOT-use-it-in-lcrd.patch Normal file
View File

@ -0,0 +1,25 @@
From f51b2b35b7249469b63039ae7af4922b7292b349 Mon Sep 17 00:00:00 2001
From: chenxin <kepler.chenxin@huawei.com>
Date: Wed, 4 Sep 2019 15:53:53 +0800
Subject: [PATCH 3/4] close open ssl. we do NOT use it in lcrd.
Change-Id: Ib2647c66e7c246b215f827ce76438a9b544b796b
Signed-off-by: chenxin <kepler.chenxin@huawei.com>
---
cmake/options.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/options.cmake b/cmake/options.cmake
index f7d6f22..1738642 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -1,5 +1,5 @@
# -DEVHTP_DISABLE_SSL=ON
-option (EVHTP_DISABLE_SSL "Disable ssl support" OFF)
+option (EVHTP_DISABLE_SSL "Disable ssl support" ON)
# -DEVHTP_DISABLE_EVTHR=ON
option (EVHTP_DISABLE_EVTHR "Disable evthread support" OFF)
--
1.8.3.1

30
0004-Use-shared-library-instead-static-one.patch Normal file
View File

@ -0,0 +1,30 @@
From 4c4731a5295a60029c27f98212ceeed0c4a373d8 Mon Sep 17 00:00:00 2001
From: chenxin <kepler.chenxin@huawei.com>
Date: Wed, 4 Sep 2019 15:56:00 +0800
Subject: [PATCH 4/4] Use shared library instead static one.
There is NO option EVHTP_BUILD_SHARED in options.cmake any more
in new version. so modify add_library directly.
Change-Id: I6cf034e84ca696ac1c065cbc1706b278c4447fc9
Signed-off-by: chenxin <kepler.chenxin@huawei.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 481ddd0..fbb0f50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ elseif(EVHTP_ALLOCATOR STREQUAL "tcmalloc")
endif()
endif()
-add_library(evhtp ${LIBEVHTP_SOURCE_FILES})
+add_library(evhtp SHARED ${LIBEVHTP_SOURCE_FILES})
target_link_libraries(evhtp PUBLIC ${LIBEVHTP_EXTERNAL_LIBS})
target_include_directories(evhtp PUBLIC ${LIBEVHTP_EXTERNAL_INCLUDES})
--
1.8.3.1

BIN
libevhtp-1.2.16.tar.gz
View File

Binary file not shown.

BIN
libevhtp-1.2.18.tar.gz Normal file
View File

Binary file not shown.

21
libevhtp.spec
View File

@ -1,13 +1,15 @@
Name: libevhtp Name: libevhtp
Version: 1.2.16 Version: 1.2.18
Release: 3 Release: 1
Summary: Libevent based HTTP API. Summary: Libevent based HTTP API.
License: BSD3 License: BSD3
URL: https://criticalstack.com URL: https://criticalstack.com
Source0: https://github.com/criticalstack/%{name}/archive/%{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch9000: 0001-support-dynamic-threads.patch Patch9000: 0001-decrease-numbers-of-fd-for-shared-pipe-mode.patch
Patch9001: 0002-close-openssl.patch Patch9001: 0002-evhtp-enable-dynamic-thread-pool.patch
Patch9002: 0003-close-open-ssl.-we-do-NOT-use-it-in-lcrd.patch
Patch9003: 0004-Use-shared-library-instead-static-one.patch
BuildRequires: git gcc-c++ cmake libevent-devel BuildRequires: git gcc-c++ cmake libevent-devel
@ -56,16 +58,11 @@ find %{buildroot} -name '*.cmake' -exec rm -f {} ';'
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/*.h %{_includedir}/*.h
%{_includedir}/evhtp/*.h %{_includedir}/evhtp/*.h
%{_includedir}/evhtp/sys/*.h
/usr/lib/%{name}.so /usr/lib/%{name}.so
/usr/lib/pkgconfig/evhtp.pc /usr/lib/pkgconfig/evhtp.pc
%changelog %changelog
* Mon Oct 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.2.16-3 * Wed Apr 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.18-1
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:add LICENSE file
* Sun Sep 15 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.2.16-2
- Package init - Package init