Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-26 20:09:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4790

Browse Source 
177a9d76 wallet: warn if lockable memory limit is too low (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-11-16 11:08:07 +02:00
commit 9aff9a5372
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/util.cpp
View File

@ -728,6 +728,21 @@ std::string get_nix_version_display_string()
return true;
}
ssize_t get_lockable_memory()
{
#ifdef __GLIBC__
struct rlimit rlim;
if (getrlimit(RLIMIT_MEMLOCK, &rlim) < 0)
{
MERROR("Failed to determine the lockable memory limit");
return -1;
}
return rlim.rlim_cur;
#else
return -1;
#endif
}
bool on_startup()
{
mlog_configure("", true);

2
src/common/util.h
View File

@ -221,6 +221,8 @@ namespace tools
void set_strict_default_file_permissions(bool strict);
ssize_t get_lockable_memory();
void set_max_concurrency(unsigned n);
unsigned get_max_concurrency();

8
src/wallet/wallet_args.cpp
View File

@ -211,6 +211,14 @@ namespace wallet_args
Print(print) << boost::format(wallet_args::tr("Logging to %s")) % log_path;
const ssize_t lockable_memory = tools::get_lockable_memory();
if (lockable_memory >= 0 && lockable_memory < 256 * 4096) // 256 pages -> at least 256 secret keys and other such small/medium objects
Print(print) << tr("WARNING: You may not have a high enough lockable memory limit")
#ifdef ELPP_OS_UNIX
<< ", " << tr("see ulimit -l")
#endif
;
return {std::move(vm), should_terminate};
}
}