blob: 928d1511ba43884e0976a2ab0e0d606a80e8e4f0 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2021-07-19 18:45:17 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.cc
@@ -88,7 +88,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t
}
#endif
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
tty_file_ = base::OpenFile(
base::FilePath(FILE_PATH_LITERAL("/sys/class/tty/tty0/active")), "r");
UpdateActiveTTY();
@@ -116,7 +116,7 @@ GpuWatchdogThread::~GpuWatchdogThread() {
CloseHandle(watched_thread_handle_);
#endif
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
if (tty_file_)
fclose(tty_file_);
#endif
@@ -449,7 +449,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() {
if (foregrounded_event_)
num_of_timeout_after_foregrounded_++;
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
UpdateActiveTTY();
#endif
@@ -782,7 +782,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded()
return foregrounded_event_ && num_of_timeout_after_foregrounded_ <= count;
}
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
void GpuWatchdogThread::UpdateActiveTTY() {
last_active_tty_ = active_tty_;
@@ -799,7 +799,7 @@ void GpuWatchdogThread::UpdateActiveTTY() {
#endif
bool GpuWatchdogThread::ContinueOnNonHostX11ServerTty() {
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
if (host_tty_ == -1 || active_tty_ == -1)
return false;
|
