Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Oct 2014 17:56:06 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r273389 - head/contrib/netbsd-tests/lib/libc/gen
Message-ID:  <201410211756.s9LHu6Q9098073@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Tue Oct 21 17:56:06 2014
New Revision: 273389
URL: https://svnweb.freebsd.org/changeset/base/273389

Log:
  Port lib/libc/gen/t_siginfo to FreeBSD
  
  - mcontext_t on FreeBSD doesn't have a __gregs field (it's split out on FreeBSD
  into separate fields). In order to avoid muddying the test code with MD code,
  the debugging trace info has not been implemented
  - FreeBSD does not implement the si_stime and si_utime fields in siginfo_t, so
  omit the debugging code that dumps the values
  - sys/inttypes.h doesn't exist on FreeBSD
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c

Modified: head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c	Tue Oct 21 17:17:40 2014	(r273388)
+++ head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c	Tue Oct 21 17:56:06 2014	(r273389)
@@ -29,7 +29,9 @@
 #include <atf-c.h>
 #include <atf-c/config.h>
 
+#if defined(__NetBSD__)
 #include <sys/inttypes.h>
+#endif
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
@@ -86,9 +88,11 @@ sig_debug(int signo, siginfo_t *info, uc
 		printf("uc_stack %p %lu 0x%x\n", ctx->uc_stack.ss_sp,
 		    (unsigned long)ctx->uc_stack.ss_size,
 		    ctx->uc_stack.ss_flags);
+#if defined(__NetBSD__)
 		for (i = 0; i < __arraycount(ctx->uc_mcontext.__gregs); i++)
 			printf("uc_mcontext.greg[%d] 0x%lx\n", i,
 			    (long)ctx->uc_mcontext.__gregs[i]);
+#endif
 	}
 }
 
@@ -141,8 +145,10 @@ sigchild_action(int signo, siginfo_t *in
 		printf("si_uid=%d\n", info->si_uid);
 		printf("si_pid=%d\n", info->si_pid);
 		printf("si_status=%d\n", info->si_status);
+#if defined(__NetBSD__)
 		printf("si_utime=%lu\n", (unsigned long int)info->si_utime);
 		printf("si_stime=%lu\n", (unsigned long int)info->si_stime);
+#endif
 	}
 	ATF_REQUIRE_EQ(info->si_code, code);
 	ATF_REQUIRE_EQ(info->si_signo, SIGCHLD);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410211756.s9LHu6Q9098073>