monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5344

Browse source 
5e1a3e48 lmdb: fix size_t size issues on 32 bit (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-06 15:58:50 +02:00
commit c61b3f0ead
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lmdb/database.cpp
View file

@ -46,7 +46,7 @@ namespace lmdb
{ {
namespace namespace
{ {
constexpr const std::size_t max_resize = 1 * 1024 * 1024 * 1024; // 1 GB constexpr const mdb_size_t max_resize = 1 * 1024 * 1024 * 1024; // 1 GB
void acquire_context(context& ctx) noexcept void acquire_context(context& ctx) noexcept
{ {
while (ctx.lock.test_and_set()); while (ctx.lock.test_and_set());
@ -136,7 +136,7 @@ namespace lmdb
MDB_envinfo info{}; MDB_envinfo info{};
MONERO_LMDB_CHECK(mdb_env_info(handle(), &info)); MONERO_LMDB_CHECK(mdb_env_info(handle(), &info));
const std::size_t resize = std::min(info.me_mapsize, max_resize); const mdb_size_t resize = std::min(info.me_mapsize, max_resize);
const int err = mdb_env_set_mapsize(handle(), info.me_mapsize + resize); const int err = mdb_env_set_mapsize(handle(), info.me_mapsize + resize);
ctx.lock.clear(); ctx.lock.clear();
if (err) if (err)

4
src/lmdb/value_stream.cpp
View file

@ -36,9 +36,9 @@ namespace lmdb
{ {
namespace stream namespace stream
{ {
std::size_t count(MDB_cursor* cur) mdb_size_t count(MDB_cursor* cur)
{ {
std::size_t out = 0; mdb_size_t out = 0;
if (cur) if (cur)
{ {
const int rc = mdb_cursor_count(cur, &out); const int rc = mdb_cursor_count(cur, &out);

2
src/lmdb/value_stream.h
View file

@ -43,7 +43,7 @@ namespace lmdb
\throw std::system_error if unexpected LMDB error. \throw std::system_error if unexpected LMDB error.
\return 0 if `cur == nullptr`, otherwise count of values at current key. \return 0 if `cur == nullptr`, otherwise count of values at current key.
*/ */
std::size_t count(MDB_cursor* cur); mdb_size_t count(MDB_cursor* cur);
/*! /*!
Calls `mdb_cursor_get` and does some error checking. Calls `mdb_cursor_get` and does some error checking.