This patch removes the unused realtime support completely.
Bastian
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -81,7 +81,6 @@
misc/lvm-globals.c \
misc/lvm-string.c \
misc/lvm-wrappers.c \
- misc/timestamp.c \
misc/util.c \
mm/memlock.c \
report/report.c \
--- a/lib/misc/timestamp.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2006 Rackable Systems All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Abstract out the time methods used so they can be adjusted later -
- * the results of these routines should stay in-core. This implementation
- * requires librt.
- */
-
-#include "lib.h"
-#include <stdlib.h>
-
-#include "timestamp.h"
-
-/*
- * The realtime section uses clock_gettime with the CLOCK_MONOTONIC
- * parameter to prevent issues with time warps
- */
-#ifdef HAVE_REALTIME
-
-#include <time.h>
-#include <bits/time.h>
-
-struct timestamp {
- struct timespec t;
-};
-
-struct timestamp *get_timestamp(void)
-{
- struct timestamp *ts = NULL;
-
- if (!(ts = dm_malloc(sizeof(*ts))))
- return_NULL;
-
- if (clock_gettime(CLOCK_MONOTONIC, &ts->t)) {
- log_sys_error("clock_gettime", "get_timestamp");
- return NULL;
- }
-
- return ts;
-}
-
-/* cmp_timestamp: Compare two timestamps
- *
- * Return: -1 if t1 is less than t2
- * 0 if t1 is equal to t2
- * 1 if t1 is greater than t2
- */
-int cmp_timestamp(struct timestamp *t1, struct timestamp *t2)
-{
- if(t1->t.tv_sec < t2->t.tv_sec)
- return -1;
- if(t1->t.tv_sec > t2->t.tv_sec)
- return 1;
-
- if(t1->t.tv_nsec < t2->t.tv_nsec)
- return -1;
- if(t1->t.tv_nsec > t2->t.tv_nsec)
- return 1;
-
- return 0;
-}
-
-#else /* ! HAVE_REALTIME */
-
-/*
- * The !realtime section just uses gettimeofday and is therefore subject
- * to ntp-type time warps - not sure if should allow that.
- */
-
-#include <sys/time.h>
-
-struct timestamp {
- struct timeval t;
-};
-
-struct timestamp *get_timestamp(void)
-{
- struct timestamp *ts = NULL;
-
- if (!(ts = dm_malloc(sizeof(*ts))))
- return_NULL;
-
- if (gettimeofday(&ts->t, NULL)) {
- log_sys_error("gettimeofday", "get_timestamp");
- return NULL;
- }
-
- return ts;
-}
-
-/* cmp_timestamp: Compare two timestamps
- *
- * Return: -1 if t1 is less than t2
- * 0 if t1 is equal to t2
- * 1 if t1 is greater than t2
- */
-int cmp_timestamp(struct timestamp *t1, struct timestamp *t2)
-{
- if(t1->t.tv_sec < t2->t.tv_sec)
- return -1;
- if(t1->t.tv_sec > t2->t.tv_sec)
- return 1;
-
- if(t1->t.tv_usec < t2->t.tv_usec)
- return -1;
- if(t1->t.tv_usec > t2->t.tv_usec)
- return 1;
-
- return 0;
-}
-
-#endif /* HAVE_REALTIME */
-
-void destroy_timestamp(struct timestamp *t)
-{
- if (t)
- dm_free(t);
-}
--- a/lib/misc/timestamp.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2006 Rackable Systems All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef _LVM_TIMESTAMP_H
-#define _LVM_TIMESTAMP_H
-
-struct timestamp;
-
-struct timestamp *get_timestamp(void);
-
-/* cmp_timestamp: Compare two timestamps
- *
- * Return: -1 if t1 is less than t2
- * 0 if t1 is equal to t2
- * 1 if t1 is greater than t2
- */
-int cmp_timestamp(struct timestamp *t1, struct timestamp *t2);
-
-void destroy_timestamp(struct timestamp *t);
-
-#endif /* _LVM_TIMESTAMP_H */
-
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,6 @@
ODIRECT=yes
DM_IOCTLS=yes
SELINUX=yes
- REALTIME=yes
CLUSTER=internal
FSADM=yes
;;
@@ -54,7 +53,6 @@
ODIRECT=no
DM_IOCTLS=no
SELINUX=no
- REALTIME=no
CLUSTER=none
FSADM=no
;;
@@ -314,13 +312,6 @@
AC_MSG_RESULT($READLINE)
################################################################################
-dnl -- Disable realtime clock support
-AC_MSG_CHECKING(whether to enable realtime support)
-AC_ARG_ENABLE(realtime, [ --disable-realtime Disable realtime clock support],
-REALTIME=$enableval)
-AC_MSG_RESULT($REALTIME)
-
-################################################################################
dnl -- Build cluster LVM daemon
AC_MSG_CHECKING(whether to build cluster LVM daemon)
AC_ARG_WITH(clvmd,
@@ -557,19 +548,6 @@
fi
################################################################################
-dnl -- Check for realtime clock support
-if test x$REALTIME = xyes; then
- AC_CHECK_LIB(rt, clock_gettime, HAVE_REALTIME=yes, HAVE_REALTIME=no)
-
- if test x$HAVE_REALTIME = xyes; then
- AC_DEFINE([HAVE_REALTIME], 1, [Define to 1 to include support for realtime clock.])
- LIBS="-lrt $LIBS"
- else
- AC_MSG_WARN(Disabling realtime clock)
- fi
-fi
-
-################################################################################
dnl -- Check for getopt
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
@@ -778,7 +756,6 @@
AC_SUBST(FSADM)
AC_SUBST(GROUP)
AC_SUBST(HAVE_LIBDL)
-AC_SUBST(HAVE_REALTIME)
AC_SUBST(HAVE_SELINUX)
AC_SUBST(INTL)
AC_SUBST(INTL_PACKAGE)
--
Respect is a rational process
-- McCoy, "The Galileo Seven", stardate 2822.3
Attachment:
signature.asc
Description: Digital signature
_______________________________________________ linux-lvm mailing list linux-lvm@redhat.com https://www.redhat.com/mailman/listinfo/linux-lvm read the LVM HOW-TO at http://tldp.org/HOWTO/LVM-HOWTO/
