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

[Jon Tai]

This is the packaging work around lp:~jeff-apple/openvista-gtm-integration/listener. This merge would supersede that merge.

Unfortunately, to make sure the MUMPS code and the C code get upgraded together, the fix itself had to be altered substantially, so I'm putting it up for review again.

[jeff.apple (jeff-apple)]

Make sure that waitpid is guarded against interruption in the next patch.

review: Approve

=== added file 'kids/XU_80_1508.KID'
--- kids/XU_80_1508.KID	1970-01-01 00:00:00 +0000
+++ kids/XU_80_1508.KID	2010-12-04 06:46:54 +0000
@@ -0,0 +1,496 @@
+KIDS Distribution saved on Dec 03, 2010@21:05:29
+artf10843, run ZTMGRSET after installing
+**KIDS**:XU*8.0*1508^
+
+**INSTALL NAME**
+XU*8.0*1508
+"BLD",7335,0)
+XU*8.0*1508^KERNEL^0^3101203^n
+"BLD",7335,4,0)
+^9.64PA^^
+"BLD",7335,6.3)
+1
+"BLD",7335,"ABPKG")
+n
+"BLD",7335,"INID")
+y
+"BLD",7335,"KRN",0)
+^9.67PA^8989.52^19
+"BLD",7335,"KRN",.4,0)
+.4
+"BLD",7335,"KRN",.401,0)
+.401
+"BLD",7335,"KRN",.402,0)
+.402
+"BLD",7335,"KRN",.403,0)
+.403
+"BLD",7335,"KRN",.5,0)
+.5
+"BLD",7335,"KRN",.84,0)
+.84
+"BLD",7335,"KRN",3.6,0)
+3.6
+"BLD",7335,"KRN",3.8,0)
+3.8
+"BLD",7335,"KRN",9.2,0)
+9.2
+"BLD",7335,"KRN",9.8,0)
+9.8
+"BLD",7335,"KRN",9.8,"NM",0)
+^9.68A^1^1
+"BLD",7335,"KRN",9.8,"NM",1,0)
+ZISTCPS^^0^B20023114
+"BLD",7335,"KRN",9.8,"NM","B","ZISTCPS",1)
+
+"BLD",7335,"KRN",19,0)
+19
+"BLD",7335,"KRN",19.1,0)
+19.1
+"BLD",7335,"KRN",101,0)
+101
+"BLD",7335,"KRN",409.61,0)
+409.61
+"BLD",7335,"KRN",771,0)
+771
+"BLD",7335,"KRN",870,0)
+870
+"BLD",7335,"KRN",8989.51,0)
+8989.51
+"BLD",7335,"KRN",8989.52,0)
+8989.52
+"BLD",7335,"KRN",8994,0)
+8994
+"BLD",7335,"KRN","B",.4,.4)
+
+"BLD",7335,"KRN","B",.401,.401)
+
+"BLD",7335,"KRN","B",.402,.402)
+
+"BLD",7335,"KRN","B",.403,.403)
+
+"BLD",7335,"KRN","B",.5,.5)
+
+"BLD",7335,"KRN","B",.84,.84)
+
+"BLD",7335,"KRN","B",3.6,3.6)
+
+"BLD",7335,"KRN","B",3.8,3.8)
+
+"BLD",7335,"KRN","B",9.2,9.2)
+
+"BLD",7335,"KRN","B",9.8,9.8)
+
+"BLD",7335,"KRN","B",19,19)
+
+"BLD",7335,"KRN","B",19.1,19.1)
+
+"BLD",7335,"KRN","B",101,101)
+
+"BLD",7335,"KRN","B",409.61,409.61)
+
+"BLD",7335,"KRN","B",771,771)
+
+"BLD",7335,"KRN","B",870,870)
+
+"BLD",7335,"KRN","B",8989.51,8989.51)
+
+"BLD",7335,"KRN","B",8989.52,8989.52)
+
+"BLD",7335,"KRN","B",8994,8994)
+
+"BLD",7335,"MSC")
+/home/jon/XU_80_1508.KID
+"BLD",7335,"MSCOM")
+artf10843, run ZTMGRSET after installing
+"BLD",7335,"PRE")
+XU1508E
+"BLD",7335,"QUES",0)
+^9.62^^
+"BLD",7335,"REQB",0)
+^9.611^^
+"MBREQ")
+0
+"PKG",3,-1)
+1^1
+"PKG",3,0)
+KERNEL^XU^SIGN-ON, SECURITY, MENU DRIVER, DEVICES, TASKMAN^
+"PKG",3,20,0)
+^9.402P^^
+"PKG",3,22,0)
+^9.49I^1^1
+"PKG",3,22,1,0)
+8.0^3040115^2960606^1
+"PKG",3,22,1,"PAH",1,0)
+1508^3101203
+"PRE")
+XU1508E
+"QUES","XPF1",0)
+Y
+"QUES","XPF1","??")
+^D REP^XPDH
+"QUES","XPF1","A")
+Shall I write over your |FLAG| File
+"QUES","XPF1","B")
+YES
+"QUES","XPF1","M")
+D XPF1^XPDIQ
+"QUES","XPF2",0)
+Y
+"QUES","XPF2","??")
+^D DTA^XPDH
+"QUES","XPF2","A")
+Want my data |FLAG| yours
+"QUES","XPF2","B")
+YES
+"QUES","XPF2","M")
+D XPF2^XPDIQ
+"QUES","XPI1",0)
+YO
+"QUES","XPI1","??")
+^D INHIBIT^XPDH
+"QUES","XPI1","A")
+Want KIDS to INHIBIT LOGONs during the install
+"QUES","XPI1","B")
+NO
+"QUES","XPI1","M")
+D XPI1^XPDIQ
+"QUES","XPM1",0)
+PO^VA(200,:EM
+"QUES","XPM1","??")
+^D MG^XPDH
+"QUES","XPM1","A")
+Enter the Coordinator for Mail Group '|FLAG|'
+"QUES","XPM1","B")
+
+"QUES","XPM1","M")
+D XPM1^XPDIQ
+"QUES","XPO1",0)
+Y
+"QUES","XPO1","??")
+^D MENU^XPDH
+"QUES","XPO1","A")
+Want KIDS to Rebuild Menu Trees Upon Completion of Install
+"QUES","XPO1","B")
+NO
+"QUES","XPO1","M")
+D XPO1^XPDIQ
+"QUES","XPZ1",0)
+Y
+"QUES","XPZ1","??")
+^D OPT^XPDH
+"QUES","XPZ1","A")
+Want to DISABLE Scheduled Options, Menu Options, and Protocols
+"QUES","XPZ1","B")
+NO
+"QUES","XPZ1","M")
+D XPZ1^XPDIQ
+"QUES","XPZ2",0)
+Y
+"QUES","XPZ2","??")
+^D RTN^XPDH
+"QUES","XPZ2","A")
+Want to MOVE routines to other CPUs
+"QUES","XPZ2","B")
+NO
+"QUES","XPZ2","M")
+D XPZ2^XPDIQ
+"RTN")
+2
+"RTN","XU1508E")
+0^^B2244259
+"RTN","XU1508E",1,0)
+XU1508E ;MSC/JKT - Environment check routine for XU*8.0*1508 ;3DEC2010 20:18
+"RTN","XU1508E",2,0)
+ ;;8.0;KERNEL;**1508**;DEC 3, 2010;
+"RTN","XU1508E",3,0)
+ ;
+"RTN","XU1508E",4,0)
+ ; check for presence of $&openvista.gtmserver2 call
+"RTN","XU1508E",5,0)
+ ;
+"RTN","XU1508E",6,0)
+ Q:$G(^%ZOSF("OS"))'["GT.M"
+"RTN","XU1508E",7,0)
+ ;
+"RTN","XU1508E",8,0)
+ N XC,%I,LINE,FOUND,VERSION
+"RTN","XU1508E",9,0)
+ S XC=$$GTMPATH^ZCD($$CURRENT^ZCD())_"/openvista.xc"
+"RTN","XU1508E",10,0)
+ S %I=$I O XC:(READONLY) U XC
+"RTN","XU1508E",11,0)
+ S FOUND=0 F  R LINE Q:LINE=""  S:$P(LINE,":",1)="gtmserver2" FOUND=1
+"RTN","XU1508E",12,0)
+ C XC U %I
+"RTN","XU1508E",13,0)
+ I 'FOUND D
+"RTN","XU1508E",14,0)
+ . S VERSION=$TR($E($P($ZV," ",2),2,999),"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz")
+"RTN","XU1508E",15,0)
+ . S VERSION=$P(VERSION,"-")_$P(VERSION,"-",2)
+"RTN","XU1508E",16,0)
+ . D BMES^XPDUTL("** You must install version 0.8.11 or later of the openvista-libs-"_VERSION_" Linux package before installing this build **")
+"RTN","XU1508E",17,0)
+ . S XPDABORT=1
+"RTN","XU1508E",18,0)
+ Q
+"RTN","ZISTCPS")
+0^1^B20023114
+"RTN","ZISTCPS",1,0)
+%ZISTCPS ;ISF/RWF MSC/JDA - DEVICE HANDLER TCP/IP SERVER CALLS ;03DEC2010
+"RTN","ZISTCPS",2,0)
+ ;;8.0;KERNEL;**78,118,127,225,275,388,1508**;Jul 10, 1995
+"RTN","ZISTCPS",3,0)
+ Q
+"RTN","ZISTCPS",4,0)
+ ;
+"RTN","ZISTCPS",5,0)
+CLOSE ;Close and reset
+"RTN","ZISTCPS",6,0)
+ G CLOSE^%ZISTCP
+"RTN","ZISTCPS",7,0)
+ Q
+"RTN","ZISTCPS",8,0)
+ ;
+"RTN","ZISTCPS",9,0)
+ ;In ZRULE, set ZISQUIT=1 to quit
+"RTN","ZISTCPS",10,0)
+LISTEN(SOCK,RTN,ZRULE) ;Listen on socket, start routine
+"RTN","ZISTCPS",11,0)
+ N %A,ZISOS,X,NIO,EXIT
+"RTN","ZISTCPS",12,0)
+ N $ES,$ET S $ETRAP="D OPNERR^%ZISTCPS"
+"RTN","ZISTCPS",13,0)
+ S ZISOS=^%ZOSF("OS"),ZRULE=$G(ZRULE)
+"RTN","ZISTCPS",14,0)
+ S POP=1
+"RTN","ZISTCPS",15,0)
+ D GETENV^%ZOSV S U="^",XUENV=Y,XQVOL=$P(Y,U,2)
+"RTN","ZISTCPS",16,0)
+ S POP=1 D LONT:ZISOS["OpenM",LGTM:ZISOS["GT.M"
+"RTN","ZISTCPS",17,0)
+ I 'POP C NIO ;Close port
+"RTN","ZISTCPS",18,0)
+ Q
+"RTN","ZISTCPS",19,0)
+ ;
+"RTN","ZISTCPS",20,0)
+ ;
+"RTN","ZISTCPS",21,0)
+LONT ;Open port in Accept mode with standard terminators.
+"RTN","ZISTCPS",22,0)
+ N %ZA,NEWCHAR
+"RTN","ZISTCPS",23,0)
+ S NIO="|TCP|"_SOCK,EXIT=0
+"RTN","ZISTCPS",24,0)
+ ;(adr:sock:term:ibuf:obuf:queue)
+"RTN","ZISTCPS",25,0)
+ O NIO:(:SOCK:"AT"::512:512:10):30 Q:'$T  S POP=0 U NIO
+"RTN","ZISTCPS",26,0)
+ ;Wait on read for a connect
+"RTN","ZISTCPS",27,0)
+LONT2 F  U NIO R *NEWCHAR:30 S EXIT=$$EXIT Q:$T!EXIT
+"RTN","ZISTCPS",28,0)
+ I EXIT C NIO Q
+"RTN","ZISTCPS",29,0)
+ ;JOB params (:Concurrent Server bit:principal input:principal output)
+"RTN","ZISTCPS",30,0)
+ J CHILDONT^%ZISTCPS(NIO,RTN):(:16::):10 S %ZA=$ZA
+"RTN","ZISTCPS",31,0)
+ I %ZA\8196#2=1 W *-2 ;Job failed to clear bit
+"RTN","ZISTCPS",32,0)
+ G LONT2
+"RTN","ZISTCPS",33,0)
+ ;
+"RTN","ZISTCPS",34,0)
+CHILDONT(IO,RTN) ;Child process for OpenM
+"RTN","ZISTCPS",35,0)
+ S $ETRAP="D ^%ZTER L  HALT",IO=$ZU(53)
+"RTN","ZISTCPS",36,0)
+ U IO:(::"-M") ;Work like DSM
+"RTN","ZISTCPS",37,0)
+ S NEWJOB=$$NEWOK
+"RTN","ZISTCPS",38,0)
+ I 'NEWJOB W "421 Service temporarily down.",$C(13,10),!
+"RTN","ZISTCPS",39,0)
+ I NEWJOB K NEWJOB D VAR,@RTN
+"RTN","ZISTCPS",40,0)
+ HALT
+"RTN","ZISTCPS",41,0)
+ ;
+"RTN","ZISTCPS",42,0)
+VAR ;Setup IO variables
+"RTN","ZISTCPS",43,0)
+ S IO(0)=IO,IO(1,IO)="",POP=0
+"RTN","ZISTCPS",44,0)
+ S IOT="TCP",IOST="P-TCP",IOST(0)=0
+"RTN","ZISTCPS",45,0)
+ S IOF=$$FLUSHCHR^%ZISTCP
+"RTN","ZISTCPS",46,0)
+ S ^XUTL("XQ",$J,0)=$$DT^XLFDT
+"RTN","ZISTCPS",47,0)
+ Q
+"RTN","ZISTCPS",48,0)
+NEWOK() ;Is it OK to start a new process
+"RTN","ZISTCPS",49,0)
+ I $G(^%ZIS(14.5,"LOGON",^%ZOSF("VOL"))) Q 0
+"RTN","ZISTCPS",50,0)
+ I $$AVJ^%ZOSV()<3 Q 0
+"RTN","ZISTCPS",51,0)
+ Q 1
+"RTN","ZISTCPS",52,0)
+OPNERR ;
+"RTN","ZISTCPS",53,0)
+ S POP=1,EXIT=1,IO("ERROR")=$ECODE,$ECODE=""
+"RTN","ZISTCPS",54,0)
+ Q
+"RTN","ZISTCPS",55,0)
+EXIT() ;See if time to exit
+"RTN","ZISTCPS",56,0)
+ I $$S^%ZTLOAD Q 1
+"RTN","ZISTCPS",57,0)
+ N ZISQUIT S ZISQUIT=0
+"RTN","ZISTCPS",58,0)
+ I $L(ZRULE) X ZRULE I $G(ZISQUIT) Q 1
+"RTN","ZISTCPS",59,0)
+ Q 0
+"RTN","ZISTCPS",60,0)
+ ;
+"RTN","ZISTCPS",61,0)
+LGTM ;GT.M multi thread server
+"RTN","ZISTCPS",62,0)
+ N %A K ^TMP("ZISTCP",$J)
+"RTN","ZISTCPS",63,0)
+ S $ZINTERRUPT="I $$JOBEXAM^ZU($ZPOSITION)"
+"RTN","ZISTCPS",64,0)
+ S NIO="SCK$"_$S($J>86400:$J,1:84600+$J) ;Construct a dummy, but "unique" devicename for job
+"RTN","ZISTCPS",65,0)
+ D LOG("Open for Listen "_NIO)
+"RTN","ZISTCPS",66,0)
+ ;Open the device
+"RTN","ZISTCPS",67,0)
+ O NIO:(ZLISTEN=SOCK_":TCP":ATTACH="listener"):30:"SOCKET"
+"RTN","ZISTCPS",68,0)
+ I '$T D LOG("Can't Open Socket: "_SOCK) Q
+"RTN","ZISTCPS",69,0)
+ U NIO S NIO("ZISTCP",0)=$KEY D LOG("Have port.")
+"RTN","ZISTCPS",70,0)
+ ;Start Listening
+"RTN","ZISTCPS",71,0)
+ W /LISTEN(1) S NIO("ZISTCP",1)=$KEY D LOG("Start Listening. "_NIO("ZISTCP",1))
+"RTN","ZISTCPS",72,0)
+ N ZC,ZR,IDX,DESC,LDESC
+"RTN","ZISTCPS",73,0)
+ S ZC="ZSHOW ""D"":ZR"
+"RTN","ZISTCPS",74,0)
+ X ZC
+"RTN","ZISTCPS",75,0)
+ ; Find the listener file descriptor. The child must close it.
+"RTN","ZISTCPS",76,0)
+ S LDESC="" F IDX=1:1:$O(ZR("D",""),-1) S:(ZR("D",IDX)["listener")&(ZR("D",IDX)["PORT="_SOCK) LDESC=$P($P(ZR("D",IDX),"DESC=",2)," ",1) Q:LDESC'=""
+"RTN","ZISTCPS",77,0)
+ ;Wait for connection
+"RTN","ZISTCPS",78,0)
+LG2 S %A=0,EXIT=0 F  D  Q:%A!EXIT
+"RTN","ZISTCPS",79,0)
+ . U NIO:(SOCKET="listener")
+"RTN","ZISTCPS",80,0)
+ . W /WAIT(30) ;Wait for connect
+"RTN","ZISTCPS",81,0)
+ . I $P($KEY,"|",1)="CONNECT" S NIO("ZISTCP",2)=$KEY,%A=1
+"RTN","ZISTCPS",82,0)
+ . S EXIT=$$EXIT
+"RTN","ZISTCPS",83,0)
+ . Q
+"RTN","ZISTCPS",84,0)
+ I EXIT C NIO Q
+"RTN","ZISTCPS",85,0)
+ ;
+"RTN","ZISTCPS",86,0)
+ S NIO("SOCK")=$P($G(NIO("ZISTCP",2)),"|",2)
+"RTN","ZISTCPS",87,0)
+ D LOG("Got connection on "_NIO("SOCK"))
+"RTN","ZISTCPS",88,0)
+ I '$$NEWOK D  G LG2
+"RTN","ZISTCPS",89,0)
+ . U NIO:(SOCKET=NIO("SOCK")) W "421 Service temporarily down.",$C(13,10),#
+"RTN","ZISTCPS",90,0)
+ . C NIO:(SOCKET=NIO("SOCK")) K NIO("ZISTCP",2)
+"RTN","ZISTCPS",91,0)
+ . Q
+"RTN","ZISTCPS",92,0)
+ ;Find file descriptor
+"RTN","ZISTCPS",93,0)
+ X ZC
+"RTN","ZISTCPS",94,0)
+ S DESC="" F IDX=1:1:$O(ZR("D",""),-1) S:ZR("D",IDX)[NIO("SOCK") DESC=$P($P(ZR("D",IDX),"DESC=",2)," ",1) Q:DESC'=""
+"RTN","ZISTCPS",95,0)
+ I DESC="" D LOG("Can not find file descriptor!") G LG2
+"RTN","ZISTCPS",96,0)
+ ;spawn child process
+"RTN","ZISTCPS",97,0)
+ S SPAWNID=$&openvista.gtmserver2(DESC,LDESC,"GTMLNCH^%ZISTCPS")
+"RTN","ZISTCPS",98,0)
+ L +^TMP("ZISTCPS",SPAWNID)
+"RTN","ZISTCPS",99,0)
+ S ^TMP("ZISTCPS",SPAWNID)=RTN
+"RTN","ZISTCPS",100,0)
+ L -^TMP("ZISTCPS",SPAWNID)
+"RTN","ZISTCPS",101,0)
+ D LOG("Spawned child "_SPAWNID)
+"RTN","ZISTCPS",102,0)
+ ;Close the client socket since the child now has it
+"RTN","ZISTCPS",103,0)
+ C NIO:(SOCKET=NIO("SOCK"))
+"RTN","ZISTCPS",104,0)
+ G LG2
+"RTN","ZISTCPS",105,0)
+ Q
+"RTN","ZISTCPS",106,0)
+ ;
+"RTN","ZISTCPS",107,0)
+GTMLNCH ;Run gt.m job for this connection.
+"RTN","ZISTCPS",108,0)
+ N RTN S RTN=""
+"RTN","ZISTCPS",109,0)
+ S IO("GTM-IP")=$P($K,"|",3)
+"RTN","ZISTCPS",110,0)
+ F  D  Q:RTN'=""  ; Loop until we get entry point
+"RTN","ZISTCPS",111,0)
+ . L +^TMP("ZISTCPS",$J) ; Get lock that tells us data is ready
+"RTN","ZISTCPS",112,0)
+ . S RTN=$G(^TMP("ZISTCPS",$J)) ; Get entry point
+"RTN","ZISTCPS",113,0)
+ . L -^TMP("ZISTCPS",$J) ; release entry point lock
+"RTN","ZISTCPS",114,0)
+ . H:RTN="" 1 ; We did not get a entry point, so wait a second for server to populate
+"RTN","ZISTCPS",115,0)
+ . Q
+"RTN","ZISTCPS",116,0)
+ K ^TMP("ZISTCPS",$J)
+"RTN","ZISTCPS",117,0)
+ N NIO,SOCK,ZISOS,EXIT,XQVOL,$ETRAP
+"RTN","ZISTCPS",118,0)
+ S U="^",$ETRAP="D ^%ZTER L  HALT"
+"RTN","ZISTCPS",119,0)
+ S (IO,IO(0))=$P,IO(1,IO)=""
+"RTN","ZISTCPS",120,0)
+ D VAR,@RTN
+"RTN","ZISTCPS",121,0)
+ Q
+"RTN","ZISTCPS",122,0)
+ ;
+"RTN","ZISTCPS",123,0)
+LOG(MSG) ;LOG STATUS
+"RTN","ZISTCPS",124,0)
+ N CNT
+"RTN","ZISTCPS",125,0)
+ S CNT=$G(^TMP("ZISTCP",$J))+1,^TMP("ZISTCP",$J)=CNT,^($J,CNT)=MSG
+"RTN","ZISTCPS",126,0)
+ Q
+"RTN","ZISTCPS",127,0)
+ ;
+"VER")
+8.0^22.0
+**END**
+**END**
 
=== added file 'mumps/XU1508E.m'
--- mumps/XU1508E.m	1970-01-01 00:00:00 +0000
+++ mumps/XU1508E.m	2010-12-04 06:46:54 +0000
@@ -0,0 +1,18 @@
+XU1508E ;MSC/JKT - Environment check routine for XU*8.0*1508 ;3DEC2010 20:18
+	;;8.0;KERNEL;**1508**;DEC 3, 2010;
+	;
+	; check for presence of $&openvista.gtmserver2 call
+	;
+	Q:$G(^%ZOSF("OS"))'["GT.M"
+	;
+	N XC,%I,LINE,FOUND,VERSION
+	S XC=$$GTMPATH^ZCD($$CURRENT^ZCD())_"/openvista.xc"
+	S %I=$I O XC:(READONLY) U XC
+	S FOUND=0 F  R LINE Q:LINE=""  S:$P(LINE,":",1)="gtmserver2" FOUND=1
+	C XC U %I
+	I 'FOUND D
+	. S VERSION=$TR($E($P($ZV," ",2),2,999),"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz")
+	. S VERSION=$P(VERSION,"-")_$P(VERSION,"-",2)
+	. D BMES^XPDUTL("** You must install version 0.8.11 or later of the openvista-libs-"_VERSION_" Linux package before installing this build **")
+	. S XPDABORT=1
+	Q
 
=== modified file 'mumps/ZISTCPS.m'
--- mumps/ZISTCPS.m	2009-06-05 20:09:12 +0000
+++ mumps/ZISTCPS.m	2010-12-04 06:46:54 +0000
@@ -1,5 +1,5 @@
-%ZISTCPS ;ISF/RWF MSC/JDA - DEVICE HANDLER TCP/IP SERVER CALLS ;22APR2009
- ;;8.0;KERNEL;**78,118,127,225,275,388,MSC**;Jul 10, 1995
+%ZISTCPS ;ISF/RWF MSC/JDA - DEVICE HANDLER TCP/IP SERVER CALLS ;03DEC2010
+ ;;8.0;KERNEL;**78,118,127,225,275,388,1508**;Jul 10, 1995
  Q
  ;
 CLOSE ;Close and reset
@@ -69,8 +69,11 @@
  U NIO S NIO("ZISTCP",0)=$KEY D LOG("Have port.")
  ;Start Listening
  W /LISTEN(1) S NIO("ZISTCP",1)=$KEY D LOG("Start Listening. "_NIO("ZISTCP",1))
- N ZC,ZR,IDX,DESC
+ N ZC,ZR,IDX,DESC,LDESC
  S ZC="ZSHOW ""D"":ZR"
+ X ZC
+ ; Find the listener file descriptor. The child must close it.
+ S LDESC="" F IDX=1:1:$O(ZR("D",""),-1) S:(ZR("D",IDX)["listener")&(ZR("D",IDX)["PORT="_SOCK) LDESC=$P($P(ZR("D",IDX),"DESC=",2)," ",1) Q:LDESC'=""
  ;Wait for connection
 LG2 S %A=0,EXIT=0 F  D  Q:%A!EXIT
  . U NIO:(SOCKET="listener")
@@ -91,7 +94,7 @@
  S DESC="" F IDX=1:1:$O(ZR("D",""),-1) S:ZR("D",IDX)[NIO("SOCK") DESC=$P($P(ZR("D",IDX),"DESC=",2)," ",1) Q:DESC'=""
  I DESC="" D LOG("Can not find file descriptor!") G LG2
  ;spawn child process
- S SPAWNID=$&openvista.gtmserver(DESC,"GTMLNCH^%ZISTCPS")
+ S SPAWNID=$&openvista.gtmserver2(DESC,LDESC,"GTMLNCH^%ZISTCPS")
  L +^TMP("ZISTCPS",SPAWNID)
  S ^TMP("ZISTCPS",SPAWNID)=RTN
  L -^TMP("ZISTCPS",SPAWNID)
 
=== modified file 'src/libopenvista/GTMSRV.m'
--- src/libopenvista/GTMSRV.m	2009-04-23 04:45:12 +0000
+++ src/libopenvista/GTMSRV.m	2010-12-04 06:46:54 +0000
@@ -26,15 +26,19 @@
  Open TCPDEV:(ZLISTEN=PORTNO_":TCP":attach="listener"):TIMEOUT:"SOCKET"
  Use TCPDEV
  Write /listen(1)
+ ZSHOW "D":ZS
+ N IDX,LDESC S LDESC="" F IDX=1:1:$O(ZS("D",""),-1) D  Q:LDESC'=""
+ . S:ZS("D",IDX)["listener"&(ZS("D",IDX)["PORT="_PORTNO) LDESC=$P($P(ZS("D",IDX),"DESC=",2)," ",1)
+ . Q
  F  D
  . Use TCPDEV:(SOCKET="listener")
  . Write /wait(TIMEOUT)
  . N HANDLE S HANDLE=$P($KEY,"|",2)
  . K ZS ZSHOW "D":ZS
- . N IDX,DESC S DESC="" F IDX=1:1:$O(ZS("D",""),-1) D  Q:DESC'=""
+ . N DESC S DESC="" F IDX=1:1:$O(ZS("D",""),-1) D  Q:DESC'=""
  . . S:ZS("D",IDX)[HANDLE DESC=$P($P(ZS("D",IDX),"DESC=",2)," ",1)
  . . Q
- . D &gtmserver(DESC,CMD)
+ . D &gtmserver2(DESC,LDESC,CMD)
  . C TCPDEV:(socket=HANDLE)
  . Q
  Q
 
=== modified file 'src/libopenvista/gtmserver.c'
--- src/libopenvista/gtmserver.c	2009-04-23 04:45:12 +0000
+++ src/libopenvista/gtmserver.c	2010-12-04 06:46:54 +0000
@@ -37,18 +37,103 @@
   ret_val = -1;
   grandchild_id = -1;
 
-  RETRY_EINTR(result=pipe(fds));
-  if (result<0) {
-    perror("pipe()");
-    return ret_val;
-  }
-  child_id=fork();
-  if (child_id<0) {
-    perror("child fork()");
-    return ret_val;
-  }
-  if (child_id==0) {
-    /* In child */
+  fprintf(stderr, "$&openvista.gtmserver is deprecated; use $&openvista.gtmserver2 instead\n");
+  fprintf(stderr, "OpenVista users can upgrade by installing XU*8.0*1508 and running ZTMGRSET\n\n");
+
+  RETRY_EINTR(result=pipe(fds));
+  if (result<0) {
+    perror("pipe()");
+    return ret_val;
+  }
+  child_id=fork();
+  if (child_id<0) {
+    perror("child fork()");
+    return ret_val;
+  }
+  if (child_id==0) {
+    /* In child */
+    RETRY_EINTR(result=close(fds[0]) );
+    if (result != 0) {
+      perror("child close()");
+      SEND_PID;
+    }
+    /*
+     * Fork again. Child exits and is reaped so as not to be a zombie.
+     * Grandchild will be the actual client, which will be reaped by init.
+     */
+    grandchild_id=fork();
+    if (grandchild_id<0) {
+      perror("grandchild fork()");
+      SEND_PID;
+    }
+    if (!grandchild_id) {
+      /* In grandchild */
+      RETRY_EINTR(dup2(connfd, STDIN_FILENO));
+      RETRY_EINTR(dup2(connfd, STDOUT_FILENO));
+      execlp("mumps", "mumps", "-run", cmd, (char*)0);
+      /* We should never get here */
+      perror("execlp() returned");
+      _exit(-1); /* Do not do atexit() callbacks */
+    } else {
+      /* Still in child. Send grandchild pid to parent. */
+      if (SEND_PID<0) {
+        perror("child write()");
+        _exit(-1);
+      }
+      if (close(fds[1]) != 0) {
+        perror("child close()");
+      }
+      RETRY_EINTR(sleep(1000)); /* parent will kill us */
+      _exit(0);
+    }
+  } else if (child_id) {
+    /* still in parent */
+    int bytes_read;
+    int status;
+    RETRY_EINTR(result=close(fds[1]));
+    if (result != 0) {
+      perror("parent close(fds[1])");
+    }
+    while( (bytes_read = read(fds[0], &ret_val, sizeof ret_val))==-1 && errno==EINTR) ;
+    //RETRY_EINTR(bytes_read = read(fds[0], &ret_val, sizeof ret_val));
+    if (bytes_read != sizeof ret_val) {
+      perror("incomplete read()");
+      /* ret_val = -1; */
+    }
+    RETRY_EINTR(result=close(fds[0]));
+    if (result != 0) {
+      perror("parent close(fds[0])");
+    }
+    kill(child_id, SIGKILL);
+    waitpid(child_id, &status, 0);
+    return ret_val;
+  }
+}
+
+xc_long_t gtmserver2(int count, int connfd, int listen_fd, const char *cmd) {
+  int fds[2];
+  int child_id;
+  int grandchild_id;
+  int ret_val;
+  int pid;
+  int result;
+
+  ret_val = -1;
+  grandchild_id = -1;
+
+  RETRY_EINTR(result=pipe(fds));
+  if (result<0) {
+    perror("pipe()");
+    return ret_val;
+  }
+  child_id=fork();
+  if (child_id<0) {
+    perror("child fork()");
+    return ret_val;
+  }
+  if (child_id==0) {
+    /* In child */
+    RETRY_EINTR(close(listen_fd));
     RETRY_EINTR(result=close(fds[0]) );
     if (result != 0) {
       perror("child close()");
 
=== modified file 'src/libopenvista/openvista.xc.in'
--- src/libopenvista/openvista.xc.in	2009-07-08 04:08:14 +0000
+++ src/libopenvista/openvista.xc.in	2010-12-04 06:46:54 +0000
@@ -1,2 +1,3 @@
 @GTM_DIST@/libopenvista.so
 gtmserver: xc_long_t gtmserver(I:xc_long_t, I:xc_char_t*)
+gtmserver2: xc_long_t gtmserver2(I:xc_long_t, I:xc_long_t, I:xc_char_t*)