Change 34778 by [EMAIL PROTECTED] on 2008/11/08 15:51:45 From change #34775, reverting perlio.c change for now. Also, setting the tests to TODO.
Affected files ... ... //depot/perl/ext/PerlIO/t/ioleaks.t#2 edit ... //depot/perl/perlio.c#395 edit Differences ... ==== //depot/perl/ext/PerlIO/t/ioleaks.t#2 (text) ==== Index: perl/ext/PerlIO/t/ioleaks.t --- perl/ext/PerlIO/t/ioleaks.t#1~34775~ 2008-11-07 21:18:16.000000000 -0800 +++ perl/ext/PerlIO/t/ioleaks.t 2008-11-08 07:51:45.000000000 -0800 @@ -10,14 +10,17 @@ # :perlio -> ok # :crlf -> ok -foreach my $layer(qw(:unix :stdio :perlio :crlf)){ - my $base_fd = do{ open my $in, '<', $0 or die $!; fileno $in }; +TODO: { + local $TODO = "[perl #56644] PerlIO resource leaks on open() and then :pop in :unix and :stdio"; + foreach my $layer(qw(:unix :stdio :perlio :crlf)){ + my $base_fd = do{ open my $in, '<', $0 or die $!; fileno $in }; - for(1 .. 3){ - open my $fh, "<$layer", $0 or die $!; + for(1 .. 3){ + open my $fh, "<$layer", $0 or die $!; - is fileno($fh), $base_fd, $layer; - binmode $fh, ':pop'; - } + is fileno($fh), $base_fd, $layer; + binmode $fh, ':pop'; + } + } } ==== //depot/perl/perlio.c#395 (text) ==== Index: perl/perlio.c --- perl/perlio.c#394~34775~ 2008-11-07 21:18:16.000000000 -0800 +++ perl/perlio.c 2008-11-08 07:51:45.000000000 -0800 @@ -2736,14 +2736,9 @@ return PerlLIO_lseek(PerlIOSelf(f, PerlIOUnix)->fd, 0, SEEK_CUR); } -IV -PerlIOUnix_close(pTHX_ PerlIO *f) -{ - return PerlIOBase_noop_ok(aTHX_ f); -} IV -PerlIOUnix_popped(pTHX_ PerlIO *f) +PerlIOUnix_close(pTHX_ PerlIO *f) { dVAR; const int fd = PerlIOSelf(f, PerlIOUnix)->fd; @@ -2777,7 +2772,7 @@ sizeof(PerlIOUnix), PERLIO_K_RAW, PerlIOUnix_pushed, - PerlIOUnix_popped, + PerlIOBase_popped, PerlIOUnix_open, PerlIOBase_binmode, /* binmode */ NULL, @@ -3127,12 +3122,6 @@ IV PerlIOStdio_close(pTHX_ PerlIO *f) { - return PerlIOBase_noop_ok(aTHX_ f); -} - -IV -PerlIOStdio_popped(pTHX_ PerlIO *f) -{ FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio; if (!stdio) { errno = EBADF; @@ -3569,7 +3558,7 @@ sizeof(PerlIOStdio), PERLIO_K_BUFFERED|PERLIO_K_RAW, PerlIOStdio_pushed, - PerlIOStdio_popped, + PerlIOBase_popped, PerlIOStdio_open, PerlIOBase_binmode, /* binmode */ NULL, End of Patch.