ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-05 00:42:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx++: changes after codereview-1 (part 2 of 2).

Browse Source 
Change-Id: I8e1ca134bb8c5d447895f116247dfd12fa6871f0
This commit is contained in:
Leonid Yuriev
2020-09-14 16:40:46 +03:00
parent 04b0d258ff
commit cacc4aa829
15 changed files with 631 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/keygen.cc
View File

@@ -16,7 +16,7 @@
namespace keygen {
static inline __pure_function serial_t mask(unsigned bits) {
static inline MDBX_PURE_FUNCTION serial_t mask(unsigned bits) {
assert(bits > 0 && bits <= serial_maxwith);
return serial_allones >> (serial_maxwith - bits);
}

4
test/log.cc
View File

@@ -31,7 +31,7 @@ const char *test_strerror(int errnum) {
return mdbx_strerror_r(errnum, buf, sizeof(buf));
}
__noreturn void failure_perror(const char *what, int errnum) {
MDBX_NORETURN void failure_perror(const char *what, int errnum) {
failure("%s failed: %s (%d)\n", what, test_strerror(errnum), errnum);
}
@@ -39,7 +39,7 @@ __noreturn void failure_perror(const char *what, int errnum) {
static void mdbx_logger(MDBX_log_level_t priority, const char *function,
int line, const char *msg,
va_list args) cxx17_noexcept {
va_list args) MDBX_CXX17_NOEXCEPT {
if (!function)
function = "unknown";

26
test/log.h
View File

@@ -17,9 +17,9 @@
#include "base.h"
#include "chrono.h"
__noreturn void usage(void);
__noreturn void mdbx_printf_args(1, 2) failure(const char *fmt, ...);
__noreturn void failure_perror(const char *what, int errnum);
MDBX_NORETURN void usage(void);
MDBX_NORETURN void MDBX_PRINTF_ARGS(1, 2) failure(const char *fmt, ...);
MDBX_NORETURN void failure_perror(const char *what, int errnum);
const char *test_strerror(int errnum);
namespace logging {
@@ -51,12 +51,12 @@ void setlevel(loglevel priority);
void output_nocheckloglevel_ap(const loglevel priority, const char *format,
va_list ap);
bool mdbx_printf_args(2, 3)
bool MDBX_PRINTF_ARGS(2, 3)
output(const loglevel priority, const char *format, ...);
bool feed_ap(const char *format, va_list ap);
bool mdbx_printf_args(1, 2) feed(const char *format, ...);
bool MDBX_PRINTF_ARGS(1, 2) feed(const char *format, ...);
void inline mdbx_printf_args(2, 3)
void inline MDBX_PRINTF_ARGS(2, 3)
output_nocheckloglevel(const loglevel priority, const char *format, ...) {
va_list ap;
va_start(ap, format);
@@ -85,13 +85,13 @@ public:
} // namespace logging
void mdbx_printf_args(1, 2) log_extra(const char *msg, ...);
void mdbx_printf_args(1, 2) log_trace(const char *msg, ...);
void mdbx_printf_args(1, 2) log_debug(const char *msg, ...);
void mdbx_printf_args(1, 2) log_verbose(const char *msg, ...);
void mdbx_printf_args(1, 2) log_notice(const char *msg, ...);
void mdbx_printf_args(1, 2) log_warning(const char *msg, ...);
void mdbx_printf_args(1, 2) log_error(const char *msg, ...);
void MDBX_PRINTF_ARGS(1, 2) log_extra(const char *msg, ...);
void MDBX_PRINTF_ARGS(1, 2) log_trace(const char *msg, ...);
void MDBX_PRINTF_ARGS(1, 2) log_debug(const char *msg, ...);
void MDBX_PRINTF_ARGS(1, 2) log_verbose(const char *msg, ...);
void MDBX_PRINTF_ARGS(1, 2) log_notice(const char *msg, ...);
void MDBX_PRINTF_ARGS(1, 2) log_warning(const char *msg, ...);
void MDBX_PRINTF_ARGS(1, 2) log_error(const char *msg, ...);
void log_trouble(const char *where, const char *what, int errnum);
void log_flush(void);

2
test/main.cc
View File

@@ -19,7 +19,7 @@
#include <sys/time.h>
#endif /* !Windows */
__noreturn void usage(void) {
MDBX_NORETURN void usage(void) {
puts(
"usage:\n"
" --help or -h Show this text\n"

2
test/test.cc
View File

@@ -80,7 +80,7 @@ const char *keygencase2str(const keygen_case keycase) {
int testcase::oom_callback(MDBX_env *env, mdbx_pid_t pid, mdbx_tid_t tid,
uint64_t txn, unsigned gap, size_t space,
int retry) cxx17_noexcept {
int retry) MDBX_CXX17_NOEXCEPT {
testcase *self = (testcase *)mdbx_env_get_userctx(env);

2
test/test.h
View File

@@ -168,7 +168,7 @@ protected:
static int oom_callback(MDBX_env *env, mdbx_pid_t pid, mdbx_tid_t tid,
uint64_t txn, unsigned gap, size_t space,
int retry) cxx17_noexcept;
int retry) MDBX_CXX17_NOEXCEPT;
MDBX_env_flags_t actual_env_mode{MDBX_ENV_DEFAULTS};
bool is_nested_txn_available() const {