From 69f5174d9ae957637020992f615fbe132180e08b Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Sun, 18 Sep 1994 20:29:55 +0000 Subject: [PATCH] Redo kernel NTP PLL support, user-mode interface. --- lib/libc/gen/Makefile.inc | 17 +++++------ lib/libc/gen/ntp_gettime.c | 59 ++++++++++++++++++++++++++++++++++++++ lib/libc/sys/Makefile.inc | 3 +- 3 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 lib/libc/gen/ntp_gettime.c diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 6d5027d4cca5..f6e0346f764d 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -9,14 +9,15 @@ SRCS+= alarm.c assert.c clock.c closedir.c confstr.c crypt.c ctermid.c \ getdomainname.c getgrent.c getgrouplist.c gethostname.c getloadavg.c \ getlogin.c getmntinfo.c getnetgrent.c getosreldate.c getpagesize.c \ getpass.c getpwent.c getttyent.c getusershell.c glob.c initgroups.c \ - isatty.c nice.c nlist.c opendir.c pause.c popen.c psignal.c pwcache.c \ - raise.c readdir.c rewinddir.c scandir.c seekdir.c setdomainname.c \ - sethostname.c setjmperr.c setmode.c siginterrupt.c siglist.c signal.c \ - sigsetjmp.c sigsetops.c sleep.c sysconf.c sysctl.c syslog.c telldir.c \ - termios.c time.c times.c timezone.c ttyname.c ttyslot.c ualarm.c \ - uname.c unvis.c usleep.c utime.c valloc.c vis.c wait.c wait3.c \ - waitpid.c msgctl.c msgget.c msgrcv.c msgsnd.c semconfig.c semctl.c \ - semget.c semop.c shmat.c shmctl.c shmdt.c shmget.c + isatty.c msgctl.c msgget.c msgrcv.c msgsnd.c nice.c nlist.c \ + ntp_gettime.c opendir.c pause.c popen.c psignal.c pwcache.c raise.c \ + readdir.c rewinddir.c scandir.c seekdir.c semconfig.c semctl.c \ + semget.c semop.c setdomainname.c sethostname.c setjmperr.c setmode.c \ + shmat.c shmctl.c shmdt.c shmget.c siginterrupt.c siglist.c signal.c \ + sigsetjmp.c sigsetops.c sleep.c sysconf.c sysctl.c syslog.c \ + telldir.c termios.c time.c times.c timezone.c ttyname.c ttyslot.c \ + ualarm.c uname.c unvis.c usleep.c utime.c valloc.c vis.c wait.c \ + wait3.c waitpid.c # machine-dependent gen sources .include "${.CURDIR}/${MACHINE}/gen/Makefile.inc" diff --git a/lib/libc/gen/ntp_gettime.c b/lib/libc/gen/ntp_gettime.c new file mode 100644 index 000000000000..13331fc62ce5 --- /dev/null +++ b/lib/libc/gen/ntp_gettime.c @@ -0,0 +1,59 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static const char rcsid[] = + "$Id$"; +#endif /* LIBC_SCCS and not lint */ + +#include +#include +#include +#include + +int +gethostname(struct ntptimeval *ntv) +{ + int mib[3]; + struct ntptimeval tv; + size_t size = sizeof tv; + + mib[0] = CTL_KERN; + mib[1] = KERN_NTP_PLL; + mib[2] = NTP_PLL_GETTIME; + if (sysctl(mib, 3, &tv, &size, NULL, 0) == -1) + return TIME_ERROR; + if(ntv) *ntv = tv; + return tv.time_state; +} + diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index de666dd2dc8c..9e4a4d07c0c5 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -23,8 +23,7 @@ ASM= accept.o access.o acct.o adjtime.o bind.o chdir.o chflags.o chmod.o \ lfs_segclean.o lfs_segwait.o link.o listen.o lstat.o \ madvise.o mincore.o mkdir.o mkfifo.o mknod.o mlock.o mount.o \ mprotect.o msgsys.o msync.o munlock.o munmap.o nfssvc.o \ - ntp_adjtime.o ntp_gettime.o open.o \ - pathconf.o profil.o quotactl.o read.o \ + ntp_adjtime.o open.o pathconf.o profil.o quotactl.o read.o \ readlink.o readv.o recvfrom.o recvmsg.o rename.o revoke.o rmdir.o \ rtprio.o select.o semsys.o sendmsg.o sendto.o setegid.o seteuid.o setgid.o \ setgroups.o setitimer.o setpgid.o setpriority.o setrlimit.o \