diff options
author | Michael Brown | 2012-05-04 18:53:23 +0200 |
---|---|---|
committer | Michael Brown | 2012-05-04 18:54:31 +0200 |
commit | 6ed905aba298136dee5911a33e9692c7bf23335b (patch) | |
tree | 24bd13abb68a25388ae15d051afca5e63c9117cf | |
parent | [malloc] Allow Valgrind to be used when all assertions are enabled (diff) | |
download | ipxe-6ed905aba298136dee5911a33e9692c7bf23335b.tar.gz ipxe-6ed905aba298136dee5911a33e9692c7bf23335b.tar.xz ipxe-6ed905aba298136dee5911a33e9692c7bf23335b.zip |
[time] Add Linux time source using gettimeofday()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r-- | src/config/defaults/linux.h | 2 | ||||
-rw-r--r-- | src/include/ipxe/linux/linux_time.h | 18 | ||||
-rw-r--r-- | src/include/ipxe/time.h | 1 | ||||
-rw-r--r-- | src/include/linux_api.h | 1 | ||||
-rw-r--r-- | src/interface/linux/linux_time.c | 45 |
5 files changed, 65 insertions, 2 deletions
diff --git a/src/config/defaults/linux.h b/src/config/defaults/linux.h index 58c73c38..50897560 100644 --- a/src/config/defaults/linux.h +++ b/src/config/defaults/linux.h @@ -15,7 +15,7 @@ #define SMBIOS_LINUX #define SANBOOT_NULL #define ENTROPY_LINUX -#define TIME_NULL +#define TIME_LINUX #define DRIVERS_LINUX diff --git a/src/include/ipxe/linux/linux_time.h b/src/include/ipxe/linux/linux_time.h new file mode 100644 index 00000000..93a25773 --- /dev/null +++ b/src/include/ipxe/linux/linux_time.h @@ -0,0 +1,18 @@ +#ifndef _IPXE_LINUX_TIME_H +#define _IPXE_LINUX_TIME_H + +/** @file + * + * Linux time source + * + */ + +FILE_LICENCE ( GPL2_OR_LATER ); + +#ifdef TIME_LINUX +#define TIME_PREFIX_linux +#else +#define TIME_PREFIX_linux __linux_ +#endif + +#endif /* _IPXE_LINUX_TIME_H */ diff --git a/src/include/ipxe/time.h b/src/include/ipxe/time.h index c74959f8..673fe098 100644 --- a/src/include/ipxe/time.h +++ b/src/include/ipxe/time.h @@ -44,6 +44,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* Include all architecture-independent time API headers */ #include <ipxe/null_time.h> +#include <ipxe/linux/linux_time.h> /* Include all architecture-dependent time API headers */ #include <bits/time.h> diff --git a/src/include/linux_api.h b/src/include/linux_api.h index 066cdd30..94dc991f 100644 --- a/src/include/linux_api.h +++ b/src/include/linux_api.h @@ -37,7 +37,6 @@ FILE_LICENCE(GPL2_OR_LATER); #include <linux/types.h> #include <linux/posix_types.h> typedef __kernel_pid_t pid_t; -typedef __kernel_time_t time_t; typedef __kernel_suseconds_t suseconds_t; typedef __kernel_loff_t loff_t; #include <linux/time.h> diff --git a/src/interface/linux/linux_time.c b/src/interface/linux/linux_time.c new file mode 100644 index 00000000..6d722aad --- /dev/null +++ b/src/interface/linux/linux_time.c @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2012 Michael Brown <mbrown@fensystems.co.uk>. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +FILE_LICENCE ( GPL2_OR_LATER ); + +/** @file + * + * Linux time source + * + */ + +#include <stdint.h> +#include <errno.h> +#include <linux_api.h> +#include <ipxe/time.h> + +/** + * Get current time in seconds + * + * @ret time Time, in seconds + */ +static time_t linux_now ( void ) { + struct timeval now; + + linux_gettimeofday ( &now, NULL ); + return now.tv_sec; +} + +PROVIDE_TIME ( linux, time_now, linux_now ); |