X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-sig-handler.c;h=25a54378fa7a5ca19a7e4ec501e3d9d5ee3624e8;hb=98a5bca16007a7c4740c4326ef83768d034aed3e;hp=ad56392c6fe2cae8be11f216dc822bbd8887b3af;hpb=1d5157a6c68a790f7a50811f4a3b48b29ee82f58;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-sig-handler.c b/src/afb-sig-handler.c
index ad56392c..25a54378 100644
--- a/src/afb-sig-handler.c
+++ b/src/afb-sig-handler.c
@@ -21,12 +21,12 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/syscall.h>
 #include <setjmp.h>
 
+#include <afb/afb-req-itf.h>
+
 #include "afb-sig-handler.h"
+#include "afb-thread.h"
 #include "verbose.h"
 
 static _Thread_local sigjmp_buf *error_handler;
@@ -75,15 +75,39 @@ int afb_sig_handler_init()
 	return (install(on_signal_error, sigerr) & install(on_signal_terminate, sigterm)) - 1;
 }
 
+int afb_sig_req(struct afb_req req, void (*callback)(struct afb_req req))
+{
+	volatile int signum;
+	sigjmp_buf jmpbuf, *older;
+
+	older = error_handler;
+	signum = setjmp(jmpbuf);
+	if (signum != 0)
+		afb_req_fail_f(req, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
+	else {
+		error_handler = &jmpbuf;
+		callback(req);
+	}
+	error_handler = older;
+	return signum;
+}
+
+int afb_sig_req_timeout(struct afb_req req, void (*callback)(struct afb_req req), int timeout)
+{
+	int rc;
+
+	if (timeout)
+		afb_thread_timer_arm(timeout);
+	rc = afb_sig_req(req, callback);
+	afb_thread_timer_disarm();
+	return rc;
+}
+
 void afb_sig_monitor(void (*function)(int sig, void*), void *closure, int timeout)
 {
-	volatile int signum, timerset;
-	timer_t timerid;
+	volatile int signum;
 	sigjmp_buf jmpbuf, *older;
-	struct sigevent sevp;
-	struct itimerspec its;
 
-	timerset = 0;
 	older = error_handler;
 	signum = setjmp(jmpbuf);
 	if (signum != 0) {
@@ -91,28 +115,11 @@ void afb_sig_monitor(void (*function)(int sig, void*), void *closure, int timeou
 	}
 	else {
 		error_handler = &jmpbuf;
-		if (timeout > 0) {
-			timerset = 1; /* TODO: check statuses */
-			sevp.sigev_notify = SIGEV_THREAD_ID;
-			sevp.sigev_signo = SIGALRM;
-			sevp.sigev_value.sival_ptr = NULL;
-#if defined(sigev_notify_thread_id)
-			sevp.sigev_notify_thread_id = (pid_t)syscall(SYS_gettid);
-#else
-			sevp._sigev_un._tid = (pid_t)syscall(SYS_gettid);
-#endif
-			timer_create(CLOCK_THREAD_CPUTIME_ID, &sevp, &timerid);
-			its.it_interval.tv_sec = 0;
-			its.it_interval.tv_nsec = 0;
-			its.it_value.tv_sec = timeout;
-			its.it_value.tv_nsec = 0;
-			timer_settime(timerid, 0, &its, NULL);
-		}
-
+		if (timeout)
+			afb_thread_timer_arm(timeout);
 		function(0, closure);
 	}
-	if (timerset)
-		timer_delete(timerid);
+	afb_thread_timer_disarm();
 	error_handler = older;
 }