diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-12-12 02:17:17 +0100 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-01-23 10:41:44 -0500 |
| commit | 4786302fb99f930afca1e778255b72c6999ca480 (patch) | |
| tree | 8c92a473f0c8772d152561d909fedce4b8ed5d2f /src/leveldb/db/version_set.h | |
| parent | c429f2b062140843f42b78d70278279c6be74441 (diff) | |
| download | bitcoin-4786302fb99f930afca1e778255b72c6999ca480.tar.xz | |
Replace leveldb/ with vanilla 1.7.0
Diffstat (limited to 'src/leveldb/db/version_set.h')
| -rw-r--r-- | src/leveldb/db/version_set.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leveldb/db/version_set.h b/src/leveldb/db/version_set.h index 61c4c99a08..792899b7f8 100644 --- a/src/leveldb/db/version_set.h +++ b/src/leveldb/db/version_set.h @@ -21,6 +21,7 @@ #include "db/dbformat.h" #include "db/version_edit.h" #include "port/port.h" +#include "port/thread_annotations.h" namespace leveldb { @@ -159,7 +160,8 @@ class VersionSet { // current version. Will release *mu while actually writing to the file. // REQUIRES: *mu is held on entry. // REQUIRES: no other thread concurrently calls LogAndApply() - Status LogAndApply(VersionEdit* edit, port::Mutex* mu); + Status LogAndApply(VersionEdit* edit, port::Mutex* mu) + EXCLUSIVE_LOCKS_REQUIRED(mu); // Recover the last saved descriptor from persistent storage. Status Recover(); |