From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 01:20:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1CB5116A46B; Mon, 22 Oct 2007 01:20:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC8B516A417
	for <perforce@freebsd.org>; Mon, 22 Oct 2007 01:20:38 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BB1BD13C4B2
	for <perforce@freebsd.org>; Mon, 22 Oct 2007 01:20:38 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9M1Kc8s098192
	for <perforce@freebsd.org>; Mon, 22 Oct 2007 01:20:38 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9M1KcUL098189
	for perforce@freebsd.org; Mon, 22 Oct 2007 01:20:38 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 22 Oct 2007 01:20:38 GMT
Message-Id: <200710220120.l9M1KcUL098189@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 127910 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: Mon, 22 Oct 2007 01:20:39 -0000

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

Change 127910 by jb@jb_freebsd1 on 2007/10/22 01:19:46

	Implement version 2 of kld_file_stat which contains the
	full path name to the module loaded. DTrace needs to get
	to this to read the CTF data. Solaris uses a module
	file system instead. I am not allowed to say that I don't
	like that.

Affected files ...

.. //depot/projects/dtrace6/src/sys/kern/kern_linker.c#2 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/kern/kern_linker.c#2 (text+ko) ====

@@ -492,6 +492,7 @@
 	lf->userrefs = 0;
 	lf->flags = 0;
 	lf->filename = linker_strdup(filename);
+	lf->pathname = linker_strdup(pathname);
 	LINKER_GET_NEXT_FILE_ID(lf->id);
 	lf->ndeps = 0;
 	lf->deps = NULL;
@@ -590,6 +591,10 @@
 		free(file->filename, M_LINKER);
 		file->filename = NULL;
 	}
+	if (file->pathname) {
+		free(file->pathname, M_LINKER);
+		file->pathname = NULL;
+	}
 	kobj_delete((kobj_t) file, M_LINKER);
 out:
 	return (error);
@@ -972,7 +977,7 @@
 {
 	linker_file_t lf;
 	int error = 0;
-	int namelen, version;
+	int namelen, version, version_num;
 	struct kld_file_stat *stat;
 
 #ifdef MAC
@@ -995,10 +1000,16 @@
 	 */
 	if ((error = copyin(&stat->version, &version, sizeof(version))) != 0)
 		goto out;
-	if (version != sizeof(struct kld_file_stat)) {
+	if (version == sizeof(struct kld_file_stat_1))
+		version_num = 1;
+	else if (version == sizeof(struct kld_file_stat))
+		version_num = 2;
+	else {
 		error = EINVAL;
 		goto out;
 	}
+
+	/* Version 1 fields: */
 	namelen = strlen(lf->filename) + 1;
 	if (namelen > MAXPATHLEN)
 		namelen = MAXPATHLEN;
@@ -1013,6 +1024,15 @@
 		goto out;
 	if ((error = copyout(&lf->size, &stat->size, sizeof(size_t))) != 0)
 		goto out;
+	if (version_num > 1) {
+		/* Version 2 fields: */
+		namelen = strlen(lf->pathname) + 1;
+		if (namelen > MAXPATHLEN)
+			namelen = MAXPATHLEN;
+		if ((error = copyout(lf->pathname, &stat->pathname[0],
+		    namelen)) != 0)
+			goto out;
+	}
 
 	td->td_retval[0] = 0;
 out: