HP_MALLOC: Fix computation of PKG stats

Many thanks to 46Labs for supporting this work!

Author: liviuchircu

mem/hp_malloc_dyn.h

@@ -177,20 +177,10 @@ void __pkg_frag_split(struct hp_block *hpb, struct hp_frag *frag,
 	n->file=file;
 	n->func=func;
 	n->line=line;
-#ifndef STATISTICS
-	hpb->used -= FRAG_OVERHEAD;
-	hpb->real_used += FRAG_OVERHEAD;
-	hpb->total_fragments++;
-#endif
 #endif
 
 	hp_frag_attach(hpb, n);
 	update_stats_pkg_frag_attach(hpb, n);
-
-#if defined(DBG_MALLOC) && !defined(STATISTICS)
-	hpb->used -= n->size;
-	hpb->real_used -= n->size + FRAG_OVERHEAD;
-#endif
 }
 
 #if !defined INLINE_ALLOC && defined DBG_MALLOC
@@ -427,11 +417,6 @@ void *hp_pkg_malloc(struct hp_block *hpb, unsigned long size,
 	hp_frag_detach(hpb, frag);
 	update_stats_pkg_frag_detach(hpb, frag);
 
-#ifndef STATISTICS
-	hpb->used += frag->size;
-	hpb->real_used += frag->size + FRAG_OVERHEAD;
-#endif
-
 	/* split the fragment if possible */
 	#if !defined INLINE_ALLOC && defined DBG_MALLOC
 	pkg_frag_split_dbg(hpb, frag, size, file, "hp_malloc frag", line);
@@ -848,34 +833,21 @@ void hp_pkg_free(struct hp_block *hpb, void *p,
 		update_stats_pkg_frag_detach(hpb, next);
 
 #ifdef DBG_MALLOC
-#ifndef STATISTICS
-		hpb->used += next->size;
-		hpb->real_used += next->size + FRAG_OVERHEAD;
-#endif
 		hpb->used += FRAG_OVERHEAD;
 #endif
 
 		f->size += next->size + FRAG_OVERHEAD;
 		update_stats_pkg_frag_merge(hpb);
-
-#if defined(DBG_MALLOC) && !defined(STATISTICS)
-		hpb->real_used -= FRAG_OVERHEAD;
-		hpb->total_fragments--;
-#endif
 	}
 
 	hp_frag_attach(hpb, f);
 	update_stats_pkg_frag_attach(hpb, f);
+
 	#ifdef DBG_MALLOC
 	f->file=file;
 	f->func=func;
 	f->line=line;
 	#endif
-
-#if defined(DBG_MALLOC) && !defined(STATISTICS)
-	hpb->used -= f->size;
-	hpb->real_used -= f->size + FRAG_OVERHEAD;
-#endif
 }
 
 #if !defined INLINE_ALLOC && defined DBG_MALLOC
@@ -1116,14 +1088,11 @@ void *hp_pkg_realloc(struct hp_block *hpb, void *p, unsigned long size,
 			update_stats_pkg_frag_detach(hpb, next);
 
 			#ifdef DBG_MALLOC
-			#ifndef STATISTICS
-			hpb->used += next->size;
-			hpb->real_used += next->size + FRAG_OVERHEAD;
-			#endif
 			hpb->used += FRAG_OVERHEAD;
 			#endif
 
 			f->size += next->size + FRAG_OVERHEAD;
+			update_stats_pkg_frag_merge(hpb);
 
 			/* split the result if necessary */
 			if (f->size > size)
@@ -1591,7 +1560,7 @@ void hp_status(struct hp_block *hpb)
 		}
 	}
 
-	LM_GEN1(memdump, "TOTAL: %6d free fragments\n", t);
+	LM_GEN1(memdump, "TOTAL: %6d/%ld free fragments\n", t, hpb->total_fragments);
 	LM_GEN1(memdump, "Fragment overhead: %u\n", (unsigned int)FRAG_OVERHEAD);
 	LM_GEN1(memdump, "-----------------------------\n");
 }

mem/hp_malloc_stats.c

@@ -179,8 +179,9 @@ void hp_init_shm_statistics(struct hp_block *hpb)
 	update_stat(shm_rused, (long)hpb->real_used);
 	update_stat(shm_frags, (long)hpb->total_fragments);
 
-	LM_DBG("initializing atomic shm statistics: "
-	       "[ us: %ld | rus: %ld | frags: %ld ]\n", hpb->used, hpb->real_used, hpb->total_fragments);
+	LM_INFO("initialized atomic shm statistics: "
+	       "[ us: %ld | rus: %ld | frags: %ld ]\n", hpb->used, hpb->real_used,
+	       hpb->total_fragments);
 }
 
 unsigned long hp_shm_get_used(struct hp_block *hpb)

mem/hp_malloc_stats.h

@@ -71,13 +71,12 @@ unsigned long hp_rpm_get_frags(struct hp_block *hpb);
 #define update_stats_pkg_frag_split(blk, ...) \
 	do { \
 		(blk)->used -= FRAG_OVERHEAD; \
-		(blk)->real_used += FRAG_OVERHEAD; \
 		(blk)->total_fragments++; \
 	} while (0)
 
 #define update_stats_pkg_frag_merge(blk, ...) \
 	do { \
-		(blk)->real_used -= FRAG_OVERHEAD; \
+		(blk)->used += FRAG_OVERHEAD; \
 		(blk)->total_fragments--; \
 	} while (0)