Deleted Added
full compact
libpmc.c (291494) libpmc.c (298896)
1/*-
2 * Copyright (c) 2003-2008 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003-2008 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/lib/libpmc/libpmc.c 291494 2015-11-30 17:35:49Z rrs $");
28__FBSDID("$FreeBSD: head/lib/libpmc/libpmc.c 298896 2016-05-01 19:37:33Z pfg $");
29
30#include <sys/types.h>
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/pmc.h>
34#include <sys/syscall.h>
35
36#include <ctype.h>

--- 3198 unchanged lines hidden (view full) ---

3235
3236 pmc_syscall = pmc_modstat.data.intval;
3237
3238 /* check the kernel module's ABI against our compiled-in version */
3239 abi_version = PMC_VERSION;
3240 if (PMC_CALL(GETMODULEVERSION, &abi_version) < 0)
3241 return (pmc_syscall = -1);
3242
29
30#include <sys/types.h>
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/pmc.h>
34#include <sys/syscall.h>
35
36#include <ctype.h>

--- 3198 unchanged lines hidden (view full) ---

3235
3236 pmc_syscall = pmc_modstat.data.intval;
3237
3238 /* check the kernel module's ABI against our compiled-in version */
3239 abi_version = PMC_VERSION;
3240 if (PMC_CALL(GETMODULEVERSION, &abi_version) < 0)
3241 return (pmc_syscall = -1);
3242
3243 /* ignore patch & minor numbers for the comparision */
3243 /* ignore patch & minor numbers for the comparison */
3244 if ((abi_version & 0xFF000000) != (PMC_VERSION & 0xFF000000)) {
3245 errno = EPROGMISMATCH;
3246 return (pmc_syscall = -1);
3247 }
3248
3249 if (PMC_CALL(GETCPUINFO, &op_cpu_info) < 0)
3250 return (pmc_syscall = -1);
3251

--- 668 unchanged lines hidden ---
3244 if ((abi_version & 0xFF000000) != (PMC_VERSION & 0xFF000000)) {
3245 errno = EPROGMISMATCH;
3246 return (pmc_syscall = -1);
3247 }
3248
3249 if (PMC_CALL(GETCPUINFO, &op_cpu_info) < 0)
3250 return (pmc_syscall = -1);
3251

--- 668 unchanged lines hidden ---