vmsish fix, ieee rand() cleanup

Message-Id: <011019174427.d749b@DUPHY4.Physics.Drexel.Edu>

p4raw-id: //depot/perl@12513

4 files changed, 164 insertions, 77 deletions

diff --git a/vms/ext/vmsish.pm b/vms/ext/vmsish.pm
index c51863a4f3..89ec72c28c 100644
--- a/vms/ext/vmsish.pm
+++ b/vms/ext/vmsish.pm
@@ -11,7 +11,10 @@ vmsish - Perl pragma to control VMS-specific language features
     use vmsish 'status';	# or '$?'
     use vmsish 'exit';
     use vmsish 'time';
+
     use vmsish 'hushed';
+    no vmsish 'hushed';
+    vmsish::hushed($hush);
 
     use vmsish;
     no vmsish 'time';
@@ -44,13 +47,59 @@ default of Universal Time (a.k.a Greenwich Mean Time, or GMT).
 
 =item C<vmsish hushed>
 
-This suppresses printing of VMS status messages to SYS$OUTPUT and SYS$ERROR
-if Perl terminates with an error status.  This primarily effects error
-exits from things like Perl compiler errors or "standard Perl" runtime errors,
-where text error messages are also generated by Perl.
-
-The error exits from inside the core are generally more serious, and are
-not supressed.
+This suppresses printing of VMS status messages to SYS$OUTPUT and
+SYS$ERROR if Perl terminates with an error status.  and allows
+programs that are expecting "unix-style" Perl to avoid having to parse
+VMS error messages.  It does not supress any messages from Perl
+itself, just the messages generated by DCL after Perl exits.  The DCL
+symbol $STATUS will still have the termination status, but with a
+high-order bit set:
+
+EXAMPLE:
+    $ perl -e"exit 44;"                             Non-hushed error exit
+    %SYSTEM-F-ABORT, abort                          DCL message
+    $ show sym $STATUS
+      $STATUS == "%X0000002C"
+
+    $ perl -e"use vmsish qw(hushed); exit 44;"      Hushed error exit
+    $ show sym $STATUS
+      $STATUS == "%X1000002C"
+
+The 'hushed' flag has a global scope during compilation: the exit() or
+die() commands that are compiled after 'vmsish hushed' will be hushed
+when they are executed.  Doing a "no vmsish 'hushed'" turns off the
+hushed flag.
+
+The status of the hushed flag also affects output of VMS error
+messages from compilation errors.   Again, you still get the Perl
+error message (and the code in $STATUS)
+
+EXAMPLE:
+    use vmsish 'hushed';    # turn on hushed flag
+    use Carp;          # Carp compiled hushed
+    exit 44;           # will be hushed
+    croak('I die');    # will be hushed
+    no vmsish 'hushed';     # turn off hushed flag
+    exit 44;           # will not be hushed
+    croak('I die2'):   # WILL be hushed, croak was compiled hushed
+
+You can also control the 'hushed' flag at run-time, using the built-in
+routine vmsish::hushed().  Without argument, it returns the hushed status.
+Since vmsish::hushed is built-in, you do not need to "use vmsish" to call
+it.
+
+EXAMPLE:
+    if ($quiet_exit) {
+        vmsish::hushed(1);
+    } 
+    print "Sssshhhh...I'm hushed...\n" if vmsish::hushed();
+    exit 44;
+
+Note that an exit() or die() that is compiled 'hushed' because of "use
+vmsish" is not un-hushed by calling vmsish::hushed(0) at runtime.
+
+The messages from error exits from inside the Perl core are generally
+more serious, and are not supressed.
 
 =back
 
@@ -67,7 +116,6 @@ sub bits {
     my $bits = 0;
     my $sememe;
     foreach $sememe (@_) {
-        $bits |= 0x20000000, next if $sememe eq 'hushed';
         $bits |= 0x40000000, next if $sememe eq 'status' || $sememe eq '$?';
 	$bits |= 0x80000000, next if $sememe eq 'time';
     }
@@ -76,21 +124,23 @@ sub bits {
 
 sub import {
     shift;
-    $^H |= bits(@_ ? @_ : qw(status time hushed));
+    $^H |= bits(@_ ? @_ : qw(status time));
     my $sememe;
 
-    foreach $sememe (@_ ? @_ : qw(exit)) {
+    foreach $sememe (@_ ? @_ : qw(exit hushed)) {
         $^H{'vmsish_exit'}   = 1 if $sememe eq 'exit';
+        vmsish::hushed(1) if $sememe eq 'hushed';
     }
 }
 
 sub unimport {
     shift;
-    $^H &= ~ bits(@_ ? @_ : qw(status time hushed));
+    $^H &= ~ bits(@_ ? @_ : qw(status time));
     my $sememe;
 
-    foreach $sememe (@_ ? @_ : qw(exit)) {
+    foreach $sememe (@_ ? @_ : qw(exit hushed)) {
         $^H{'vmsish_exit'}   = 0 if $sememe eq 'exit';
+        vmsish::hushed(0) if $sememe eq 'hushed';
     }
 }
 
diff --git a/vms/ext/vmsish.t b/vms/ext/vmsish.t
index d63da57235..0f3c0ec1eb 100644
--- a/vms/ext/vmsish.t
+++ b/vms/ext/vmsish.t
@@ -3,31 +3,27 @@ BEGIN { unshift @INC, '[-.lib]'; }
 
 my $Invoke_Perl = qq(MCR $^X "-I[-.lib]");
 
-print "1..17\n";
+require "test.pl";
+plan(tests => 24);
 
 #========== vmsish status ==========
 `$Invoke_Perl -e 1`;  # Avoid system() from a pipe from harness.  Mutter.
-if ($?) { print "not ok 1 # POSIX status is $?\n"; }
-else    { print "ok 1\n"; }
+is($?,0,"simple Perl invokation: POSIX success status");
 {
   use vmsish qw(status);
-  if (not ($? & 1)) { print "not ok 2 # vmsish status is $?\n"; }
-  else              { print "ok 2\n"; }
+  is(($? & 1),1, "importing vmsish [vmsish status]");
   {
-    no vmsish '$?'; # check unimport function
-    if ($?) { print "not ok 3 # POSIX status is $?\n"; }
-    else    { print "ok 3\n"; }
+    no vmsish qw(status); # check unimport function
+    is($?,0, "unimport vmsish [POSIX STATUS]");
   }
   # and lexical scoping
-  if (not ($? & 1)) { print "not ok 4 # vmsish status is $?\n"; }
-  else              { print "ok 4\n"; }
+  is(($? & 1),1,"lex scope of vmsish [vmsish status]");
 }
-if ($?) { print "not ok 5 # POSIX status is $?\n"; }
-else    { print "ok 5\n";                          }
+is($?,0,"outer lex scope of vmsish [POSIX status]");
+
 {
   use vmsish qw(exit);  # check import function
-  if ($?) { print "not ok 6 # POSIX status is $?\n"; }
-  else    { print "ok 6\n"; }
+  is($?,0,"importing vmsish exit [POSIX status]");
 }
 
 #========== vmsish exit, messages ==========
@@ -35,39 +31,54 @@ else    { print "ok 5\n";                          }
   use vmsish qw(status);
 
   $msg = do_a_perl('-e "exit 1"');
-  if ($msg !~ /ABORT/) {
     $msg =~ s/\n/\\n/g; # keep output on one line
-    print "not ok 7 # subprocess output: |$msg|\n";
-  }
-  else { print "ok 7\n"; }
-  if ($? & 1) { print "not ok 8 # subprocess VMS status: $?\n"; }
-  else        { print "ok 8\n"; }
+  like($msg,'ABORT', "POSIX ERR exit, DCL error message check");
+  is($?&1,0,"vmsish status check, POSIX ERR exit");
 
   $msg = do_a_perl('-e "use vmsish qw(exit); exit 1"');
-  if (length $msg) {
     $msg =~ s/\n/\\n/g; # keep output on one line
-    print "not ok 9 # subprocess output: |$msg|\n";
-  }
-  else { print "ok 9\n"; }
-  if (not ($? & 1)) { print "not ok 10 # subprocess VMS status: $?\n"; }
-  else              { print "ok 10\n"; }
+  ok(length($msg)==0,"vmsish OK exit, DCL error message check");
+  is($?&1,1, "vmsish status check, vmsish OK exit");
 
   $msg = do_a_perl('-e "use vmsish qw(exit); exit 44"');
-  if ($msg !~ /ABORT/) {
     $msg =~ s/\n/\\n/g; # keep output on one line
-    print "not ok 11 # subprocess output: |$msg|\n";
-  }
-  else { print "ok 11\n"; }
-  if ($? & 1) { print "not ok 12 # subprocess VMS status: $?\n"; }
-  else        { print "ok 12\n"; }
+  like($msg, 'ABORT', "vmsish ERR exit, DCL error message check");
+  is($?&1,0,"vmsish ERR exit, vmsish status check");
+
+  $msg = do_a_perl('-e "use vmsish qw(hushed); exit 1"');
+  $msg =~ s/\n/\\n/g; # keep output on one line
+  ok(($msg !~ /ABORT/),"POSIX ERR exit, vmsish hushed, DCL error message check");
 
   $msg = do_a_perl('-e "use vmsish qw(exit hushed); exit 44"');
-  if ($msg =~ /ABORT/) {
     $msg =~ s/\n/\\n/g; # keep output on one line
-    print "not ok 13 # subprocess output: |$msg|\n";
-  }
-  else { print "ok 13\n"; }
-
+  ok(($msg !~ /ABORT/),"vmsish ERR exit, vmsish hushed, DCL error message check");
+
+  $msg = do_a_perl('-e "use vmsish qw(exit hushed); no vmsish qw(hushed); exit 44"');
+  $msg =~ s/\n/\\n/g; # keep output on one line
+  like($msg,'ABORT',"vmsish ERR exit, no vmsish hushed, DCL error message check");
+
+  $msg = do_a_perl('-e "use vmsish qw(hushed); die(qw(blah));"');
+  $msg =~ s/\n/\\n/g; # keep output on one line
+  ok(($msg !~ /ABORT/),"die, vmsish hushed, DCL error message check");
+
+  $msg = do_a_perl('-e "use vmsish qw(hushed); use Carp; croak(qw(blah));"');
+  $msg =~ s/\n/\\n/g; # keep output on one line
+  ok(($msg !~ /ABORT/),"croak, vmsish hushed, DCL error message check");
+
+  $msg = do_a_perl('-e "use vmsish qw(exit); vmsish::hushed(1); exit 44;"');
+  $msg =~ s/\n/\\n/g; # keep output on one line
+  ok(($msg !~ /ABORT/),"vmsish ERR exit, vmsish hushed at runtime, DCL error message check");
+
+  local *TEST;
+  open(TEST,'>vmsish_test.pl') || die('not ok ?? : unable to open "vmsish_test.pl" for writing');  
+  print TEST "#! perl\n";
+  print TEST "use vmsish qw(hushed);\n";
+  print TEST "\$obvious = (\$compile(\$error;\n";
+  close TEST;
+  $msg = do_a_perl('vmsish_test.pl');
+  $msg =~ s/\n/\\n/g; # keep output on one line
+  ok(($msg !~ /ABORT/),"compile ERR exit, vmsish hushed, DCL error message check");
+  unlink 'vmsish_test.pl';
 }
 
 
@@ -84,7 +95,7 @@ else    { print "ok 5\n";                          }
     gmtime(0); # Force reset of tz offset
   }
   {
-     use vmsish qw(time);
+     use_ok('vmsish qw(time)');
      $vmstime   = time;
      @vmslocal  = localtime($vmstime);
      @vmsgmtime = gmtime($vmstime);
@@ -101,33 +112,21 @@ else    { print "ok 5\n";                          }
   # since it's unlikely local time will differ from UTC by so small
   # an amount, and it renders the test resistant to delays from
   # things like stat() on a file mounted over a slow network link.
-  if ($utctime - $vmstime + $offset > 10) {
-    print "not ok 14  # (time) UTC: $utctime  VMS: $vmstime\n";
-  }
-  else { print "ok 14\n"; }
+  ok($utctime - $vmstime +$offset <= 10,"(time) UTC:$utctime VMS:$vmstime");
 
   $utcval = $utclocal[5] * 31536000 + $utclocal[7] * 86400 +
             $utclocal[2] * 3600     + $utclocal[1] * 60 + $utclocal[0];
   $vmsval = $vmslocal[5] * 31536000 + $vmslocal[7] * 86400 +
             $vmslocal[2] * 3600     + $vmslocal[1] * 60 + $vmslocal[0];
-  if ($vmsval - $utcval + $offset > 10) {
-    print "not ok 15  # (localtime)\n# UTC: @utclocal\n# VMS: @vmslocal\n";
-  }
-  else { print "ok 15\n"; }
+  ok($vmsval - $utcval + $offset <= 10, "(localtime)\n# UTC: @utclocal\n# VMS: @vmslocal");
 
   $utcval = $utcgmtime[5] * 31536000 + $utcgmtime[7] * 86400 +
             $utcgmtime[2] * 3600     + $utcgmtime[1] * 60 + $utcgmtime[0];
   $vmsval = $vmsgmtime[5] * 31536000 + $vmsgmtime[7] * 86400 +
             $vmsgmtime[2] * 3600     + $vmsgmtime[1] * 60 + $vmsgmtime[0];
-  if ($vmsval - $utcval + $offset > 10) {
-    print "not ok 16  # (gmtime)\n# UTC: @utcgmtime\n# VMS: @vmsgmtime\n";
-  }
-  else { print "ok 16\n"; }
+  ok($vmsval - $utcval + $offset <= 10, "(gmtime)\n# UTC: @utcgmtime\n# VMS: @vmsgmtime");
 
-  if ($vmsmtime - $utcmtime + $offset > 10) {
-    print "not ok 17  # (stat) UTC: $utcmtime  VMS: $vmsmtime\n";
-  }
-  else { print "ok 17\n"; }
+  ok($vmsmtime - $utcmtime + $offset <= 10,"(stat) UTC: $utcmtime  VMS: $vmsmtime");
 }
 
 #====== need this to make sure error messages come out, even if
diff --git a/vms/vms.c b/vms/vms.c
index bd9ed125b4..1150ea3859 100644
--- a/vms/vms.c
+++ b/vms/vms.c
@@ -6911,6 +6911,44 @@ mod2fname(pTHX_ CV *cv)
 }
 
 void
+hushexit_fromperl(pTHX_ CV *cv)
+{
+    dXSARGS;
+
+    if (items > 0) {
+        VMSISH_HUSHED = SvTRUE(ST(0));
+    }
+    ST(0) = boolSV(VMSISH_HUSHED);
+    XSRETURN(1);
+}
+
+void  
+Perl_sys_intern_dup(pTHX_ struct interp_intern *src, 
+                          struct interp_intern *dst)
+{
+    memcpy(dst,src,sizeof(struct interp_intern));
+}
+
+void  
+Perl_sys_intern_clear(pTHX)
+{
+}
+
+void  
+Perl_sys_intern_init(pTHX)
+{
+    int ix = RAND_MAX;
+    float x;
+
+    VMSISH_HUSHED = 0;
+
+    x = (float)ix;
+    MY_INV_RAND_MAX = 1./x;
+}
+
+
+
+void
 init_os_extras()
 {
   dTHX;
@@ -6932,18 +6970,10 @@ init_os_extras()
   newXSproto("VMS::Filespec::candelete",candelete_fromperl,file,"$");
   newXSproto("DynaLoader::mod2fname", mod2fname, file, "$");
   newXS("File::Copy::rmscopy",rmscopy_fromperl,file);
+  newXSproto("vmsish::hushed",hushexit_fromperl,file,";$");
 
   store_pipelocs(aTHX);
 
-#ifdef Drand01_is_rand
-/* this hackery brought to you by a bug in DECC for /ieee=denorm */
-  { 
-    int ix = RAND_MAX;
-    float x = (float)ix;
-    PL_my_inv_rand_max = 1./x;
-  }
-#endif
-
   return;
 }
   
diff --git a/vms/vmsish.h b/vms/vmsish.h
index 93af772415..34062b7a07 100644
--- a/vms/vmsish.h
+++ b/vms/vmsish.h
@@ -285,16 +285,24 @@
 #define COMPLEX_STATUS	1	/* We track both "POSIX" and VMS values */
 
 #define HINT_V_VMSISH		24
-#define HINT_M_VMSISH_HUSHED	0x20000000 /* stifle error msgs on exit */
 #define HINT_M_VMSISH_STATUS	0x40000000 /* system, $? return VMS status */
 #define HINT_M_VMSISH_TIME	0x80000000 /* times are local, not UTC */
 #define NATIVE_HINTS		(PL_hints >> HINT_V_VMSISH)  /* used in op.c */
 
 #define TEST_VMSISH(h)	(PL_curcop->op_private & ((h) >> HINT_V_VMSISH))
-#define VMSISH_HUSHED	TEST_VMSISH(HINT_M_VMSISH_HUSHED)
 #define VMSISH_STATUS	TEST_VMSISH(HINT_M_VMSISH_STATUS)
 #define VMSISH_TIME	TEST_VMSISH(HINT_M_VMSISH_TIME)
 
+/* VMS-specific data storage */
+
+#define HAVE_INTERP_INTERN
+struct interp_intern {
+    int    hushed;
+    float  inv_rand_max;
+};
+#define VMSISH_HUSHED     (PL_sys_intern.hushed)
+#define MY_INV_RAND_MAX   (PL_sys_intern.inv_rand_max)
+
 /* Flags for vmstrnenv() */
 #define PERL__TRNENV_SECURE 0x01