Module Name: src
Committed By: christos
Date: Sun Apr 10 00:04:37 UTC 2011
Modified Files:
src/sys/sys: siginfo.h
Log Message:
Make lwpid part of siginfo so that it can be passed to userland.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/sys/siginfo.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/siginfo.h
diff -u src/sys/sys/siginfo.h:1.20 src/sys/sys/siginfo.h:1.21
--- src/sys/sys/siginfo.h:1.20 Sun Jan 2 13:12:01 2011
+++ src/sys/sys/siginfo.h Sat Apr 9 20:04:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.20 2011/01/02 18:12:01 skrll Exp $ */
+/* $NetBSD: siginfo.h,v 1.21 2011/04/10 00:04:37 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -60,6 +60,12 @@
struct {
pid_t _pid;
uid_t _uid;
+ lwpid_t _lid;
+ } _lwp;
+
+ struct {
+ pid_t _pid;
+ uid_t _uid;
int _status;
clock_t _utime;
clock_t _stime;
@@ -82,7 +88,6 @@
u_long ksi_flags; /* 4 or 8 bytes (LP64) */
CIRCLEQ_ENTRY(ksiginfo) ksi_list;
struct _ksiginfo ksi_info;
- lwpid_t ksi_lid; /* 0, or directed to LWP */
} ksiginfo_t;
#define KSI_TRAP 0x01 /* signal caused by trap */
@@ -140,6 +145,9 @@
#define si_value _info._reason._rt._value
#define si_pid _info._reason._child._pid
#define si_uid _info._reason._child._uid
+#if defined(_NETBSD_SOURCE)
+#define si_lid _info._reason._lwp._lid
+#endif
#define si_status _info._reason._child._status
#define si_utime _info._reason._child._utime
#define si_stime _info._reason._child._stime
@@ -157,12 +165,15 @@
#define ksi_errno ksi_info._errno
#define ksi_value ksi_info._reason._rt._value
+
#define ksi_pid ksi_info._reason._child._pid
#define ksi_uid ksi_info._reason._child._uid
#define ksi_status ksi_info._reason._child._status
#define ksi_utime ksi_info._reason._child._utime
#define ksi_stime ksi_info._reason._child._stime
+#define ksi_lid ksi_info._reason._lwp._lid /* 0, or directed to LWP */
+
#define ksi_addr ksi_info._reason._fault._addr
#define ksi_trap ksi_info._reason._fault._trap
