cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-02 09:46:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#34437: rpc: uptime should begin on application start

Browse Source 
e67a676df9af5ece5307438ae1b4ddb0730e3482 fix: uptime RPC returns 0 on first call (Lőrinc)

Pull request description:

  ### Problem
  #34328 switched uptime to use monotonic time, but `g_startup_time` was a function-local static in `GetUptime()`, meaning it was initialized on first call rather than at program start.
  This caused the first uptime RPC to always return 0.

  ### Fix
  Move `g_startup_time` to namespace scope so it initializes at program start, ensuring the first `uptime()` call returns actual elapsed time.

  ### Reproducer

  Revert the fix and run the test or alternatively:

  ```bash
  cmake -B build && cmake --build build --target bitcoind bitcoin-cli -j$(nproc)
  ./build/bin/bitcoind -regtest -daemon
  sleep 10
  ./build/bin/bitcoin-cli -regtest uptime
  ./build/bin/bitcoin-cli -regtest stop
  ```

  <details>
  <summary>Before (uptime is initialized on first call)</summary>

  ```bash
  Bitcoin Core starting
  0
  Bitcoin Core stopping
  ```

  </details>

  <details>
  <summary>After (first uptime call is in-line with sleep)</summary>

  ```bash
  Bitcoin Core starting
  10
  Bitcoin Core stopping
  ```
  </details>

  ----

  Fixes #34423, added reporter as coauthor.

ACKs for top commit:
  maflcko:
    lgtm ACK e67a676df9af5ece5307438ae1b4ddb0730e3482
  optout21:
    crACK e67a676df9af5ece5307438ae1b4ddb0730e3482
  carloantinarella:
    Tested ACK e67a676df9af5ece5307438ae1b4ddb0730e3482
  achow101:
    ACK e67a676df9af5ece5307438ae1b4ddb0730e3482
  musaHaruna:
    Tested ACK [e67a676](e67a676df9)

Tree-SHA512: b156f7ed15c3fbb50e8a15f6c9a0d4e2ffb956d0c6ef949e0f8a661a564a20c0d3ed2149fae75ce7e2baa9326788d5037e726e7a7ac2c6ef4e70e4862cd5763f
This commit is contained in:
Ava Chow 2026-02-05 17:02:37 -08:00
commit 9ec1ae0e98
No known key found for this signature in database
GPG Key ID: 17565732E08E5E41
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/system.cpp
View File

@ -127,8 +127,8 @@ std::optional<size_t> GetTotalRAM()
return std::nullopt;
}
SteadyClock::duration GetUptime()
{
static const auto g_startup_time{SteadyClock::now()};
return SteadyClock::now() - g_startup_time;
}
namespace {
const auto g_startup_time{SteadyClock::now()};
} // namespace
SteadyClock::duration GetUptime() { return SteadyClock::now() - g_startup_time; }

5
test/functional/rpc_uptime.py
View File

@ -26,8 +26,11 @@ class UptimeTest(BitcoinTestFramework):
assert_raises_rpc_error(-8, "Mocktime must be in the range [0, 9223372036], not -1.", self.nodes[0].setmocktime, -1)
def _test_uptime(self):
wait_time = 20_000
time.sleep(1) # Do some work before checking uptime
uptime_before = self.nodes[0].uptime()
assert uptime_before > 0, "uptime should begin at app start"
wait_time = 20_000
self.nodes[0].setmocktime(int(time.time()) + wait_time)
uptime_after = self.nodes[0].uptime()
self.nodes[0].setmocktime(0)