tfix conflict - plan9port - [fork] Plan 9 from user space
 (HTM) git clone git://src.adamsgaard.dk/plan9port
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit a796abef1632f379ced703b1b2e691d8f63436e2
 (DIR) parent 30387d7ba615e35e72e433df15fed2e918debf61
 (HTM) Author: rsc <devnull@localhost>
       Date:   Wed, 12 May 2004 18:23:57 +0000
       
       fix conflict
       
       Diffstat:
         M acid/thread                         |      22 +++++++++++-----------
       
       1 file changed, 11 insertions(+), 11 deletions(-)
       ---
 (DIR) diff --git a/acid/thread b/acid/thread
       t@@ -151,7 +151,7 @@ defn pthreads(P){
                local T, Tq, mainpid;
        
                mainpid = pid;
       -        setproc(P.pid);
       +//        setproc(P.pid);
                Tq = (Tqueue)P.threads;
                T = (Thread)Tq.$head;
                while T != 0 do{
       t@@ -159,7 +159,7 @@ defn pthreads(P){
                        thread(T);
                        T = (Thread)T.nextt;
                }
       -        setproc(mainpid);
       +//        setproc(mainpid);
        }
        
        defn threads(){
       t@@ -193,7 +193,7 @@ defn stacks(){
                        P = (Proc)P.next;
                        print("\n");
                }
       -        setproc(mainpid);
       +        // setproc(mainpid);
        }
        
        defn stacksizes(){
       t@@ -219,7 +219,7 @@ defn stacksizes(){
                        }
                        P = P.next;
                }
       -        setproc(mainpid);
       +        // setproc(mainpid);
        }
        
        defn lproc(P){
       t@@ -241,7 +241,7 @@ defn threadstks(P){
                stkprefix = pref+"\t\t";
                ign = stkignore;
                stkignore = threadstkignore;
       -        setproc(P.pid);
       +        // setproc(P.pid);
                Tq = (Tqueue)P.threads;
                T = (Thread)Tq.$head;
                while T != 0 do{
       t@@ -253,7 +253,7 @@ defn threadstks(P){
                        T = (Thread)T.nextt;
                        print("\n");
                }
       -        setproc(mainpid);
       +        // setproc(mainpid);
                stkprefix = pref;
                stkignore = ign;
        }
       t@@ -285,15 +285,15 @@ defn threadlstk(T){
                local P, mainpid;
        
                P = (Proc)T.proc;
       -        mainpid = pid;
       -        setproc(P.pid);
       +        // mainpid = pid;
       +        // setproc(P.pid);
        
                if T.state == Running then{
                        lstk();
                } else {
                        lablstk(T.sched);
                }
       -        setproc(mainpid);
       +        // setproc(mainpid);
        }
        
        defn threadstk(T){
       t@@ -302,14 +302,14 @@ defn threadstk(T){
        
                P = (Proc)T.proc;
                mainpid = pid;
       -        setproc(P.pid);
       +        // setproc(P.pid);
        
                if T.state == Running then{
                        stk();
                } else {
                        labstk(T.sched);
                }
       -        setproc(mainpid);
       +        // setproc(mainpid);
        }
        
        defn tqueue(Q) {