svn commit: r200266 - stable/8/sys/kern

[Fabien Thomas]

Author: fabient
Date: Tue Dec  8 18:23:52 2009
New Revision: 200266
URL: http://svn.freebsd.org/changeset/base/200266

Log:
  MFC 198464:
  Inform hwpmc(4) of a thread's impending demise prior to invoking sched_throw().

Modified:
  stable/8/sys/kern/kern_thread.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/kern/kern_thread.c
==============================================================================
--- stable/8/sys/kern/kern_thread.c	Tue Dec  8 18:23:51 2009	(r200265)
+++ stable/8/sys/kern/kern_thread.c	Tue Dec  8 18:23:52 2009	(r200266)
@@ -27,6 +27,7 @@
  */
 
 #include "opt_witness.h"
+#include "opt_hwpmc_hooks.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -47,6 +48,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/ktr.h>
 #include <sys/umtx.h>
 #include <sys/cpuset.h>
+#ifdef	HWPMC_HOOKS
+#include <sys/pmckern.h>
+#endif
 
 #include <security/audit/audit.h>
 
@@ -417,6 +421,14 @@ thread_exit(void)
 			panic ("thread_exit: Last thread exiting on its own");
 		}
 	} 
+#ifdef	HWPMC_HOOKS
+	/*
+	 * If this thread is part of a process that is being tracked by hwpmc(4),
+	 * inform the module of the thread's impending exit.
+	 */
+	if (PMC_PROC_IS_USING_PMCS(td->td_proc))
+		PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT);
+#endif
 	PROC_UNLOCK(p);
 	thread_lock(td);
 	/* Save our tick information with both the thread and proc locked */