diff options
author | roberto <roberto@FreeBSD.org> | 2008-08-17 17:37:33 +0000 |
---|---|---|
committer | roberto <roberto@FreeBSD.org> | 2008-08-17 17:37:33 +0000 |
commit | 4ded1c1fa0bc21c61f91a2dbe864835986745121 (patch) | |
tree | 16d100fbc9dae63888d48b464e471ba0e5065193 /contrib/ntp/adjtimed | |
parent | 8b5a86d4fda08a9c68231415812edcb26be52f79 (diff) | |
download | FreeBSD-src-4ded1c1fa0bc21c61f91a2dbe864835986745121.zip FreeBSD-src-4ded1c1fa0bc21c61f91a2dbe864835986745121.tar.gz |
Flatten the dist and various 4.n.n trees in preparation of future ntp imports.
Diffstat (limited to 'contrib/ntp/adjtimed')
-rw-r--r-- | contrib/ntp/adjtimed/Makefile.am | 8 | ||||
-rw-r--r-- | contrib/ntp/adjtimed/Makefile.in | 445 | ||||
-rw-r--r-- | contrib/ntp/adjtimed/README | 22 | ||||
-rw-r--r-- | contrib/ntp/adjtimed/adjtimed.c | 491 |
4 files changed, 0 insertions, 966 deletions
diff --git a/contrib/ntp/adjtimed/Makefile.am b/contrib/ntp/adjtimed/Makefile.am deleted file mode 100644 index 14a44c6..0000000 --- a/contrib/ntp/adjtimed/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -#AUTOMAKE_OPTIONS = ../ansi2knr #no-dependencies -AUTOMAKE_OPTIONS = ../util/ansi2knr -bin_PROGRAMS = @MAKE_ADJTIMED@ -EXTRA_PROGRAMS = adjtimed -INCLUDES = -I$(top_srcdir)/include -LDADD = ../libntp/libntp.a -#EXTRA_DIST = TAGS -ETAGS_ARGS = Makefile.am diff --git a/contrib/ntp/adjtimed/Makefile.in b/contrib/ntp/adjtimed/Makefile.in deleted file mode 100644 index b411260..0000000 --- a/contrib/ntp/adjtimed/Makefile.in +++ /dev/null @@ -1,445 +0,0 @@ -# Makefile.in generated by automake 1.7.7 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. -# This Makefile.in 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -ARLIB_DIR = @ARLIB_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHUTEST = @CHUTEST@ -CLKTEST = @CLKTEST@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCFD = @DCFD@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EF_LIBS = @EF_LIBS@ -EF_PROGS = @EF_PROGS@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LCRYPTO = @LCRYPTO@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBPARSE = @LIBPARSE@ -LIBS = @LIBS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MAKE_ADJTIMED = @MAKE_ADJTIMED@ -MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@ -MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@ -MAKE_LIBPARSE = @MAKE_LIBPARSE@ -MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@ -MAKE_NTPDSIM = @MAKE_NTPDSIM@ -MAKE_NTPTIME = @MAKE_NTPTIME@ -MAKE_NTP_KEYGEN = @MAKE_NTP_KEYGEN@ -MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@ -MAKE_SNTP = @MAKE_SNTP@ -MAKE_TICKADJ = @MAKE_TICKADJ@ -MAKE_TIMETRIM = @MAKE_TIMETRIM@ -OBJEXT = @OBJEXT@ -OPENSSL = @OPENSSL@ -OPENSSL_INC = @OPENSSL_INC@ -OPENSSL_LIB = @OPENSSL_LIB@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_PERL = @PATH_PERL@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PATH_SH = @PATH_SH@ -PROPDELAY = @PROPDELAY@ -RANLIB = @RANLIB@ -READLINE_LIBS = @READLINE_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TESTDCF = @TESTDCF@ -U = @U@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ - -#AUTOMAKE_OPTIONS = ../ansi2knr #no-dependencies -AUTOMAKE_OPTIONS = ../util/ansi2knr -bin_PROGRAMS = @MAKE_ADJTIMED@ -EXTRA_PROGRAMS = adjtimed -INCLUDES = -I$(top_srcdir)/include -LDADD = ../libntp/libntp.a -#EXTRA_DIST = TAGS -ETAGS_ARGS = Makefile.am -subdir = adjtimed -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -EXTRA_PROGRAMS = adjtimed$(EXEEXT) -bin_PROGRAMS = @MAKE_ADJTIMED@ -PROGRAMS = $(bin_PROGRAMS) - -adjtimed_SOURCES = adjtimed.c -adjtimed_OBJECTS = adjtimed$U.$(OBJEXT) -adjtimed_LDADD = $(LDADD) -adjtimed_DEPENDENCIES = ../libntp/libntp.a -adjtimed_LDFLAGS = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/adjtimed$U.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = adjtimed.c -DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am -SOURCES = adjtimed.c - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu adjtimed/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - done - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -adjtimed$(EXEEXT): $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES) - @rm -f adjtimed$(EXEEXT) - $(LINK) $(adjtimed_LDFLAGS) $(adjtimed_OBJECTS) $(adjtimed_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core - -distclean-compile: - -rm -f *.tab.c - -ANSI2KNR = ../util/ansi2knr -../util/ansi2knr: - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr - -mostlyclean-kr: - -test "$U" = "" || rm -f *_.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adjtimed$U.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -adjtimed_.c: adjtimed.c $(ANSI2KNR) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtimed.c; then echo $(srcdir)/adjtimed.c; else echo adjtimed.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ -adjtimed_.$(OBJEXT) : $(ANSI2KNR) -uninstall-info-am: - -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) - -installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-binPROGRAMS - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-kr pdf pdf-am ps ps-am tags \ - uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/contrib/ntp/adjtimed/README b/contrib/ntp/adjtimed/README deleted file mode 100644 index d4bd593..0000000 --- a/contrib/ntp/adjtimed/README +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------------------------------------------------- -The adjtimed daemon emulates the BSD adjtime(2) system call. The -adjtime() routine communicates with this daemon via SYSV messages. - -The emulation uses an undocumented kernel variable (as of 6.0/2.0 -and later releases) and as such it cannot be guaranteed to work in -future HP-UX releases. Perhaps HP-UX will have a real adjtime(2) -system call in the future. - -Author: Tai Jin (tai@sde.hp.com) ------------------------------------------------------------------------------- - -IMPORTANT NOTE: This stuff must be compiled with no optimization !! - -NOTE: This code is known to work as of 8.0 on s300's, s700's and s800's. - PLEASE do not modify it unless you have access to kernel sources - and fully understand the implications of any changes you are making. - One person already has trashed adjtimed by making it do "the right - thing". This is not an exact replacement for BSD adjtime(2), don't - try to make it into one. - - -- Ken diff --git a/contrib/ntp/adjtimed/adjtimed.c b/contrib/ntp/adjtimed/adjtimed.c deleted file mode 100644 index f38e66d..0000000 --- a/contrib/ntp/adjtimed/adjtimed.c +++ /dev/null @@ -1,491 +0,0 @@ -/*************************************************************************/ -/* (c) Copyright Tai Jin, 1988. All Rights Reserved. */ -/* Hewlett-Packard Laboratories. */ -/* */ -/* Permission is hereby granted for unlimited modification, use, and */ -/* distribution. This software is made available with no warranty of */ -/* any kind, express or implied. This copyright notice must remain */ -/* intact in all versions of this software. */ -/* */ -/* The author would appreciate it if any bug fixes and enhancements were */ -/* to be sent back to him for incorporation into future versions of this */ -/* software. Please send changes to tai@iag.hp.com or ken@sdd.hp.com. */ -/*************************************************************************/ - -#ifndef lint -static char RCSid[] = "adjtimed.c,v 3.1 1993/07/06 01:04:45 jbj Exp"; -#endif - -/* - * Adjust time daemon. - * This daemon adjusts the rate of the system clock a la BSD's adjtime(). - * The adjtime() routine uses SYSV messages to communicate with this daemon. - * - * Caveat: This emulation uses an undocumented kernel variable. As such, it - * cannot be guaranteed to work in future HP-UX releases. Fortunately, - * it will no longer be needed in HPUX 10.01 and later. - */ - -#include <sys/param.h> -#include <sys/types.h> -#include <sys/ipc.h> -#include <sys/msg.h> -#include <sys/lock.h> -#include <time.h> -#include <signal.h> -#include <nlist.h> -#include <fcntl.h> -#include <stdio.h> -#include <unistd.h> - -#include "ntp_syslog.h" -#include "ntp_stdlib.h" - -#include "adjtime.h" - -double atof (const char *); - -int InitClockRate (void); -int AdjustClockRate (register struct timeval *delta, register struct timeval *olddelta); -long GetClockRate (void); -int SetClockRate (long); -void ResetClockRate (void); -void Cleanup (void); -void Exit (int); - -#define MILLION 1000000L - -/* emacs cc-mode goes nuts if we split the next line... */ -#define tvtod(tv) ((double)tv.tv_sec + ((double)tv.tv_usec / (double)MILLION)) - -char *progname = NULL; -int verbose = 0; -int sysdebug = 0; -static int mqid; -static double oldrate = 0.0; - -int -main( - int argc, - char *argv[] - ) -{ - struct timeval remains; - struct sigvec vec; - MsgBuf msg; - char ch; - int nofork = 0; - int fd; - - progname = argv[0]; - -#ifdef LOG_LOCAL6 - openlog("adjtimed", LOG_PID, LOG_LOCAL6); -#else - openlog("adjtimed", LOG_PID); -#endif - - while ((ch = ntp_getopt(argc, argv, "hkrvdfp:")) != EOF) { - switch (ch) { - case 'k': - case 'r': - if ((mqid = msgget(KEY, 0)) != -1) { - if (msgctl(mqid, IPC_RMID, (struct msqid_ds *)0) == -1) { - msyslog(LOG_ERR, "remove old message queue: %m"); - perror("adjtimed: remove old message queue"); - exit(1); - } - } - - if (ch == 'k') - exit(0); - - break; - - case 'v': - ++verbose, nofork = 1; - break; - - case 'd': - ++sysdebug; - break; - - case 'f': - nofork = 1; - break; - - case 'p': - fputs("adjtimed: -p option ignored\n", stderr); - break; - - default: - puts("usage: adjtimed -hkrvdf"); - puts("-h\thelp"); - puts("-k\tkill existing adjtimed, if any"); - puts("-r\trestart (kills existing adjtimed, if any)"); - puts("-v\tdebug output (repeat for more output)"); - puts("-d\tsyslog output (repeat for more output)"); - puts("-f\tno fork"); - msyslog(LOG_ERR, "usage error"); - exit(1); - } /* switch */ - } /* while */ - - if (!nofork) { - switch (fork()) { - case 0: - close(fileno(stdin)); - close(fileno(stdout)); - close(fileno(stderr)); - -#ifdef TIOCNOTTY - if ((fd = open("/dev/tty")) != -1) { - ioctl(fd, TIOCNOTTY, 0); - close(fd); - } -#else - setpgrp(); -#endif - break; - - case -1: - msyslog(LOG_ERR, "fork: %m"); - perror("adjtimed: fork"); - exit(1); - - default: - exit(0); - } /* switch */ - } /* if */ - - if (nofork) { - setvbuf(stdout, NULL, _IONBF, BUFSIZ); - setvbuf(stderr, NULL, _IONBF, BUFSIZ); - } - - msyslog(LOG_INFO, "started"); - if (verbose) printf("adjtimed: started\n"); - - if (InitClockRate() == -1) - Exit(2); - - (void)signal(SIGHUP, SIG_IGN); - (void)signal(SIGINT, SIG_IGN); - (void)signal(SIGQUIT, SIG_IGN); - (void)signal(SIGTERM, Cleanup); - - vec.sv_handler = ResetClockRate; - vec.sv_flags = 0; - vec.sv_mask = ~0; - sigvector(SIGALRM, &vec, (struct sigvec *)0); - - if (msgget(KEY, IPC_CREAT|IPC_EXCL) == -1) { - if (errno == EEXIST) { - msyslog(LOG_ERR, "message queue already exists, use -r to remove it"); - fputs("adjtimed: message queue already exists, use -r to remove it\n", - stderr); - Exit(1); - } - - msyslog(LOG_ERR, "create message queue: %m"); - perror("adjtimed: create message queue"); - Exit(1); - } - - if ((mqid = msgget(KEY, 0)) == -1) { - msyslog(LOG_ERR, "get message queue id: %m"); - perror("adjtimed: get message queue id"); - Exit(1); - } - - /* Lock process in memory to improve response time */ - if (plock(PROCLOCK)) { - msyslog(LOG_ERR, "plock: %m"); - perror("adjtimed: plock"); - Cleanup(); - } - - /* Also raise process priority. - * If we do not get run when we want, this leads to bad timekeeping - * and "Previous time adjustment didn't complete" gripes from xntpd. - */ - if (nice(-10) == -1) { - msyslog(LOG_ERR, "nice: %m"); - perror("adjtimed: nice"); - Cleanup(); - } - - for (;;) { - if (msgrcv(mqid, &msg.msgp, MSGSIZE, CLIENT, 0) == -1) { - if (errno == EINTR) continue; - msyslog(LOG_ERR, "read message: %m"); - perror("adjtimed: read message"); - Cleanup(); - } - - switch (msg.msgb.code) { - case DELTA1: - case DELTA2: - AdjustClockRate(&msg.msgb.tv, &remains); - - if (msg.msgb.code == DELTA2) { - msg.msgb.tv = remains; - msg.msgb.mtype = SERVER; - - while (msgsnd(mqid, &msg.msgp, MSGSIZE, 0) == -1) { - if (errno == EINTR) continue; - msyslog(LOG_ERR, "send message: %m"); - perror("adjtimed: send message"); - Cleanup(); - } - } - - if (remains.tv_sec + remains.tv_usec != 0L) { - if (verbose) { - printf("adjtimed: previous correction remaining %.6fs\n", - tvtod(remains)); - } - if (sysdebug) { - msyslog(LOG_INFO, "previous correction remaining %.6fs", - tvtod(remains)); - } - } - break; - - default: - fprintf(stderr, "adjtimed: unknown message code %d\n", msg.msgb.code); - msyslog(LOG_ERR, "unknown message code %d", msg.msgb.code); - } /* switch */ - } /* loop */ -} /* main */ - -/* - * Default clock rate (old_tick). - */ -#define DEFAULT_RATE (MILLION / HZ) -#define UNKNOWN_RATE 0L -#define TICK_ADJ 5 /* standard adjustment rate, microsec/tick */ - -static long default_rate = DEFAULT_RATE; -static long tick_rate = HZ; /* ticks per sec */ -static long slew_rate = TICK_ADJ * HZ; /* in microsec/sec */ - -int -AdjustClockRate( - register struct timeval *delta, - register struct timeval *olddelta - ) -{ - register long rate, dt, leftover; - struct itimerval period, remains; - - dt = (delta->tv_sec * MILLION) + delta->tv_usec; - - if (verbose) - printf("adjtimed: new correction %.6fs\n", (double)dt / (double)MILLION); - if (sysdebug) - msyslog(LOG_INFO, "new correction %.6fs", (double)dt / (double)MILLION); - if (verbose > 2) printf("adjtimed: leftover %ldus\n", leftover); - if (sysdebug > 2) msyslog(LOG_INFO, "leftover %ldus", leftover); - rate = dt; - - /* - * Apply a slew rate of slew_rate over a period of dt/slew_rate seconds. - */ - if (dt > 0) { - rate = slew_rate; - } else { - rate = -slew_rate; - dt = -dt; - } - period.it_value.tv_sec = dt / slew_rate; - period.it_value.tv_usec = (dt % slew_rate) * (MILLION / slew_rate); - /* - * Note: we assume the kernel will convert the specified period into ticks - * using the modified clock rate rather than an assumed nominal clock rate, - * and therefore will generate the timer interrupt after the specified - * number of true seconds, not skewed seconds. - */ - - if (verbose > 1) - printf("adjtimed: will be complete in %lds %ldus\n", - period.it_value.tv_sec, period.it_value.tv_usec); - if (sysdebug > 1) - msyslog(LOG_INFO, "will be complete in %lds %ldus", - period.it_value.tv_sec, period.it_value.tv_usec); - /* - * adjust the clock rate - */ - if (dt) { - if (SetClockRate((rate / tick_rate) + default_rate) == -1) { - msyslog(LOG_ERR, "set clock rate: %m"); - perror("adjtimed: set clock rate"); - } - } - /* - * start the timer - * (do this after changing the rate because the period has been rounded down) - */ - period.it_interval.tv_sec = period.it_interval.tv_usec = 0L; - setitimer(ITIMER_REAL, &period, &remains); - /* - * return old delta - */ - if (olddelta) { - dt = ((remains.it_value.tv_sec * MILLION) + remains.it_value.tv_usec) * - oldrate; - olddelta->tv_sec = dt / MILLION; - olddelta->tv_usec = dt - (olddelta->tv_sec * MILLION); - } - - oldrate = (double)rate / (double)MILLION; - return(0); -} /* AdjustClockRate */ - -static struct nlist nl[] = { -#ifdef __hp9000s800 -#ifdef PRE7_0 - { "tick" }, -#else - { "old_tick" }, -#endif -#else - { "_old_tick" }, -#endif - { "" } -}; - -static int kmem; - -/* - * The return value is the clock rate in old_tick units or -1 if error. - */ -long -GetClockRate(void) -{ - long rate, mask; - - if (lseek(kmem, (off_t)nl[0].n_value, 0) == -1L) - return (-1L); - - mask = sigblock(sigmask(SIGALRM)); - - if (read(kmem, (caddr_t)&rate, sizeof(rate)) != sizeof(rate)) - rate = UNKNOWN_RATE; - - sigsetmask(mask); - return (rate); -} /* GetClockRate */ - -/* - * The argument is the new rate in old_tick units. - */ -int -SetClockRate( - long rate - ) -{ - long mask; - - if (lseek(kmem, (off_t)nl[0].n_value, 0) == -1L) - return (-1); - - mask = sigblock(sigmask(SIGALRM)); - - if (write(kmem, (caddr_t)&rate, sizeof(rate)) != sizeof(rate)) { - sigsetmask(mask); - return (-1); - } - - sigsetmask(mask); - - if (rate != default_rate) { - if (verbose > 3) { - printf("adjtimed: clock rate (%lu) %ldus/s\n", rate, - (rate - default_rate) * tick_rate); - } - if (sysdebug > 3) { - msyslog(LOG_INFO, "clock rate (%lu) %ldus/s", rate, - (rate - default_rate) * tick_rate); - } - } - - return (0); -} /* SetClockRate */ - -int -InitClockRate(void) -{ - if ((kmem = open("/dev/kmem", O_RDWR)) == -1) { - msyslog(LOG_ERR, "open(/dev/kmem): %m"); - perror("adjtimed: open(/dev/kmem)"); - return (-1); - } - - nlist("/hp-ux", nl); - - if (nl[0].n_type == 0) { - fputs("adjtimed: /hp-ux has no symbol table\n", stderr); - msyslog(LOG_ERR, "/hp-ux has no symbol table"); - return (-1); - } - /* - * Set the default to the system's original value - */ - default_rate = GetClockRate(); - if (default_rate == UNKNOWN_RATE) default_rate = DEFAULT_RATE; - tick_rate = (MILLION / default_rate); - slew_rate = TICK_ADJ * tick_rate; - fprintf(stderr,"default_rate=%ld, tick_rate=%ld, slew_rate=%ld\n",default_rate,tick_rate,slew_rate); - - return (0); -} /* InitClockRate */ - -/* - * Reset the clock rate to the default value. - */ -void -ResetClockRate(void) -{ - struct itimerval it; - - it.it_value.tv_sec = it.it_value.tv_usec = 0L; - setitimer(ITIMER_REAL, &it, (struct itimerval *)0); - - if (verbose > 2) puts("adjtimed: resetting the clock"); - if (sysdebug > 2) msyslog(LOG_INFO, "resetting the clock"); - - if (GetClockRate() != default_rate) { - if (SetClockRate(default_rate) == -1) { - msyslog(LOG_ERR, "set clock rate: %m"); - perror("adjtimed: set clock rate"); - } - } - - oldrate = 0.0; -} /* ResetClockRate */ - -void -Cleanup(void) -{ - ResetClockRate(); - - if (msgctl(mqid, IPC_RMID, (struct msqid_ds *)0) == -1) { - if (errno != EINVAL) { - msyslog(LOG_ERR, "remove message queue: %m"); - perror("adjtimed: remove message queue"); - } - } - - Exit(2); -} /* Cleanup */ - -void -Exit(status) - int status; -{ - msyslog(LOG_ERR, "terminated"); - closelog(); - if (kmem != -1) close(kmem); - exit(status); -} /* Exit */ |