Browse Source

Plan 9 from Bell Labs 2007-04-16

David du Colombier 17 years ago
parent
commit
800a283914
5 changed files with 7 additions and 13 deletions
  1. 2 2
      dist/replica/_plan9.db
  2. 2 2
      dist/replica/plan9.db
  3. 2 0
      dist/replica/plan9.log
  4. 0 7
      sys/src/9/port/devcons.c
  5. 1 2
      sys/src/9/port/proc.c

+ 2 - 2
dist/replica/_plan9.db

@@ -8114,7 +8114,7 @@ sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1168304142 4128
-sys/src/9/port/devcons.c - 664 sys sys 1168304164 23127
+sys/src/9/port/devcons.c - 664 sys sys 1176658321 22943
 sys/src/9/port/devdraw.c - 664 sys sys 1147023550 44447
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1169498893 7015
@@ -8171,7 +8171,7 @@ sys/src/9/port/portdat.h - 664 sys sys 1155995676 22703
 sys/src/9/port/portfns.h - 664 sys sys 1146746630 11059
 sys/src/9/port/portmkfile - 664 sys sys 1173788325 2069
 sys/src/9/port/print.c - 664 sys sys 1014931178 227
-sys/src/9/port/proc.c - 664 sys sys 1166244036 28770
+sys/src/9/port/proc.c - 664 sys sys 1176658321 28742
 sys/src/9/port/qio.c - 664 sys sys 1070287837 23562
 sys/src/9/port/qlock.c - 664 sys sys 1139666988 3200
 sys/src/9/port/rdb.c - 664 sys sys 1018721202 1698

+ 2 - 2
dist/replica/plan9.db

@@ -8114,7 +8114,7 @@ sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1168304142 4128
-sys/src/9/port/devcons.c - 664 sys sys 1168304164 23127
+sys/src/9/port/devcons.c - 664 sys sys 1176658321 22943
 sys/src/9/port/devdraw.c - 664 sys sys 1147023550 44447
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1169498893 7015
@@ -8171,7 +8171,7 @@ sys/src/9/port/portdat.h - 664 sys sys 1155995676 22703
 sys/src/9/port/portfns.h - 664 sys sys 1146746630 11059
 sys/src/9/port/portmkfile - 664 sys sys 1173788325 2069
 sys/src/9/port/print.c - 664 sys sys 1014931178 227
-sys/src/9/port/proc.c - 664 sys sys 1166244036 28770
+sys/src/9/port/proc.c - 664 sys sys 1176658321 28742
 sys/src/9/port/qio.c - 664 sys sys 1070287837 23562
 sys/src/9/port/qlock.c - 664 sys sys 1139666988 3200
 sys/src/9/port/rdb.c - 664 sys sys 1018721202 1698

+ 2 - 0
dist/replica/plan9.log

@@ -48366,3 +48366,5 @@
 1176521407 113 c sys/src/cmd/mkfile - 664 sys sys 1176520958 2674
 1176582606 0 c 386/9loaddebug - 775 sys sys 1176581009 402158
 1176582606 1 c 386/9loadlitedebug - 775 sys sys 1176581010 202587
+1176660006 0 c sys/src/9/port/devcons.c - 664 sys sys 1176658321 22943
+1176660006 1 c sys/src/9/port/proc.c - 664 sys sys 1176658321 28742

+ 0 - 7
sys/src/9/port/devcons.c

@@ -58,7 +58,6 @@ enum
 	CMhalt,
 	CMreboot,
 	CMpanic,
-	CMcoop,					/* RSC */
 };
 
 Cmdtab rebootmsg[] =
@@ -66,7 +65,6 @@ Cmdtab rebootmsg[] =
 	CMhalt,		"halt",		1,
 	CMreboot,	"reboot",	0,
 	CMpanic,	"panic",	0,
-	CMcoop,		"coop",		0,	/* RSC */
 };
 
 void
@@ -1050,11 +1048,6 @@ conswrite(Chan *c, void *va, long n, vlong off)
 		case CMpanic:
 			*(ulong*)0=0;
 			panic("/dev/reboot");
-		case CMcoop: /* RSC */
-			{extern int coopsched; coopsched = !coopsched;
-			print("coopsched %d\n", coopsched);
-			}
-			break;
 		}
 		poperror();
 		free(cb);

+ 1 - 2
sys/src/9/port/proc.c

@@ -7,7 +7,6 @@
 #include	"edf.h"
 #include	<trace.h>
 
-int	coopsched;
 int	schedgain = 30;	/* units in seconds */
 int	nrdy;
 Ref	noteidalloc;
@@ -504,7 +503,7 @@ runproc(void)
 	start = perfticks();
 
 	/* cooperative scheduling until the clock ticks */
-	if(coopsched && (p=m->readied) && p->mach==0 && p->state==Ready
+	if((p=m->readied) && p->mach==0 && p->state==Ready
 	&& runq[Nrq-1].head == nil && runq[Nrq-2].head == nil){
 		skipscheds++;
 		rq = &runq[p->priority];