Make sure packedgitwindowsize is multiple of (pagesize * 2)
The next patch depends on this. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Feb 14, 2007 at 13:20 UTC
5faaf24634a4d3a630bd3655cc85fa96f8bc1903
2 files changed
+10
-5
config.c
+7
-5
@@ -310,12 +310,14 @@ int git_default_config(const char *var, const char *value)
310
}
311
312
if (!strcmp(var, "core.packedgitwindowsize")) {
313
- int pgsz = getpagesize();
313
+ int pgsz_x2 = getpagesize() * 2;
314
packed_git_window_size = git_config_int(var, value);
315
- packed_git_window_size /= pgsz;
316
- if (packed_git_window_size < 2)
317
- packed_git_window_size = 2;
318
- packed_git_window_size *= pgsz;
315
+
316
+ /* This value must be multiple of (pagesize * 2) */
317
+ packed_git_window_size /= pgsz_x2;
318
+ if (packed_git_window_size < 1)
319
+ packed_git_window_size = 1;
320
+ packed_git_window_size *= pgsz_x2;
321
return 0;
322
}
323
git-compat-util.h
+3
@@ -96,11 +96,14 @@ extern void set_warn_routine(void (*routine)(const char *warn, va_list params));
96
extern void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
97
extern int git_munmap(void *start, size_t length);
98
99
+/* This value must be multiple of (pagesize * 2) */
100
#define DEFAULT_PACKED_GIT_WINDOW_SIZE (1 * 1024 * 1024)
101
102
#else /* NO_MMAP */
103
104
#include <sys/mman.h>
105
+
106
+/* This value must be multiple of (pagesize * 2) */
107
#define DEFAULT_PACKED_GIT_WINDOW_SIZE \
108
(sizeof(void*) >= 8 \
109
? 1 * 1024 * 1024 * 1024 \