mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
bdf73e42de
Summary:
It looks like D9477181 conflicted with D9635507, causing a compile error:
```
eden/fs/utils/ProcessNameCache.cpp:74:15: error: no member named 'names' in 'folly::LockedPtr<folly::Synchronized<facebook::eden::ProcessNameCache::State, folly::SharedMutexImpl<false> >, folly::LockPolicyExclusive>'
state.names.emplace(pid, ProcessName{detail::readPidName(pid), now});
~~~~~ ^
eden/fs/utils/Synchronized.h:48:10: note: in instantiation of function template specialization 'facebook::eden::ProcessNameCache::add(pid_t)::(anonymous class)::operator()<folly::LockedPtr<folly::Synchronized<facebook::eden::ProcessNameCache::State, folly::SharedMutexImpl<false> >, folly::LockPolicyExclusive> >' requested here
return update(wlock);
^
eden/fs/utils/ProcessNameCache.cpp:58:3: note: in instantiation of function template specialization 'facebook::eden::tryRlockCheckBeforeUpdate<folly::Unit, facebook::eden::ProcessNameCache::State, (lambda), (lambda)>' requested here
tryRlockCheckBeforeUpdate<folly::Unit>(
^
eden/fs/utils/ProcessNameCache.cpp:81:15: error: no member named 'waterLevel' in 'folly::LockedPtr<folly::Synchronized<facebook::eden::ProcessNameCache::State, folly::SharedMutexImpl<false> >, folly::LockPolicyExclusive>'
state.waterLevel += 2;
~~~~~ ^
eden/fs/utils/ProcessNameCache.cpp:82:19: error: no member named 'waterLevel' in 'folly::LockedPtr<folly::Synchronized<facebook::eden::ProcessNameCache::State, folly::SharedMutexImpl<false> >, folly::LockPolicyExclusive>'
if (state.waterLevel > state.names.size()) {
~~~~~ ^
3 errors generated.
```
Dereference `state` to fix the error.
Reviewed By: chadaustin
Differential Revision: D9673324
fbshipit-source-id: 5143cd22baf66307e5aacb0a04669de69dde99e8
|
||
|---|---|---|
| .. | ||
| test | ||
| BucketedLog.h | ||
| Bug.cpp | ||
| Bug.h | ||
| Clock.cpp | ||
| Clock.h | ||
| CMakeLists.txt | ||
| DirType.h | ||
| FutureUnixSocket.cpp | ||
| FutureUnixSocket.h | ||
| HgCommand.cpp | ||
| HgCommand.h | ||
| IoFuture.cpp | ||
| IoFuture.h | ||
| LeaseCache.h | ||
| MappedDiskVector.h | ||
| PathFuncs.cpp | ||
| PathFuncs.h | ||
| PathMap.h | ||
| ProcessAccessLog.cpp | ||
| ProcessAccessLog.h | ||
| ProcessNameCache.cpp | ||
| ProcessNameCache.h | ||
| ProcUtil.cpp | ||
| ProcUtil.h | ||
| SortedInsert.h | ||
| SSLContext.cpp | ||
| SSLContext.h | ||
| Synchronized.h | ||
| SystemError.h | ||
| TimeUtil.cpp | ||
| TimeUtil.h | ||
| UnboundedQueueExecutor.cpp | ||
| UnboundedQueueExecutor.h | ||
| UnixSocket.cpp | ||
| UnixSocket.h | ||
| XAttr.cpp | ||
| XAttr.h | ||