From 80b3616b3ce42e41b2996504720895aec2daa732 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Mon, 25 Jul 1994 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1994-07-25 --- carrera/fns.h | 1 + pc/fns.h | 1 + port/portdat.h | 1 + port/proc.c | 2 +- power/fns.h | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/carrera/fns.h b/carrera/fns.h index 53f663824514afb7a568bd477107e5df67e4e4c7..331ac7175437bc2bd7ec14cf4bfbed26e39e0284 100644 --- a/carrera/fns.h +++ b/carrera/fns.h @@ -6,6 +6,7 @@ void addportintr(int(*)(void)); #define affinity(x) m void allflush(void*, ulong); void arginit(void); +#define balance(x) m int busprobe(ulong); void cleancache(void); void clearmmucache(void); diff --git a/pc/fns.h b/pc/fns.h index e2ef8b1dc66b937582b199f2b8c28287c117f079..84b2b52e29f143e93cbeca7a9c1e1a15908f9c9d 100644 --- a/pc/fns.h +++ b/pc/fns.h @@ -3,6 +3,7 @@ void aamloop(int); void addconf(char*, char*); #define affinity(x) m +#define balance(x) m void bbinit(void); void bigcursor(void); void bootargs(ulong); diff --git a/port/portdat.h b/port/portdat.h index cc1e9529758f5a54f1c4f22ee459224908a6c564..afec73e1f3cf6e34bac5a6c6b7611fff44947786 100644 --- a/port/portdat.h +++ b/port/portdat.h @@ -578,6 +578,7 @@ struct Proc Mach *mp; /* machine this process last ran on */ ulong affinity; /* affinity counter for that mach */ + ulong movetime; /* ticks when proc was last reassigned */ void *ureg; /* User registers for notes */ void *dbgreg; /* User registers for devproc */ diff --git a/port/proc.c b/port/proc.c index 56cd8a63345f8f3a3dc5529e82d79cb48e3d53f4..703a8865ca221609b07c213f6403678052a0c87f 100644 --- a/port/proc.c +++ b/port/proc.c @@ -114,7 +114,7 @@ ready(Proc *p) s = splhi(); if(p->state == Running) - rq = &m->loq; + rq = &balance(p)->loq; else rq = &affinity(p)->hiq; diff --git a/power/fns.h b/power/fns.h index 1910f6934b10888986d5a36f5186b6111c077574..0dfb826635ab9371fff9df15455b13ad6dae81e8 100644 --- a/power/fns.h +++ b/power/fns.h @@ -2,6 +2,7 @@ #define affinity(x) m void arginit(void); +#define balance(x) m void clearmmucache(void); void clock(Ureg*); void clockinit(void);