Date: Tue, 4 Jun 2013 21:56:03 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 229383 for review Message-ID: <201306042156.r54Lu3WT021618@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@229383?ac=10 Change 229383 by brooks@brooks_zenith on 2013/06/04 21:55:43 u Affected files ... .. //depot/projects/ctsrd/tesla/src/lib/libtesla/Makefile#6 edit .. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA#2 edit .. //depot/projects/ctsrd/tesla/src/sys/conf/files#8 edit .. //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#4 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#2 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#2 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#2 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_strnlen.h#2 edit .. //depot/projects/ctsrd/tesla/src/sys/libtesla/Makefile#5 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/config.h#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/libtesla.h#7 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla-macros.h#5 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla.h#7 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_class.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_class_global.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_class_perthread.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_debug.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_dtrace.c#5 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_internal.h#12 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_key.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_notification.c#5 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_store.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_strnlen.h#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_update.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_util.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#5 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/lib/libtesla/Makefile#6 (text+ko) ==== @@ -4,7 +4,7 @@ #MAN= tesla.3 SHLIB_MAJOR= 1 -CFLAGS+= -I${.CURDIR} +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} .PATH: ${.CURDIR}/../../sys/contrib/tesla/include .PATH: ${.CURDIR}/../../sys/contrib/tesla/libtesla ==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA#2 (text+ko) ==== @@ -2,3 +2,5 @@ ident TESLA options TESLA +nooptions KDTRACE_HOOKS + ==== //depot/projects/ctsrd/tesla/src/sys/conf/files#8 (text+ko) ==== @@ -487,6 +487,16 @@ contrib/libfdt/fdt_strerror.c optional fdt contrib/libfdt/fdt_sw.c optional fdt contrib/libfdt/fdt_wip.c optional fdt +contrib/tesla/libtesla/tesla_class.c optional tesla +contrib/tesla/libtesla/tesla_class_global.c optional tesla +contrib/tesla/libtesla/tesla_class_perthread.c optional tesla +contrib/tesla/libtesla/tesla_debug.c optional tesla +contrib/tesla/libtesla/tesla_dtrace.c optional tesla kdtrace_hooks +contrib/tesla/libtesla/tesla_key.c optional tesla +contrib/tesla/libtesla/tesla_notification.c optional tesla +contrib/tesla/libtesla/tesla_store.c optional tesla +contrib/tesla/libtesla/tesla_update.c optional tesla +contrib/tesla/libtesla/tesla_util.c optional tesla contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \ compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm" contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \ @@ -2936,16 +2946,6 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard -libtesla/tesla_class.c optional tesla -libtesla/tesla_class_global.c optional tesla -libtesla/tesla_class_perthread.c optional tesla -libtesla/tesla_debug.c optional tesla -libtesla/tesla_dtrace.c optional tesla -libtesla/tesla_key.c optional tesla -libtesla/tesla_notification.c optional tesla -libtesla/tesla_store.c optional tesla -libtesla/tesla_update.c optional tesla -libtesla/tesla_util.c optional tesla net/bpf.c standard net/bpf_buffer.c optional bpf net/bpf_jitter.c optional bpf_jitter ==== //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#4 (text+ko) ==== @@ -59,6 +59,9 @@ # include path into contrib'ed source files. INCLUDES+= -I$S/contrib/altq +# ... and the same for TESLA +INCLUDES+= -I$S/contrib/tesla/include + .if make(depend) || make(kernel-depend) # ... and the same for ipfilter ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#2 (text+ko) ==== @@ -128,10 +128,12 @@ #ifndef NDEBUG -/* TODO: kernel version... probably just say no? */ int32_t tesla_debugging(const char *name) { +#ifdef _KERNEL + return 0; +#else #ifdef HAVE_ISSETUGID /* * Debugging paths could be more vulnerable to format string problems @@ -154,6 +156,7 @@ /* Otherwise, use fnmatch's normal star-matching. */ return (fnmatch(env, name, 0) == 0); +#endif } void ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#2 (text+ko) ==== @@ -38,10 +38,13 @@ * @{ */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #ifdef _KERNEL #include "opt_kdb.h" +#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/eventhandler.h> #include <sys/kdb.h> @@ -54,17 +57,15 @@ #include <sys/systm.h> #include <machine/_inttypes.h> - -#include <libtesla/libtesla.h> #else #include <assert.h> #include <err.h> #include <pthread.h> #include <stdlib.h> #include <string.h> +#endif #include <libtesla.h> -#endif /** Is @a x a subset of @a y? */ #define SUBSET(x,y) ((x & y) == x) ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#2 (text+ko) ==== @@ -98,9 +98,12 @@ }; -/** Default to print-with-failstop in userspace, DTrace in the kernel. */ +/** + * Default to print-with-failstop except in the kernel when DTrace is + * available. + */ struct tesla_event_handlers *ev_handlers = -#ifdef _KERNEL +#if defined(_KERNEL) && defined(KDTRACE_HOOKS) &dtrace_handlers #else &failstop_handlers ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_strnlen.h#2 (text+ko) ==== @@ -1,10 +1,15 @@ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif +#ifdef _KERNEL +#include <sys/libkern.h> +#else #ifdef HAVE_STRNLEN #include <string.h> - #else /* If we don't have strnlen(), fake it. */ #warning Platform does not supply strnlen(); faking it with strlen(). #define strnlen(s, len) strlen(s) #endif +#endif ==== //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#5 (text+ko) ==== @@ -80,8 +80,8 @@ #include <sys/vmmeter.h> #include <sys/vnode.h> -#include <libtesla/tesla.h> -#include <libtesla/tesla-macros.h> +#include <tesla.h> +#include <tesla-macros.h> #include <vm/vm.h> #include <vm/vm_param.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306042156.r54Lu3WT021618>