Merge lp:~joel-sher/openvista-gtm-integration/bug370652 into lp:openvista-gtm-integration

[JSHER]

[jeff.apple (jeff-apple)]

MSCZJOBU reverts changes from previous versions. For example, it calls "mupip intrpt" instead of "gtmsignal".

review: Needs Fixing

[lp:~joel-sher/openvista-gtm-integration/bug370652]

45. By JSHER on 2009-05-13

Corrected verision of MSCZJOBU.m

=== modified file 'mumps/MSCZJOB.m'
--- mumps/MSCZJOB.m	2009-04-28 18:34:54 +0000
+++ mumps/MSCZJOB.m	2009-05-12 18:10:30 +0000
@@ -1,4 +1,4 @@
-MSCZJOB	;GFT,JDS/MSC;28JAN2009
+MSCZJOB	;GFT,JDS/MSC;1 MAY 2009
 	;;8.0;KERNEL;**MSC**
 	W !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	N MSC
@@ -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-12 18:10:30 +0000
@@ -1,4 +1,4 @@
-MSCZJOBU	;RHL,JDS/MSC;26JUNE2007
+MSCZJOBU	;RHL,JDS/MSC;1MAY 2009
 	;;8.0;KERNEL;**MSC**
 	;
 	;  JOB EXAM UTILITIES FOR GT.M
@@ -31,24 +31,27 @@
 	;  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))
-	;
-	S DEV="gtmsignaldev"
-	S CMD="gtmsignal -q "_$S(PID="*":"-a",1:PID)
-	OPEN DEV:(COMM=CMD)::"PIPE" U DEV C DEV
+	Q:$G(PID)=""
+	;
+	I PID="*" D  Q  ; ALL PIDS
+	. N ARRAY
+	. D PIDS(.ARRAY)
+	. N %J S %J=""
+	. F  S %J=$O(ARRAY(%J)) Q:%J=""  D 
+	. . S A="test1",c="mupip intrpt "_%J_" > /dev/null"
+	. . OPEN A:(COMM="mupip intrpt "_%J)::"PIPE" U A C A
+	;
+	;  JUST 1 PID
+	Q:PID'?1N.N
+	S A="test1"
+	OPEN A:(COMM="mupip intrpt "_PID)::"PIPE" U A C A
 	Q
 	;
 KILL(PID)	; Send PID to mupip to kill process
 	Q:PID'?1N.N
-	S DEV="gtmsignaldev"
-	OPEN DEV:(COMM="gtmsignal -q -s "_PID)::"PIPE" U DEV C DEV
+	ZSYSTEM "mupip stop "_PID_" > /dev/null"
 	Q
 	;
-UNLOCK(NODE,PROC)	; Use lke to remove lock on NODE.
-	N CMD,DEV
-	S CMD="lke clear -lock="""_NODE_""" -nointeractive -output=/dev/null"
-	S DEV="lkedev"
-	OPEN DEV:(COMM=CMD)::"PIPE" U DEV C DEV
+UNLOCK(NODE)	; Use lke to remove lock on NODE.
+	ZSYSTEM "lke clear -lock="""_NODE_""" -nointeractive -output=/dev/null"
 	Q
 
=== modified file 'mumps/ZCD.m'
--- mumps/ZCD.m	2009-05-01 19:30:14 +0000
+++ mumps/ZCD.m	2009-05-12 18:44:59 +0000
@@ -1,4 +1,4 @@
-ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 01/30/2009
+ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 5/8/2009
 	;;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., 
@@ -68,18 +68,6 @@
 	C P
 	Q X
 	;
-SWITCH(INSTANCE)	
-	; switch to another OpenVista instance by setting $ZG and $ZRO
-	;
-	; there are several ways to do this; try them in order until 
-	; one succeeds
-	;
-	; FIXME: we may want to allow this entry point to be called using DO
-	Q:$$SWITCH1(INSTANCE) 1
-	Q:$$SWITCH2(INSTANCE) 1
-	Q:$$SWITCH3(INSTANCE) 1
-	Q 0
-	;
 SWITCH1(INSTANCE)	
 	; private entry point
 	;
@@ -116,32 +104,6 @@
 	; FIXME: do we need to set $ZINTERRUPT and $PATH?
 	Q 1
 	;
-SWITCH2(INSTANCE)	
-	; private entry point
-	;
-	; look for new values of $ZG and $ZRO in env file of target instance
-	;
-	; if the env file does not exist or is unreadable (permission denied) 
-	; or unparsable, Q 0 without setting $ZG and $ZRO
-	;
-	; FIXME: implement this
-	;
-	; FIXME: do we need to set $ZINTERRUPT and $PATH?
-	Q 0
-	;
-SWITCH3(INSTANCE)	
-	; private entry point
-	;
-	; get new values of $ZG and $ZRO by replacing $$PATH() with 
-	; $$ROOT()_"/"_INSTANCE.  Q 0 without setting $ZG and $ZRO if the 
-	; resulting paths don't actually exist or we do not have permission to
-	; access them
-	;
-	; FIXME: implement this
-	;
-	; FIXME: do we need to set $ZINTERRUPT and $PATH?
-	Q 0
-	;
 CD	;Interactive
 	N Y,DIR
 	R !,"Namespace: ",DIR