Skip to content

Commit

Permalink
Update gnulib files.
Browse files Browse the repository at this point in the history
  • Loading branch information
jas4711 committed Feb 18, 2010
1 parent 9985aac commit 970afbe
Show file tree
Hide file tree
Showing 11 changed files with 188 additions and 15 deletions.
27 changes: 26 additions & 1 deletion gl/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close connect error fdl-1.3 gendocs getaddrinfo getline getpass-gnu gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile manywarnings minmax perror pmccabe2html progname read-file readline recv select send setsockopt shutdown socket sockets sys_stat update-copyright version-etc-fsf warnings
# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close connect error fdl-1.3 gendocs getaddrinfo getline getpass-gnu gettime gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile manywarnings minmax perror pmccabe2html progname read-file readline recv select send setsockopt shutdown socket sockets sys_stat update-copyright version-etc-fsf warnings

AUTOMAKE_OPTIONS = 1.5 gnits

Expand Down Expand Up @@ -303,6 +303,24 @@ libgnu_la_SOURCES += gettext.h

## end gnulib module gettext-h

## begin gnulib module gettime


EXTRA_DIST += gettime.c

EXTRA_libgnu_la_SOURCES += gettime.c

## end gnulib module gettime

## begin gnulib module gettimeofday


EXTRA_DIST += gettimeofday.c

EXTRA_libgnu_la_SOURCES += gettimeofday.c

## end gnulib module gettimeofday

## begin gnulib module gnumakefile

distclean-local: clean-GNUmakefile
Expand Down Expand Up @@ -1134,6 +1152,13 @@ EXTRA_DIST += time.in.h

## end gnulib module time

## begin gnulib module timespec


EXTRA_DIST += timespec.h

## end gnulib module timespec

## begin gnulib module unistd

BUILT_SOURCES += unistd.h
Expand Down
48 changes: 48 additions & 0 deletions gl/gettime.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* gettime -- get the system clock
Copyright (C) 2002, 2004-2007, 2009-2010 Free Software Foundation, Inc.
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 3 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, see <http://www.gnu.org/licenses/>. */

/* Written by Paul Eggert. */

#include <config.h>

#include "timespec.h"

#include <sys/time.h>

/* Get the system time into *TS. */

void
gettime (struct timespec *ts)
{
#if HAVE_NANOTIME
nanotime (ts);
#else

# if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
if (clock_gettime (CLOCK_REALTIME, ts) == 0)
return;
# endif

{
struct timeval tv;
gettimeofday (&tv, NULL);
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec * 1000;
}

#endif
}
File renamed without changes.
31 changes: 31 additions & 0 deletions gl/m4/clock_time.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# clock_time.m4 serial 10
dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

# Check for clock_gettime and clock_settime, and set LIB_CLOCK_GETTIME.
# For a program named, say foo, you should add a line like the following
# in the corresponding Makefile.am file:
# foo_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)

AC_DEFUN([gl_CLOCK_TIME],
[
dnl Persuade glibc and Solaris <time.h> to declare these functions.
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
# Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
# Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
# Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all*
# programs in the package would end up linked with that potentially-shared
# library, inducing unnecessary run-time overhead.
LIB_CLOCK_GETTIME=
AC_SUBST([LIB_CLOCK_GETTIME])
gl_saved_libs=$LIBS
AC_SEARCH_LIBS([clock_gettime], [rt posix4],
[test "$ac_cv_search_clock_gettime" = "none required" ||
LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
AC_CHECK_FUNCS([clock_gettime clock_settime])
LIBS=$gl_saved_libs
])
15 changes: 15 additions & 0 deletions gl/m4/gettime.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# gettime.m4 serial 7
dnl Copyright (C) 2002, 2004-2006, 2009-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

AC_DEFUN([gl_GETTIME],
[
AC_LIBOBJ([gettime])
dnl Prerequisites of lib/gettime.c.
AC_REQUIRE([gl_CLOCK_TIME])
AC_REQUIRE([gl_TIMESPEC])
AC_CHECK_FUNCS_ONCE([gettimeofday nanotime])
])
3 changes: 2 additions & 1 deletion gl/m4/gnulib-cache.m4
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


# Specification in the form of a command-line invocation:
# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close connect error fdl-1.3 gendocs getaddrinfo getline getpass-gnu gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile manywarnings minmax perror pmccabe2html progname read-file readline recv select send setsockopt shutdown socket sockets sys_stat update-copyright version-etc-fsf warnings
# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close connect error fdl-1.3 gendocs getaddrinfo getline getpass-gnu gettime gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile manywarnings minmax perror pmccabe2html progname read-file readline recv select send setsockopt shutdown socket sockets sys_stat update-copyright version-etc-fsf warnings

# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl/override])
Expand All @@ -32,6 +32,7 @@ gl_MODULES([
getaddrinfo
getline
getpass-gnu
gettime
gnupload
gpl-3.0
inet_ntop
Expand Down
14 changes: 11 additions & 3 deletions gl/m4/gnulib-comp.m4
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ AC_SUBST([LTALLOCA])
AC_LIBOBJ([bind])
fi
gl_SYS_SOCKET_MODULE_INDICATOR([bind])
gl_CLOCK_TIME
gl_FUNC_CLOSE
gl_UNISTD_MODULE_INDICATOR([close])
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
Expand All @@ -91,6 +92,9 @@ AC_SUBST([LTALLOCA])
gl_FUNC_GETPASS_GNU
AC_SUBST([LIBINTL])
AC_SUBST([LTLIBINTL])
gl_GETTIME
gl_FUNC_GETTIMEOFDAY
gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
# Autoconf 2.61a.99 and earlier don't support linking a file only
# in VPATH builds. But since GNUmakefile is for maintainer use
# only, it does not matter if we skip the link with older autoconf.
Expand Down Expand Up @@ -191,6 +195,7 @@ AC_SUBST([LTALLOCA])
gl_HEADER_SYS_TIME_H
AC_PROG_MKDIR_P
gl_HEADER_TIME_H
gl_TIMESPEC
gl_UNISTD_H
gl_FUNC_VASNPRINTF
gl_VERSION_ETC
Expand Down Expand Up @@ -237,8 +242,6 @@ AC_SUBST([LTALLOCA])
gl_COMMON
gl_source_base='gl/tests'
gl_FUNC_UNGETC_WORKS
gl_FUNC_GETTIMEOFDAY
gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
AC_C_BIGENDIAN
AC_C_BIGENDIAN
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
Expand Down Expand Up @@ -393,6 +396,8 @@ AC_DEFUN([gl_FILE_LIST], [
lib/getpass.c
lib/getpass.h
lib/gettext.h
lib/gettime.c
lib/gettimeofday.c
lib/inet_ntop.c
lib/inet_pton.c
lib/intprops.h
Expand Down Expand Up @@ -440,6 +445,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/sys_stat.in.h
lib/sys_time.in.h
lib/time.in.h
lib/timespec.h
lib/unistd.in.h
lib/vasnprintf.c
lib/vasnprintf.h
Expand All @@ -453,6 +459,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/alloca.m4
m4/arpa_inet_h.m4
m4/autobuild.m4
m4/clock_time.m4
m4/close.m4
m4/errno_h.m4
m4/error.m4
Expand All @@ -464,6 +471,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/getdelim.m4
m4/getline.m4
m4/getpass.m4
m4/gettime.m4
m4/gettimeofday.m4
m4/gnulib-common.m4
m4/hostent.m4
Expand Down Expand Up @@ -512,6 +520,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/sys_stat_h.m4
m4/sys_time_h.m4
m4/time_h.m4
m4/timespec.m4
m4/ungetc.m4
m4/unistd_h.m4
m4/vasnprintf.m4
Expand Down Expand Up @@ -576,7 +585,6 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-wchar.c
tests/zerosize-ptr.h
tests=lib/dummy.c
tests=lib/gettimeofday.c
tests=lib/ioctl.c
tests=lib/sys_ioctl.in.h
tests=lib/verify.h
Expand Down
15 changes: 15 additions & 0 deletions gl/m4/timespec.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#serial 14

# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

dnl From Jim Meyering

AC_DEFUN([gl_TIMESPEC],
[
dnl Prerequisites of lib/timespec.h.
AC_REQUIRE([AC_C_INLINE])
])
2 changes: 1 addition & 1 deletion gl/netdb.in.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct addrinfo
# endif
# ifndef AI_ADDRCONFIG
# define AI_ADDRCONFIG 0 /* 0x0020: Use configuration of this host to choose
returned address type.. */
returned address type. */
# endif

/* Error values for `getaddrinfo' function. */
Expand Down
9 changes: 0 additions & 9 deletions gl/tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,6 @@ EXTRA_DIST += test-getline.c signature.h macros.h

## end gnulib module getline-tests

## begin gnulib module gettimeofday


EXTRA_DIST += gettimeofday.c

EXTRA_libtests_a_SOURCES += gettimeofday.c

## end gnulib module gettimeofday

## begin gnulib module gettimeofday-tests

TESTS += test-gettimeofday
Expand Down
39 changes: 39 additions & 0 deletions gl/timespec.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* timespec -- System time interface
Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2010 Free Software
Foundation, Inc.
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 3 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, see <http://www.gnu.org/licenses/>. */

#if ! defined TIMESPEC_H
# define TIMESPEC_H

# include <time.h>

/* Return negative, zero, positive if A < B, A == B, A > B, respectively.
Assume the nanosecond components are in range, or close to it. */
static inline int
timespec_cmp (struct timespec a, struct timespec b)
{
return (a.tv_sec < b.tv_sec ? -1
: a.tv_sec > b.tv_sec ? 1
: a.tv_nsec < b.tv_nsec ? -1
: a.tv_nsec > b.tv_nsec ? 1
: 0);
}

void gettime (struct timespec *);
int settime (struct timespec const *);

#endif

0 comments on commit 970afbe

Please sign in to comment.