rpm: fix statistics name and crash when not used

OpenSIPS · Mar 29, 2019 · 38d7339 · 38d7339
1 parent 9328335
commit 38d7339
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/mem/rpm_mem.c b/mem/rpm_mem.c
@@ -79,23 +79,23 @@ stat_var *rpm_frags;
 
 #ifdef STATISTICS
 stat_export_t rpm_stats[] = {
-	{"total_size" ,     STAT_IS_FUNC,    (stat_var**)rpm_get_size  },
+	{"rpm_total_size" ,     STAT_IS_FUNC,    (stat_var**)rpm_get_size  },
 
 #if defined(HP_MALLOC)
-	{"used_size" ,     STAT_NO_RESET,               &rpm_used      },
-	{"real_used_size" ,STAT_NO_RESET,               &rpm_rused     },
+	{"rpm_used_size" ,     STAT_NO_RESET,               &rpm_used      },
+	{"rpm_real_used_size" ,STAT_NO_RESET,               &rpm_rused     },
 #else
-	{"used_size" ,      STAT_IS_FUNC,    (stat_var**)rpm_get_used  },
-	{"real_used_size" , STAT_IS_FUNC,    (stat_var**)rpm_get_rused },
+	{"rpm_used_size" ,      STAT_IS_FUNC,    (stat_var**)rpm_get_used  },
+	{"rpm_real_used_size" , STAT_IS_FUNC,    (stat_var**)rpm_get_rused },
 #endif
 
-	{"max_used_size" ,  STAT_IS_FUNC,    (stat_var**)rpm_get_mused },
-	{"free_size" ,      STAT_IS_FUNC,    (stat_var**)rpm_get_free  },
+	{"rpm_max_used_size" ,  STAT_IS_FUNC,    (stat_var**)rpm_get_mused },
+	{"rpm_free_size" ,      STAT_IS_FUNC,    (stat_var**)rpm_get_free  },
 
 #if defined(HP_MALLOC)
-	{"fragments" ,     STAT_NO_RESET,               &rpm_frags     },
+	{"rpm_fragments" ,     STAT_NO_RESET,               &rpm_frags     },
 #else
-	{"fragments" ,      STAT_IS_FUNC,    (stat_var**)rpm_get_frags },
+	{"rpm_fragments" ,      STAT_IS_FUNC,    (stat_var**)rpm_get_frags },
 #endif
 
 	{0,0,0}

diff --git a/mem/rpm_mem.h b/mem/rpm_mem.h
@@ -326,21 +326,33 @@ void hp_init_rpm_statistics(struct hp_block *hpb);
 extern stat_export_t rpm_stats[];
 
 inline static unsigned long rpm_get_size(unsigned short foo) {
+	if (!rpm_block)
+		return 0;
 	return RPM_GET_SIZE(rpm_block);
 }
 inline static unsigned long rpm_get_used(unsigned short foo) {
+	if (!rpm_block)
+		return 0;
 	return RPM_GET_USED(rpm_block);
 }
 inline static unsigned long rpm_get_rused(unsigned short foo) {
+	if (!rpm_block)
+		return 0;
 	return RPM_GET_RUSED(rpm_block);
 }
 inline static unsigned long rpm_get_mused(unsigned short foo) {
+	if (!rpm_block)
+		return 0;
 	return RPM_GET_MUSED(rpm_block);
 }
 inline static unsigned long rpm_get_free(unsigned short foo) {
+	if (!rpm_block)
+		return 0;
 	return RPM_GET_FREE(rpm_block);
 }
 inline static unsigned long rpm_get_frags(unsigned short foo) {
+	if (!rpm_block)
+		return 0;
 	return RPM_GET_FRAGS(rpm_block);
 }
 #endif /*STATISTICS*/