global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-02 13:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '95ad2a65fbb9b7f26669fed9906fe9a1a531810b' into msysgit/devel

Browse Source 
Conflicts:
	compat/nedmalloc/Readme.txt
	compat/nedmalloc/malloc.c.h
	compat/nedmalloc/nedmalloc.c
This commit is contained in:
Steffen Prohaska
2009-06-21 09:04:35 +02:00
parent f6fe5428ce 95ad2a65fb
commit 2cd084bb43
4 changed files with 776 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1721,7 +1721,7 @@ distclean: clean
$(RM) configure
clean:
$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
$(LIB_FILE) $(XDIFF_LIB)
$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS)

2
compat/nedmalloc/Readme.txt
View File

@@ -69,7 +69,7 @@ test. The speed test is designed to be a representative synthetic
memory allocator test. It works by randomly mixing allocations with frees
with half of the allocation sizes being a two power multiple less than
512 bytes (to mimic C++ stack instantiated objects) and the other half
being a simple random value less than 16Kb.
being a simple random value less than 16Kb.
The real world code results are from Tn's TestIO benchmark. This is a
heavily multithreaded and memory intensive benchmark with a lot of branching

1520
compat/nedmalloc/malloc.c.h
View File

File diff suppressed because it is too large Load Diff

28
compat/nedmalloc/nedmalloc.c
View File

@@ -205,15 +205,15 @@ static FORCEINLINE unsigned int size2binidx(size_t _size) THROWSPEC
/* 16=1 20=1 24=1 32=10 48=11 64=100 96=110 128=1000 4096=100000000 */
#if defined(__GNUC__)
topbit = sizeof(size)*__CHAR_BIT__ - 1 - __builtin_clz(size);
topbit = sizeof(size)*__CHAR_BIT__ - 1 - __builtin_clz(size);
#elif defined(_MSC_VER) && _MSC_VER>=1300
{
unsigned long bsrTopBit;
unsigned long bsrTopBit;
_BitScanReverse(&bsrTopBit, size);
_BitScanReverse(&bsrTopBit, size);
topbit = bsrTopBit;
}
topbit = bsrTopBit;
}
#else
#if 0
union {
@@ -782,8 +782,8 @@ void * nedpmalloc(nedpool *p, size_t size) THROWSPEC
#endif
if(!ret)
{ /* Use this thread's mspace */
GETMSPACE(m, p, tc, mymspace, size,
ret=mspace_malloc(m, size));
GETMSPACE(m, p, tc, mymspace, size,
ret=mspace_malloc(m, size));
}
return ret;
}
@@ -803,8 +803,8 @@ void * nedpcalloc(nedpool *p, size_t no, size_t size) THROWSPEC
#endif
if(!ret)
{ /* Use this thread's mspace */
GETMSPACE(m, p, tc, mymspace, rsize,
ret=mspace_calloc(m, 1, rsize));
GETMSPACE(m, p, tc, mymspace, rsize,
ret=mspace_calloc(m, 1, rsize));
}
return ret;
}
@@ -861,8 +861,8 @@ void * nedpmemalign(nedpool *p, size_t alignment, size_t bytes) THROWSPEC
int mymspace;
GetThreadCache(&p, &tc, &mymspace, &bytes);
{ /* Use this thread's mspace */
GETMSPACE(m, p, tc, mymspace, bytes,
ret=mspace_memalign(m, alignment, bytes));
GETMSPACE(m, p, tc, mymspace, bytes,
ret=mspace_memalign(m, alignment, bytes));
}
return ret;
}
@@ -927,7 +927,7 @@ void **nedpindependent_calloc(nedpool *p, size_t elemsno, size_t elemsize, void
int mymspace;
GetThreadCache(&p, &tc, &mymspace, &elemsize);
GETMSPACE(m, p, tc, mymspace, elemsno*elemsize,
ret=mspace_independent_calloc(m, elemsno, elemsize, chunks));
ret=mspace_independent_calloc(m, elemsno, elemsize, chunks));
return ret;
}
void **nedpindependent_comalloc(nedpool *p, size_t elems, size_t *sizes, void **chunks) THROWSPEC
@@ -938,10 +938,10 @@ void **nedpindependent_comalloc(nedpool *p, size_t elems, size_t *sizes, void **
size_t i, *adjustedsizes=(size_t *) alloca(elems*sizeof(size_t));
if(!adjustedsizes) return 0;
for(i=0; i<elems; i++)
adjustedsizes[i]=sizes[i]<sizeof(threadcacheblk) ? sizeof(threadcacheblk) : sizes[i];
adjustedsizes[i]=sizes[i]<sizeof(threadcacheblk) ? sizeof(threadcacheblk) : sizes[i];
GetThreadCache(&p, &tc, &mymspace, 0);
GETMSPACE(m, p, tc, mymspace, 0,
ret=mspace_independent_comalloc(m, elems, adjustedsizes, chunks));
ret=mspace_independent_comalloc(m, elems, adjustedsizes, chunks));
return ret;
}