diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /xpcom/base/AvailableMemoryWatcherMac.cpp | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom/base/AvailableMemoryWatcherMac.cpp')
-rw-r--r-- | xpcom/base/AvailableMemoryWatcherMac.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/xpcom/base/AvailableMemoryWatcherMac.cpp b/xpcom/base/AvailableMemoryWatcherMac.cpp index d6f2d16b30..de6901f8d5 100644 --- a/xpcom/base/AvailableMemoryWatcherMac.cpp +++ b/xpcom/base/AvailableMemoryWatcherMac.cpp @@ -95,11 +95,11 @@ class nsAvailableMemoryWatcher final : public nsITimerCallback, void AddParentAnnotation(CrashReporter::Annotation aAnnotation, nsAutoCString aString) { - CrashReporter::AnnotateCrashReport(aAnnotation, aString); + CrashReporter::RecordAnnotationNSCString(aAnnotation, aString); } void AddParentAnnotation(CrashReporter::Annotation aAnnotation, uint32_t aData) { - CrashReporter::AnnotateCrashReport(aAnnotation, aData); + CrashReporter::RecordAnnotationU32(aAnnotation, aData); } void LowMemoryResponse(); @@ -251,18 +251,18 @@ nsresult nsAvailableMemoryWatcher::Init() { // Set the initial state of all annotations for parent crash reports. // Content process crash reports are set when a crash occurs and // AddChildAnnotations() is called. - CrashReporter::AnnotateCrashReport( + CrashReporter::RecordAnnotationNSCString( CrashReporter::Annotation::MacMemoryPressure, mLevelStr); - CrashReporter::AnnotateCrashReport( + CrashReporter::RecordAnnotationNSCString( CrashReporter::Annotation::MacMemoryPressureNormalTime, mNormalTimeStr); - CrashReporter::AnnotateCrashReport( + CrashReporter::RecordAnnotationNSCString( CrashReporter::Annotation::MacMemoryPressureWarningTime, mWarningTimeStr); - CrashReporter::AnnotateCrashReport( + CrashReporter::RecordAnnotationNSCString( CrashReporter::Annotation::MacMemoryPressureCriticalTime, mCriticalTimeStr); - CrashReporter::AnnotateCrashReport( + CrashReporter::RecordAnnotationU32( CrashReporter::Annotation::MacMemoryPressureSysctl, mLevelSysctl); - CrashReporter::AnnotateCrashReport( + CrashReporter::RecordAnnotationU32( CrashReporter::Annotation::MacAvailableMemorySysctl, mAvailMemSysctl); // To support running experiments, handle pref @@ -441,18 +441,18 @@ void nsAvailableMemoryWatcher::OnMemoryPressureChangedInternal( // Add all annotations to the provided crash reporter instance. void nsAvailableMemoryWatcher::AddChildAnnotations( const UniquePtr<ipc::CrashReporterHost>& aCrashReporter) { - aCrashReporter->AddAnnotation(CrashReporter::Annotation::MacMemoryPressure, - mLevelStr); - aCrashReporter->AddAnnotation( + aCrashReporter->AddAnnotationNSCString( + CrashReporter::Annotation::MacMemoryPressure, mLevelStr); + aCrashReporter->AddAnnotationNSCString( CrashReporter::Annotation::MacMemoryPressureNormalTime, mNormalTimeStr); - aCrashReporter->AddAnnotation( + aCrashReporter->AddAnnotationNSCString( CrashReporter::Annotation::MacMemoryPressureWarningTime, mWarningTimeStr); - aCrashReporter->AddAnnotation( + aCrashReporter->AddAnnotationNSCString( CrashReporter::Annotation::MacMemoryPressureCriticalTime, mCriticalTimeStr); - aCrashReporter->AddAnnotation( + aCrashReporter->AddAnnotationU32( CrashReporter::Annotation::MacMemoryPressureSysctl, mLevelSysctl); - aCrashReporter->AddAnnotation( + aCrashReporter->AddAnnotationU32( CrashReporter::Annotation::MacAvailableMemorySysctl, mAvailMemSysctl); } |