xfs
[Top] [All Lists]

[PATCH 2/3] xfsprogs: misc uClibc patches: use POSIX signal API

To: xfs@xxxxxxxxxxx
Subject: [PATCH 2/3] xfsprogs: misc uClibc patches: use POSIX signal API
From: Joshua Kinard <kumba@xxxxxxxxxx>
Date: Mon, 18 Jan 2016 05:29:25 -0500
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1453112991; bh=SQrXF7V/gijXP41ISzmi0nfGmaGFNtPkMDDRl2LIYpg=; h=Received:Received:From:Subject:To:Message-ID:Date:MIME-Version: Content-Type; b=QBaYLqaarCjDoccGj5sAEVsHFK9zbzrn4djRF2EuFoaYFJDifa5+5pxxmPR3u7Jm/ T9fHnlAWQ6QcxZ/TTaSsbCvLr7QerPHPvndDXeQp6NBq93KDE1l0Md04ronpKOgE9y E5ycdd+KQljAT6rBxiegVPsYN5T2O2RzALJs0x4FDo1VFE8WrJeW7bWMapYRLEpuJb DLYSUjWIT+PhV6Tvxpvh46ph9hd4VukVbY33G/iOatHCJPcWSTep1Crzs5UW5qC/rI b8LC1TCHRoiC8+zxHphFgTKVnnPBjR9i1EqD4tDDd4EM9iz+/ThS5amfdfHc7MK5Ns xXhQkYc/B8wDQ==
User-agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:42.0) Gecko/20100101 Thunderbird/42.0
From: Joshua Kinard <kumba@xxxxxxxxxx>

uClibc doesn't provide the sigrelse or sighold calls, so this patch replaces
them with POSIX signal API calls (sigprocmask(2), etc).

Refer to Gentoo Bug #477758:
https://bugs.gentoo.org/show_bug.cgi?id=477758

Signed-off-by: Joshua Kinard <kumba@xxxxxxxxxx>
Suggested-by: Renà RhÃaume <rene.rheaume@xxxxxxxxx>
---
 copy/xfs_copy.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff -Naurp xfsprogs-4.3.0.orig/copy/xfs_copy.c xfsprogs-4.3.0/copy/xfs_copy.c
--- xfsprogs-4.3.0.orig/copy/xfs_copy.c 2015-10-15 21:31:26.000000000 +0000
+++ xfsprogs-4.3.0/copy/xfs_copy.c      2016-01-01 10:53:04.722229000 +0000
@@ -75,6 +75,16 @@ static int   format_logs(struct xfs_mount
 #define LAST   0x10            /* final message we print */
 
 void
+signal_maskfunc(int addset, int newset)
+{
+       sigset_t set;
+
+       sigemptyset(&set);
+       sigaddset(&set, addset);
+       sigprocmask(newset, &set, NULL);
+}
+
+void
 do_message(int flags, int code, const char *fmt, ...)
 {
        va_list ap;
@@ -477,9 +487,9 @@ write_wbuf(void)
                if (target[i].state != INACTIVE)
                        pthread_mutex_unlock(&targ[i].wait);    /* wake up */
 
-       sigrelse(SIGCHLD);
+       signal_maskfunc(SIGCHLD, SIG_UNBLOCK);
        pthread_mutex_lock(&mainwait);
-       sighold(SIGCHLD);
+       signal_maskfunc(SIGCHLD, SIG_BLOCK);
 }
 
 void
@@ -893,7 +903,7 @@ main(int argc, char **argv)
        /* set up sigchild signal handler */
 
        signal(SIGCHLD, handler);
-       sighold(SIGCHLD);
+       signal_maskfunc(SIGCHLD, SIG_BLOCK);
 
        /* make children */
 


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 2/3] xfsprogs: misc uClibc patches: use POSIX signal API, Joshua Kinard <=