Merge lp:~jontai/openvista-gtm-integration/bug392194 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

[lp:~jontai/openvista-gtm-integration/bug392194]

78. By Jon Tai on 2009-06-26

update comments

=== modified file 'mumps/MSCZJOB.m'
--- mumps/MSCZJOB.m	2009-05-21 00:50:25 +0000
+++ mumps/MSCZJOB.m	2009-06-26 21:06:41 +0000
@@ -1,4 +1,4 @@
-MSCZJOB	;GFT,JDS/MSC;1 MAY 2009
+MSCZJOB	;GFT,JDS/MSC;26JUN2009
 	;;8.0;KERNEL;**MSC**
 	W !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	N MSC
@@ -7,9 +7,10 @@
 	D ^DDS Q
 	;
 UNLOCK(D0)	;FROM FIELD 2, PAGE 3: UNLOCK THE LOCK
-	N X,R S R=$G(@MSC@(MSCJOBID,"L",D0)) I R'["^" Q  ;CAN'T SEE IT
+	N X,R,N S R=$G(@MSC@(MSCJOBID,"L",D0)) I R'["^" Q  ;CAN'T SEE IT
 	S R=$P(R," ",2),X="L "_R D ^DIM Q:'$D(X)
-	D UNLOCK^MSCZJOBU(R)
+	S N=$$NSP(MSCJOBD0)
+	D UNLOCK^MSCZJOBU(R,N)
 	Q
 	;
 KILL(J)	;FROM FIELD
@@ -18,7 +19,8 @@
 	;
 COMPMUL	;COMPUTED MULTIPLE FOR MSCZJOBEXAM BLOCK
 	N X,D0,J
-	S MSC="^TMP(""MSCZJOB"")" D POLL
+	S MSC="^TMP(""MSCZJOB1"",$J)" D POLL
+	D JOBEXAM^MSCZJOBU(MSC)
 	F D0=0:0 S D0=$O(MSCZJOB(D0)) Q:'D0  D
 	.S MSCZJOB(D0)=MSCZJOB(D0)_U_$$DEV(D0)_U_$$USER(D0)_U_$$NSP(D0)_U_U_U_U_U_$$ROUTINE(D0)
 	.S X=MSCZJOB(D0) X DICMX
@@ -29,7 +31,7 @@
 	.N L,P S N=$$FIND(D0,"I","$ZGBLDIR"),L=$L(N,"/") I L<2 Q
 	.F L=L-1:-1:2 S P=$P(N,"/",L) I P'[".",P'["globals" Q
 	.S P=1 I $P(N,"/")="" S P=2
-	.S N=$P(N,"/",P,L)
+	.S N=$P(N,"/",L)
 USER(D0)	Q $P($G(^VA(200,+$$FIND(D0,"V","DUZ"),0)),U)
 ROUTINE(D0)	Q $$FIND(D0,"V","%ZPOS")
 	;
@@ -38,7 +40,8 @@
 	Q X
 	;
 COMPSTK	;COMPUTED MULTIPLE FOR MSCZJOBSTACK BLOCK
-	S MSC="^TMP(""MSCZJOB"")" K @MSC@(MSCJOBID) D POLL1
+	S MSC="^TMP(""MSCZJOB1"",$J)" K @MSC@(MSCJOBID) D POLL1
+	D JOBEXAM^MSCZJOBU(MSC,MSCJOBID)
 	N D0,J S J=MSCJOBID
 	F D0=1:1:$O(@MSC@(J,"S",""),-1)  S X="" X DICMX
 	Q
@@ -47,13 +50,15 @@
 	Q X
 	;
 COMPVARS	;COMPUTED MULTIPLE FOR MSCZJOBVARS BLOCK
-	S MSC="^TMP(""MSCZJOB"")" K @MSC@(MSCJOBID) D POLL1
+	S MSC="^TMP(""MSCZJOB1"",$J)" K @MSC@(MSCJOBID) D POLL1
+	D JOBEXAM^MSCZJOBU(MSC,MSCJOBID)
 	N D0,J S J=MSCJOBID
 	F D0=1:1:$O(@MSC@(J,"V",""),-1)  S X="" X DICMX
 	Q
 	;
 COMPLKS	;COMPUTED MULTIPLE FOR MSCZJOBLOCKS BLOCK
-	S MSC="^TMP(""MSCZJOB"")" D POLL1
+	S MSC="^TMP(""MSCZJOB1"",$J)" D POLL1
+	D JOBEXAM^MSCZJOBU(MSC,MSCJOBID)
 	N D0
 	F D0=1:1:$$LOCKS  S X="" X DICMX
 	Q
@@ -81,9 +86,9 @@
 TEST	Q
 COMPLK	;COMPUTED MULTIPLE FOR MSCZLOCK BLOCK
 	N X,D0,J
-	S MSC="^TMP(""MSCZJOB"")" D POLL S D0=0
+	S MSC="^TMP(""MSCZJOB1"",$J)" K @MSC D POLL,JOBEXAM^MSCZJOBU(MSC) S D0=0
 	F K=0:0 S K=$O(MSCZJOB(K)) Q:'K  D
-	.F J=0:0 S J=$O(^TMP("MSCZJOB",MSCZJOB(K),"L",J)) Q:'J  S A=$TR(^(J),U,"~") D
+	.F J=0:0 S J=$O(^TMP("MSCZJOB1",$J,MSCZJOB(K),"L",J)) Q:'J  S A=$TR(^(J),U,"~") D
 	..S D0=D0+1,MSCZLK(D0)=$P(A,"LOCK ",2,9)_U_$$USER(K)_U_$TR($$ROUTINE(K),U,"~")_"^^"_MSCZJOB(K)
 	..S X=MSCZLK(D0) X DICMX
 	Q
@@ -91,6 +96,7 @@
 	S DDSFILE=3.081,DR="[MSCZLOCK]",DDSPARM="S"
 	D ^DDS Q
 UNL(D0)	;FROM FIELD 2, PAGE 3: UNLOCK THE LOCK
-	N X,R S R=$P($G(MSCZLK(D0)),U),P=$P($G(MSCZLK(D0)),U,5) ;I R'["^" Q  ;CAN'T SEE IT
+	N X,R,N S R=$P($G(MSCZLK(D0)),U),P=$P($G(MSCZLK(D0)),U,5) ;I R'["^" Q  ;CAN'T SEE IT
 	S R=$P(R,"~",2),R="^"_$S(R'["(":$P(R," "),1:$P(R,")")_")"),X="L "_R D ^DIM Q:'$D(X)  ;GOOD SYNTAX?
-	D UNLOCK^MSCZJOBU(R)
+	S N=$$NSP(D0)
+	D UNLOCK^MSCZJOBU(R,N)

=== modified file 'mumps/MSCZJOBS.m'
--- mumps/MSCZJOBS.m	2009-06-01 18:46:25 +0000
+++ mumps/MSCZJOBS.m	2009-06-26 17:39:51 +0000
@@ -1,4 +1,4 @@
-MSCZJOBS	;JKT/MSC - OpenVista System status ;27MAY2009
+MSCZJOBS	;JKT/MSC - OpenVista System status ;26JUN2009
 	;;8.0;KERNEL;**MSC**
 	;
 ALL	D SS() Q
@@ -13,19 +13,22 @@
 	D INTRPT^MSCZJOBU("*") H .5
 	;
 	N DATETIME S DATETIME=$$HTE^XLFDT($H)
-	W #!,?22,"OpenVista System Status"
-	W !,?(34-($L(DATETIME)/2)\1),DATETIME
-	W !!,?1,"Process",?12,"Device",?30,"Instance",?42,"Routine",?56,"User"
+	W #!,?28,"OpenVista System Status"
+	W !,?(40-($L(DATETIME)/2)\1),DATETIME
+	W !!,?1,"Process",?12,"Device",?30,"Instance",?42,"Routine",?56,"User",?70,"Identity"
 	;
+	N MSC S MSC="^TMP(""MSCZJOB1"",$J)" K @MSC
+	D JOBEXAM^MSCZJOBU(MSC)
 	N PID S PID=""
-	D PIDS^MSCZJOBU(.PID)
-	F  S PID=$O(PID(PID)) Q:PID=""  D
+	F  S PID=$O(@MSC@(PID)) Q:PID=""  D
 	. I $G(THIS) Q:$$INSTANCE(PID)'=$$CURRENT^ZCD()
 	. W !,$$PID(PID)
 	. W ?12,$$DEVICE(PID)
 	. W ?30,$$INSTANCE(PID)
 	. W ?42,$$ROUTINE(PID)
 	. W ?56,$$USER(PID)
+	. W ?70,$$IDENT(PID)
+	K @MSC
 	;
 	W !! ZSY "uptime"
 	Q
@@ -34,22 +37,24 @@
 	Q $J(PID,8)_$S($J=PID:"*",1:"")
 	;
 DEVICE(PID) ;Return device
-	Q $$FIND("^TMP(""MSCZJOB"")",PID,"I","$PRINCIPAL")
+	Q $$FIND(PID,"I","$PRINCIPAL")
 	;
 INSTANCE(PID) ;Return name of OpenVista instance
-	N ZG S ZG=$$FIND("^TMP(""MSCZJOB"")",PID,"I","$ZGBLDIR")
+	N ZG S ZG=$$FIND(PID,"I","$ZGBLDIR")
 	Q $P(ZG,"/",$L(ZG,"/")-2)
 	;
 ROUTINE(PID) ;Return routine
-	Q $P($$FIND("^TMP(""MSCZJOB"")",PID,"V","%ZPOS"),"^",2)
-	;
-USER(PID) ;Return OpenVista user
-	N DUZ S DUZ=+$$FIND("^TMP(""MSCZJOB"")",PID,"V","DUZ")
-	; FIXME: this code is looking up the name of the person in *this* 
-	; instance, which assumes that ^VA(200) is the same across databases
-	Q $P($G(^VA(200,DUZ,0)),"^")
-	;
-FIND(NODE,PID,ARR,KEY) ;Return the value of a key in one of the ZSHOW arrays
+	Q $P($$FIND(PID,"V","%ZPOS"),"^",2)
+	;
+USER(PID) ;Return Linux user
+	Q $$OWNER^MSCZJOBU(PID)
+	;
+IDENT(PID) ;Return OpenVista user
+	N DUZ S DUZ=+$$FIND(PID,"V","DUZ")
+	N ZG S ZG=$$FIND(PID,"I","$ZGBLDIR")
+	Q $P($G(^|ZG|VA(200,DUZ,0)),"^")
+	;
+FIND(PID,ARR,KEY) ;Return the value of a key in one of the ZSHOW arrays
 	N I,X S I="",X=""
-        F  S I=$O(@NODE@(PID,ARR,I)) Q:'I  I $P(^(I),KEY_"=")="" S X=$TR($P(^(I),"=",2),"""") Q
+        F  S I=$O(@MSC@(PID,ARR,I)) Q:'I  I $P(@MSC@(PID,ARR,I),KEY_"=")="" S X=$TR($P(@MSC@(PID,ARR,I),"=",2),"""") Q
 	Q X

=== modified file 'mumps/MSCZJOBU.m'
--- mumps/MSCZJOBU.m	2009-05-21 01:38:37 +0000
+++ mumps/MSCZJOBU.m	2009-06-26 21:06:41 +0000
@@ -1,4 +1,4 @@
-MSCZJOBU	;RHL,JDS,JKT/MSC;20MAY2009
+MSCZJOBU	;RHL,JDS,JKT/MSC;26JUN2009
 	;;8.0;KERNEL;**MSC**
 	;
 	;  JOB EXAM UTILITIES FOR GT.M
@@ -10,7 +10,7 @@
 	;
 	N DEV
 	S DEV="psdev"
-	OPEN DEV:(COMM="ps -o pid= -C mumps")::"PIPE" U DEV
+	OPEN DEV:(COMM="ps -o pid= -C mumps":READONLY)::"PIPE" U DEV
 	;
 	N %I S %I=$I
 	N %J ; $JOB
@@ -21,6 +21,39 @@
 	C DEV
 	Q
 	;
+JOBEXAM(XARY,ONEPID)	; GET ARRAY OF JOB EXAM DATA FOR ALL MUMPS PROCESSES
+	;  XARY PASSED BY REFERENCE
+	;
+	; get a list of all OpenVista instances and look up their $ZG values
+	N Y D LIST^ZCD
+	N INSTANCE S INSTANCE=""
+	F  S INSTANCE=$O(Y("B",INSTANCE)) Q:INSTANCE=""  D
+	. N %ZG,%ZRO D NEWZGZRO^ZCD(INSTANCE)
+	. S Y("B",INSTANCE)=%ZG
+	;
+	I $G(ONEPID) D GETJOB(ONEPID) Q
+	; for each mumps process, search each OpenVista instance for the latest job exam data
+	D PIDS(.XARY)
+	N PID S PID=""
+	F  S PID=$O(XARY(PID)) Q:PID=""  D GETJOB(PID)
+	Q
+GETJOB(PID)	;
+	N SORTDATE
+	F  S INSTANCE=$O(Y("B",INSTANCE)) Q:INSTANCE=""  D
+	. N H S H=$G(^|Y("B",INSTANCE)|TMP("MSCZJOB",PID,0)) Q:H=""
+	. S SORTDATE($$SEC^XLFDT(H))=INSTANCE
+	N MAXDATE S MAXDATE=$O(SORTDATE(""),-1) Q:MAXDATE=""
+	M @XARY@(PID)=^|Y("B",SORTDATE(MAXDATE))|TMP("MSCZJOB",PID)
+	Q
+	;
+OWNER(PID)	; get owner of process with PID
+	N DEV
+	S DEV="psdev"
+	OPEN DEV:(COMM="ps -o user= -p "_PID:READONLY)::"PIPE" U DEV
+	N UID R UID
+	C DEV
+	Q UID
+	;
 INTRPT(PID)	; SEND mupip intrpt to process with PID
 	;  WHICH CAUSES THE $ZINTERRUPT CODE TO BE EXECUTED.
 	;  PID PASSED BY VALUE
@@ -32,7 +65,7 @@
 	N CMD,DEV
 	S CMD="gtmsignal -q "_$S(PID="*":"-a",1:PID)
 	S DEV="gtmsignaldev"
-	OPEN DEV:(COMM=CMD)::"PIPE" U DEV C DEV
+	OPEN DEV:(COMM=CMD:READONLY)::"PIPE" U DEV C DEV
 	Q
 	;
 KILL(PID)	; Send mupip stop to process with PID
@@ -43,12 +76,15 @@
 	;
 	N DEV
 	S DEV="gtmsignaldev"
-	OPEN DEV:(COMM="gtmsignal -q -s "_PID)::"PIPE" U DEV C DEV
+	OPEN DEV:(COMM="gtmsignal -q -s "_PID:READONLY)::"PIPE" U DEV C DEV
 	Q
 	;
-UNLOCK(NODE)	; Use lke to remove lock on NODE.
+UNLOCK(NODE,INSTANCE)	; Use lke to remove lock on NODE.
+	N %ZG,%ZRO
+	D:$G(INSTANCE)'="" NEWZGZRO^ZCD(INSTANCE)
 	N CMD,DEV
 	S CMD="lke clear -lock="""_NODE_""" -nointeractive -output=/dev/null"
+	S:$G(%ZG)'="" CMD="gtmgbldir="""_%ZG_""" "_CMD
 	S DEV="lkedev"
-	OPEN DEV:(COMM=CMD)::"PIPE" U DEV C DEV
+	OPEN DEV:(SHELL="/bin/sh":COMM=CMD:READONLY)::"PIPE" U DEV C DEV
 	Q

=== modified file 'mumps/ZCD.m'
--- mumps/ZCD.m	2009-06-25 00:16:23 +0000
+++ mumps/ZCD.m	2009-06-25 23:15:27 +0000
@@ -1,4 +1,4 @@
-ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 24JUN2009
+ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 25JUN2009
 	;;8.0;KERNEL;**MSC**;April 21 2009
 	; This routine assumes that your global directory file exists one 
 	; directory below the root of the instance, e.g., 
@@ -57,15 +57,7 @@
 	Q
 	;
 SWITCH(INSTANCE) ; switch to another OpenVista instance
-	;
-	; don't allow switching if GT.M versions aren't the same
-	Q:$$GTMPATH($$CURRENT())'=$$GTMPATH(INSTANCE) 0
-	;
-	; there are several ways to determine new values of $ZG and $ZRO
-	; try each method until one succeeds
-	N %ZG,%ZRO,%METHOD S %ZG="",%ZRO=""
-	F %METHOD="ENV","CAT","REP" Q:$$@("SWITCH"_%METHOD)(INSTANCE)
-	I %ZG="",%ZRO="" Q 0
+	N %ZG,%ZRO D NEWZGZRO(INSTANCE) I %ZG="",%ZRO="" Q 0
 	;
 	; FIXME: set gtm_dist="$root/$instance/gtm"
 	N %TEMPDIR S %TEMPDIR=$$MKTEMP() S $ZG=%ZG,$ZRO=%ZRO_" "_%TEMPDIR
@@ -99,26 +91,39 @@
 	Q:'$Q
 	Q 1
 	;
-SWITCHENV(INSTANCE) ; private entry point to be used by $$SWITCH only
+NEWZGZRO(INSTANCE) ; determine new values of $ZG and $ZRO
+	S %ZG="",%ZRO=""
+	;
+	; don't allow switching if GT.M versions aren't the same
+	Q:$$GTMPATH($$CURRENT())'=$$GTMPATH(INSTANCE)
+	;
+	; there are several ways to determine new values of $ZG and $ZRO
+	; try each method until one succeeds
+	N %METHOD F %METHOD="ENV","CAT","REP" D @("SWITCH"_%METHOD)(INSTANCE) Q:%ZG'=""&(%ZRO'="")
+	Q
+	;
+SWITCHENV(INSTANCE) ; private entry point
 	; set new $ZG and $ZRO by parsing env file in target instance
 	;
 	; FIXME: implement this
-	Q 0
+	Q
 	;
-SWITCHCAT(INSTANCE) ; private entry point to be used by $$SWITCH only
-	; set new $ZG and $ZRO by concatenating conventional names to $$ROOT
+SWITCHCAT(INSTANCE) ; private entry point
+	; set new $ZG and $ZRO by concatenating conventional names to $$ROOT.
+	; NOTE: this code makes assumptions about the directory layout of the
+	; OpenVista instance.
 	;
 	S %ZG=$$PATH(INSTANCE)_"/globals/mumps.gld"
 	S %ZRO=$$PATH(INSTANCE)_"/objects("_$$PATH(INSTANCE)_"/routines) "_$$PATH(INSTANCE)_"/gtm"
 	;
 	; FIXME: check that %ZG actually exists and that all pieces of %ZRO exist
-	Q 1
+	Q
 	;
-SWITCHREP(INSTANCE) ; private entry point to be used by $$SWITCH only
+SWITCHREP(INSTANCE) ; private entry point
 	; set new $ZG and $ZRO by replacing $$PATH($$CURRENT()) with $$PATH(INSTANCE)
 	;
 	; FIXME: implement this
-	Q 0
+	Q
 	;
 MKTEMP() ; create a secure temporary directory, returns path to new directory
 	N %PIPE,%I S %PIPE="mktemp",%I=$I

=== modified file 'mumps/ZOSFGUX.m'
--- mumps/ZOSFGUX.m	2009-06-05 18:44:13 +0000
+++ mumps/ZOSFGUX.m	2009-06-26 07:02:30 +0000
@@ -1,4 +1,4 @@
-ZOSFGUX	;SFISC/MVB,PUG/TOAD MSC/JDS- ZOSF Table for GT.M for Unix ;6JUN2009
+ZOSFGUX	;SFISC/MVB,PUG/TOAD MSC/JDS,JKT- ZOSF Table for GT.M for Unix ;26JUN2009
 	;;8.0;KERNEL;**275,MSC**;Jul 10, 1995
 	;; for GT.M for Unix, version 4.3
 	;
@@ -100,7 +100,7 @@
 	;;RSUM
 	;;S Y=0 F %=1,3:1 S %1=$T(+%^@X),%3=$F(%1," ") Q:'%3  S %3=$S($E(%1,%3)'=";":$L(%1),$E(%1,%3+1)=";":$L(%1),1:%3-2) F %2=1:1:%3 S Y=$A(%1,%2)*%2+Y
 	;;SS
-	;;D ^MSCZJOB
+	;;D ^%SS
 	;;SAVE
 	;;D SAVE^%ZOSV2(X) ;N %I,%F S %I=$I,%F=$P($S($ZRO["(":$P($P($ZRO,"(",2),")"),1:$ZRO)," ")_"/"_X_".m" O %F:(NEWVERSION) U %F X "F  S XCN=$O(@(DIE_XCN_"")"")) Q:+XCN'=XCN  S %=@(DIE_XCN_"",0)"") Q:$E(%,1)=""$""  I $E(%)'="";"" W %,!" C %F U %I
 	;;SIZE

=== modified file 'mumps/ZUGTM.m'
--- mumps/ZUGTM.m	2009-06-09 20:13:51 +0000
+++ mumps/ZUGTM.m	2009-06-26 00:26:42 +0000
@@ -1,4 +1,4 @@
-ZU	;SF/JLI,RWF MSC/JDS- For GT.M, TIE ALL TERMINALS TO THIS ROUTINE!! ;01MAY2009
+ZU	;SF/JLI,RWF MSC/JDS,JKT- For GT.M, TIE ALL TERMINALS TO THIS ROUTINE!! ;25JUN2009
 	;;8.0;KERNEL;**275,MSC**;Jul 10, 1995
 	; for GT.M for VMS & Unix, version 4.3
 	;
@@ -81,6 +81,7 @@
 	I $G(^XUTL("XUSYS","COMMAND"))'="EXAM" ZSHOW "SD":^XUTL("XUSYS",$J,"JE")
 	I $G(^XUTL("XUSYS","COMMAND"))="EXAM" ZSHOW "*":^XUTL("XUSYS",$J,"JE")
 	I $G(^XUTL("XUSYS",$J,"CMD"))="HALT" ;To do.
+	S ^TMP("MSCZJOB",$J,0)=$H
 	ZSHOW "*":^TMP("MSCZJOB",$J)
 	Q 1
 	;