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

retained_ and subscription_count only used with sys tree.

Browse Source
This commit is contained in:
Roger A. Light 2014-09-16 23:48:26 +01:00
parent 7b1ee68ef1
commit 3eead8c507
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mosquitto_broker.h
View File

@ -218,9 +218,9 @@ struct mosquitto_db{
struct mqtt3_config *config;
int persistence_changes;
struct _mosquitto_auth_plugin auth_plugin;
#ifdef WITH_SYS_TREE
int subscription_count;
int retained_count;
#ifdef WITH_SYS_TREE
int connected_count;
int disconnected_count;
#endif

10
src/subs.c
View File

@ -82,12 +82,16 @@ static int _subs_process(struct mosquitto_db *db, struct _mosquitto_subhier *hie
if(hier->retained){
hier->retained->ref_count--;
/* FIXME - it would be nice to be able to remove the message from the store at this point if ref_count == 0 */
#ifdef WITH_SYS_TREE
db->retained_count--;
#endif
}
if(stored->msg.payloadlen){
hier->retained = stored;
hier->retained->ref_count++;
#ifdef WITH_SYS_TREE
db->retained_count++;
#endif
}else{
hier->retained = NULL;
}
@ -271,7 +275,9 @@ static int _sub_add(struct mosquitto_db *db, struct mosquitto *context, int qos,
subhier->subs = leaf;
leaf->prev = NULL;
}
#ifdef WITH_SYS_TREE
db->subscription_count++;
#endif
}
return MOSQ_ERR_SUCCESS;
}
@ -309,7 +315,9 @@ static int _sub_remove(struct mosquitto_db *db, struct mosquitto *context, struc
leaf = subhier->subs;
while(leaf){
if(leaf->context==context){
#ifdef WITH_SYS_TREE
db->subscription_count--;
#endif
if(leaf->prev){
leaf->prev->next = leaf->next;
}else{
@ -496,7 +504,9 @@ static int _subs_clean_session(struct mosquitto_db *db, struct mosquitto *contex
leaf = root->subs;
while(leaf){
if(leaf->context == context){
#ifdef WITH_SYS_TREE
db->subscription_count--;
#endif
if(leaf->prev){
leaf->prev->next = leaf->next;
}else{