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

fixed gcc compile warnings

This commit is contained in:
Jan Steemann 2012-11-22 21:34:41 +01:00
parent 969915a47e
commit b2faa016a6
8 changed files with 80 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
UnitTests/Philadelphia/mersenne-test.cpp
View File

@ -86,40 +86,40 @@ BOOST_AUTO_TEST_CASE (tst_mersenne_int31) {
////////////////////////////////////////////////////////////////////////////////
BOOST_AUTO_TEST_CASE (tst_mersenne_seed) {
TRI_SeedMersenneTwister((uint32_t) 0);
BOOST_CHECK_EQUAL((uint32_t) 2357136044, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2546248239, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 3071714933, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 0UL);
BOOST_CHECK_EQUAL((uint32_t) 2357136044UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2546248239UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 3071714933UL, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 1);
BOOST_CHECK_EQUAL((uint32_t) 1791095845, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4282876139, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 3093770124, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 1UL);
BOOST_CHECK_EQUAL((uint32_t) 1791095845UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4282876139UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 3093770124UL, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 2);
BOOST_CHECK_EQUAL((uint32_t) 1872583848, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 794921487, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 111352301, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 2UL);
BOOST_CHECK_EQUAL((uint32_t) 1872583848UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 794921487UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 111352301UL, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 23);
BOOST_CHECK_EQUAL((uint32_t) 2221777491, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 23UL);
BOOST_CHECK_EQUAL((uint32_t) 2221777491UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416UL, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 42);
BOOST_CHECK_EQUAL((uint32_t) 1608637542, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 3421126067, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4083286876, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 42UL);
BOOST_CHECK_EQUAL((uint32_t) 1608637542UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 3421126067UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4083286876UL, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 458735);
BOOST_CHECK_EQUAL((uint32_t) 1537542272, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4131475792, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2280116031, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 458735UL);
BOOST_CHECK_EQUAL((uint32_t) 1537542272UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4131475792UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2280116031UL, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 395568682893);
BOOST_CHECK_EQUAL((uint32_t) 2297195664, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2381406737, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4184846092, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 395568682893UL);
BOOST_CHECK_EQUAL((uint32_t) 2297195664UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2381406737UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4184846092UL, TRI_Int32MersenneTwister());
}
////////////////////////////////////////////////////////////////////////////////
@ -127,26 +127,26 @@ BOOST_AUTO_TEST_CASE (tst_mersenne_seed) {
////////////////////////////////////////////////////////////////////////////////
BOOST_AUTO_TEST_CASE (tst_mersenne_reseed) {
TRI_SeedMersenneTwister((uint32_t) 23);
BOOST_CHECK_EQUAL((uint32_t) 2221777491, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 23UL);
BOOST_CHECK_EQUAL((uint32_t) 2221777491UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416UL, TRI_Int32MersenneTwister());
// re-seed with same value and compare
TRI_SeedMersenneTwister((uint32_t) 23);
BOOST_CHECK_EQUAL((uint32_t) 2221777491, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 23UL);
BOOST_CHECK_EQUAL((uint32_t) 2221777491UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416UL, TRI_Int32MersenneTwister());
// seed with different value
TRI_SeedMersenneTwister((uint32_t) 458735);
BOOST_CHECK_EQUAL((uint32_t) 1537542272, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 458735UL);
BOOST_CHECK_EQUAL((uint32_t) 1537542272UL, TRI_Int32MersenneTwister());
// re-seed with original value and compare
TRI_SeedMersenneTwister((uint32_t) 23);
BOOST_CHECK_EQUAL((uint32_t) 2221777491, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416, TRI_Int32MersenneTwister());
TRI_SeedMersenneTwister((uint32_t) 23UL);
BOOST_CHECK_EQUAL((uint32_t) 2221777491UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 2873750246UL, TRI_Int32MersenneTwister());
BOOST_CHECK_EQUAL((uint32_t) 4067173416UL, TRI_Int32MersenneTwister());
}
////////////////////////////////////////////////////////////////////////////////

4
arangod/HashIndex/hasharray.c
View File

@ -124,7 +124,7 @@ static bool AllocateTable (TRI_hasharray_t* array, size_t numElements) {
}
// position array directly on a cache line boundary
offset = ((uint64_t) data) % CACHE_LINE_SIZE;
offset = ((intptr_t) data) % CACHE_LINE_SIZE;
if (offset == 0) {
// we're already on a cache line boundary
@ -134,7 +134,7 @@ static bool AllocateTable (TRI_hasharray_t* array, size_t numElements) {
// move to start of a cache line
table = data + (CACHE_LINE_SIZE - offset);
}
assert(((uint64_t) table) % CACHE_LINE_SIZE == 0);
assert(((intptr_t) table) % CACHE_LINE_SIZE == 0);
array->_data = data;
array->_table = table;

4
arangod/SkipLists/skiplist.c
View File

@ -353,7 +353,7 @@ void TRI_InitSkipList (TRI_skiplist_t* skiplist, size_t elementSize,
// ..........................................................................
skiplist->_base._maxHeight = maximumHeight;
if (maximumHeight > SKIPLIST_ABSOLUTE_MAX_HEIGHT) {
LOG_ERROR("Invalid maximum height for skiplist", TRI_ERROR_INTERNAL);
LOG_ERROR("Invalid maximum height for skiplist");
assert(false);
}
@ -1413,7 +1413,7 @@ void TRI_InitSkipListMulti (TRI_skiplist_multi_t* skiplist,
// ..........................................................................
skiplist->_base._maxHeight = maximumHeight;
if (maximumHeight > SKIPLIST_ABSOLUTE_MAX_HEIGHT) {
LOG_ERROR("Invalid maximum height for skiplist", TRI_ERROR_INTERNAL);
LOG_ERROR("Invalid maximum height for skiplist");
assert(false);
}

2
arangod/VocBase/collection.c
View File

@ -352,7 +352,7 @@ static bool CheckCollection (TRI_collection_t* collection) {
collection->_lastError = datafile->_lastError;
stop = true;
LOG_ERROR("cannot rename sealed log-file to %s, this should not happen: %s", filename, TRI_errno());
LOG_ERROR("cannot rename sealed log-file to %s, this should not happen: %s", filename, TRI_last_error());
break;
}

8
arangod/VocBase/compactor.c
View File

@ -248,7 +248,7 @@ static bool Compactifier (TRI_df_marker_t const* marker, void* data, TRI_datafil
TRI_READ_UNLOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(primary);
if (deleted) {
LOG_TRACE("found a stale document: %lu", d->_did);
LOG_TRACE("found a stale document: %llu", d->_did);
return true;
}
@ -256,7 +256,7 @@ static bool Compactifier (TRI_df_marker_t const* marker, void* data, TRI_datafil
res = CopyDocument(sim, marker, &result, &fid);
if (res != TRI_ERROR_NO_ERROR) {
LOG_FATAL("cannot write compactor file: ", TRI_last_error());
LOG_FATAL("cannot write compactor file: %s", TRI_last_error());
return false;
}
@ -277,7 +277,7 @@ static bool Compactifier (TRI_df_marker_t const* marker, void* data, TRI_datafil
dfi->_numberDead += 1;
dfi->_sizeDead += marker->_size - markerSize;
LOG_DEBUG("found a stale document after copying: %lu", d->_did);
LOG_DEBUG("found a stale document after copying: %llu", d->_did);
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(primary);
return true;
@ -302,7 +302,7 @@ static bool Compactifier (TRI_df_marker_t const* marker, void* data, TRI_datafil
res = CopyDocument(sim, marker, &result, &fid);
if (res != TRI_ERROR_NO_ERROR) {
LOG_FATAL("cannot write compactor file: ", TRI_last_error());
LOG_FATAL("cannot write compactor file: %s", TRI_last_error());
return false;
}

8
arangod/VocBase/datafile.c
View File

@ -169,7 +169,7 @@ static int TruncateDatafile (TRI_datafile_t* datafile, TRI_voc_size_t vocSize) {
res = TRI_UNMMFile(datafile->_data, datafile->_maximalSize, &(datafile->_fd), &(datafile->_mmHandle));
if (res < 0) {
LOG_ERROR("munmap failed with: %s", res);
LOG_ERROR("munmap failed with: %d", res);
return res;
}
@ -514,7 +514,7 @@ static TRI_datafile_t* OpenDatafile (char const* filename, bool ignoreErrors) {
if (res != TRI_ERROR_NO_ERROR) {
TRI_set_errno(res);
close(fd);
LOG_ERROR("cannot memory map file '%s': '%s'", filename, res);
LOG_ERROR("cannot memory map file '%s': '%d'", filename, res);
return NULL;
}
@ -626,7 +626,7 @@ TRI_datafile_t* TRI_CreateDatafile (char const* filename, TRI_voc_size_t maximal
// remove empty file
TRI_UnlinkFile(filename);
LOG_ERROR("cannot memory map file '%s': '%s'", filename, res);
LOG_ERROR("cannot memory map file '%s': '%d'", filename, res);
return NULL;
}
@ -1009,7 +1009,7 @@ bool TRI_CloseDatafile (TRI_datafile_t* datafile) {
res = TRI_UNMMFile(datafile->_data, datafile->_maximalSize, &(datafile->_fd), &(datafile->_mmHandle));
if (res != TRI_ERROR_NO_ERROR) {
LOG_ERROR("munmap failed with: %s", res);
LOG_ERROR("munmap failed with: %d", res);
datafile->_state = TRI_DF_STATE_WRITE_ERROR;
datafile->_lastError = res;
return false;

8
arangod/VocBase/document-collection.c
View File

@ -2439,12 +2439,12 @@ static int FillIndex (TRI_document_collection_t* collection, TRI_index_t* idx) {
++inserted;
if (inserted % 10000 == 0) {
LOG_DEBUG("indexed %ld documents of collection %lu", inserted, (unsigned long) primary->base._cid);
LOG_DEBUG("indexed %lu documents of collection %lu", (unsigned long) inserted, (unsigned long) primary->base._cid);
}
}
if (scanned % 10000 == 0) {
LOG_TRACE("scanned %ld of %ld datafile entries of collection %lu", scanned, n, (unsigned long) primary->base._cid);
LOG_TRACE("scanned %ld of %ld datafile entries of collection %lu", (unsigned long) scanned, (unsigned long) n, (unsigned long) primary->base._cid);
}
}
}
@ -3312,14 +3312,14 @@ static TRI_index_t* CreateGeoIndexDocumentCollection (TRI_document_collection_t*
if (location != NULL) {
idx = TRI_CreateGeo1Index(&sim->base, location, loc, geoJson, constraint, ignoreNull);
LOG_TRACE("created geo-index for location '%s': %d",
LOG_TRACE("created geo-index for location '%s': %ld",
location,
(unsigned long) loc);
}
else if (longitude != NULL && latitude != NULL) {
idx = TRI_CreateGeo2Index(&sim->base, latitude, lat, longitude, lon, constraint, ignoreNull);
LOG_TRACE("created geo-index for location '%s': %d, %d",
LOG_TRACE("created geo-index for location '%s': %ld, %ld",
location,
(unsigned long) lat,
(unsigned long) lon);

21
lib/BasicsC/logging.h
View File

@ -282,6 +282,21 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @brief macro that validates printf() style call arguments
/// the printf() call contained will never be executed but is just there to
/// enable compile-time error check. it will be optimised away after that
////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_ENABLE_LOGGER
#define LOG_ARG_CHECK(...) \
if (false) { \
printf(__VA_ARGS__); \
} \
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief logs fatal errors
////////////////////////////////////////////////////////////////////////////////
@ -290,6 +305,7 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
#define LOG_FATAL(...) \
do { \
LOG_ARG_CHECK(__VA_ARGS__) \
if (TRI_IsHumanLogging() && TRI_IsFatalLogging()) { \
TRI_Log(__FUNCTION__, __FILE__, __LINE__, TRI_LOG_LEVEL_FATAL, TRI_LOG_SEVERITY_HUMAN, __VA_ARGS__); \
} \
@ -309,6 +325,7 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
#define LOG_ERROR(...) \
do { \
LOG_ARG_CHECK(__VA_ARGS__) \
if (TRI_IsHumanLogging() && TRI_IsErrorLogging()) { \
TRI_Log(__FUNCTION__, __FILE__, __LINE__, TRI_LOG_LEVEL_ERROR, TRI_LOG_SEVERITY_HUMAN, __VA_ARGS__); \
} \
@ -330,6 +347,7 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
#define LOG_WARNING(...) \
do { \
LOG_ARG_CHECK(__VA_ARGS__) \
if (TRI_IsHumanLogging() && TRI_IsWarningLogging()) { \
TRI_Log(__FUNCTION__, __FILE__, __LINE__, TRI_LOG_LEVEL_WARNING, TRI_LOG_SEVERITY_HUMAN, __VA_ARGS__); \
} \
@ -351,6 +369,7 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
#define LOG_INFO(...) \
do { \
LOG_ARG_CHECK(__VA_ARGS__) \
if (TRI_IsHumanLogging() && TRI_IsInfoLogging()) { \
TRI_Log(__FUNCTION__, __FILE__, __LINE__, TRI_LOG_LEVEL_INFO, TRI_LOG_SEVERITY_HUMAN, __VA_ARGS__); \
} \
@ -372,6 +391,7 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
#define LOG_DEBUG(...) \
do { \
LOG_ARG_CHECK(__VA_ARGS__) \
if (TRI_IsHumanLogging() && TRI_IsDebugLogging(__FILE__)) { \
TRI_Log(__FUNCTION__, __FILE__, __LINE__, TRI_LOG_LEVEL_DEBUG, TRI_LOG_SEVERITY_HUMAN, __VA_ARGS__); \
} \
@ -391,6 +411,7 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
#define LOG_TRACE(...) \
do { \
LOG_ARG_CHECK(__VA_ARGS__) \
if (TRI_IsHumanLogging() && TRI_IsTraceLogging(__FILE__)) { \
TRI_Log(__FUNCTION__, __FILE__, __LINE__, TRI_LOG_LEVEL_TRACE, TRI_LOG_SEVERITY_HUMAN, __VA_ARGS__); \
} \