2045529 - Make the assertion+check less weird in IdleTaskRunner::ResetTimer

Status: RESOLVED FIXED

(Core :: XPCOM, task)

Description

[Jens Stutte [:jstutte]]

Comment + assertion + equivalent check here:

    // We rely on timers that target the main thread to be infallible (except
    // for very late shutdown edge cases that should not occur, normally).
    nsresult rv = mTimer->InitWithNamedFuncCallback(
        TimedOut, this, aDelay.ToMilliseconds(), nsITimer::TYPE_ONE_SHOT,
        mName);
    if (NS_WARN_IF(NS_FAILED(rv))) {
      MOZ_ASSERT(
          AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMShutdownThreads));
      if (AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMShutdownThreads)) {
        Cancel();
      }
    } else ...

look a bit confusing. Maybe the following would make the intention easier to follow:

    nsresult rv = mTimer->InitWithNamedFuncCallback(
        TimedOut, this, aDelay.ToMilliseconds(), nsITimer::TYPE_ONE_SHOT,
        mName);
    if (NS_WARN_IF(NS_FAILED(rv))) {
      if (AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMShutdownThreads)) {
        Cancel();
      } else {
        MOZ_ASSERT_UNREACHABLE("We rely on timers that target the main thread to be infallible before shutdown.");
      }
    } else ...

Comment 1

[Jens Stutte [:jstutte]]

Attachment: Bug 2045529 - Make the assertion+check less weird in IdleTaskRunner::ResetTimer. r?smaug

Replace the redundant MOZ_ASSERT + duplicate IsInOrBeyond check with a
cleaner if/else: call Cancel() in the shutdown case, and use
MOZ_ASSERT_UNREACHABLE in the impossible non-shutdown case.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/d6bfff438523
https://hg.mozilla.org/integration/autoland/rev/290f1d01d400
Make the assertion+check less weird in IdleTaskRunner::ResetTimer. r=smaug

Comment 3

[Cristian Tuns]

https://hg.mozilla.org/mozilla-central/rev/290f1d01d400