From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 2/4] lib: export the exit handler interface Date: Wed, 22 May 2013 17:40:46 +0300 Message-ID: <1369233648-5873-2-git-send-email-imre.deak@intel.com> References: <1369233648-5873-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id 219ABE63E1 for ; Wed, 22 May 2013 07:40:54 -0700 (PDT) In-Reply-To: <1369233648-5873-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Signed-off-by: Imre Deak --- lib/drmtest.c | 7 +++---- lib/drmtest.h | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index 9fc03a0..16f5be1 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -1022,7 +1022,6 @@ static struct { bool installed; } orig_sig[MAX_SIGNALS]; -typedef void (*drmtest_exit_handler_t)(int sig); static drmtest_exit_handler_t exit_handler_fn[MAX_EXIT_HANDLERS]; static int exit_handler_count; static bool exit_handler_disabled; @@ -1101,7 +1100,7 @@ static void drmtest_sig_handler(int sig) * The handler will be passed the signal number if called due to a signal, or * 0 otherwise. */ -static int drmtest_install_exit_handler(drmtest_exit_handler_t fn) +int drmtest_install_exit_handler(drmtest_exit_handler_t fn) { int i; @@ -1131,7 +1130,7 @@ err: return -1; } -static void drmtest_disable_exit_handler(void) +void drmtest_disable_exit_handler(void) { sigset_t set; int i; @@ -1151,7 +1150,7 @@ static void drmtest_disable_exit_handler(void) exit_handler_disabled = true; } -static void drmtest_enable_exit_handler(void) +void drmtest_enable_exit_handler(void) { if (!exit_handler_disabled) return; diff --git a/lib/drmtest.h b/lib/drmtest.h index 6f78102..7202ad5 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -132,4 +132,10 @@ inline static void _do_or_die(const char *function, int line, int ret) #define do_or_die(x) _do_or_die(__FUNCTION__, __LINE__, x) #define do_ioctl(fd, ptr, sz) do_or_die(drmIoctl((fd), (ptr), (sz))) +typedef void (*drmtest_exit_handler_t)(int sig); + +int drmtest_install_exit_handler(drmtest_exit_handler_t fn); +void drmtest_enable_exit_handler(void); +void drmtest_disable_exit_handler(void); + int drmtest_set_vt_graphics_mode(void); -- 1.8.1.2