diff options
author | Conrad Meyer <cem@FreeBSD.org> | 2018-01-08 20:14:16 +0000 |
---|---|---|
committer | Conrad Meyer <cem@FreeBSD.org> | 2018-01-08 20:14:16 +0000 |
commit | d3692a4dee4d6ff0926365bcf95bbedb039ea70d (patch) | |
tree | 0a2325cf63c3c3607c603363f0bdcff868b05174 /sys/contrib/zstd | |
parent | 349b6dad63a53b2d82179e3b153357e4a60cbfa5 (diff) | |
download | src-d3692a4dee4d6ff0926365bcf95bbedb039ea70d.tar.gz src-d3692a4dee4d6ff0926365bcf95bbedb039ea70d.zip |
Integrate zstd into the kernel
Mock userspace headers and include mocked headers first in compilation
command to inject kernel headers and override e.g., malloc(3) with
malloc(9).
Submitted by: allanjude
Reviewed by: imp (earlier version), bapt (earlier version)
Differential Revision: https://reviews.freebsd.org/D10407
Notes
Notes:
svn path=/head/; revision=327706
Diffstat (limited to 'sys/contrib/zstd')
-rw-r--r-- | sys/contrib/zstd/lib/freebsd/stddef.h | 3 | ||||
-rw-r--r-- | sys/contrib/zstd/lib/freebsd/stdint.h | 3 | ||||
-rw-r--r-- | sys/contrib/zstd/lib/freebsd/stdio.h | 3 | ||||
-rw-r--r-- | sys/contrib/zstd/lib/freebsd/stdlib.h | 3 | ||||
-rw-r--r-- | sys/contrib/zstd/lib/freebsd/string.h | 3 | ||||
-rw-r--r-- | sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h | 56 | ||||
-rw-r--r-- | sys/contrib/zstd/lib/freebsd/zstd_kmalloc.c | 33 |
7 files changed, 104 insertions, 0 deletions
diff --git a/sys/contrib/zstd/lib/freebsd/stddef.h b/sys/contrib/zstd/lib/freebsd/stddef.h new file mode 100644 index 000000000000..564c7920975b --- /dev/null +++ b/sys/contrib/zstd/lib/freebsd/stddef.h @@ -0,0 +1,3 @@ +/* This file is in the public domain */ +/* $FreeBSD$ */ +#include "zstd_kfreebsd.h" diff --git a/sys/contrib/zstd/lib/freebsd/stdint.h b/sys/contrib/zstd/lib/freebsd/stdint.h new file mode 100644 index 000000000000..564c7920975b --- /dev/null +++ b/sys/contrib/zstd/lib/freebsd/stdint.h @@ -0,0 +1,3 @@ +/* This file is in the public domain */ +/* $FreeBSD$ */ +#include "zstd_kfreebsd.h" diff --git a/sys/contrib/zstd/lib/freebsd/stdio.h b/sys/contrib/zstd/lib/freebsd/stdio.h new file mode 100644 index 000000000000..564c7920975b --- /dev/null +++ b/sys/contrib/zstd/lib/freebsd/stdio.h @@ -0,0 +1,3 @@ +/* This file is in the public domain */ +/* $FreeBSD$ */ +#include "zstd_kfreebsd.h" diff --git a/sys/contrib/zstd/lib/freebsd/stdlib.h b/sys/contrib/zstd/lib/freebsd/stdlib.h new file mode 100644 index 000000000000..564c7920975b --- /dev/null +++ b/sys/contrib/zstd/lib/freebsd/stdlib.h @@ -0,0 +1,3 @@ +/* This file is in the public domain */ +/* $FreeBSD$ */ +#include "zstd_kfreebsd.h" diff --git a/sys/contrib/zstd/lib/freebsd/string.h b/sys/contrib/zstd/lib/freebsd/string.h new file mode 100644 index 000000000000..564c7920975b --- /dev/null +++ b/sys/contrib/zstd/lib/freebsd/string.h @@ -0,0 +1,3 @@ +/* This file is in the public domain */ +/* $FreeBSD$ */ +#include "zstd_kfreebsd.h" diff --git a/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h b/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h new file mode 100644 index 000000000000..af01d4ecf371 --- /dev/null +++ b/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h @@ -0,0 +1,56 @@ +/*- + * Copyright (c) 2014-2015 Allan Jude <allanjude@freebsd.org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef ZSTD_KFREEBSD_H +#define ZSTD_KFREEBSD_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef _KERNEL +#include <sys/param.h> /* size_t */ +#include <sys/systm.h> /* memcpy, memset */ +#ifndef BUILDING_ZFS +#include <sys/stddef.h> /* ptrdiff_t */ +#endif +#include <sys/malloc.h> + +MALLOC_DECLARE(M_ZSTD); + +#define malloc(x) (malloc)((x), M_ZSTD, M_WAITOK) +#define free(x) (free)((x), M_ZSTD) +/* in zstd's use of calloc, a is always 1 */ +#define calloc(a,b) (malloc)((a)*(b), M_ZSTD, M_WAITOK | M_ZERO) +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ZSTD_KFREEBSD_H */ diff --git a/sys/contrib/zstd/lib/freebsd/zstd_kmalloc.c b/sys/contrib/zstd/lib/freebsd/zstd_kmalloc.c new file mode 100644 index 000000000000..c9792a92ef68 --- /dev/null +++ b/sys/contrib/zstd/lib/freebsd/zstd_kmalloc.c @@ -0,0 +1,33 @@ +/*- + * Copyright (c) 2016-2017 Allan Jude <allanjude@freebsd.org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include <sys/param.h> +#include <sys/kernel.h> +#include <sys/malloc.h> + +MALLOC_DEFINE(M_ZSTD, "zstd", "ZSTD Compressor"); |