diff options
| author | Russell Yanofsky <[email protected]> | 2017-11-03 07:49:16 -0400 |
|---|---|---|
| committer | Russell Yanofsky <[email protected]> | 2018-08-31 10:00:38 -0400 |
| commit | 190bf62be1214b072513c7fd7e01cc191723967c (patch) | |
| tree | aeece6f0d62abfa11a70875d120350f0374cabee /src/httpserver.cpp | |
| parent | Merge #11640: Make LOCK, LOCK2, TRY_LOCK work with CWaitableCriticalSection (diff) | |
| download | discoin-190bf62be1214b072513c7fd7e01cc191723967c.tar.xz discoin-190bf62be1214b072513c7fd7e01cc191723967c.zip | |
scripted-diff: Small locking rename
Call sync.h primitives "locks" and "mutexes" instead of "blocks" and "waitable
critical sections" to match current coding conventions and c++11 standard
names.
This PR does not rename the "CCriticalSection" class (though this could be done
as a followup) because it is used everywhere and would swamp the other changes
in this PR. Plain mutexes should mostly be preferred instead of recursive
mutexes in new code anyway.
-BEGIN VERIFY SCRIPT-
set -x
set -e
ren() { git grep -l $1 | xargs sed -i s/$1/$2/; }
ren CCriticalBlock UniqueLock
ren CWaitableCriticalSection Mutex
ren CConditionVariable std::condition_variable
ren cs_GenesisWait g_genesis_wait_mutex
ren condvar_GenesisWait g_genesis_wait_cv
perl -0777 -pi -e 's/.*typedef.*condition_variable.*\n\n?//g' src/sync.h
-END VERIFY SCRIPT-
Diffstat (limited to 'src/httpserver.cpp')
| -rw-r--r-- | src/httpserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 200fcad61..326f7f6b6 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -69,7 +69,7 @@ class WorkQueue { private: /** Mutex protects entire object */ - CWaitableCriticalSection cs; + Mutex cs; std::condition_variable cond; std::deque<std::unique_ptr<WorkItem>> queue; bool running; |