[Glibc-bsd-commits] r4602 - trunk/glibc-ports/kfreebsd/sys

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-06-24 13:01:05 +0000 (Mon, 24 Jun 2013)
New Revision: 4602

Modified:
   trunk/glibc-ports/kfreebsd/sys/ptrace.h
Log:
Enable PT_LWPINFO and resync with upstream HEAD

Modified: trunk/glibc-ports/kfreebsd/sys/ptrace.h
===================================================================
--- trunk/glibc-ports/kfreebsd/sys/ptrace.h	2013-06-24 08:17:22 UTC (rev 4601)
+++ trunk/glibc-ports/kfreebsd/sys/ptrace.h	2013-06-24 13:01:05 UTC (rev 4602)
@@ -34,8 +34,11 @@
 #define _SYS_PTRACE_H	1
 
 #include <features.h>
-#include <sys/types.h>
 
+#include <signal.h>
+#include <sys/kern/param.h>
+#include <machine/reg.h>
+
 __BEGIN_DECLS
 
 #define	PT_TRACE_ME	0	/* child declares it's being traced */
@@ -53,11 +56,9 @@
 #define	PT_DETACH	11	/* stop tracing a process */
 #define PT_IO		12	/* do I/O to/from stopped process. */
 
-#if 0				/* our threading libray is different */
 #define	PT_LWPINFO	13	/* Info about the LWP that stopped. */
 #define PT_GETNUMLWPS	14	/* get total number of threads */
 #define PT_GETLWPLIST	15	/* get thread list */
-#endif
 
 #define PT_CLEARSTEP	16	/* turn off single step */
 #define PT_SETSTEP	17	/* turn on single step */
@@ -91,20 +92,27 @@
 #define PIOD_READ_I	3	/* Read from I space */
 #define PIOD_WRITE_I	4	/* Write to I space */
 
-#if 0
 /* Argument structure for PT_LWPINFO. */
 struct ptrace_lwpinfo {
-	lwpid_t	pl_lwpid;	/* LWP described. */
+	__lwpid_t	pl_lwpid;	/* LWP described. */
 	int	pl_event;	/* Event that stopped the LWP. */
 #define	PL_EVENT_NONE	0
 #define	PL_EVENT_SIGNAL	1
 	int	pl_flags;	/* LWP flags. */
 #define	PL_FLAG_SA	0x01	/* M:N thread */
 #define	PL_FLAG_BOUND	0x02	/* M:N bound thread */
+#define	PL_FLAG_SCE	0x04	/* syscall enter point */
+#define	PL_FLAG_SCX	0x08	/* syscall leave point */
+#define	PL_FLAG_EXEC	0x10	/* exec(2) succeeded */
+#define	PL_FLAG_SI	0x20	/* siginfo is valid */
+#define	PL_FLAG_FORKED	0x40	/* new child */
+#define	PL_FLAG_CHILD	0x80	/* I am from child */
 	sigset_t	pl_sigmask;	/* LWP signal mask */
 	sigset_t	pl_siglist;	/* LWP pending signal */
+	struct siginfo	pl_siginfo;	/* siginfo for signal */
+	char		pl_tdname[MAXCOMLEN + 1]; /* LWP name */
+	int		pl_child_pid;	/* New child pid */
 };
-#endif
 
 extern int ptrace(int _request, pid_t _pid, caddr_t _addr, int _data) __THROW;