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

Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug370652
Merge into: lp:openvista-gtm-integration
Diff against target: None lines
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug370652
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+6724@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jon Tai (jontai) wrote :

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.

Revision history for this message
jeff.apple (jeff-apple) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1MSCZJOB ;GFT,JDS/MSC;28JAN20091MSCZJOB ;GFT,JDS/MSC;1 MAY 2009
2 ;;8.0;KERNEL;**MSC**2 ;;8.0;KERNEL;**MSC**
3 W !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3 W !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4 N MSC4 N MSC
@@ -9,7 +9,7 @@
9UNLOCK(D0) ;FROM FIELD 2, PAGE 3: UNLOCK THE LOCK9UNLOCK(D0) ;FROM FIELD 2, PAGE 3: UNLOCK THE LOCK
10 N X,R S R=$G(@MSC@(MSCJOBID,"L",D0)) I R'["^" Q ;CAN'T SEE IT10 N X,R S R=$G(@MSC@(MSCJOBID,"L",D0)) I R'["^" Q ;CAN'T SEE IT
11 S R=$P(R," ",2),X="L "_R D ^DIM Q:'$D(X)11 S R=$P(R," ",2),X="L "_R D ^DIM Q:'$D(X)
12 D UNLOCK^MSCZJOBU(R,MSCJOBID)12 D UNLOCK^MSCZJOBU(R)
13 Q13 Q
14 ;14 ;
15KILL(J) ;FROM FIELD15KILL(J) ;FROM FIELD
@@ -93,4 +93,4 @@
93UNL(D0) ;FROM FIELD 2, PAGE 3: UNLOCK THE LOCK93UNL(D0) ;FROM FIELD 2, PAGE 3: UNLOCK THE LOCK
94 N X,R S R=$P($G(MSCZLK(D0)),U),P=$P($G(MSCZLK(D0)),U,5) ;I R'["^" Q ;CAN'T SEE IT94 N X,R S R=$P($G(MSCZLK(D0)),U),P=$P($G(MSCZLK(D0)),U,5) ;I R'["^" Q ;CAN'T SEE IT
95 S R=$P(R,"~",2),R="^"_$S(R'["(":$P(R," "),1:$P(R,")")_")"),X="L "_R D ^DIM Q:'$D(X) ;GOOD SYNTAX?95 S R=$P(R,"~",2),R="^"_$S(R'["(":$P(R," "),1:$P(R,")")_")"),X="L "_R D ^DIM Q:'$D(X) ;GOOD SYNTAX?
96 D UNLOCK^MSCZJOBU(R,P)96 D UNLOCK^MSCZJOBU(R)
9797
=== 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 @@
1MSCZJOBU ;RHL,JDS/MSC;26JUNE20071MSCZJOBU ;RHL,JDS,JKT/MSC;20MAY2009
2 ;;8.0;KERNEL;**MSC**2 ;;8.0;KERNEL;**MSC**
3 ;3 ;
4 ; JOB EXAM UTILITIES FOR GT.M4 ; JOB EXAM UTILITIES FOR GT.M
@@ -8,45 +8,45 @@
8 ; RETURNS XARY(PID)=""8 ; RETURNS XARY(PID)=""
9 ; NOTE: Unix PID=$J for all mumps processes.9 ; NOTE: Unix PID=$J for all mumps processes.
10 ;10 ;
11 N %FILE11 N DEV
12 S A="TEST"12 S DEV="psdev"
13 OPEN A:(COMM="ps --no-headers -o pid= -C mumps")::"PIPE" U A13 OPEN DEV:(COMM="ps -o pid= -C mumps")::"PIPE" U DEV
14 ;14 ;
15 N %I S %I=$I15 N %I S %I=$I
16 N %J ; $JOB16 N %J ; $JOB
17 N %LINE17 F U DEV R %J U %I Q:%J="" D
18 N U S U="^"18 . F Q:$E(%J,1)'=" " S %J=$E(%J,2,999) ; strip leading spaces
19 F U A R %LINE U %I Q:%LINE="" D
20 . Q:$P(%LINE,U)="PID" ; header line
21 . S %J=$P(%LINE,U)
22 . F Q:$E(%J,1)'=" " S %J=$E(%J,2,999)
23 . S XARY(%J)=""19 . S XARY(%J)=""
24 ;20 ;
25 C A21 C DEV
26 Q22 Q
27 ;23 ;
28INTRPT(PID) ; SEND mupip intrpt to each process.24INTRPT(PID) ; SEND mupip intrpt to process with PID
29 ; WHICH CAUSES THE $ZINTERRUPT CODE TO BE EXECUTED.25 ; WHICH CAUSES THE $ZINTERRUPT CODE TO BE EXECUTED.
30 ; PID PASSED BY VALUE26 ; PID PASSED BY VALUE
31 ; PID CAN BE A SINGLE PID, I.E. $J27 ; PID CAN BE A SINGLE PID, I.E. $J
32 ; PID CAN BE A "*" WHICH SENDS AN INTERRUPT TO ALL MUMPS PROCESSES28 ; PID CAN BE A "*" WHICH SENDS AN INTERRUPT TO ALL MUMPS PROCESSES
33 ;29 ;
34 N CMD30 Q:$G(PID)'?1N.N&($G(PID)'="*")
35 S PID=$G(PID)
36 Q:(PID="")!'((PID="*")!(PID=+PID))
37 ;31 ;
38 S DEV="gtmsignaldev"32 N CMD,DEV
39 S CMD="gtmsignal -q "_$S(PID="*":"-a",1:PID)33 S CMD="gtmsignal -q "_$S(PID="*":"-a",1:PID)
34 S DEV="gtmsignaldev"
40 OPEN DEV:(COMM=CMD)::"PIPE" U DEV C DEV35 OPEN DEV:(COMM=CMD)::"PIPE" U DEV C DEV
41 Q36 Q
42 ;37 ;
43KILL(PID) ; Send PID to mupip to kill process38KILL(PID) ; Send mupip stop to process with PID
44 Q:PID'?1N.N39 ; PID PASSED BY VALUE
40 ; PID CAN BE A SINGLE PID, I.E. $J
41 ;
42 Q:$G(PID)'?1N.N
43 ;
44 N DEV
45 S DEV="gtmsignaldev"45 S DEV="gtmsignaldev"
46 OPEN DEV:(COMM="gtmsignal -q -s "_PID)::"PIPE" U DEV C DEV46 OPEN DEV:(COMM="gtmsignal -q -s "_PID)::"PIPE" U DEV C DEV
47 Q47 Q
48 ;48 ;
49UNLOCK(NODE,PROC) ; Use lke to remove lock on NODE.49UNLOCK(NODE) ; Use lke to remove lock on NODE.
50 N CMD,DEV50 N CMD,DEV
51 S CMD="lke clear -lock="""_NODE_""" -nointeractive -output=/dev/null"51 S CMD="lke clear -lock="""_NODE_""" -nointeractive -output=/dev/null"
52 S DEV="lkedev"52 S DEV="lkedev"

Subscribers

People subscribed via source and target branches