author Markus Stange <>
Tue, 05 May 2020 22:00:49 +0000
changeset 528274 aea741f601bdd780aa5ce08d584dbae822a35f46
parent 528273 83bf4959aa4abd71b0069da41ee509a55f8b514c
permissions -rw-r--r--
Bug 1634784 - Remove #ifdef MOZ_GECKO_PROFILER wrappers in mozglue/baseprofiler cpp files, and reorder includes. r=gerald I apologize for mixing multiple types of changes in this patch. The mix is probably harder to review than necessary. Because of the way these .cpp files are listed in mozglue/baseprofiler/, they are only built when MOZ_GECKO_PROFILER is set. So the #ifdef MOZ_GECKO_PROFILER wrapper is now unnecessary. Removing this wrapper has many knock-on effects on other lines in these files due to preprocessor line indentation. As I was removing the #ifdefs, I was reordering includes as well, to follow the include order laid out on ; namely, system headers should go before "your project's" .h files. I also removed the BaseProfiler.h include from some files but not from all. In the past, the BaseProfiler.h include served the purpose of picking up the MOZ_BASE_PROFILER #define, and it's no longer needed for that reason. There are probably lots of now-unnecessary BaseProfiler.h includes left. Differential Revision:

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 * vim: set ts=8 sts=2 et sw=2 tw=80:
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at */

#include "BaseProfilingStack.h"

#include <algorithm>

#include "mozilla/IntegerRange.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/UniquePtrExtensions.h"

#include "BaseProfiler.h"

namespace mozilla {
namespace baseprofiler {

ProfilingStack::~ProfilingStack() {
  // The label macros keep a reference to the ProfilingStack to avoid a TLS
  // access. If these are somehow not all cleared we will get a
  // use-after-free so better to crash now.
  MOZ_RELEASE_ASSERT(stackPointer == 0);

  delete[] frames;

void ProfilingStack::ensureCapacitySlow() {
  MOZ_ASSERT(stackPointer >= capacity);
  const uint32_t kInitialCapacity = 128;

  uint32_t sp = stackPointer;
  auto newCapacity =
      std::max(sp + 1, capacity ? capacity * 2 : kInitialCapacity);

  auto* newFrames = new ProfilingStackFrame[newCapacity];

  // It's important that `frames` / `capacity` / `stackPointer` remain
  // consistent here at all times.
  for (auto i : IntegerRange(capacity)) {
    newFrames[i] = frames[i];

  ProfilingStackFrame* oldFrames = frames;
  frames = newFrames;
  capacity = newCapacity;
  delete[] oldFrames;

}  // namespace baseprofiler
}  // namespace mozilla