From 933592db4782b0fe155231f805e017330efd5f65 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Fri, 24 Aug 2018 22:15:32 +0200
Subject: use new memusage gathering in loop

---
 benchmarks/bench_loop.c | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/bench_loop.c b/benchmarks/bench_loop.c
index ecfa5d6..af7ff10 100644
--- a/benchmarks/bench_loop.c
+++ b/benchmarks/bench_loop.c
@@ -77,8 +77,8 @@ int main(int argc, char* argv[]) {
 	int num_threads;
 	struct ThreadArgs thread_args;
 
-	if (argc < 7) {
-		fprintf(stderr, "Usage: %s <benchmark> <num threads> <num allocations> <max size> <num of stored allocations> <print mem stats> [<output-file>]\n", argv[0]);
+	if (argc < 6) {
+		fprintf(stderr, "Usage: %s <benchmark> <num threads> <num allocations> <max size> <num of stored allocations>\n", argv[0]);
 		return 1;
 	}
 
@@ -104,34 +104,14 @@ int main(int argc, char* argv[]) {
 		}
 	}
 
-	if (strcmp(argv[6], "yes") == 0)
+	if (argc == 7)
 	{
-		char buf[4096];
-
-		FILE* status = fopen("/proc/self/status", "r");
-		if (status == NULL)
-		{
-			perror("fopen status");
-			exit(1);
-		}
-
-		FILE* output = stdout;
-		if (argc == 8)
-		{
-			output = fopen(argv[7], "w");
-			if (output == NULL)
-			{
-				perror("fopen output file");
-				exit(1);
-			}
-		}
-
-		while (!feof(status))
-		{
-			fgets(&buf, 4096, status);
-			fprintf(output, "%s", buf);
-		}
-		fclose(status);
+		FILE* f = stdout;
+		if (strcmp(argv[6],"stdout") != 0)
+			f = fopen(argv[6], "w");
+		malloc_info(0, f);
+		if (strcmp(argv[6],"stdout") != 0)
+			fclose(f);
 	}
 
 	return 0;
-- 
cgit v1.2.3