strace: terminate itself if interrupted by a signal

[strace] / tests / getcpu.c

diff --git a/tests/getcpu.c b/tests/getcpu.c
index baef1bb4928b88a2479fbbd5db275e892254b7aa..6e1f548471c8e467fa730bc677c6e7a3972dbf54 100644 (file)
--- a/tests/getcpu.c
+++ b/tests/getcpu.c
@@ -1,30 +1,11 @@
 /*
  * Check decoding of getcpu syscall.
  *
- * Copyright (c) 2016 Eugene Syromiatnikov <evgsyr@gmail.com>
+ * Copyright (c) 2016 Eugene Syromyatnikov <evgsyr@gmail.com>
+ * Copyright (c) 2016-2017 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"
@@ -39,17 +20,17 @@
 int
 main(void)
 {
-       static const unsigned *bogus_cpu =
-               (unsigned *) (unsigned long) 0xfffffeedfffffaceULL;
-       static const unsigned *bogus_node =
-               (unsigned *) (unsigned long) 0xfffffca7ffffc0deULL;
-       static const unsigned *bogus_tcache =
-               (unsigned *) (unsigned long) 0xffffda7affffdeadULL;
+       unsigned *bogus_cpu =
+               (unsigned *) tail_alloc(sizeof(*bogus_cpu)) + 1;
+       unsigned *bogus_node =
+               (unsigned *) tail_alloc(sizeof(*bogus_node)) + 1;
+       unsigned *bogus_tcache =
+               (unsigned *) tail_alloc(sizeof(*bogus_tcache)) + 1;
 
        long res;
-       unsigned *cpu = tail_alloc(sizeof(*cpu));
-       unsigned *node = tail_alloc(sizeof(*node));
-       long * tcache = tail_alloc(128);
+       TAIL_ALLOC_OBJECT_CONST_PTR(unsigned, cpu);
+       TAIL_ALLOC_OBJECT_CONST_PTR(unsigned, node);
+       long *tcache = tail_alloc(128);
 
        res = syscall(__NR_getcpu, NULL, NULL, NULL);
        printf("getcpu(NULL, NULL, NULL) = %s\n", sprintrc(res));