gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(fix monit server compile error): call gettimeofday directly

Browse Source
This commit is contained in:
yangwei
2024-11-27 19:50:50 +08:00
parent 35f3ec6e73
commit 0c1d52f5d2
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
infra/monitor/monitor_private.h
View File

@@ -243,7 +243,6 @@ extern "C"
struct timeval time_now;
struct stm_stat *stat;
struct stm_spinlock *lock; // for dynamic register command, conn_close_cb
int (*gettime_cb)(struct timeval *tv, void *tz);
struct monitor_connection current_conn;
struct stm_pktdump_runtime *packet_dump;
@@ -282,7 +281,6 @@ extern "C"
/************************************************************************************************************/
/* monitor call gettimeofday(2) by default */
struct stellar_monitor_config *stellar_monitor_config_new(const char *toml);
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz));
struct stellar_monitor *stellar_monitor_get(void);
struct stm_connection_manager *stm_connection_insert(struct evhttp_connection *evconn);
void stm_connection_update(struct stm_connection_manager *conn_mgr, const struct evhttp_connection *evconn);

11
infra/monitor/monitor_server.c
View File

@@ -194,16 +194,6 @@ static void stm_server_set_default_cfg(struct stellar_monitor_config *config)
config->output_interval_ms = STM_STAT_OUTPUT_INTERVAL_MS;
}
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz))
{
if (NULL == gettime_cb)
{
return -1;
}
stm->gettime_cb = gettime_cb;
return 0;
}
struct stellar_monitor_config *stellar_monitor_config_new(const char *toml_file)
{
struct stellar_monitor_config *config = CALLOC(struct stellar_monitor_config, 1);
@@ -532,7 +522,6 @@ struct stellar_monitor *monitor_new(const char *toml_file, struct module_manager
stm->lock = stm_spinlock_new();
stm->worker_thread_num = module_manager_get_max_thread_num(mod_mgr);
assert(stm->worker_thread_num > 0);
stm->gettime_cb = gettimeofday;
stm->aide = stm_cmd_assistant_new();
if (stm_event_http_init(stm) < 0)
{

7
infra/monitor/monitor_transaction.c
View File

@@ -18,7 +18,7 @@ struct stm_connection_manager *stm_connection_insert(struct evhttp_connection *e
{
if (ele->conn == evconn)
{
stm->gettime_cb(&ele->last_active_time, NULL);
gettimeofday(&ele->last_active_time, NULL);
return ele;
}
}
@@ -33,7 +33,7 @@ struct stm_connection_manager *stm_connection_insert(struct evhttp_connection *e
strncpy(new_conn->peer_ipaddr, tmp_ip_addr, INET6_ADDRSTRLEN - 1);
}
new_conn->peer_port_host_order = tmp_port;
stm->gettime_cb(&new_conn->link_start_time, NULL);
gettimeofday(&new_conn->link_start_time, NULL);
new_conn->last_active_time = new_conn->link_start_time;
new_conn->conn = evconn;
DL_APPEND(stm->connection_mgr, new_conn);
@@ -58,13 +58,12 @@ void stm_connection_delete(struct evhttp_connection *evconn)
void stm_connection_update(struct stm_connection_manager *conn_mgr, const struct evhttp_connection *evconn)
{
struct stellar_monitor *stm = stellar_monitor_get();
struct stm_connection_manager *ele, *tmp;
DL_FOREACH_SAFE(conn_mgr, ele, tmp)
{
if (ele->conn == evconn)
{
stm->gettime_cb(&ele->last_active_time, NULL);
gettimeofday(&ele->last_active_time, NULL);
}
}
}