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

[Jon Tai]

[Jon Tai (jontai)]

This merge request supercedes https://code.launchpad.net/~joel-sher/openvista-gtm-integration/bug370652/+merge/6483 I merged Joel's branch into the branch presented here and did some additional work on the routines. I also ignored Joel's update to ZCD when I merged his branch - that update belongs on a different branch.

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'mumps/MSCZJOB.m'
--- mumps/MSCZJOB.m	2009-04-28 18:34:54 +0000
+++ mumps/MSCZJOB.m	2009-05-21 00:50:25 +0000
@@ -1,4 +1,4 @@
-MSCZJOB	;GFT,JDS/MSC;28JAN2009
+MSCZJOB	;GFT,JDS/MSC;1 MAY 2009
 	;;8.0;KERNEL;**MSC**
 	W !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	N MSC
@@ -9,7 +9,7 @@
 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
 	S R=$P(R," ",2),X="L "_R D ^DIM Q:'$D(X)
-	D UNLOCK^MSCZJOBU(R,MSCJOBID)
+	D UNLOCK^MSCZJOBU(R)
 	Q
 	;
 KILL(J)	;FROM FIELD
@@ -93,4 +93,4 @@
 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
 	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,P)
+	D UNLOCK^MSCZJOBU(R)

=== modified file 'mumps/MSCZJOBU.m'
--- mumps/MSCZJOBU.m	2009-05-01 21:23:14 +0000
+++ mumps/MSCZJOBU.m	2009-05-21 01:38:37 +0000
@@ -1,4 +1,4 @@
-MSCZJOBU	;RHL,JDS/MSC;26JUNE2007
+MSCZJOBU	;RHL,JDS,JKT/MSC;20MAY2009
 	;;8.0;KERNEL;**MSC**
 	;
 	;  JOB EXAM UTILITIES FOR GT.M
@@ -8,45 +8,45 @@
 	;  RETURNS XARY(PID)=""
 	;  NOTE:  Unix PID=$J for all mumps processes.
 	;
-	N %FILE
-	S A="TEST"
-	OPEN A:(COMM="ps --no-headers -o pid= -C mumps")::"PIPE" U A
+	N DEV
+	S DEV="psdev"
+	OPEN DEV:(COMM="ps -o pid= -C mumps")::"PIPE" U DEV
 	;
 	N %I S %I=$I
 	N %J ; $JOB
-	N %LINE
-	N U S U="^"
-	F  U A R %LINE U %I Q:%LINE=""  D
-	. Q:$P(%LINE,U)="PID"  ; header line
-	. S %J=$P(%LINE,U)
-	. F  Q:$E(%J,1)'=" "  S %J=$E(%J,2,999)
+	F  U DEV R %J U %I Q:%J=""  D
+	. F  Q:$E(%J,1)'=" "  S %J=$E(%J,2,999) ; strip leading spaces
 	. S XARY(%J)=""
 	;
-	C A
+	C DEV
 	Q
 	;
-INTRPT(PID)	; SEND mupip intrpt to each process.
-	       ; WHICH CAUSES THE $ZINTERRUPT CODE TO BE EXECUTED.
+INTRPT(PID)	; SEND mupip intrpt to process with PID
+	;  WHICH CAUSES THE $ZINTERRUPT CODE TO BE EXECUTED.
 	;  PID PASSED BY VALUE
 	;  PID CAN BE A SINGLE PID, I.E. $J
 	;  PID CAN BE A "*" WHICH SENDS AN INTERRUPT TO ALL MUMPS PROCESSES
 	;
-	N CMD
-	S PID=$G(PID)
-	Q:(PID="")!'((PID="*")!(PID=+PID))
+	Q:$G(PID)'?1N.N&($G(PID)'="*")
 	;
-	S DEV="gtmsignaldev"
+	N CMD,DEV
 	S CMD="gtmsignal -q "_$S(PID="*":"-a",1:PID)
+	S DEV="gtmsignaldev"
 	OPEN DEV:(COMM=CMD)::"PIPE" U DEV C DEV
 	Q
 	;
-KILL(PID)	; Send PID to mupip to kill process
-	Q:PID'?1N.N
+KILL(PID)	; Send mupip stop to process with PID
+	;  PID PASSED BY VALUE
+	;  PID CAN BE A SINGLE PID, I.E. $J
+	;
+	Q:$G(PID)'?1N.N
+	;
+	N DEV
 	S DEV="gtmsignaldev"
 	OPEN DEV:(COMM="gtmsignal -q -s "_PID)::"PIPE" U DEV C DEV
 	Q
 	;
-UNLOCK(NODE,PROC)	; Use lke to remove lock on NODE.
+UNLOCK(NODE)	; Use lke to remove lock on NODE.
 	N CMD,DEV
 	S CMD="lke clear -lock="""_NODE_""" -nointeractive -output=/dev/null"
 	S DEV="lkedev"