cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflict

Browse source
This commit is contained in:
rsc 2004-05-12 18:23:57 +00:00
parent 30387d7ba6
commit a796abef16
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
acid/thread
View file

@ -151,7 +151,7 @@ defn pthreads(P){
local T, Tq, mainpid; local T, Tq, mainpid;
mainpid = pid; mainpid = pid;
setproc(P.pid); // setproc(P.pid);
Tq = (Tqueue)P.threads; Tq = (Tqueue)P.threads;
T = (Thread)Tq.$head; T = (Thread)Tq.$head;
while T != 0 do{ while T != 0 do{
@ -159,7 +159,7 @@ defn pthreads(P){
thread(T); thread(T);
T = (Thread)T.nextt; T = (Thread)T.nextt;
} }
setproc(mainpid); // setproc(mainpid);
} }
defn threads(){ defn threads(){
@ -193,7 +193,7 @@ defn stacks(){
P = (Proc)P.next; P = (Proc)P.next;
print("\n"); print("\n");
} }
setproc(mainpid); // setproc(mainpid);
} }
defn stacksizes(){ defn stacksizes(){
@ -219,7 +219,7 @@ defn stacksizes(){
} }
P = P.next; P = P.next;
} }
setproc(mainpid); // setproc(mainpid);
} }
defn lproc(P){ defn lproc(P){
@ -241,7 +241,7 @@ defn threadstks(P){
stkprefix = pref+"\t\t"; stkprefix = pref+"\t\t";
ign = stkignore; ign = stkignore;
stkignore = threadstkignore; stkignore = threadstkignore;
setproc(P.pid); // setproc(P.pid);
Tq = (Tqueue)P.threads; Tq = (Tqueue)P.threads;
T = (Thread)Tq.$head; T = (Thread)Tq.$head;
while T != 0 do{ while T != 0 do{
@ -253,7 +253,7 @@ defn threadstks(P){
T = (Thread)T.nextt; T = (Thread)T.nextt;
print("\n"); print("\n");
} }
setproc(mainpid); // setproc(mainpid);
stkprefix = pref; stkprefix = pref;
stkignore = ign; stkignore = ign;
} }
@ -285,15 +285,15 @@ defn threadlstk(T){
local P, mainpid; local P, mainpid;
P = (Proc)T.proc; P = (Proc)T.proc;
mainpid = pid; // mainpid = pid;
setproc(P.pid); // setproc(P.pid);
if T.state == Running then{ if T.state == Running then{
lstk(); lstk();
} else { } else {
lablstk(T.sched); lablstk(T.sched);
} }
setproc(mainpid); // setproc(mainpid);
} }
defn threadstk(T){ defn threadstk(T){
@ -302,14 +302,14 @@ defn threadstk(T){
P = (Proc)T.proc; P = (Proc)T.proc;
mainpid = pid; mainpid = pid;
setproc(P.pid); // setproc(P.pid);
if T.state == Running then{ if T.state == Running then{
stk(); stk();
} else { } else {
labstk(T.sched); labstk(T.sched);
} }
setproc(mainpid); // setproc(mainpid);
} }
defn tqueue(Q) { defn tqueue(Q) {