Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
89f036922b
|
@ -1,6 +1,6 @@
|
||||||
subdir-m += include
|
subdir-m += include
|
||||||
DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c
|
DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c
|
||||||
DISTFILES += u8_textprep.c getexecname.c
|
DISTFILES += u8_textprep.c getexecname.c gethrtime.c
|
||||||
|
|
||||||
LIBRARY := libspl
|
LIBRARY := libspl
|
||||||
|
|
||||||
|
@ -23,4 +23,4 @@ ${LIBRARY}-objs += strlcat.o
|
||||||
${LIBRARY}-objs += strnlen.o
|
${LIBRARY}-objs += strnlen.o
|
||||||
${LIBRARY}-objs += u8_textprep.o
|
${LIBRARY}-objs += u8_textprep.o
|
||||||
${LIBRARY}-objs += getexecname.o
|
${LIBRARY}-objs += getexecname.o
|
||||||
|
${LIBRARY}-objs += gethrtime.o
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
/*
|
||||||
|
* CDDL HEADER START
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the terms of the
|
||||||
|
* Common Development and Distribution License (the "License").
|
||||||
|
* You may not use this file except in compliance with the License.
|
||||||
|
*
|
||||||
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||||
|
* or http://www.opensolaris.org/os/licensing.
|
||||||
|
* See the License for the specific language governing permissions
|
||||||
|
* and limitations under the License.
|
||||||
|
*
|
||||||
|
* When distributing Covered Code, include this CDDL HEADER in each
|
||||||
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||||
|
* If applicable, add the following below this CDDL HEADER, with the
|
||||||
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||||
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||||
|
*
|
||||||
|
* CDDL HEADER END
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
* Use is subject to license terms.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma ident "%Z%%M% %I% %E% SMI"
|
||||||
|
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
hrtime_t
|
||||||
|
gethrtime(void)
|
||||||
|
{
|
||||||
|
struct timespec ts;
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
rc = clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||||
|
if (rc) {
|
||||||
|
fprintf(stderr, "Error: clock_gettime() = %d\n", rc)
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (((u_int64_t)ts.tv_sec) * NANOSEC) + ts.tv_nsec;
|
||||||
|
}
|
|
@ -29,29 +29,13 @@
|
||||||
|
|
||||||
#include_next <sys/time.h>
|
#include_next <sys/time.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
typedef longlong_t hrtime_t;
|
||||||
#include <stdlib.h>
|
typedef struct timespec timestruc_t;
|
||||||
#include <sys/types.h>
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
typedef longlong_t hrtime_t;
|
|
||||||
typedef struct timespec timestruc_t;
|
|
||||||
|
|
||||||
#ifndef NANOSEC
|
#ifndef NANOSEC
|
||||||
#define NANOSEC 1000000000
|
#define NANOSEC 1000000000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline hrtime_t gethrtime(void) {
|
extern hrtime_t gethrtime(void);
|
||||||
struct timespec ts;
|
|
||||||
|
|
||||||
if(clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
|
|
||||||
fprintf(stderr, "Error: clock_gettime(CLOCK_MONOTONIC) failed\n");
|
|
||||||
fprintf(stderr, "Make sure you are are running kernel 2.6.x and have glibc 2.3.3 or newer installed\n");
|
|
||||||
fprintf(stderr, "Aborting...\n");
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
|
|
||||||
return (((u_int64_t)ts.tv_sec) * NANOSEC) + ts.tv_nsec;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue