Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

odissey: remove unused server states

This commit is contained in:
Dmitry Simonenko 2017-05-29 18:15:18 +03:00
parent d542d4c15a
commit 4be6971647
3 changed files with 15 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/od_server.h
View File

@ -13,11 +13,8 @@ typedef enum
{
OD_SUNDEF,
OD_SIDLE,
OD_SEXPIRE,
OD_SCLOSE,
OD_SCONNECT,
OD_SRESET,
OD_SACTIVE
OD_SACTIVE,
OD_SEXPIRE
} od_serverstate_t;
struct od_server

73
src/od_server_pool.c
View File

@ -29,18 +29,12 @@
void od_serverpool_init(od_serverpool_t *pool)
{
pool->count_active = 0;
pool->count_connect = 0;
pool->count_reset = 0;
pool->count_expire = 0;
pool->count_close = 0;
pool->count_idle = 0;
od_list_init(&pool->active);
od_list_init(&pool->connect);
od_list_init(&pool->reset);
pool->count_active = 0;
pool->count_expire = 0;
od_list_init(&pool->idle);
od_list_init(&pool->active);
od_list_init(&pool->expire);
od_list_init(&pool->close);
od_list_init(&pool->link);
}
@ -56,18 +50,6 @@ void od_serverpool_free(od_serverpool_t *pool)
server = od_container_of(i, od_server_t, link);
od_server_free(server);
}
od_list_foreach_safe(&pool->close, i, n) {
server = od_container_of(i, od_server_t, link);
od_server_free(server);
}
od_list_foreach_safe(&pool->connect, i, n) {
server = od_container_of(i, od_server_t, link);
od_server_free(server);
}
od_list_foreach_safe(&pool->reset, i, n) {
server = od_container_of(i, od_server_t, link);
od_server_free(server);
}
od_list_foreach_safe(&pool->active, i, n) {
server = od_container_of(i, od_server_t, link);
od_server_free(server);
@ -85,18 +67,9 @@ void od_serverpool_set(od_serverpool_t *pool, od_server_t *server,
case OD_SEXPIRE:
pool->count_expire--;
break;
case OD_SCLOSE:
pool->count_close--;
break;
case OD_SIDLE:
pool->count_idle--;
break;
case OD_SCONNECT:
pool->count_connect--;
break;
case OD_SRESET:
pool->count_reset--;
break;
case OD_SACTIVE:
pool->count_active--;
break;
@ -109,22 +82,10 @@ void od_serverpool_set(od_serverpool_t *pool, od_server_t *server,
target = &pool->expire;
pool->count_expire++;
break;
case OD_SCLOSE:
target = &pool->close;
pool->count_close++;
break;
case OD_SIDLE:
target = &pool->idle;
pool->count_idle++;
break;
case OD_SCONNECT:
target = &pool->connect;
pool->count_connect++;
break;
case OD_SRESET:
target = &pool->reset;
pool->count_reset++;
break;
case OD_SACTIVE:
target = &pool->active;
pool->count_active++;
@ -142,19 +103,13 @@ od_serverpool_next(od_serverpool_t *pool, od_serverstate_t state)
{
od_list_t *target = NULL;
switch (state) {
case OD_SIDLE: target = &pool->idle;
case OD_SIDLE: target = &pool->idle;
break;
case OD_SEXPIRE: target = &pool->expire;
case OD_SEXPIRE: target = &pool->expire;
break;
case OD_SCLOSE: target = &pool->close;
case OD_SACTIVE: target = &pool->active;
break;
case OD_SCONNECT: target = &pool->connect;
break;
case OD_SRESET: target = &pool->reset;
break;
case OD_SACTIVE: target = &pool->active;
break;
case OD_SUNDEF: assert(0);
case OD_SUNDEF: assert(0);
break;
}
if (od_list_empty(target))
@ -172,19 +127,13 @@ od_serverpool_foreach(od_serverpool_t *pool,
{
od_list_t *target = NULL;
switch (state) {
case OD_SIDLE: target = &pool->idle;
case OD_SIDLE: target = &pool->idle;
break;
case OD_SEXPIRE: target = &pool->expire;
case OD_SEXPIRE: target = &pool->expire;
break;
case OD_SCLOSE: target = &pool->close;
case OD_SACTIVE: target = &pool->active;
break;
case OD_SCONNECT: target = &pool->connect;
break;
case OD_SRESET: target = &pool->reset;
break;
case OD_SACTIVE: target = &pool->active;
break;
case OD_SUNDEF: assert(0);
case OD_SUNDEF: assert(0);
break;
}
od_server_t *server;

10
src/od_server_pool.h
View File

@ -14,17 +14,11 @@ typedef int (*od_serverpool_cb_t)(od_server_t*, void*);
struct od_serverpool
{
od_list_t active;
od_list_t connect;
od_list_t reset;
od_list_t expire;
od_list_t close;
od_list_t idle;
od_list_t expire;
int count_active;
int count_connect;
int count_reset;
int count_expire;
int count_close;
int count_idle;
int count_expire;
od_list_t link;
};