Thanks to visit codestin.com
Credit goes to github.com

Skip to content

socketpool: refine pool entry timeout #1923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2019
Merged

socketpool: refine pool entry timeout #1923

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
409f520
socketpool: refine pool entry timeout
Dec 6, 2018
c1d533d
fix PR issue: 'SIZE_MAX' to 'UINT64_MAX'
Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions lib/common/socketpool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@
#include "h2o/socket.h"
#include "h2o/balancer.h"

/* TODO set the timer by calculating the exact moment when the oldest entry expires */
#define CHECK_EXPIRATION_INTERVAL 1000
/**
* timeout will be set to this value when calculated less than this value
*/
#define CHECK_EXPIRATION_MIN_INTERVAL 1000

struct pool_entry_t {
h2o_socket_export_t sockinfo;
Expand Down Expand Up @@ -82,36 +84,49 @@ static void destroy_attached(struct pool_entry_t *entry)
destroy_detached(entry);
}

static void destroy_expired(h2o_socketpool_t *pool)
/* caller should lock the mutex */
static uint64_t destroy_expired_locked(h2o_socketpool_t *pool)
{
if (pool->_interval_cb.loop == NULL)
return;
if (pool->_interval_cb.loop != NULL) {
uint64_t now_ms = h2o_now(pool->_interval_cb.loop);
uint64_t expire_before = now_ms - pool->timeout;
while (!h2o_linklist_is_empty(&pool->_shared.sockets)) {
struct pool_entry_t *entry = H2O_STRUCT_FROM_MEMBER(struct pool_entry_t, all_link, pool->_shared.sockets.next);
if (entry->added_at > expire_before) {
return entry->added_at + pool->timeout - now_ms;
}
destroy_attached(entry);
__sync_sub_and_fetch(&pool->_shared.count, 1);
__sync_sub_and_fetch(&pool->_shared.pooled_count, 1);
}
}
return UINT64_MAX;
}

/* caller should lock the mutex */
uint64_t expire_before = h2o_now(pool->_interval_cb.loop) - pool->timeout;
while (!h2o_linklist_is_empty(&pool->_shared.sockets)) {
struct pool_entry_t *entry = H2O_STRUCT_FROM_MEMBER(struct pool_entry_t, all_link, pool->_shared.sockets.next);
if (entry->added_at > expire_before)
break;
destroy_attached(entry);
__sync_sub_and_fetch(&pool->_shared.count, 1);
__sync_sub_and_fetch(&pool->_shared.pooled_count, 1);
/* caller should lock the mutex */
static void check_pool_expired_locked(h2o_socketpool_t *pool)
{
uint64_t next_expired = destroy_expired_locked(pool);
if (next_expired != UINT64_MAX) {
if (!h2o_timer_is_linked(&pool->_interval_cb.timeout)) {
if (next_expired < CHECK_EXPIRATION_MIN_INTERVAL)
next_expired = CHECK_EXPIRATION_MIN_INTERVAL;
h2o_timer_link(pool->_interval_cb.loop, next_expired, &pool->_interval_cb.timeout);
}
}
}

static void on_timeout(h2o_timer_t *timeout)
{
/* FIXME decrease the frequency of this function being called; the expiration
/* decrease the frequency of this function being called; the expiration
* check can be (should be) performed in the `connect` fuction as well
*/
h2o_socketpool_t *pool = H2O_STRUCT_FROM_MEMBER(h2o_socketpool_t, _interval_cb.timeout, timeout);

if (pthread_mutex_trylock(&pool->_shared.mutex) == 0) {
destroy_expired(pool);
check_pool_expired_locked(pool);
pthread_mutex_unlock(&pool->_shared.mutex);
}

h2o_timer_link(pool->_interval_cb.loop, CHECK_EXPIRATION_INTERVAL, &pool->_interval_cb.timeout);
}

static void common_init(h2o_socketpool_t *pool, h2o_socketpool_target_t **targets, size_t num_targets, size_t capacity,
Expand Down Expand Up @@ -269,7 +284,7 @@ void h2o_socketpool_register_loop(h2o_socketpool_t *pool, h2o_loop_t *loop)

pool->_interval_cb.loop = loop;
h2o_timer_init(&pool->_interval_cb.timeout, on_timeout);
h2o_timer_link(loop, CHECK_EXPIRATION_INTERVAL, &pool->_interval_cb.timeout);
h2o_timer_link(loop, CHECK_EXPIRATION_MIN_INTERVAL, &pool->_interval_cb.timeout);
}

void h2o_socketpool_unregister_loop(h2o_socketpool_t *pool, h2o_loop_t *loop)
Expand Down Expand Up @@ -460,7 +475,7 @@ void h2o_socketpool_connect(h2o_socketpool_connect_request_t **_req, h2o_socketp

/* fetch an entry and return it */
pthread_mutex_lock(&pool->_shared.mutex);
destroy_expired(pool);
check_pool_expired_locked(pool);

/* TODO lookup outside this critical section */
if (is_global_pool(pool)) {
Expand Down Expand Up @@ -588,7 +603,7 @@ int h2o_socketpool_return(h2o_socketpool_t *pool, h2o_socket_t *sock)
__sync_add_and_fetch(&pool->_shared.pooled_count, 1);

pthread_mutex_lock(&pool->_shared.mutex);
destroy_expired(pool);
check_pool_expired_locked(pool);
h2o_linklist_insert(&pool->_shared.sockets, &entry->all_link);
h2o_linklist_insert(&pool->targets.entries[target]->_shared.sockets, &entry->target_link);
pthread_mutex_unlock(&pool->_shared.mutex);
Expand Down