fix _tos->pcycles, make _tos->kcycles actually count cycles executing kernel code on behalf of the process

1 files changed, 11 insertions, 1 deletions

diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c
index ff928af2e..0172de1de 100644
--- a/sys/src/9/pc/main.c
+++ b/sys/src/9/pc/main.c
@@ -580,11 +580,14 @@ mathinit(void)
  *  set up floating point for a new process
  */
 void
-procsetup(Proc*p)
+procsetup(Proc *p)
 {
 	p->fpstate = FPinit;
 	fpoff();
 
+	cycles(&p->kentry);
+	p->pcycles = -p->kentry;
+
 	memset(p->gdt, 0, sizeof(p->gdt));
 	p->ldt = nil;
 	p->nldt = 0;
@@ -593,6 +596,9 @@ procsetup(Proc*p)
 void
 procfork(Proc *p)
 {
+	p->kentry = up->kentry;
+	p->pcycles = -p->kentry;
+
 	/* inherit user descriptors */
 	memmove(p->gdt, up->gdt, sizeof(p->gdt));
 
@@ -611,7 +617,9 @@ procrestore(Proc *p)
 
 	if(p->kp)
 		return;
+
 	cycles(&t);
+	p->kentry += t;
 	p->pcycles -= t;
 }
 
@@ -624,7 +632,9 @@ procsave(Proc *p)
 	uvlong t;
 
 	cycles(&t);
+	p->kentry -= t;
 	p->pcycles += t;
+
 	if(p->fpstate == FPactive){
 		if(p->state == Moribund)
 			fpclear();