From owner-svn-src-all@FreeBSD.ORG Mon Mar 26 19:12:10 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 28C58106566B; Mon, 26 Mar 2012 19:12:10 +0000 (UTC) (envelope-from rmh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EE2018FC08; Mon, 26 Mar 2012 19:12:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2QJC95F046595; Mon, 26 Mar 2012 19:12:09 GMT (envelope-from rmh@svn.freebsd.org) Received: (from rmh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2QJC9A0046591; Mon, 26 Mar 2012 19:12:09 GMT (envelope-from rmh@svn.freebsd.org) Message-Id: <201203261912.q2QJC9A0046591@svn.freebsd.org> From: Robert Millan Date: Mon, 26 Mar 2012 19:12:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233519 - in head: lib/librt sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2012 19:12:10 -0000 Author: rmh Date: Mon Mar 26 19:12:09 2012 New Revision: 233519 URL: http://svn.freebsd.org/changeset/base/233519 Log: Register signal 33 explicitly as reserved by real-time library, and use it by its new name (SIGLIBRT) rather than internal definition in librt (SIGSERVICE). Approved by: davidxu, arch Modified: head/lib/librt/sigev_thread.c head/lib/librt/sigev_thread.h head/sys/sys/signal.h Modified: head/lib/librt/sigev_thread.c ============================================================================== --- head/lib/librt/sigev_thread.c Mon Mar 26 19:06:59 2012 (r233518) +++ head/lib/librt/sigev_thread.c Mon Mar 26 19:12:09 2012 (r233519) @@ -224,11 +224,11 @@ __sigev_get_sigevent(struct sigev_node * sigev_id_t id) { /* - * Build a new sigevent, and tell kernel to deliver SIGSERVICE + * Build a new sigevent, and tell kernel to deliver SIGLIBRT * signal to the new thread. */ newevp->sigev_notify = SIGEV_THREAD_ID; - newevp->sigev_signo = SIGSERVICE; + newevp->sigev_signo = SIGLIBRT; newevp->sigev_notify_thread_id = (lwpid_t)sn->sn_tn->tn_lwpid; newevp->sigev_value.sival_ptr = (void *)id; } @@ -279,7 +279,7 @@ __sigev_delete_node(struct sigev_node *s LIST_REMOVE(sn, sn_link); if (--sn->sn_tn->tn_refcount == 0) - _pthread_kill(sn->sn_tn->tn_thread, SIGSERVICE); + _pthread_kill(sn->sn_tn->tn_thread, SIGLIBRT); if (sn->sn_flags & SNF_WORKING) sn->sn_flags |= SNF_REMOVED; else @@ -326,7 +326,7 @@ sigev_thread_create(int usedefault) LIST_INSERT_HEAD(&sigev_threads, tn, tn_link); __sigev_list_unlock(); - sigfillset(&set); /* SIGSERVICE is masked. */ + sigfillset(&set); /* SIGLIBRT is masked. */ sigdelset(&set, SIGBUS); sigdelset(&set, SIGILL); sigdelset(&set, SIGFPE); @@ -378,7 +378,7 @@ sigev_service_loop(void *arg) __sigev_list_unlock(); sigemptyset(&set); - sigaddset(&set, SIGSERVICE); + sigaddset(&set, SIGLIBRT); for (;;) { ret = sigwaitinfo(&set, &si); Modified: head/lib/librt/sigev_thread.h ============================================================================== --- head/lib/librt/sigev_thread.h Mon Mar 26 19:06:59 2012 (r233518) +++ head/lib/librt/sigev_thread.h Mon Mar 26 19:12:09 2012 (r233519) @@ -67,8 +67,6 @@ struct sigev_thread { #define SNF_REMOVED 0x02 #define SNF_SYNC 0x04 -#define SIGSERVICE (SIGTHR+1) - int __sigev_check_init(); struct sigev_node *__sigev_alloc(int, const struct sigevent *, struct sigev_node *, int); Modified: head/sys/sys/signal.h ============================================================================== --- head/sys/sys/signal.h Mon Mar 26 19:06:59 2012 (r233518) +++ head/sys/sys/signal.h Mon Mar 26 19:12:09 2012 (r233519) @@ -111,6 +111,7 @@ #if __BSD_VISIBLE #define SIGTHR 32 /* reserved by thread library. */ #define SIGLWP SIGTHR +#define SIGLIBRT 33 /* reserved by real-time library. */ #endif #define SIGRTMIN 65