2017-07-20 21:31:56 +03:00
|
|
|
/* -*- 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 http://mozilla.org/MPL/2.0/. */
|
|
|
|
|
|
|
|
#ifndef mozilla_HangDetails_h
|
|
|
|
#define mozilla_HangDetails_h
|
|
|
|
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
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
2020-01-20 19:19:48 +03:00
|
|
|
#include <utility>
|
|
|
|
|
2017-07-20 21:31:56 +03:00
|
|
|
#include "ipc/IPCMessageUtils.h"
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
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
2020-01-20 19:19:48 +03:00
|
|
|
#include "mozilla/HangAnnotations.h"
|
|
|
|
#include "mozilla/HangTypes.h"
|
2017-07-20 21:31:56 +03:00
|
|
|
#include "mozilla/ProcessedStack.h"
|
|
|
|
#include "mozilla/RefPtr.h"
|
2019-11-22 01:41:00 +03:00
|
|
|
#include "mozilla/Result.h"
|
2017-12-07 13:35:36 +03:00
|
|
|
#include "mozilla/TimeStamp.h"
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
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
2020-01-20 19:19:48 +03:00
|
|
|
#include "nsIHangDetails.h"
|
|
|
|
#include "nsTArray.h"
|
2017-07-20 21:31:56 +03:00
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
|
2019-11-22 01:41:00 +03:00
|
|
|
enum class PersistedToDisk {
|
|
|
|
No,
|
|
|
|
Yes,
|
|
|
|
};
|
|
|
|
|
2017-07-20 21:31:56 +03:00
|
|
|
/**
|
|
|
|
* HangDetails is the concrete implementaion of nsIHangDetails, and contains the
|
|
|
|
* infromation which we want to expose to observers of the bhr-thread-hang
|
|
|
|
* observer notification.
|
|
|
|
*/
|
|
|
|
class nsHangDetails : public nsIHangDetails {
|
|
|
|
public:
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
|
|
NS_DECL_NSIHANGDETAILS
|
|
|
|
|
2019-11-22 01:41:00 +03:00
|
|
|
explicit nsHangDetails(HangDetails&& aDetails,
|
|
|
|
PersistedToDisk aPersistedToDisk)
|
|
|
|
: mDetails(std::move(aDetails)), mPersistedToDisk(aPersistedToDisk) {}
|
2017-07-20 21:31:56 +03:00
|
|
|
|
|
|
|
// Submit these HangDetails to the main thread. This will dispatch a runnable
|
|
|
|
// to the main thread which will fire off the bhr-thread-hang observer
|
|
|
|
// notification with this HangDetails as the subject.
|
|
|
|
void Submit();
|
|
|
|
|
|
|
|
private:
|
|
|
|
virtual ~nsHangDetails() {}
|
|
|
|
|
|
|
|
HangDetails mDetails;
|
2019-11-22 01:41:00 +03:00
|
|
|
PersistedToDisk mPersistedToDisk;
|
2017-07-20 21:31:56 +03:00
|
|
|
};
|
|
|
|
|
2019-11-22 01:41:00 +03:00
|
|
|
Result<Ok, nsresult> WriteHangDetailsToFile(HangDetails& aDetails,
|
|
|
|
nsIFile* aFile);
|
|
|
|
|
2017-07-20 21:31:56 +03:00
|
|
|
/**
|
|
|
|
* This runnable is run on the StreamTransportService threadpool in order to
|
|
|
|
* process the stack off main thread before submitting it to the main thread as
|
|
|
|
* an observer notification.
|
|
|
|
*
|
|
|
|
* This object should have the only remaining reference to aHangDetails, as it
|
|
|
|
* will access its fields without synchronization.
|
|
|
|
*/
|
|
|
|
class ProcessHangStackRunnable final : public Runnable {
|
|
|
|
public:
|
2019-11-22 01:41:00 +03:00
|
|
|
explicit ProcessHangStackRunnable(HangDetails&& aHangDetails,
|
|
|
|
PersistedToDisk aPersistedToDisk)
|
2017-07-20 21:31:56 +03:00
|
|
|
: Runnable("ProcessHangStackRunnable"),
|
2019-11-22 01:41:00 +03:00
|
|
|
mHangDetails(std::move(aHangDetails)),
|
|
|
|
mPersistedToDisk(aPersistedToDisk) {}
|
2017-07-20 21:31:56 +03:00
|
|
|
|
|
|
|
NS_IMETHOD Run() override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
HangDetails mHangDetails;
|
2019-11-22 01:41:00 +03:00
|
|
|
PersistedToDisk mPersistedToDisk;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This runnable handles checking whether our last session wrote a permahang to
|
|
|
|
* disk which we were unable to submit through telemetry. If so, we read the
|
|
|
|
* permahang out and try again to submit it.
|
|
|
|
*/
|
|
|
|
class SubmitPersistedPermahangRunnable final : public Runnable {
|
|
|
|
public:
|
|
|
|
explicit SubmitPersistedPermahangRunnable(nsIFile* aPermahangFile)
|
|
|
|
: Runnable("SubmitPersistedPermahangRunnable"),
|
|
|
|
mPermahangFile(aPermahangFile) {}
|
|
|
|
|
|
|
|
NS_IMETHOD Run() override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
nsCOMPtr<nsIFile> mPermahangFile;
|
2017-07-20 21:31:56 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
#endif // mozilla_HangDetails_h
|