svn commit: r258379 - vendor-sys/illumos/dist/uts/common/dtrace vendor/illumos/dist/lib/libdtrace/common

[Andriy Gapon]

Author: avg
Date: Wed Nov 20 11:02:18 2013
New Revision: 258379
URL: http://svnweb.freebsd.org/changeset/base/258379

Log:
  4248 dtrace(1M) should never create DOF with empty probes section
  
  4249 Only probes from the first DTrace object file will be included
  
  illumos/illumos-gate at 54a20ab41aadcb81c53e72fc65886e964e9add59

Modified:
  vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/lib/libdtrace/common/dt_dof.c
  vendor/illumos/dist/lib/libdtrace/common/dt_error.c
  vendor/illumos/dist/lib/libdtrace/common/dt_impl.h

Modified: vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c	Wed Nov 20 11:00:20 2013	(r258378)
+++ vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c	Wed Nov 20 11:02:18 2013	(r258379)
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
@@ -13941,8 +13941,8 @@ dtrace_helper_provider_add(dof_helper_t 
 	 * Check to make sure this isn't a duplicate.
 	 */
 	for (i = 0; i < help->dthps_nprovs; i++) {
-		if (dofhp->dofhp_addr ==
-		    help->dthps_provs[i]->dthp_prov.dofhp_addr)
+		if (dofhp->dofhp_dof ==
+		    help->dthps_provs[i]->dthp_prov.dofhp_dof)
 			return (EALREADY);
 	}