From owner-svn-src-stable-11@freebsd.org Sun Oct 9 12:34:59 2016 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0ED73C06065; Sun, 9 Oct 2016 12:34:59 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C400EEB0; Sun, 9 Oct 2016 12:34:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u99CYvWo018416; Sun, 9 Oct 2016 12:34:57 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u99CYv4x018407; Sun, 9 Oct 2016 12:34:57 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201610091234.u99CYv4x018407@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 9 Oct 2016 12:34:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r306905 - in stable/11: include lib/librt tests/sys/mqueue X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Oct 2016 12:34:59 -0000 Author: kib Date: Sun Oct 9 12:34:56 2016 New Revision: 306905 URL: https://svnweb.freebsd.org/changeset/base/306905 Log: MFC r306588: Export the mq_getfd_np() and timer_oshandle_np() symbols from librt.so. Modified: stable/11/include/mqueue.h stable/11/include/time.h stable/11/lib/librt/Symbol.map stable/11/lib/librt/mq.c stable/11/lib/librt/timer.c stable/11/tests/sys/mqueue/Makefile stable/11/tests/sys/mqueue/mqtest3.c stable/11/tests/sys/mqueue/mqtest4.c Directory Properties: stable/11/ (props changed) Modified: stable/11/include/mqueue.h ============================================================================== --- stable/11/include/mqueue.h Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/include/mqueue.h Sun Oct 9 12:34:56 2016 (r306905) @@ -50,7 +50,9 @@ ssize_t mq_timedreceive(mqd_t, char *__r int mq_timedsend(mqd_t, const char *, size_t, unsigned, const struct timespec *); int mq_unlink(const char *); -int __mq_oshandle(mqd_t mqd); +#if __BSD_VISIBLE +int mq_getfd_np(mqd_t mqd); +#endif /* __BSD_VISIBLE */ __END_DECLS #endif Modified: stable/11/include/time.h ============================================================================== --- stable/11/include/time.h Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/include/time.h Sun Oct 9 12:34:56 2016 (r306905) @@ -194,6 +194,7 @@ char *timezone(int, int); /* XXX XSI con void tzsetwall(void); time_t timelocal(struct tm * const); time_t timegm(struct tm * const); +int timer_oshandle_np(timer_t timerid); #endif /* __BSD_VISIBLE */ #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) Modified: stable/11/lib/librt/Symbol.map ============================================================================== --- stable/11/lib/librt/Symbol.map Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/lib/librt/Symbol.map Sun Oct 9 12:34:56 2016 (r306905) @@ -25,6 +25,11 @@ FBSD_1.0 { timer_getoverrun; }; +FBSD_1.5 { + mq_getfd_np; + timer_oshandle_np; +}; + FBSDprivate_1.0 { _aio_read; _aio_write; Modified: stable/11/lib/librt/mq.c ============================================================================== --- stable/11/lib/librt/mq.c Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/lib/librt/mq.c Sun Oct 9 12:34:56 2016 (r306905) @@ -272,8 +272,9 @@ __mq_unlink(const char *path) return __sys_kmq_unlink(path); } +#pragma weak mq_getfd_np int -__mq_oshandle(mqd_t mqd) +mq_getfd_np(mqd_t mqd) { return (mqd->oshandle); Modified: stable/11/lib/librt/timer.c ============================================================================== --- stable/11/lib/librt/timer.c Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/lib/librt/timer.c Sun Oct 9 12:34:56 2016 (r306905) @@ -175,8 +175,9 @@ __timer_settime(timer_t timerid, int fla flags, value, ovalue); } +#pragma weak timer_oshandle_np int -__timer_oshandle(timer_t timerid) +timer_oshandle_np(timer_t timerid) { return (timerid->oshandle); Modified: stable/11/tests/sys/mqueue/Makefile ============================================================================== --- stable/11/tests/sys/mqueue/Makefile Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/tests/sys/mqueue/Makefile Sun Oct 9 12:34:56 2016 (r306905) @@ -10,8 +10,8 @@ CFLAGS+= -I${SRCTOP}/tests PROGS+= mqtest1 PROGS+= mqtest2 -#PROGS+= mqtest3 -#PROGS+= mqtest4 +PROGS+= mqtest3 +PROGS+= mqtest4 PROGS+= mqtest5 LIBADD+= rt Modified: stable/11/tests/sys/mqueue/mqtest3.c ============================================================================== --- stable/11/tests/sys/mqueue/mqtest3.c Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/tests/sys/mqueue/mqtest3.c Sun Oct 9 12:34:56 2016 (r306905) @@ -62,9 +62,10 @@ main(void) buf = malloc(attr.mq_msgsize); for (j = 0; j < LOOPS; ++j) { FD_ZERO(&set); - FD_SET(__mq_oshandle(mq), &set); + FD_SET(mq_getfd_np(mq), &set); alarm(3); - status = select(__mq_oshandle(mq)+1, &set, NULL, NULL, NULL); + status = select(mq_getfd_np(mq) + 1, &set, NULL, + NULL, NULL); if (status != 1) err(1, "child process: select()"); status = mq_receive(mq, buf, attr.mq_msgsize, &prio); @@ -94,8 +95,9 @@ main(void) } alarm(3); FD_ZERO(&set); - FD_SET(__mq_oshandle(mq), &set); - status = select(__mq_oshandle(mq)+1, NULL, &set, NULL, NULL); + FD_SET(mq_getfd_np(mq), &set); + status = select(mq_getfd_np(mq) + 1, NULL, &set, + NULL, NULL); if (status != 1) err(1, "select()"); status = mq_send(mq, buf, attr.mq_msgsize, PRIO); Modified: stable/11/tests/sys/mqueue/mqtest4.c ============================================================================== --- stable/11/tests/sys/mqueue/mqtest4.c Sun Oct 9 11:44:33 2016 (r306904) +++ stable/11/tests/sys/mqueue/mqtest4.c Sun Oct 9 12:34:56 2016 (r306905) @@ -57,7 +57,7 @@ main(void) mq = mq_open(MQNAME, O_RDWR); if (mq == (mqd_t)-1) err(1, "child: mq_open"); - EV_SET(&kev, __mq_oshandle(mq), EVFILT_READ, EV_ADD, 0, 0, 0); + EV_SET(&kev, mq_getfd_np(mq), EVFILT_READ, EV_ADD, 0, 0, 0); status = kevent(kq, &kev, 1, NULL, 0, NULL); if (status == -1) err(1, "child: kevent"); @@ -89,7 +89,7 @@ main(void) signal(SIGALRM, sighandler); kq = kqueue(); - EV_SET(&kev, __mq_oshandle(mq), EVFILT_WRITE, EV_ADD, 0, 0, 0); + EV_SET(&kev, mq_getfd_np(mq), EVFILT_WRITE, EV_ADD, 0, 0, 0); status = kevent(kq, &kev, 1, NULL, 0, NULL); if (status == -1) err(1, "kevent");