forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Backport #12783: macOS: disable AppNap during sync (and mixing) #3024
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// Copyright (c) 2011-2018 The Bitcoin Core developers | ||
// Distributed under the MIT software license, see the accompanying | ||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
||
#ifndef BITCOIN_QT_MACOS_APPNAP_H | ||
#define BITCOIN_QT_MACOS_APPNAP_H | ||
|
||
#include <memory> | ||
|
||
class CAppNapInhibitor final | ||
{ | ||
public: | ||
explicit CAppNapInhibitor(); | ||
~CAppNapInhibitor(); | ||
|
||
void disableAppNap(); | ||
void enableAppNap(); | ||
|
||
private: | ||
class CAppNapImpl; | ||
std::unique_ptr<CAppNapImpl> impl; | ||
}; | ||
|
||
#endif // BITCOIN_QT_MACOS_APPNAP_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
// Copyright (c) 2011-2018 The Bitcoin Core developers | ||
// Distributed under the MIT software license, see the accompanying | ||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
||
#include "macos_appnap.h" | ||
|
||
#include <AvailabilityMacros.h> | ||
#include <Foundation/NSProcessInfo.h> | ||
#include <Foundation/Foundation.h> | ||
|
||
class CAppNapInhibitor::CAppNapImpl | ||
{ | ||
public: | ||
~CAppNapImpl() | ||
{ | ||
if(activityId) | ||
enableAppNap(); | ||
} | ||
|
||
void disableAppNap() | ||
{ | ||
if (!activityId) | ||
{ | ||
@autoreleasepool { | ||
const NSActivityOptions activityOptions = | ||
NSActivityUserInitiatedAllowingIdleSystemSleep & | ||
~(NSActivitySuddenTerminationDisabled | | ||
NSActivityAutomaticTerminationDisabled); | ||
|
||
id processInfo = [NSProcessInfo processInfo]; | ||
if ([processInfo respondsToSelector:@selector(beginActivityWithOptions:reason:)]) | ||
{ | ||
activityId = [processInfo beginActivityWithOptions: activityOptions reason:@"Temporarily disable App Nap for dash-qt."]; | ||
[activityId retain]; | ||
} | ||
} | ||
} | ||
} | ||
|
||
void enableAppNap() | ||
{ | ||
if(activityId) | ||
{ | ||
@autoreleasepool { | ||
id processInfo = [NSProcessInfo processInfo]; | ||
if ([processInfo respondsToSelector:@selector(endActivity:)]) | ||
[processInfo endActivity:activityId]; | ||
|
||
[activityId release]; | ||
activityId = nil; | ||
} | ||
} | ||
} | ||
|
||
private: | ||
NSObject* activityId; | ||
}; | ||
|
||
CAppNapInhibitor::CAppNapInhibitor() : impl(new CAppNapImpl()) {} | ||
|
||
CAppNapInhibitor::~CAppNapInhibitor() = default; | ||
|
||
void CAppNapInhibitor::disableAppNap() | ||
{ | ||
impl->disableAppNap(); | ||
} | ||
|
||
void CAppNapInhibitor::enableAppNap() | ||
{ | ||
impl->enableAppNap(); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh my... :D
The original from Bitcoin was already bad...using the ternary operator as a replacement for if/else and at the same time relying on the side effects of the evaluation result... :D
Can you maybe change this to something as simple as:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated the code sample to use disableAppNap instead of enableAppNap
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about 7ffb163? :) (mostly the same as yours, just changed
if (privateSendClient.fPrivateSendRunning)
part)