[Glibc-bsd-commits] r1735 - in trunk:
glibc-2.3-head/sysdeps/kfreebsd glibc-2.3-head/sysdeps/kfreebsd/bits
glibc-2.3-head/sysdeps/kfreebsd/sys glibc-ports/kfreebsd
glibc-ports/kfreebsd/bits glibc-ports/kfreebsd/sys
kfreebsd-kernel-headers/debian
kfreebsd-kernel-headers/debian/patches
Petr Salinger
ps-guest at alioth.debian.org
Mon Nov 20 10:00:19 CET 2006
Author: ps-guest
Date: 2006-11-20 10:00:18 +0100 (Mon, 20 Nov 2006)
New Revision: 1735
Added:
trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
Removed:
trunk/glibc-2.3-head/sysdeps/kfreebsd/sys/ktrace.h
trunk/glibc-ports/kfreebsd/sys/ktrace.h
Modified:
trunk/glibc-2.3-head/sysdeps/kfreebsd/Dist
trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile
trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/uio.h
trunk/glibc-ports/kfreebsd/Dist
trunk/glibc-ports/kfreebsd/Makefile
trunk/glibc-ports/kfreebsd/bits/uio.h
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/includes.list
Log:
* move <sys/ktrace.h> from libc0.1-dev into kfreebsd-kernel-headers
this way it gets also updated
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/Dist
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/Dist 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/Dist 2006-11-20 09:00:18 UTC (rev 1735)
@@ -17,7 +17,6 @@
sys/extattr.h
sys/io.h
sys/jail.h
-sys/ktrace.h
sys/linker.h
sys/mount.h
sys/perm.h
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile 2006-11-20 09:00:18 UTC (rev 1735)
@@ -7,7 +7,6 @@
ifeq ($(subdir),misc)
sysdep_headers += \
- sys/ktrace.h \
sys/mount.h \
sys/kd.h \
sys/rfork.h
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/uio.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/uio.h 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/uio.h 2006-11-20 09:00:18 UTC (rev 1735)
@@ -35,3 +35,15 @@
writev() system call. For larger arrays of 'struct iovec', the libc
uses a single read() or write() call to guarantee atomicity. */
#define UIO_MAXIOV 1024
+
+#ifdef __USE_BSD
+enum uio_rw { UIO_READ, UIO_WRITE };
+
+/* Segment flag values. */
+enum uio_seg {
+ UIO_USERSPACE, /* from user data space */
+ UIO_SYSSPACE, /* from system space */
+ UIO_NOCOPY /* don't copy, already in object */
+};
+#endif
+
Deleted: trunk/glibc-2.3-head/sysdeps/kfreebsd/sys/ktrace.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/sys/ktrace.h 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/sys/ktrace.h 2006-11-20 09:00:18 UTC (rev 1735)
@@ -1,184 +0,0 @@
-/* 'ktrace' system call debugger support interface. FreeBSD version.
- Copyright (C) 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _SYS_KTRACE_H
-#define _SYS_KTRACE_H 1
-
-#include <features.h>
-
-/* Define MAXCOMLEN. */
-#include <sys/param.h>
-
-/* Define register_t. */
-#include <sys/types.h>
-
-/* Define __sighandler_t, __sigset_t. */
-#include <signal.h>
-
-/* Define 'struct timeval'. */
-#define __need_timeval
-#include <bits/time.h>
-
-
-/* Structure of records written to the system call trace log file.
- A header of type ktr_header, followed by a variable length buffer. */
-
-struct ktr_header
- {
- int ktr_len; /* Length of ktr_buf. */
- short ktr_type; /* Trace record type. */
- __pid_t ktr_pid; /* Process id. */
- char ktr_comm[MAXCOMLEN+1]; /* Command name. */
- struct timeval ktr_time; /* Timestamp. */
- void *ktr_buf; /* Pointer to ktr_len bytes.
- (Ignore in the log file.) */
- };
-
-/* Possible values of ktr_type. */
-enum
-{
- KTR_SYSCALL = 1, /* System call record. */
-#define KTR_SYSCALL KTR_SYSCALL
- KTR_SYSRET = 2, /* Return from system call record. */
-#define KTR_SYSRET KTR_SYSRET
- KTR_NAMEI = 3, /* Namei record. */
-#define KTR_NAMEI KTR_NAMEI
- KTR_GENIO = 4, /* Generic process I/O record. */
-#define KTR_GENIO KTR_GENIO
- KTR_PSIG = 5, /* Processed signal record. */
-#define KTR_PSIG KTR_PSIG
- KTR_CSW = 6, /* Context switch record. */
-#define KTR_CSW KTR_CSW
- KTR_USER = 7 /* User defined record. */
-#define KTR_USER KTR_USER
-};
-
-/* ktr_buf for KTR_SYSCALL: System call record. */
-struct ktr_syscall
- {
- short ktr_code; /* Syscall number. */
- short ktr_narg; /* Number of arguments. */
- register_t ktr_args __flexarr;
- };
-
-/* ktr_buf for KTR_SYSRET: Return from system call record. */
-struct ktr_sysret
- {
- short ktr_code; /* Syscall number. */
- short ktr_eosys;
- int ktr_error;
- register_t ktr_retval;
- };
-
-/* ktr_buf for KTR_NAMEI: Namei record.
- It contains the pathname. */
-
-/* ktr_buf for KTR_GENIO: Generic process I/O record. */
-enum uio_rw
-{
- UIO_READ,
- UIO_WRITE
-};
-struct ktr_genio
- {
- int ktr_fd; /* File descriptor. */
- enum uio_rw ktr_rw; /* I/O direction. */
- char ktr_data __flexarr; /* Data successfully read/written. */
- };
-
-/* ktr_buf for KTR_PSIG: Processed signal record. */
-struct ktr_psig
- {
- int signo;
- __sighandler_t action;
- int code;
- sigset_t mask;
- };
-
-/* ktr_buf for KTR_CSW: Context switch record. */
-struct ktr_csw
- {
- int out; /* 1 if switch out, 0 if switch in. */
- int user; /* 1 if usermode, 0 if kernel mode. */
- };
-
-/* Maximum size of ktr_buf for KTR_USER: User defined record. */
-#define KTR_USER_MAXLEN 2048
-
-
-/* The OP_FLAGS argument of ktrace() consists of an operation and
- some flags. This macro extracts the operation. */
-#define KTROP(op_flags) ((op_flags) & 3)
-
-/* Possible values for operation in OP_FLAGS argument of ktrace(). */
-enum
-{
- KTROP_SET = 0, /* Set trace facilities. */
-#define KTROP_SET KTROP_SET
- KTROP_CLEAR = 1, /* Clear trace facilities. */
-#define KTROP_CLEAR KTROP_CLEAR
- KTROP_CLEARFILE = 2 /* Stop all tracing to file. */
-#define KTROP_CLEARFILE KTROP_CLEARFILE
-};
-
-/* Possible flags to be ORed into OP_FLAGS argument of ktrace(). */
-enum
-{
- KTRFLAG_DESCEND = 4 /* Perform operation on all children processes too. */
-#define KTRFLAG_DESCEND KTRFLAG_DESCEND
-};
-
-
-/* The FAC is an OR of some trace facilities. */
-enum
-{
- KTRFAC_SYSCALL = 1 << KTR_SYSCALL, /* Trace system calls. */
-#define KTRFAC_SYSCALL KTRFAC_SYSCALL
- KTRFAC_SYSRET = 1 << KTR_SYSRET, /* Trace system call returns. */
-#define KTRFAC_SYSRET KTRFAC_SYSRET
- KTRFAC_NAMEI = 1 << KTR_NAMEI, /* Trace namei operations. */
-#define KTRFAC_NAMEI KTRFAC_NAMEI
- KTRFAC_GENIO = 1 << KTR_GENIO, /* Trace generic process I/O. */
-#define KTRFAC_GENIO KTRFAC_GENIO
- KTRFAC_PSIG = 1 << KTR_PSIG, /* Trace signal processing. */
-#define KTRFAC_PSIG KTRFAC_PSIG
- KTRFAC_CSW = 1 << KTR_CSW, /* Trace context switches. */
-#define KTRFAC_CSW KTRFAC_CSW
- KTRFAC_USER = 1 << KTR_USER, /* Trace user defined records. */
-#define KTRFAC_USER KTRFAC_USER
- KTRFAC_INHERIT = 1 << 30 /* Inherit trace flags to new children. */
-#define KTRFAC_INHERIT KTRFAC_INHERIT
-};
-
-
-__BEGIN_DECLS
-
-/* Enable system call tracing for the process PID.
- Trace records will be written to TRACEFILE; this file is truncated. If
- OP_FLAGS contains KTROP_CLEAR, TRACEFILE may be NULL.
- FAC contains the facilities to switch on or off. */
-extern int ktrace (__const char *__tracefile, int __op_flags, int __fac,
- __pid_t pid) __THROW;
-
-/* Write a user defined record to the current process' trace log file. */
-extern int utrace (__const void *__buf, size_t __len) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_KTRACE_H */
Modified: trunk/glibc-ports/kfreebsd/Dist
===================================================================
--- trunk/glibc-ports/kfreebsd/Dist 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-ports/kfreebsd/Dist 2006-11-20 09:00:18 UTC (rev 1735)
@@ -17,7 +17,6 @@
sys/extattr.h
sys/io.h
sys/jail.h
-sys/ktrace.h
sys/linker.h
sys/mount.h
sys/perm.h
Modified: trunk/glibc-ports/kfreebsd/Makefile
===================================================================
--- trunk/glibc-ports/kfreebsd/Makefile 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-ports/kfreebsd/Makefile 2006-11-20 09:00:18 UTC (rev 1735)
@@ -7,7 +7,6 @@
ifeq ($(subdir),misc)
sysdep_headers += \
- sys/ktrace.h \
sys/mount.h \
sys/kd.h \
sys/rfork.h
Modified: trunk/glibc-ports/kfreebsd/bits/uio.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/uio.h 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-ports/kfreebsd/bits/uio.h 2006-11-20 09:00:18 UTC (rev 1735)
@@ -35,3 +35,15 @@
writev() system call. For larger arrays of 'struct iovec', the libc
uses a single read() or write() call to guarantee atomicity. */
#define UIO_MAXIOV 1024
+
+#ifdef __USE_BSD
+enum uio_rw { UIO_READ, UIO_WRITE };
+
+/* Segment flag values. */
+enum uio_seg {
+ UIO_USERSPACE, /* from user data space */
+ UIO_SYSSPACE, /* from system space */
+ UIO_NOCOPY /* don't copy, already in object */
+};
+#endif
+
Deleted: trunk/glibc-ports/kfreebsd/sys/ktrace.h
===================================================================
--- trunk/glibc-ports/kfreebsd/sys/ktrace.h 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/glibc-ports/kfreebsd/sys/ktrace.h 2006-11-20 09:00:18 UTC (rev 1735)
@@ -1,184 +0,0 @@
-/* 'ktrace' system call debugger support interface. FreeBSD version.
- Copyright (C) 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _SYS_KTRACE_H
-#define _SYS_KTRACE_H 1
-
-#include <features.h>
-
-/* Define MAXCOMLEN. */
-#include <sys/param.h>
-
-/* Define register_t. */
-#include <sys/types.h>
-
-/* Define __sighandler_t, __sigset_t. */
-#include <signal.h>
-
-/* Define 'struct timeval'. */
-#define __need_timeval
-#include <bits/time.h>
-
-
-/* Structure of records written to the system call trace log file.
- A header of type ktr_header, followed by a variable length buffer. */
-
-struct ktr_header
- {
- int ktr_len; /* Length of ktr_buf. */
- short ktr_type; /* Trace record type. */
- __pid_t ktr_pid; /* Process id. */
- char ktr_comm[MAXCOMLEN+1]; /* Command name. */
- struct timeval ktr_time; /* Timestamp. */
- void *ktr_buf; /* Pointer to ktr_len bytes.
- (Ignore in the log file.) */
- };
-
-/* Possible values of ktr_type. */
-enum
-{
- KTR_SYSCALL = 1, /* System call record. */
-#define KTR_SYSCALL KTR_SYSCALL
- KTR_SYSRET = 2, /* Return from system call record. */
-#define KTR_SYSRET KTR_SYSRET
- KTR_NAMEI = 3, /* Namei record. */
-#define KTR_NAMEI KTR_NAMEI
- KTR_GENIO = 4, /* Generic process I/O record. */
-#define KTR_GENIO KTR_GENIO
- KTR_PSIG = 5, /* Processed signal record. */
-#define KTR_PSIG KTR_PSIG
- KTR_CSW = 6, /* Context switch record. */
-#define KTR_CSW KTR_CSW
- KTR_USER = 7 /* User defined record. */
-#define KTR_USER KTR_USER
-};
-
-/* ktr_buf for KTR_SYSCALL: System call record. */
-struct ktr_syscall
- {
- short ktr_code; /* Syscall number. */
- short ktr_narg; /* Number of arguments. */
- register_t ktr_args __flexarr;
- };
-
-/* ktr_buf for KTR_SYSRET: Return from system call record. */
-struct ktr_sysret
- {
- short ktr_code; /* Syscall number. */
- short ktr_eosys;
- int ktr_error;
- register_t ktr_retval;
- };
-
-/* ktr_buf for KTR_NAMEI: Namei record.
- It contains the pathname. */
-
-/* ktr_buf for KTR_GENIO: Generic process I/O record. */
-enum uio_rw
-{
- UIO_READ,
- UIO_WRITE
-};
-struct ktr_genio
- {
- int ktr_fd; /* File descriptor. */
- enum uio_rw ktr_rw; /* I/O direction. */
- char ktr_data __flexarr; /* Data successfully read/written. */
- };
-
-/* ktr_buf for KTR_PSIG: Processed signal record. */
-struct ktr_psig
- {
- int signo;
- __sighandler_t action;
- int code;
- sigset_t mask;
- };
-
-/* ktr_buf for KTR_CSW: Context switch record. */
-struct ktr_csw
- {
- int out; /* 1 if switch out, 0 if switch in. */
- int user; /* 1 if usermode, 0 if kernel mode. */
- };
-
-/* Maximum size of ktr_buf for KTR_USER: User defined record. */
-#define KTR_USER_MAXLEN 2048
-
-
-/* The OP_FLAGS argument of ktrace() consists of an operation and
- some flags. This macro extracts the operation. */
-#define KTROP(op_flags) ((op_flags) & 3)
-
-/* Possible values for operation in OP_FLAGS argument of ktrace(). */
-enum
-{
- KTROP_SET = 0, /* Set trace facilities. */
-#define KTROP_SET KTROP_SET
- KTROP_CLEAR = 1, /* Clear trace facilities. */
-#define KTROP_CLEAR KTROP_CLEAR
- KTROP_CLEARFILE = 2 /* Stop all tracing to file. */
-#define KTROP_CLEARFILE KTROP_CLEARFILE
-};
-
-/* Possible flags to be ORed into OP_FLAGS argument of ktrace(). */
-enum
-{
- KTRFLAG_DESCEND = 4 /* Perform operation on all children processes too. */
-#define KTRFLAG_DESCEND KTRFLAG_DESCEND
-};
-
-
-/* The FAC is an OR of some trace facilities. */
-enum
-{
- KTRFAC_SYSCALL = 1 << KTR_SYSCALL, /* Trace system calls. */
-#define KTRFAC_SYSCALL KTRFAC_SYSCALL
- KTRFAC_SYSRET = 1 << KTR_SYSRET, /* Trace system call returns. */
-#define KTRFAC_SYSRET KTRFAC_SYSRET
- KTRFAC_NAMEI = 1 << KTR_NAMEI, /* Trace namei operations. */
-#define KTRFAC_NAMEI KTRFAC_NAMEI
- KTRFAC_GENIO = 1 << KTR_GENIO, /* Trace generic process I/O. */
-#define KTRFAC_GENIO KTRFAC_GENIO
- KTRFAC_PSIG = 1 << KTR_PSIG, /* Trace signal processing. */
-#define KTRFAC_PSIG KTRFAC_PSIG
- KTRFAC_CSW = 1 << KTR_CSW, /* Trace context switches. */
-#define KTRFAC_CSW KTRFAC_CSW
- KTRFAC_USER = 1 << KTR_USER, /* Trace user defined records. */
-#define KTRFAC_USER KTRFAC_USER
- KTRFAC_INHERIT = 1 << 30 /* Inherit trace flags to new children. */
-#define KTRFAC_INHERIT KTRFAC_INHERIT
-};
-
-
-__BEGIN_DECLS
-
-/* Enable system call tracing for the process PID.
- Trace records will be written to TRACEFILE; this file is truncated. If
- OP_FLAGS contains KTROP_CLEAR, TRACEFILE may be NULL.
- FAC contains the facilities to switch on or off. */
-extern int ktrace (__const char *__tracefile, int __op_flags, int __fac,
- __pid_t pid) __THROW;
-
-/* Write a user defined record to the current process' trace log file. */
-extern int utrace (__const void *__buf, size_t __len) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_KTRACE_H */
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2006-11-20 09:00:18 UTC (rev 1735)
@@ -4,6 +4,7 @@
* sync <sys/ioccom.h> with <sys/ioctl.h>, needed by darkice due to "-pedantic"
* fix <sys/iconv.h>, needed by wv2
* fix <dev/acpica/acpiio.h>, needed by gnome-applets
+ * move <sys/ktrace.h> from libc0.1-dev
-- Aurelien Jarno <aurel32 at debian.org> Tue, 17 Nov 2006 17:09:17 +0100
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/kfreebsd-kernel-headers/debian/control 2006-11-20 09:00:18 UTC (rev 1735)
@@ -8,7 +8,7 @@
Package: kfreebsd-kernel-headers
Architecture: kfreebsd-i386 kfreebsd-amd64
-Replaces: kfreebsd-headers
+Replaces: kfreebsd-headers, libc0.1-dev (<=2.3.6.ds1-8)
Conflicts: kfreebsd-headers
Description: kernel of FreeBSD headers for development
This package provides headers from the kernel of FreeBSD. These headers
Modified: trunk/kfreebsd-kernel-headers/debian/includes.list
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/includes.list 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/kfreebsd-kernel-headers/debian/includes.list 2006-11-20 09:00:18 UTC (rev 1735)
@@ -165,6 +165,7 @@
sys/kse.h
sys/kthread.h
sys/ktr.h
+sys/ktrace.h
sys/libkern.h
sys/limits.h
sys/linker.h
Added: trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2006-11-18 22:15:11 UTC (rev 1734)
+++ trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2006-11-20 09:00:18 UTC (rev 1735)
@@ -0,0 +1,22 @@
+--- sys/sys/ktrace.h 2006-06-25 11:40:55.000000000 +0200
++++ sys/sys/ktrace.h 2006-11-20 10:32:42.000000000 +0100
+@@ -33,6 +33,19 @@
+ #ifndef _SYS_KTRACE_H_
+ #define _SYS_KTRACE_H_
+
++#include <features.h>
++
++#include <stdint.h>
++
++/* Define MAXCOMLEN. */
++#include <sys/param.h>
++
++/* Define enum uio_rw */
++#include <sys/uio.h>
++
++/* Define __sighandler_t, __sigset_t. */
++#include <signal.h>
++
+ /*
+ * operations to ktrace system call (KTROP(op))
+ */
More information about the Glibc-bsd-commits
mailing list