xfs
[Top] [All Lists]

[PATCH] xfsprogs: xfs_copy: use exit() to replace killall()

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfsprogs: xfs_copy: use exit() to replace killall()
From: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Date: Sun, 4 May 2014 15:44:15 +0800
Cc: joe.jin@xxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
Sending a SIGKILL signal to child thread will terminate the whole process,
xfs_copy will return an error value 137. This cause confuse for script to
know whether the copy successes.

Calling exit() in main thread can terminate the whole process and return the
right value.

Cc: Joe Jin <joe.jin@xxxxxxxxxx>
Signed-off-by: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
---
 copy/xfs_copy.c |   33 +++------------------------------
 1 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 39517da..1419ce7 100644
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -217,25 +217,6 @@ handle_error:
 }
 
 void
-killall(void)
-{
-       int i;
-
-       /* only the parent gets to kill things */
-
-       if (getpid() != parent_pid)
-               return;
-
-       for (i = 0; i < num_targets; i++)  {
-               if (target[i].state == ACTIVE)  {
-                       /* kill up target threads */
-                       pthread_kill(target[i].pid, SIGKILL);
-                       pthread_mutex_unlock(&targ[i].wait);
-               }
-       }
-}
-
-void
 handler(int sig)
 {
        pid_t   pid = getpid();
@@ -400,8 +381,7 @@ read_wbuf(int fd, wbuf *buf, xfs_mount_t *mp)
        if (buf->length > buf->size)  {
                do_warn(_("assert error:  buf->length = %d, buf->size = %d\n"),
                        buf->length, buf->size);
-               killall();
-               abort();
+               exit(1);
        }
 
        if ((res = read(fd, buf->data, buf->length)) < 0)  {
@@ -591,11 +571,6 @@ main(int argc, char **argv)
 
        parent_pid = getpid();
 
-       if (atexit(killall))  {
-               do_log(_("%s: couldn't register atexit function.\n"), progname);
-               die_perror();
-       }
-
        /* open up source -- is it a file? */
 
        open_flags = O_RDONLY;
@@ -1154,10 +1129,8 @@ main(int argc, char **argv)
        }
 
        check_errors();
-       killall();
-       pthread_exit(NULL);
-       /*NOTREACHED*/
-       return 0;
+
+       exit(0);
 }
 
 xfs_caddr_t
-- 
1.7.1

<Prev in Thread] Current Thread [Next in Thread>