proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 01:39:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually do the mmap... unsurprisingly, this makes the indexer work on SFS

Browse Source 
On RAM: the .idx and .pack files become links to a .lock and the original download respectively.
Assume some feature (such as record locking) supported by SFS but not JXFS or RAM: is required.
This commit is contained in:
Chris Young 2012-06-12 19:25:09 +01:00
parent 90490113af
commit 2aeadb9c78
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/indexer.c
View File

@ -363,11 +363,11 @@ int git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t siz
if (error < 0) { if (error < 0) {
idx->off = entry_start; idx->off = entry_start;
error = store_delta(idx); error = store_delta(idx);
if (error == GIT_EBUFS) if (error == GIT_EBUFS)
return 0; return 0;
if (error < 0) if (error < 0)
return error; return error;
continue; continue;
} }

1
src/mwindow.c
View File

@ -158,6 +158,7 @@ static git_mwindow *new_window(
git_mwindow *w; git_mwindow *w;
w = git__malloc(sizeof(*w)); w = git__malloc(sizeof(*w));
if (w == NULL) if (w == NULL)
return NULL; return NULL;

6
src/pack.c
View File

@ -215,7 +215,7 @@ static int packfile_unpack_header1(
unsigned shift; unsigned shift;
unsigned long size, c; unsigned long size, c;
unsigned long used = 0; unsigned long used = 0;
printf("[pack 218] buf = %lx, used = %ld, len = %ld\n", buf, used, len);
c = buf[used++]; c = buf[used++];
*type = (c >> 4) & 7; *type = (c >> 4) & 7;
size = c & 15; size = c & 15;
@ -261,8 +261,8 @@ int git_packfile_unpack_header(
base = git_mwindow_open(mwf, w_curs, *curpos, 20, &left); base = git_mwindow_open(mwf, w_curs, *curpos, 20, &left);
if (base == NULL) if (base == NULL)
return GIT_EBUFS; return GIT_EBUFS;
printf("[pack 264] base = %lx, mwf = %lx\n", base, mwf);
ret = packfile_unpack_header1(&used, size_p, type_p, base, left); ret = packfile_unpack_header1(&used, size_p, type_p, base, left);
git_mwindow_close(w_curs); git_mwindow_close(w_curs);
if (ret == GIT_EBUFS) if (ret == GIT_EBUFS)
return ret; return ret;

8
src/unix/map.c
View File

@ -39,11 +39,11 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs
#else #else
if ((prot & GIT_PROT_WRITE) && ((flags & GIT_MAP_TYPE) == GIT_MAP_SHARED)) { if ((prot & GIT_PROT_WRITE) && ((flags & GIT_MAP_TYPE) == GIT_MAP_SHARED)) {
printf("Trying to map shared-writeable file!!!\n"); printf("Trying to map shared-writeable file!!!\n");
}
if(out->data = malloc(len)) { if(out->data = malloc(len)) {
lseek(fd, offset, SEEK_SET); lseek(fd, offset, SEEK_SET);
p_read(fd, out->data, len); p_read(fd, out->data, len);
}
} }
#endif #endif