From owner-p4-projects@FreeBSD.ORG  Sat Apr 15 23:36:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E5A5616A404; Sat, 15 Apr 2006 23:36:00 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C4C5E16A402
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 23:36:00 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 90AC543D46
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 23:36:00 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FNa0id061104
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 23:36:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FNa0lk061098
	for perforce@freebsd.org; Sat, 15 Apr 2006 23:36:00 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 15 Apr 2006 23:36:00 GMT
Message-Id: <200604152336.k3FNa0lk061098@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95368 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Apr 2006 23:36:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=95368

Change 95368 by jb@jb_freebsd2 on 2006/04/15 23:35:29

	SysV -> BSD signal handling. Lots of Solaris specific files here.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 (text) ====

@@ -177,16 +177,22 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <assert.h>
+#if defined(sun)
 #include <synch.h>
+#endif
 #include <signal.h>
 #include <libgen.h>
 #include <string.h>
 #include <errno.h>
+#if defined(sun)
 #include <alloca.h>
+#endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mman.h>
+#if defined(sun)
 #include <sys/sysconf.h>
+#endif
 
 #include "ctf_headers.h"
 #include "ctftools.h"
@@ -230,7 +236,9 @@
 {
 	size_t big, *size;
 	int sizes, i;
+#if defined(sun)
 	struct memcntl_mha mha;
+#endif
 
 	/*
 	 * First, get the available pagesizes.
@@ -259,6 +267,7 @@
 	if (brk((void *)((((uintptr_t)sbrk(0) - 1) & ~(big - 1)) + big)) != 0)
 		return;
 
+#if defined(sun)
 	/*
 	 * Finally, set our heap to use the largest page size for which the
 	 * MC_HAT_ADVISE doesn't return EAGAIN.
@@ -275,6 +284,7 @@
 		if (errno != EAGAIN)
 			break;
 	}
+#endif
 }
 
 static void
@@ -700,9 +710,15 @@
 		    wq);
 	}
 
+#if defined(sun)
 	sigset(SIGINT, handle_sig);
 	sigset(SIGQUIT, handle_sig);
 	sigset(SIGTERM, handle_sig);
+#else
+	signal(SIGINT, handle_sig);
+	signal(SIGQUIT, handle_sig);
+	signal(SIGTERM, handle_sig);
+#endif
 	pthread_sigmask(SIG_UNBLOCK, &sets, NULL);
 }