X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..5eebf7385fedb1517b66b53c28e5aa6bb0a2be50:/bsd/kern/subr_prof.c?ds=sidebyside

diff --git a/bsd/kern/subr_prof.c b/bsd/kern/subr_prof.c
index ed0455eeb..4ffac789b 100644
--- a/bsd/kern/subr_prof.c
+++ b/bsd/kern/subr_prof.c
@@ -72,6 +72,8 @@
 #include <kern/mach_header.h>
 #include <machine/profile.h>
 
+decl_simple_lock_data(,mcount_lock);
+
 /*
  * Froms is actually a bunch of unsigned shorts indexing tos
  */
@@ -118,12 +120,14 @@ kmstartup()
 	p->kcount = (u_short *)cp;
 	cp += p->kcountsize;
 	p->froms = (u_short *)cp;
+	simple_lock_init(&mcount_lock);
 }
 
 /*
  * Return kernel profiling information.
  */
-sysctl_doprof(name, namelen, oldp, oldlenp, newp, newlen, p)
+int
+sysctl_doprof(name, namelen, oldp, oldlenp, newp, newlen)
 	int *name;
 	u_int namelen;
 	void *oldp;
@@ -179,7 +183,6 @@ mcount(
 	register struct tostruct *top, *prevtop;
 	struct gmonparam *p = &_gmonparam;
 	register long toindex;
-	MCOUNT_INIT;
 
     /*
      * check that we are profiling
@@ -188,7 +191,7 @@ mcount(
     if (p->state != GMON_PROF_ON)
         return;
 
-	MCOUNT_ENTER;
+	usimple_lock(&mcount_lock);
 
 	/*
 	 *	check that frompcindex is a reasonable pc value.
@@ -271,25 +274,20 @@ mcount(
 
 	}
 done:
-	MCOUNT_EXIT;
+	usimple_unlock(&mcount_lock);
 	return;
 
 overflow:
     p->state = GMON_PROF_ERROR;
-	MCOUNT_EXIT;
+        usimple_unlock(&mcount_lock);
 	printf("mcount: tos overflow\n");
 	return;
 }
 
 #endif /* GPROF */
 
-#if NCPUS > 1
 #define PROFILE_LOCK(x)		simple_lock(x)
 #define PROFILE_UNLOCK(x)	simple_unlock(x)
-#else
-#define PROFILE_LOCK(x)
-#define PROFILE_UNLOCK(x)
-#endif
 
 struct profil_args {
 	short	*bufbase;
@@ -315,7 +313,7 @@ profil(p, uap, retval)
 	}
 
 	/* Block profile interrupts while changing state. */
-	s = splstatclock();
+        s = ml_set_interrupts_enabled(FALSE);	
 	PROFILE_LOCK(&upp->pr_lock);
 	upp->pr_base = (caddr_t)uap->bufbase;
 	upp->pr_size = uap->bufsize;
@@ -331,7 +329,7 @@ profil(p, uap, retval)
 	upp->pr_next = 0;
 	PROFILE_UNLOCK(&upp->pr_lock);
 	startprofclock(p);
-	splx(s);
+	ml_set_interrupts_enabled(s);
 	return(0);
 }
 
@@ -352,7 +350,7 @@ add_profil(p, uap, retval)
 
 	if (upp->pr_scale == 0)
 		return (0);
-	s = splstatclock();
+        s = ml_set_interrupts_enabled(FALSE);		
 	upc = (struct uprof *) kalloc(sizeof (struct uprof));
 	upc->pr_base = (caddr_t)uap->bufbase;
 	upc->pr_size = uap->bufsize;
@@ -362,7 +360,7 @@ add_profil(p, uap, retval)
 	upc->pr_next = upp->pr_next;
 	upp->pr_next = upc;
 	PROFILE_UNLOCK(&upp->pr_lock);
-	splx(s);
+	ml_set_interrupts_enabled(s);		
 	return(0);
 }