From fb964fcc756cb08461e6cb326d02ab8d954113aa Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <schoebel@bell.site>
Date: Wed, 9 Jan 2013 10:35:39 +0100
Subject: [PATCH] mem: pre-allocate only the necessary

---
 mars_trans_logger.c | 28 ++++++++++++++++------------
 sy_old/mars_light.c | 10 ----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/mars_trans_logger.c b/mars_trans_logger.c
index f89e039a..daae93cd 100644
--- a/mars_trans_logger.c
+++ b/mars_trans_logger.c
@@ -9,6 +9,17 @@
 //#define STAT_DEBUGGING // here means: display full statistics
 //#define HASH_DEBUGGING
 
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/bio.h>
+
+#include "mars.h"
+#include "lib_rank.h"
+#include "lib_limiter.h"
+
+#include "mars_trans_logger.h"
+
 // variants
 #define KEEP_UNIQUE
 #define DELAY_CALLERS // this is _needed_ for production systems
@@ -20,22 +31,15 @@
 #define APPLY_DATA
 
 // tuning
-#define CONF_TRANS_CHUNKSIZE  (128 * 1024)
+#ifdef BRICK_DEBUG_MEM
+#define CONF_TRANS_CHUNKSIZE    (128 * 1024 - PAGE_SIZE * 2)
+#else
+#define CONF_TRANS_CHUNKSIZE    (128 * 1024)
+#endif
 #define CONF_TRANS_MAX_MREF_SIZE PAGE_SIZE
 //#define CONF_TRANS_ALIGN      PAGE_SIZE // FIXME: does not work
 #define CONF_TRANS_ALIGN      0
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/bio.h>
-
-#include "mars.h"
-#include "lib_rank.h"
-#include "lib_limiter.h"
-
-#include "mars_trans_logger.h"
-
 #ifdef REPLAY_DEBUGGING
 #define MARS_RPL(_fmt, _args...)  _MARS_MSG(false, "REPLAY ", _fmt, ##_args)
 #else
diff --git a/sy_old/mars_light.c b/sy_old/mars_light.c
index e65ffacc..9e403447 100644
--- a/sy_old/mars_light.c
+++ b/sy_old/mars_light.c
@@ -4071,17 +4071,7 @@ done:
 
 static struct mem_reservation global_reserve = {
 	.amount = {
-		[1] = 32,
-		[2] = 32,
-		[3] = 32,
-		[4] = 64,
 		[5] = 64,
-		[6] = 64,
-		[7] = 2,
-		[8] = 2,
-		[9] = 1,
-		[10] = 1,
-		[11] = 0,
 	},
 };