Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1

This commit is contained in:
Frank Celler 2012-12-05 09:51:24 +01:00
parent 5283ec7bfa 7c94afad4f
commit 0b8725e2bb
3 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
v1.1.0 (XXXX-XX-XX) v1.1.0 (XXXX-XX-XX)
------------------- -------------------
* fixed issue #311: fixed segfault on unload
* fixed issue #309: renamed stub "import" button from web interface * fixed issue #309: renamed stub "import" button from web interface
* fixed issue #307: added WaitForSync column in collections list in in web interface * fixed issue #307: added WaitForSync column in collections list in in web interface

26
arangod/HashIndex/hasharray.c
View File

@ -114,29 +114,13 @@ static void AddNewElement (TRI_hasharray_t* array, void* element) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static bool AllocateTable (TRI_hasharray_t* array, size_t numElements) { static bool AllocateTable (TRI_hasharray_t* array, size_t numElements) {
char* data;
char* table; char* table;
size_t offset;
data = TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, CACHE_LINE_SIZE + (array->_elementSize * numElements), true); table = (char*) TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, CACHE_LINE_SIZE + (array->_elementSize * numElements), true);
if (data == NULL) { if (table == NULL) {
return false; return false;
} }
// position array directly on a cache line boundary
offset = ((intptr_t) data) % CACHE_LINE_SIZE;
if (offset == 0) {
// we're already on a cache line boundary
table = data;
}
else {
// move to start of a cache line
table = data + (CACHE_LINE_SIZE - offset);
}
assert(((intptr_t) table) % CACHE_LINE_SIZE == 0);
array->_data = data;
array->_table = table; array->_table = table;
array->_nrAlloc = numElements; array->_nrAlloc = numElements;
@ -148,12 +132,10 @@ static bool AllocateTable (TRI_hasharray_t* array, size_t numElements) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static bool ResizeHashArray (TRI_hasharray_t* array) { static bool ResizeHashArray (TRI_hasharray_t* array) {
char* oldData;
char* oldTable; char* oldTable;
uint64_t oldAlloc; uint64_t oldAlloc;
uint64_t j; uint64_t j;
oldData = array->_data;
oldTable = array->_table; oldTable = array->_table;
oldAlloc = array->_nrAlloc; oldAlloc = array->_nrAlloc;
@ -172,7 +154,7 @@ static bool ResizeHashArray (TRI_hasharray_t* array) {
} }
} }
TRI_Free(TRI_UNKNOWN_MEM_ZONE, oldData); TRI_Free(TRI_UNKNOWN_MEM_ZONE, oldTable);
return true; return true;
} }
@ -286,7 +268,7 @@ void TRI_DestroyHashArray (TRI_hasharray_t* array) {
IndexStaticDestroyElement(array, p); IndexStaticDestroyElement(array, p);
} }
TRI_Free(TRI_UNKNOWN_MEM_ZONE, array->_data); TRI_Free(TRI_UNKNOWN_MEM_ZONE, array->_table);
} }
} }

5
arangod/HashIndex/hasharray.h
View File

@ -64,11 +64,6 @@ typedef struct TRI_hasharray_s {
uint64_t _nrAlloc; // the size of the table uint64_t _nrAlloc; // the size of the table
uint64_t _nrUsed; // the number of used entries uint64_t _nrUsed; // the number of used entries
// _table might or might not be the same pointer as _data
// if you want to handle the hash table memory, always use the _data pointer!
// if you want to work with the hash table elements, always use the _table pointer!
char* _data; // pointer to memory acquired for the hash table
char* _table; // the table itself, aligned to a cache line boundary char* _table; // the table itself, aligned to a cache line boundary
#ifdef TRI_INTERNAL_STATS #ifdef TRI_INTERNAL_STATS