256c124f94
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
|
||
|---|---|---|
| .. | ||
| AbstractTimelineMarker.cpp | ||
| AbstractTimelineMarker.h | ||
| AutoGlobalTimelineMarker.cpp | ||
| AutoGlobalTimelineMarker.h | ||
| AutoRestyleTimelineMarker.cpp | ||
| AutoRestyleTimelineMarker.h | ||
| AutoTimelineMarker.cpp | ||
| AutoTimelineMarker.h | ||
| CompositeTimelineMarker.h | ||
| ConsoleTimelineMarker.h | ||
| DocLoadingTimelineMarker.h | ||
| EventTimelineMarker.h | ||
| JavascriptTimelineMarker.h | ||
| LayerTimelineMarker.h | ||
| MarkersStorage.cpp | ||
| MarkersStorage.h | ||
| MessagePortTimelineMarker.h | ||
| ObservedDocShell.cpp | ||
| ObservedDocShell.h | ||
| RestyleTimelineMarker.h | ||
| TimelineConsumers.cpp | ||
| TimelineConsumers.h | ||
| TimelineMarker.cpp | ||
| TimelineMarker.h | ||
| TimelineMarkerEnums.h | ||
| TimestampTimelineMarker.h | ||
| WorkerTimelineMarker.h | ||
| moz.build | ||
| readme.md | ||
readme.md
#Timeline
The files in this directory are concerned with providing the backend platform features required for the developer tools interested in tracking down operations done in Gecko. The mechanism we use to define these operations are markers.
Examples of traced operations include:
- Style Recalculation
- Layout
- Painting
- JavaScript run-to-completion
- HTML parsing
- etc.
The traced operations are displayed in the DevTools Performance tool's timeline.
This is an overview of how everything works and can be extended.
##MarkersStorage
A MarkersStorage is an abstract class defining a place where timeline markers may be held. It defines an interface with pure virtual functions to highlight how this storage can be interacted with:
AddMarker: adding a marker, from the main thread onlyAddOTMTMarker: adding a marker off the main thread onlyClearMarkers: clearing all accumulated markers (both from the main thread and off it)PopMarkers: popping all accumulated markers (both from the main thread and off it).
Note on why we handle on/off the main thread markers separately: since most of our markers will come from the main thread, we can be a little more efficient and avoid dealing with multithreading scenarios until all the markers are actually cleared or popped in ClearMarkers or PopMarkers. Main thread markers may only be added via AddMarker, while off the main thread markers may only be added via AddOTMTMarker. Clearing and popping markers will yield until all operations involving off the main thread markers finish. When popping, the markers accumulated off the main thread will be moved over. We expect popping to be fairly infrequent (every few hundred milliseconds, currently we schedule this to happen every 200ms).
##ObservedDocShell
The only implementation of a MarkersStorage we have right now is an ObservedDocShell.
Instances of ObservedDocShell accumulate markers that are mostly about a particular docshell. At a high level, for example, an ObservedDocshell would be created when a timeline tool is opened on a page. It is reasonable to assume that most operations which are interesting for that particular page happen on the main thread. However certain operations may happen outside of it, yet are interesting for its developers, for which markers can be created as well (e.g. web audio stuff, service workers etc.). It is also reasonable to assume that a docshell may sometimes not be easily accessible from certain parts of the platform code, but for which markers still need to be created.
Therefore, the following scenarios arise:
-
a). creating a marker on the main thread about a particular docshell
-
b). creating a marker on the main thread without pinpointing to an affected docshell (unlikely, but allowed; in this case such a marker would have to be stored in all currently existing
ObservedDocShellinstances) -
c). creating a marker off the main thread about a particular docshell (impossible; docshells can't be referenced outside the main thread, in which case some other type of identification mechanism needs to be put in place).
-
d). creating a marker off the main thread without pinpointing to a particular docshell (same path as c. here, such a marker would have to be stored in all currently existing
ObservedDocShellinstances).
An observed docshell (in other words, "a docshell for which a timeline tool was opened") can thus receive both main thread and off the main thread markers.
Cross-process markers are unnecessary at the moment, but tracked in bug 1200120.
##TimelineConsumers
A TimelineConsumer is a singleton that facilitates access to ObservedDocShell instances. This is where a docshell can register/unregister itself as being observed via the AddConsumer and RemoveConsumer methods.
All markers may only be stored via this singleton. Certain helper methods are available:
-
Main thread only
AddMarkerForDocShell(nsDocShell*, const char*, MarkerTracingType)AddMarkerForDocShell(nsDocShell*, const char*, const TimeStamp&, MarkerTracingType)AddMarkerForDocShell(nsDocShell*, UniquePtr<AbstractTimelineMarker>&&) -
Any thread
AddMarkerForAllObservedDocShells(const char*, MarkerTracingType)AddMarkerForAllObservedDocShells(const char*, const TimeStamp&, MarkerTracingType)AddMarkerForAllObservedDocShells(UniquePtr<AbstractTimelineMarker>&)
The "main thread only" methods deal with point a). described above. The "any thread" methods deal with points b). and d).
##AbstractTimelineMarker
All markers inherit from this abstract class, providing a simple thread-safe extendable blueprint.
Markers are readonly after instantiation, and will always be identified by a name, a timestamp and their tracing type (START, END, TIMESTAMP). It should not make sense to modify their data after their creation.
There are only two accessible constructors:
AbstractTimelineMarker(const char*, MarkerTracingType)
AbstractTimelineMarker(const char*, const TimeStamp&, MarkerTracingType)
which create a marker with a name and a tracing type. If unspecified, the corresponding timestamp will be the current instantiation time. Instantiating a marker much later after a particular operation is possible, but be careful providing the correct timestamp.
The AddDetails virtual method should be implemented by subclasses when creating WebIDL versions of these markers, which will be sent over to a JavaScript frontend.
##TimelineMarker
A TimelineMarker is the main AbstractTimelineMarker implementation. They allow attaching a JavaScript stack on START and TIMESTAMP markers.
These markers will be created when using the TimelineConsumers helper methods which take in a string, a tracing type and (optionally) a timestamp. For more complex markers, subclasses are encouraged. See EventTimelineMarker or ConsoleTimelineMarker for some examples.
##RAII
mozilla::AutoTimelineMarker
The easiest way to trace Gecko events/tasks with start and end timeline markers is to use the mozilla::AutoTimelineMarker RAII class. It automatically adds the start marker on construction, and adds the end marker on destruction. Don't worry too much about potential performance impact! It only actually adds the markers when the given docshell is being observed by a timeline consumer, so essentially nothing will happen if a tool to inspect those markers isn't specifically open.
This class may only be used on the main thread, and pointer to a docshell is necessary. If the docshell is a nullptr, nothing happens and this operation fails silently.
Example: AutoTimelineMarker marker(aTargetNode->OwnerDoc()->GetDocShell(), "Parse HTML");
mozilla::AutoGlobalTimelineMarker`
Similar to the previous RAII class, but doesn't expect a specific docshell, and the marker will be visible in all timeline consumers. This is useful for generic operations that don't involve a particular docshell, or where a docshell isn't accessible. May also only be used on the main thread.
Example: AutoGlobalTimelineMarker marker("Some global operation");