strace: terminate itself if interrupted by a signal

[strace] / tests / remap_file_pages.c

diff --git a/tests/remap_file_pages.c b/tests/remap_file_pages.c
index f861b30670562c7ecea555864ab6c7d475806067..3822e27f1b87495ae182e0020ac6c05c973be04e 100644 (file)
--- a/tests/remap_file_pages.c
+++ b/tests/remap_file_pages.c
@@ -5,31 +5,12 @@
  * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_remap_file_pages
 
@@ -61,12 +42,25 @@ main(void)
        kernel_ulong_t prot = PROT_READ|PROT_WRITE|PROT_EXEC;
        kernel_ulong_t pgoff = (kernel_ulong_t) 0xcaf3babebad4deedULL;
        kernel_ulong_t flags = MAP_PRIVATE|MAP_ANONYMOUS;
+# define prot1_str "PROT_READ|PROT_WRITE|PROT_EXEC"
+# define flags1_str "MAP_PRIVATE|MAP_ANONYMOUS"
 
        k_remap_file_pages(addr, size, prot, pgoff, flags);
+# if XLAT_RAW
+       printf("remap_file_pages(%#jx, %ju, %#jx, %ju, %#jx) = %s\n",
+              (uintmax_t) addr, (uintmax_t) size, (uintmax_t) prot,
+              (uintmax_t) pgoff, (uintmax_t) flags, errstr);
+# elif XLAT_VERBOSE
+       printf("remap_file_pages(%#jx, %ju, %#jx /* %s */, %ju, %#jx /* %s */)"
+              " = %s\n",
+              (uintmax_t) addr, (uintmax_t) size, (uintmax_t) prot, prot1_str,
+              (uintmax_t) pgoff, (uintmax_t) flags,
+              flags1_str, errstr);
+# else /* XLAT_ABBREV */
        printf("remap_file_pages(%#jx, %ju, %s, %ju, %s) = %s\n",
-              (uintmax_t) addr, (uintmax_t) size,
-              "PROT_READ|PROT_WRITE|PROT_EXEC",
-              (uintmax_t) pgoff, "MAP_PRIVATE|MAP_ANONYMOUS", errstr);
+              (uintmax_t) addr, (uintmax_t) size, prot1_str,
+              (uintmax_t) pgoff, flags1_str, errstr);
+# endif
 
 #ifdef MAP_HUGETLB
 # ifndef MAP_HUGE_2MB
@@ -81,22 +75,36 @@ main(void)
        flags = MAP_TYPE | MAP_FIXED | MAP_NORESERVE | MAP_HUGETLB | MAP_HUGE_2MB;
 
        k_remap_file_pages(addr, size, prot, pgoff, flags);
-       printf("remap_file_pages(%#jx, %ju, %s, %ju"
+
 /*
  * HP PA-RISC is the only architecture that has MAP_TYPE defined to 0x3, which
  * is also used for MAP_SHARED_VALIDATE since Linux commit v4.15-rc1~71^2^2~23.
  */
 # ifdef __hppa__
-              ", MAP_SHARED_VALIDATE"
+#  define MAP_TYPE_str "MAP_SHARED_VALIDATE"
 # else
-              ", 0xf /* MAP_??? */"
+#  define MAP_TYPE_str "0xf /* MAP_??? */"
 # endif
-              "|MAP_FIXED|MAP_NORESERVE|MAP_HUGETLB|21<<MAP_HUGE_SHIFT)"
+# define flags2_str \
+       MAP_TYPE_str "|MAP_FIXED|MAP_NORESERVE|MAP_HUGETLB|21<<MAP_HUGE_SHIFT"
+
+# if XLAT_RAW
+       printf("remap_file_pages(%#jx, %ju, %#jx, %ju, %#jx) = %s\n",
+              (uintmax_t) addr, (uintmax_t) size, (uintmax_t) prot,
+              (uintmax_t) pgoff, (uintmax_t) flags, errstr);
+# elif XLAT_VERBOSE
+       printf("remap_file_pages(%#jx, %ju, %#jx /* %s */, %ju, %#jx /* %s */)"
               " = %s\n",
+              (uintmax_t) addr, (uintmax_t) size, (uintmax_t) prot,
+              prot == PROT_NONE ? "PROT_NONE" : "PROT_???",
+              (uintmax_t) pgoff, (uintmax_t) flags, flags2_str, errstr);
+# else /* XLAT_ABBREV */
+       printf("remap_file_pages(%#jx, %ju, %s, %ju, %s) = %s\n",
               (uintmax_t) addr, (uintmax_t) size,
               prot == PROT_NONE ? "PROT_NONE" :
                                   "0xdefaced00000000 /* PROT_??? */",
-              (uintmax_t) pgoff, errstr);
+              (uintmax_t) pgoff, flags2_str, errstr);
+# endif
 #endif /* MAP_HUGETLB */
 
        puts("+++ exited with 0 +++");