-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
#ifndef __LIBCFS_USER_TIME_H__
#define __LIBCFS_USER_TIME_H__
-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
-#endif
-
/* Portable time API */
/*
* Liblustre. time(2) based implementation.
*/
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
typedef time_t cfs_fs_time_t;
typedef time_t cfs_time_t;
-typedef long cfs_duration_t;
+typedef time_t cfs_duration_t;
+
+#define cfs_time_before(a, b) ((long)(a) - (long)(b) < 0)
+#define cfs_time_beforeq(a, b) ((long)(b) - (long)(a) >= 0)
static inline cfs_time_t cfs_time_current(void)
{
return time(NULL);
}
-static inline cfs_duration_t cfs_time_seconds(int seconds)
+static inline cfs_duration_t cfs_time_seconds(cfs_time_t seconds)
{
return seconds;
}
return cfs_time_seconds(cfs_time_current());
}
-static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
-{
- return t1 < t2;
-}
-
-static inline int cfs_time_beforeq(cfs_time_t t1, cfs_time_t t2)
-{
- return t1 <= t2;
-}
-
static inline cfs_duration_t cfs_duration_build(int64_t nano)
{
return (cfs_duration_t) (nano / ONE_BILLION);
#define CFS_TICK (1)
-static inline cfs_time_t cfs_time_add(cfs_time_t t, cfs_duration_t d)
-{
- return t + d;
-}
-
-static inline cfs_duration_t cfs_time_sub(cfs_time_t t1, cfs_time_t t2)
-{
- return t1 - t2;
-}
-
#define cfs_time_current_64 cfs_time_current
#define cfs_time_add_64 cfs_time_add
#define cfs_time_shift_64 cfs_time_shift
#define cfs_time_before_64 cfs_time_before
#define cfs_time_beforeq_64 cfs_time_beforeq
+/* XXX needs to move to arch specific header or configured */
#ifndef CFS_TIME_T
-#define CFS_TIME_T "%u"
+#define CFS_TIME_T "%lu"
#endif
#define CFS_DURATION_T "%ld"