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

mlocker: don't throw from lock/unlock

Browse source 
This prevents exceptions from showing up in various awkward
places such as dtors, since the only exception that can be
thrown is a lock failure, and nothing handles a lock failure
anyway.
This commit is contained in:
moneromooo-monero 2018-11-20 15:24:16 +00:00
parent 84dd674cd0
commit 23829ebb09
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/epee/src/mlocker.cpp
View file

@ -113,6 +113,8 @@ namespace epee
void mlocker::lock(void *ptr, size_t len) void mlocker::lock(void *ptr, size_t len)
{ {
TRY_ENTRY();
size_t page_size = get_page_size(); size_t page_size = get_page_size();
if (page_size == 0) if (page_size == 0)
return; return;
@ -123,10 +125,14 @@ namespace epee
for (size_t page = first; page <= last; ++page) for (size_t page = first; page <= last; ++page)
lock_page(page); lock_page(page);
++num_locked_objects; ++num_locked_objects;
CATCH_ENTRY_L1("mlocker::lock", void());
} }
void mlocker::unlock(void *ptr, size_t len) void mlocker::unlock(void *ptr, size_t len)
{ {
TRY_ENTRY();
size_t page_size = get_page_size(); size_t page_size = get_page_size();
if (page_size == 0) if (page_size == 0)
return; return;
@ -136,6 +142,8 @@ namespace epee
for (size_t page = first; page <= last; ++page) for (size_t page = first; page <= last; ++page)
unlock_page(page); unlock_page(page);
--num_locked_objects; --num_locked_objects;
CATCH_ENTRY_L1("mlocker::lock", void());
} }
size_t mlocker::get_num_locked_pages() size_t mlocker::get_num_locked_pages()