From 878714ab821b7e9618d5b176396983d680b0d67f Mon Sep 17 00:00:00 2001 From: Yurii Zubrytskyi Date: Fri, 30 Apr 2021 15:41:37 -0700 Subject: [PATCH] Add more info to IncrementalService::onDump() + suppress a couple lint warnings Bug: 184844615 Test: manual + check the dump output Change-Id: Ic1cf2a2fb519cc9e746c73816b1cb55f14d11279 --- services/incremental/IncrementalService.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp index f3e7d672ec95d..5299547fef67b 100644 --- a/services/incremental/IncrementalService.cpp +++ b/services/incremental/IncrementalService.cpp @@ -269,7 +269,10 @@ auto IncrementalService::IncFsMount::makeStorage(StorageId id) -> StorageMap::it template static auto makeCleanup(Func&& f) requires(!std::is_lvalue_reference_v) { - auto deleter = [f = std::move(f)](auto) { f(); }; + // ok to move a 'forwarding' reference here as lvalues are disabled anyway + auto deleter = [f = std::move(f)](auto) { // NOLINT + f(); + }; // &f is a dangling pointer here, but we actually never use it as deleter moves it in. return std::unique_ptr(&f, std::move(deleter)); } @@ -397,6 +400,7 @@ static long elapsedMcs(Duration start, Duration end) { void IncrementalService::onDump(int fd) { dprintf(fd, "Incremental is %s\n", incfs::enabled() ? "ENABLED" : "DISABLED"); + dprintf(fd, "IncFs features: 0x%x\n", int(mIncFs->features())); dprintf(fd, "Incremental dir: %s\n", mIncrementalDir.c_str()); std::unique_lock l(mLock); @@ -2562,7 +2566,9 @@ std::optional IncrementalService::DataLoaderStub::needToBind() { maxBindDelayMs) .count(); const auto bindDelayJitterRangeMs = bindDelayMs / Constants::bindDelayJitterDivider; - const auto bindDelayJitterMs = rand() % (bindDelayJitterRangeMs * 2) - bindDelayJitterRangeMs; + // rand() is enough, not worth maintaining a full-blown object for delay jitter + const auto bindDelayJitterMs = rand() % (bindDelayJitterRangeMs * 2) - // NOLINT + bindDelayJitterRangeMs; mPreviousBindDelay = std::chrono::milliseconds(bindDelayMs + bindDelayJitterMs); return mPreviousBindDelay; }