@@ -1,3 +1,8 @@

+Mon Mar 16 14:29:19 EET 2009 (edwin)

+------------------------------------

+ * clamd/thrmgr.c, clamdtop/clamdtop.c: print N/A if libc memory

+ usage is not available (bb #1445).

+

 Sat Mar 14 22:45:28 EET 2009 (edwin)

 ------------------------------------

  * unit_tests/check_clamd.c: put back ifndef C_BSD in unit test

@@ -196,6 +196,7 @@ int thrmgr_printstats(int f)

 	size_t pool_used = 0, pool_total = 0, seen_cnt = 0, error_flag = 0;

 	float mem_heap = 0, mem_mmap = 0, mem_used = 0, mem_free = 0, mem_releasable = 0;

 	const struct cl_engine **seen = NULL;

+	int has_libc_memstats = 0;

 	pthread_mutex_lock(&pools_lock);

 	for(cnt=0,l=pools;l;l=l->nxt) cnt++;

@@ -289,15 +290,20 @@ int thrmgr_printstats(int f)

 		mem_used = inf.uordblks/(1024*1024.0);

 		mem_free = inf.fordblks/(1024*1024.0);

 		mem_releasable = inf.keepcost/(1024*1024.0);

+		has_libc_memstats=1;

 		/* TODO: figure out how to print these statistics on other OSes */

 	}

 #endif

 	if (error_flag) {

 		mdprintf(f, "ERROR: error encountered while formatting statistics\n");

 	} else {

+	    if (has_libc_memstats)

 		mdprintf(f,"MEMSTATS: heap %.3fM mmap %.3fM used %.3fM free %.3fM releasable %.3fM pools %u pools_used %.3fM pools_total %.3fM\n",

 			mem_heap, mem_mmap, mem_used, mem_free, mem_releasable, pool_cnt,

 			pool_used/(1024*1024.0), pool_total/(1024*1024.0));

+	    else

+		mdprintf(f,"MEMSTATS: heap N/A mmap N/A used N/A free N/A releasable N/A pools %u pools_used %.3fM pools_total %.3fM\n",

+			 pool_cnt, pool_used/(1024*1024.0), pool_total/(1024*1024.0));

 	}

 	mdprintf(f,"END\n");

 	pthread_mutex_unlock(&pools_lock);

@@ -746,21 +746,27 @@ static void output_memstats(struct stats *stats)

 	int blink = 0;

 	werase(mem_window);

-	if (stats->mem > 0) {

+	if (stats->mem > 0 || (!stats->mem && (stats->lpoolt > 0))) {

 		box(mem_window, 0, 0);

-		snprintf(buf, sizeof(buf),"heap %4luM mmap %4luM unused %3luM",

-				stats->lheapu/1024, stats->lmmapu/1024, stats->lreleasable/1024);

+		if (stats->mem)

+		    snprintf(buf, sizeof(buf),"heap %4luM mmap %4luM unused %3luM",

+			     stats->lheapu/1024, stats->lmmapu/1024, stats->lreleasable/1024);

+		else

+		    snprintf(buf, sizeof(buf), "heap   N/A mmap   N/A unused  N/A");

 		mvwprintw(mem_window, 1, 1, "Mem:  ");

 		print_colored(mem_window, buf);

 		mvwprintw(mem_window, 2, 1, "Libc: ");

-		snprintf(buf, sizeof(buf),"used %4luM free %4luM total %4luM",

-				stats->ltotalu/1024, stats->ltotalf/1024, (stats->ltotalu+stats->ltotalf)/1024);

+		if (stats->mem)

+		    snprintf(buf, sizeof(buf),"used %4luM free %4luM total %4luM",

+			     stats->ltotalu/1024, stats->ltotalf/1024, (stats->ltotalu+stats->ltotalf)/1024);

+		else

+		    snprintf(buf, sizeof(buf), "used   N/A free   N/A total   N/A");

 		print_colored(mem_window, buf);

 		mvwprintw(mem_window, 3, 1, "Pool: ");

-		snprintf(buf, sizeof(buf), "count   %u  used %4luM total %4luM",

+		snprintf(buf, sizeof(buf), "count %4u used %4luM total %4luM",

 			stats->pools_cnt, stats->lpoolu/1024, stats->lpoolt/1024);

 		print_colored(mem_window, buf);

@@ -780,8 +786,17 @@ static void parse_memstats(const char *line, struct stats *stats)

 	double heapu, mmapu, totalu, totalf, releasable, pools_used, pools_total;

 	if(sscanf(line, " heap %lfM mmap %lfM used %lfM free %lfM releasable %lfM pools %u pools_used %lfM pools_total %lfM",

-			&heapu, &mmapu, &totalu, &totalf, &releasable, &stats->pools_cnt, &pools_used, &pools_total) != 8)

+			&heapu, &mmapu, &totalu, &totalf, &releasable, &stats->pools_cnt, &pools_used, &pools_total) != 8) {

+	    if (sscanf(line , " heap N/A mmap N/A used N/A free N/A releasable N/A pools %u pools_used %lfM pools_total %lfM",

+		       &stats->pools_cnt, &pools_used, &pools_total) != 3) {

+		stats->mem = -1;

 		return;

+	    }

+	    stats->lpoolu = pools_used*1000;

+	    stats->lpoolt = pools_total*1000;

+	    stats->mem = 0;

+	    return;

+	}

 	stats->lheapu = heapu*1000;

 	stats->lmmapu = mmapu*1000;

 	stats->ltotalu = totalu*1000;