diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:15:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:15:07 +0200 |
| commit | f6e8ab0dc664b4941beb79dbcf5ff36c929d17c6 (patch) | |
| tree | fa6caa2097a336bc407f62b9cdf883e84de06a32 | |
| parent | a605c0da08c2cfe700b0b431f289a47509a28189 (diff) | |
| parent | 23829ebb09cfa016044f6e5a0b361de1e04705ad (diff) | |
| download | monzero-core-f6e8ab0dc664b4941beb79dbcf5ff36c929d17c6.tar.gz monzero-core-f6e8ab0dc664b4941beb79dbcf5ff36c929d17c6.tar.xz monzero-core-f6e8ab0dc664b4941beb79dbcf5ff36c929d17c6.zip | |
Merge pull request #4875
23829ebb mlocker: don't throw from lock/unlock (moneromooo-monero)
| -rw-r--r-- | contrib/epee/src/mlocker.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/epee/src/mlocker.cpp b/contrib/epee/src/mlocker.cpp index 09ef861ac..807e60984 100644 --- a/contrib/epee/src/mlocker.cpp +++ b/contrib/epee/src/mlocker.cpp @@ -114,6 +114,8 @@ namespace epee void mlocker::lock(void *ptr, size_t len) { + TRY_ENTRY(); + size_t page_size = get_page_size(); if (page_size == 0) return; @@ -124,10 +126,14 @@ namespace epee for (size_t page = first; page <= last; ++page) lock_page(page); ++num_locked_objects; + + CATCH_ENTRY_L1("mlocker::lock", void()); } void mlocker::unlock(void *ptr, size_t len) { + TRY_ENTRY(); + size_t page_size = get_page_size(); if (page_size == 0) return; @@ -137,6 +143,8 @@ namespace epee for (size_t page = first; page <= last; ++page) unlock_page(page); --num_locked_objects; + + CATCH_ENTRY_L1("mlocker::lock", void()); } size_t mlocker::get_num_locked_pages() |