ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 19:04:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: rework/fix unaligned access.

Browse Source 
Change-Id: Ib0208e78786ac84551384ed57ac580fe0717840e
This commit is contained in:
Leonid Yuriev 2019-10-23 23:46:12 +03:00
parent b7d27c1b36
commit 81fd0beb1a
5 changed files with 620 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

975
src/elements/core.c
View File

File diff suppressed because it is too large Load Diff

6
src/elements/internals.h
View File

@ -1273,11 +1273,13 @@ typedef struct MDBX_node {
uint32_t mn_dsize; uint32_t mn_dsize;
uint32_t mn_pgno32; uint32_t mn_pgno32;
}; };
uint16_t mn_flags; /* see mdbx_node */ uint8_t mn_flags; /* see mdbx_node flags */
uint8_t mn_extra;
uint16_t mn_ksize; /* key size */ uint16_t mn_ksize; /* key size */
#else #else
uint16_t mn_ksize; /* key size */ uint16_t mn_ksize; /* key size */
uint16_t mn_flags; /* see mdbx_node */ uint8_t mn_extra;
uint8_t mn_flags; /* see mdbx_node flags */
union { union {
uint32_t mn_pgno32; uint32_t mn_pgno32;
uint32_t mn_dsize; uint32_t mn_dsize;

7
src/elements/osal.h
View File

@ -267,8 +267,11 @@ typedef pthread_mutex_t mdbx_fastmutex_t;
#endif /* all x86 */ #endif /* all x86 */
#if !defined(MDBX_UNALIGNED_OK) #if !defined(MDBX_UNALIGNED_OK)
#if (defined(__ia32__) || defined(__e2k__) || \ #if defined(_MSC_VER)
defined(__ARM_FEATURE_UNALIGNED)) && \ #define MDBX_UNALIGNED_OK 1 /* avoid MSVC misoptimization */
#elif __CLANG_PREREQ(5, 0) || __GNUC_PREREQ(5, 0)
#define MDBX_UNALIGNED_OK 0 /* expecting optimization is well done */
#elif (defined(__ia32__) || defined(__ARM_FEATURE_UNALIGNED)) && \
!defined(__ALIGNED__) !defined(__ALIGNED__)
#define MDBX_UNALIGNED_OK 1 #define MDBX_UNALIGNED_OK 1
#else #else

10
src/tools/mdbx_chk.c
View File

@ -408,16 +408,19 @@ static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
const MDBX_val *data) { const MDBX_val *data) {
char *bad = ""; char *bad = "";
pgno_t *iptr = data->iov_base; pgno_t *iptr = data->iov_base;
txnid_t txnid = *(txnid_t *)key->iov_base;
if (key->iov_len != sizeof(txnid_t)) if (key->iov_len != sizeof(txnid_t))
problem_add("entry", record_number, "wrong txn-id size", problem_add("entry", record_number, "wrong txn-id size",
"key-size %" PRIiPTR, key->iov_len); "key-size %" PRIiPTR, key->iov_len);
else if (txnid < 1 || txnid > envinfo.mi_recent_txnid) else {
txnid_t txnid;
memcpy(&txnid, key->iov_base, sizeof(txnid));
if (txnid < 1 || txnid > envinfo.mi_recent_txnid)
problem_add("entry", record_number, "wrong txn-id", "%" PRIaTXN, txnid); problem_add("entry", record_number, "wrong txn-id", "%" PRIaTXN, txnid);
else { else {
if (data->iov_len < sizeof(pgno_t) || data->iov_len % sizeof(pgno_t)) if (data->iov_len < sizeof(pgno_t) || data->iov_len % sizeof(pgno_t))
problem_add("entry", txnid, "wrong idl size", "%" PRIuPTR, data->iov_len); problem_add("entry", txnid, "wrong idl size", "%" PRIuPTR,
data->iov_len);
size_t number = (data->iov_len >= sizeof(pgno_t)) ? *iptr++ : 0; size_t number = (data->iov_len >= sizeof(pgno_t)) ? *iptr++ : 0;
if (number < 1 || number > MDBX_PNL_MAX) if (number < 1 || number > MDBX_PNL_MAX)
problem_add("entry", txnid, "wrong idl length", "%" PRIuPTR, number); problem_add("entry", txnid, "wrong idl length", "%" PRIuPTR, number);
@ -499,6 +502,7 @@ static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
} }
} }
} }
}
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }

6
test/config.h
View File

@ -124,8 +124,6 @@ inline bool parse_option_intptr(int argc, char *const argv[], int &narg,
#pragma pack(push, 1) #pragma pack(push, 1)
struct keygen_params_pod { struct keygen_params_pod {
keygen_case keycase;
/* Параметры генератора пар key-value. /* Параметры генератора пар key-value.
* *
* Ключи и значения генерируются по задаваемым параметрам на основе "плоской" * Ключи и значения генерируются по задаваемым параметрам на основе "плоской"
@ -232,11 +230,10 @@ struct keygen_params_pod {
uint8_t split; uint8_t split;
uint32_t seed; uint32_t seed;
uint64_t offset; uint64_t offset;
keygen_case keycase;
}; };
struct actor_params_pod { struct actor_params_pod {
unsigned loglevel;
unsigned mode_flags; unsigned mode_flags;
unsigned table_flags; unsigned table_flags;
intptr_t size_lower; intptr_t size_lower;
@ -265,6 +262,7 @@ struct actor_params_pod {
unsigned max_tables; unsigned max_tables;
keygen_params_pod keygen; keygen_params_pod keygen;
uint8_t loglevel;
bool drop_table; bool drop_table;
bool ignore_dbfull; bool ignore_dbfull;
bool speculum; bool speculum;