tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/src/main/native/darwin/sleep_prevention_jni.cc b/src/main/native/darwin/sleep_prevention_jni.cc
2index 67c35b201e..e50a58320e 100644
3--- a/src/main/native/darwin/sleep_prevention_jni.cc
4+++ b/src/main/native/darwin/sleep_prevention_jni.cc
5@@ -33,31 +33,13 @@ static int g_sleep_state_stack = 0;
6 static IOPMAssertionID g_sleep_state_assertion = kIOPMNullAssertionID;
7
8 int portable_push_disable_sleep() {
9- std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
10- BAZEL_CHECK_GE(g_sleep_state_stack, 0);
11- if (g_sleep_state_stack == 0) {
12- BAZEL_CHECK_EQ(g_sleep_state_assertion, kIOPMNullAssertionID);
13- CFStringRef reasonForActivity = CFSTR("build.bazel");
14- IOReturn success = IOPMAssertionCreateWithName(
15- kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, reasonForActivity,
16- &g_sleep_state_assertion);
17- BAZEL_CHECK_EQ(success, kIOReturnSuccess);
18- }
19- g_sleep_state_stack += 1;
20- return 0;
21+ // Unreliable, disable for now
22+ return -1;
23 }
24
25 int portable_pop_disable_sleep() {
26- std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
27- BAZEL_CHECK_GT(g_sleep_state_stack, 0);
28- g_sleep_state_stack -= 1;
29- if (g_sleep_state_stack == 0) {
30- BAZEL_CHECK_NE(g_sleep_state_assertion, kIOPMNullAssertionID);
31- IOReturn success = IOPMAssertionRelease(g_sleep_state_assertion);
32- BAZEL_CHECK_EQ(success, kIOReturnSuccess);
33- g_sleep_state_assertion = kIOPMNullAssertionID;
34- }
35- return 0;
36+ // Unreliable, disable for now
37+ return -1;
38 }
39
40 } // namespace blaze_jni
41diff --git a/src/main/native/darwin/system_suspension_monitor_jni.cc b/src/main/native/darwin/system_suspension_monitor_jni.cc
42index 3483aa7935..51782986ec 100644
43--- a/src/main/native/darwin/system_suspension_monitor_jni.cc
44+++ b/src/main/native/darwin/system_suspension_monitor_jni.cc
45@@ -83,10 +83,7 @@ void portable_start_suspend_monitoring() {
46 // Register to receive system sleep notifications.
47 // Testing needs to be done manually. Use the logging to verify
48 // that sleeps are being caught here.
49- suspend_state.connect_port = IORegisterForSystemPower(
50- &suspend_state, ¬ifyPortRef, SleepCallBack, ¬ifierObject);
51- BAZEL_CHECK_NE(suspend_state.connect_port, MACH_PORT_NULL);
52- IONotificationPortSetDispatchQueue(notifyPortRef, queue);
53+ // XXX: Unreliable, disable for now
54
55 // Register to deal with SIGCONT.
56 // We register for SIGCONT because we can't catch SIGSTOP.