Commit 62e562f92b45b6a9b124452f7de6b9e86a179224
2014-05-18T07:54:41
Fix compiler warning (git_off_t cast to size_t). Use size_t for page size, instead of long. Check result of sysconf. Use size_t for page offset so no cast to size_t (second arg to p_mmap). Use mod instead div/mult pair, so no cast to size_t is necessary.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
diff --git a/src/indexer.c b/src/indexer.c
index 25c3d05..93fe946 100644
--- a/src/indexer.c
+++ b/src/indexer.c
@@ -427,15 +427,19 @@ static void hash_partially(git_indexer *idx, const uint8_t *data, size_t size)
static int write_at(git_indexer *idx, const void *data, git_off_t offset, size_t size)
{
git_file fd = idx->pack->mwf.fd;
- long page_size = git__page_size();
- git_off_t page_start, page_offset;
+ size_t page_size;
+ size_t page_offset;
+ git_off_t page_start;
unsigned char *map_data;
git_map map;
int error;
+ if ((error = git__page_size(&page_size)) < 0)
+ return error;
+
/* the offset needs to be at the beginning of the a page boundary */
- page_start = (offset / page_size) * page_size;
- page_offset = offset - page_start;
+ page_offset = offset % page_size;
+ page_start = offset - page_offset;
if ((error = p_mmap(&map, page_offset + size, GIT_PROT_WRITE, GIT_MAP_SHARED, fd, page_start)) < 0)
return error;
diff --git a/src/map.h b/src/map.h
index 722eb7a..da3d1e1 100644
--- a/src/map.h
+++ b/src/map.h
@@ -42,6 +42,5 @@ typedef struct { /* memory mapped buffer */
extern int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset);
extern int p_munmap(git_map *map);
-extern long git__page_size(void);
#endif /* INCLUDE_map_h__ */
diff --git a/src/pool.c b/src/pool.c
index 146f118..1042f76 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -1,4 +1,5 @@
#include "pool.h"
+#include "posix.h"
#ifndef GIT_WIN32
#include <unistd.h>
#endif
@@ -305,17 +306,10 @@ uint32_t git_pool__system_page_size(void)
static uint32_t size = 0;
if (!size) {
-#ifdef GIT_WIN32
- SYSTEM_INFO info;
- GetSystemInfo(&info);
- size = (uint32_t)info.dwPageSize;
-#elif defined(__amigaos4__)
- size = (uint32_t)4096; /* 4K as there is no global value we can query */
-#else
- size = (uint32_t)sysconf(_SC_PAGE_SIZE);
-#endif
-
- size -= 2 * sizeof(void *); /* allow space for malloc overhead */
+ size_t page_size;
+ if (git__page_size(&page_size) < 0)
+ page_size = 4096;
+ size = page_size - 2 * sizeof(void *); /* allow space for malloc overhead */
}
return size;
diff --git a/src/pool.h b/src/pool.h
index 5ac9b76..b0007f3 100644
--- a/src/pool.h
+++ b/src/pool.h
@@ -143,8 +143,6 @@ extern uint32_t git_pool__full_pages(git_pool *pool);
extern bool git_pool__ptr_in_pool(git_pool *pool, void *ptr);
-extern uint32_t git_pool__system_page_size(void);
-
extern uint32_t git_pool__suggest_items_per_page(uint32_t item_size);
#endif
diff --git a/src/posix.c b/src/posix.c
index 7aeb0e6..7db6336 100644
--- a/src/posix.c
+++ b/src/posix.c
@@ -207,10 +207,11 @@ int p_write(git_file fd, const void *buf, size_t cnt)
#include "map.h"
-long git__page_size(void)
+int git__page_size(size_t *page_size)
{
/* dummy; here we don't need any alignment anyway */
- return 4096;
+ *page_size = 4096;
+ return 0;
}
diff --git a/src/posix.h b/src/posix.h
index 965cd98..0ef35ac 100644
--- a/src/posix.h
+++ b/src/posix.h
@@ -66,6 +66,8 @@ extern int p_creat(const char *path, mode_t mode);
extern int p_getcwd(char *buffer_out, size_t size);
extern int p_rename(const char *from, const char *to);
+extern int git__page_size(size_t *page_size);
+
#ifndef GIT_WIN32
#define p_stat(p,b) stat(p, b)
diff --git a/src/unix/map.c b/src/unix/map.c
index 3d0cbba..0a235d5 100644
--- a/src/unix/map.c
+++ b/src/unix/map.c
@@ -13,9 +13,15 @@
#include <unistd.h>
#include <errno.h>
-long git__page_size(void)
+int git__page_size(size_t *page_size)
{
- return sysconf(_SC_PAGE_SIZE);
+ long sc_page_size = sysconf(_SC_PAGE_SIZE);
+ if (sc_page_size < 0) {
+ giterr_set_str(GITERR_OS, "Can't determine system page size");
+ return -1;
+ }
+ *page_size = (size_t) sc_page_size;
+ return 0;
}
int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset)
diff --git a/src/win32/map.c b/src/win32/map.c
index ef83f88..a99c30f 100644
--- a/src/win32/map.c
+++ b/src/win32/map.c
@@ -23,9 +23,10 @@ static DWORD get_page_size(void)
return page_size;
}
-long git__page_size(void)
+int git__page_size(size_t *page_size)
{
- return (long)get_page_size();
+ *page_size = get_page_size();
+ return 0;
}
int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset)