Merge lp:~jeff-apple/openvista-gtm-integration/bug359418 into lp:openvista-gtm-integration

[jeff.apple]

[Jon Tai (jontai)]

Changes look good to me - have we tested this on Cache to ensure that it still works there?

review: Approve

[jeff.apple (jeff-apple)]

> Changes look good to me - have we tested this on Cache to ensure that it still
> works there?

Do we have a Cache instance that we can destabilize?

[Jon Tai (jontai)]

> Do we have a Cache instance that we can destabilize?

I can't think of one off-hand, no. Maybe we just merge it now, (possibly pending Joel's review), then worry about regression testing this stuff all at once at the end of Phase I. I've e-mailed Karthick (you should have been CC'd) to make sure this stuff gets regression tested on Cache on both Windows and Linux.

[jeff.apple (jeff-apple)]

> > Do we have a Cache instance that we can destabilize?
>
> I can't think of one off-hand, no. Maybe we just merge it now, (possibly
> pending Joel's review), then worry about regression testing this stuff all at
> once at the end of Phase I. I've e-mailed Karthick (you should have been
> CC'd) to make sure this stuff gets regression tested on Cache on both Windows
> and Linux.

Maybe sql.medsphere.com could be used. I'm not sure what all that's doing these days.

[lp:~jeff-apple/openvista-gtm-integration/bug359418]

8. By jeff.apple on 2009-04-13

Comments added

=== modified file 'mumps/HLCSLNCH.m'
--- mumps/HLCSLNCH.m	2009-04-11 03:29:54 +0000
+++ mumps/HLCSLNCH.m	2009-04-11 03:35:29 +0000
@@ -39,7 +39,7 @@
  ;-- execute environment check routine if HLQUIT is defined then terminate
  I HLENV'="" X HLENV G:$D(HLQUIT) STARTQ
  ;Multi-Servers, only enable the link if not OpenM
- I $P(HLPARM4,U,3)="M",$S(^%ZOSF("OS")'["OpenM":1,1:$$OS^%ZOSV["VMS") D  G STARTQ
+ I $P(HLPARM4,U,3)="M",$$NOTMULTI D  G STARTQ
  . W !,$C(7),"This LLP is a multi-threaded server. It is controlled by external service, i.e. TCPIP/UCX. You must use the external service to start this LLP."
  . Q
  ;
@@ -97,7 +97,7 @@
  W !,"like to shutdown.",!
  S DIC="^HLCS(870,",DIC(0)="QEAMZ" D ^DIC K DIC Q:Y<0
  S HLDP=+Y,HLDAPP=Y(0,0),HLPARM0=Y(0),HLPARM4=$G(^HLCS(870,HLDP,400))
- I $P(HLPARM4,U,3)="M",$S(^%ZOSF("OS")'["OpenM":1,1:$$OS^%ZOSV["VMS") D  Q
+ I $P(HLPARM4,U,3)="M",$$NOTMULTI D  Q
  . W !,$C(7),"This LLP is a multi-threaded server. It is controlled by external service, i.e. UCX. You must use the external service to disable this LLP."
  . Q
  ;
@@ -124,4 +124,7 @@
  W !,"The job for the "_HLDAPP_" Lower Level Protocol will be shut down."
  Q
  ;
+NOTMULTI() ; Returns 1 if implementation can't run multithreaded listener
+ Q:^%ZOSF("OS")["GT.M" 0
+ Q $S(^%ZOSF("OS")'["OpenM":1,1:$$OS^%ZOSV["VMS")
 STOPQ Q

=== modified file 'mumps/HLCSTCP.m'
--- mumps/HLCSTCP.m	2009-04-11 03:29:54 +0000
+++ mumps/HLCSTCP.m	2009-04-11 03:35:29 +0000
@@ -28,8 +28,8 @@
  . ;couldn't open listener port
  . I HLCSFAIL D EXITS("Openfail") Q
  ;
- ;multi-threaded listener (OpenM)
- I $G(HLTCPCS)="M",^%ZOSF("OS")["OpenM" D  Q
+ ;multi-threaded listener (OpenM or GT.M)
+ I $G(HLTCPCS)="M",(^%ZOSF("OS")["OpenM")!(^%ZOSF("OS")["GT.M") D  Q
  . D ST1,MON("Listen"),LISTEN^%ZISTCPS(HLTCPORT,"SERVERS^HLCSTCP("""_HLDP_""")")
  Q
  ;
@@ -67,7 +67,7 @@
  I $G(%)="" D ^%ZTER Q
  S (IO,IO(0))="SYS$NET",HLDP=$P(%,"^",2)
  ; **VMS specific code, need to share device**
- O IO:(TCPDEV):60 E  D MON("Openfail") Q
+ X "O IO:(TCPDEV):60" E  D MON("Openfail") Q
 LISTEN ;
  N HLLSTN,HLCSOUT,HLDBACK,HLDBSIZE,HLDREAD,HLDRETR,HLRETRA,HLDWAIT,HLOS,HLTCPADD,HLTCPCS,HLTCPLNK,HLTCPORT,HLTCPRET,HLCSFAIL
  I '$$INIT D ^%ZTER Q