From c961f3a6a06102ff69f5243dae8c0e74439f0236 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Fri, 26 Jun 2015 14:45:33 +0200
Subject: emugl: Disable signals from render and window threads.

Change-Id: Ifb4ae36fc4b112050726dcdab097635c61396acc
---
 distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp | 8 ++++++++
 distrib/android-emugl/host/libs/libOpenglRender/RenderWindow.cpp | 9 +++++++++
 2 files changed, 17 insertions(+)

(limited to 'distrib')

diff --git a/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp b/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp
index d492709fd0..7c91271b8f 100644
--- a/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp
+++ b/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp
@@ -20,6 +20,8 @@
 #include "TcpStream.h"
 #ifndef _WIN32
 #include "UnixStream.h"
+#include <signal.h>
+#include <pthread.h>
 #endif
 #ifdef _WIN32
 #include "Win32PipeStream.h"
@@ -86,6 +88,12 @@ intptr_t RenderServer::main()
 {
     RenderThreadsSet threads;
 
+#ifndef _WIN32
+    sigset_t set;
+    sigfillset(&set);
+    pthread_sigmask(SIG_SETMASK, &set, NULL);
+#endif
+
     while(1) {
         SocketStream *stream = m_listenSock->accept();
         if (!stream) {
diff --git a/distrib/android-emugl/host/libs/libOpenglRender/RenderWindow.cpp b/distrib/android-emugl/host/libs/libOpenglRender/RenderWindow.cpp
index fe42871790..1063230f0d 100644
--- a/distrib/android-emugl/host/libs/libOpenglRender/RenderWindow.cpp
+++ b/distrib/android-emugl/host/libs/libOpenglRender/RenderWindow.cpp
@@ -21,6 +21,10 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#ifndef _WIN32
+#include <signal.h>
+#include <pthread.h>
+#endif
 
 #define DEBUG 0
 
@@ -245,6 +249,11 @@ public:
 
     virtual intptr_t main() {
         D("Entering render window thread thread\n");
+#ifndef _WIN32
+        sigset_t set;
+        sigfillset(&set);
+        pthread_sigmask(SIG_SETMASK, &set, NULL);
+#endif
         bool running = true;
         while (running) {
             RenderWindowMessage msg;
-- 
cgit v1.2.3