d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys__ -> sys_tree__

Browse Source
This commit is contained in:
Roger A. Light 2016-07-08 09:14:11 +01:00
parent 43bcf6799c
commit 1b659b41de
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/loop.c
View File

@ -129,7 +129,7 @@ int mosquitto_main_loop(struct mosquitto_db *db, mosq_sock_t *listensock, int li
context__free_disused(db);
#ifdef WITH_SYS_TREE
if(db->config->sys_interval > 0){
sys__update(db, db->config->sys_interval, start_time);
sys_tree__update(db, db->config->sys_interval, start_time);
}
#endif

2
src/mosquitto.c
View File

@ -278,7 +278,7 @@ int main(int argc, char *argv[])
if(rc) return rc;
#ifdef WITH_SYS_TREE
sys__init(&int_db);
sys_tree__init(&int_db);
#endif
listener_max = -1;

4
src/mosquitto_broker.h
View File

@ -510,8 +510,8 @@ void db__msg_store_deref(struct mosquitto_db *db, struct mosquitto_msg_store **s
void db__msg_store_clean(struct mosquitto_db *db);
int db__message_reconnect_reset(struct mosquitto_db *db, struct mosquitto *context);
void db__vacuum(void);
void sys__init(struct mosquitto_db *db);
void sys__update(struct mosquitto_db *db, int interval, time_t start_time);
void sys_tree__init(struct mosquitto_db *db);
void sys_tree__update(struct mosquitto_db *db, int interval, time_t start_time);
/* ============================================================
* Subscription functions

12
src/sys_tree.c
View File

@ -40,7 +40,7 @@ int g_clients_expired = 0;
unsigned int g_socket_connections = 0;
unsigned int g_connection_count = 0;
void sys__init(struct mosquitto_db *db)
void sys_tree__init(struct mosquitto_db *db)
{
char buf[64];
@ -55,7 +55,7 @@ void sys__init(struct mosquitto_db *db)
db__messages_easy_queue(db, NULL, "$SYS/broker/timestamp", 2, strlen(buf), buf, 1);
}
static void sys__update_clients(struct mosquitto_db *db, char *buf)
static void sys_tree__update_clients(struct mosquitto_db *db, char *buf)
{
static unsigned int client_count = -1;
static int clients_expired = -1;
@ -100,7 +100,7 @@ static void sys__update_clients(struct mosquitto_db *db, char *buf)
}
#ifdef REAL_WITH_MEMORY_TRACKING
static void sys__update_memory(struct mosquitto_db *db, char *buf)
static void sys_tree__update_memory(struct mosquitto_db *db, char *buf)
{
static unsigned long current_heap = -1;
static unsigned long max_heap = -1;
@ -139,7 +139,7 @@ static void calc_load(struct mosquitto_db *db, char *buf, const char *topic, dou
* messages are sent for the $SYS hierarchy.
* 'start_time' is the result of time() that the broker was started at.
*/
void sys__update(struct mosquitto_db *db, int interval, time_t start_time)
void sys_tree__update(struct mosquitto_db *db, int interval, time_t start_time)
{
static time_t last_update = 0;
time_t now;
@ -206,7 +206,7 @@ void sys__update(struct mosquitto_db *db, int interval, time_t start_time)
snprintf(buf, BUFLEN, "%d seconds", (int)uptime);
db__messages_easy_queue(db, NULL, "$SYS/broker/uptime", 2, strlen(buf), buf, 1);
sys__update_clients(db, buf);
sys_tree__update_clients(db, buf);
if(last_update > 0){
i_mult = 60.0/(double)(now-last_update);
@ -284,7 +284,7 @@ void sys__update(struct mosquitto_db *db, int interval, time_t start_time)
}
#ifdef REAL_WITH_MEMORY_TRACKING
sys__update_memory(db, buf);
sys_tree__update_memory(db, buf);
#endif
if(msgs_received != g_msgs_received){