summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorDaniel Dragan <bulk88@hotmail.com>2015-10-16 17:49:20 -0400
committerTony Cook <tony@develop-help.com>2015-10-19 14:21:51 +1100
commit8ca2a5d6d84d93b456a8dfa622707ae9222a388a (patch)
treecbc3670fc63412844b5ba5561b98773eb0ccd728 /win32
parent03a8022922436d6126806f2021d599237739ff83 (diff)
downloadperl-8ca2a5d6d84d93b456a8dfa622707ae9222a388a.tar.gz
reimplement $^WIN32_SLOPPY_STAT as a magic var
The original implementation in commit cba61fe146 was sloppy. It is named like a special var, it is listed as a special var, but it was a regular GV. Since nobody knows this var exists, and full stat is the default (which I disagree with see below). There will be alot more PP and C/XS perl stat() calls (atleast a couple to dozens or low 100s for short lived perl processes) than reads/writes to this global scalar (rounded to 0 R/Ws) in a Win32 perl process. So avoid the 1 usually failing GV package (hash) lookup for each PP/XS/PL C stat by using magic vars and a C bool. This is a perf increase. Use sv_true instead of SvTRUE_NN because this code is extremely rare to execute and the macro has large machine code. I disagree with the default being full stat with since this increases the number of kernel IO calls and ASCII->UTF16 conversions, and there was perf criticism in the original thread that implemented this this http://www.nntp.perl.org/group/perl.perl5.porters/2006/02/msg109917.html but why full stat is default is for another ticket. This patch lessens the overhead of full stat until something else is decided. Change the initial value of the sloppystat setting for miniperl to be true instead of doing it in buildcustomize.pl in PP. Revert part of commit 8ce7a7e8b0 "speed up miniperl require on Win32" to acomplish this. Unlike Unix perl, no object files are shared between mini and full perl, so changing the default is fine on Win32 Perl. If minitest/miniperl really need hard link testing/support, they can explictly turn off sloppy stat and enable full stat with the special var. Changing the stat default from C for miniperl avoids creating the special GV on each miniperl process start as it previously was with the buildcustomize.pl way. Changing stat setting in C and not PP also saves a couple IO calls in win32_stat when opening the first .pl if it isn't -e, and opening buildcustomize.pl in all permutations. The PP code in S_parse_body contains a -f. See ticket for this patch for details. Only CPAN use of this special var is File-Stat-Moose-0.06/lib/File/Stat/Moose.pm#L208 according to cpangrep.
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c12
-rw-r--r--win32/win32.h2
2 files changed, 9 insertions, 5 deletions
diff --git a/win32/win32.c b/win32/win32.c
index a3e1754893..1f6bd9102a 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1463,10 +1463,6 @@ win32_stat(const char *path, Stat_t *sbuf)
int nlink = 1;
BOOL expect_dir = FALSE;
- GV *gv_sloppy = gv_fetchpvs("\027IN32_SLOPPY_STAT",
- GV_NOTQUAL, SVt_PV);
- BOOL sloppy = gv_sloppy && SvTRUE(GvSV(gv_sloppy));
-
if (l > 1) {
switch(path[l - 1]) {
/* FindFirstFile() and stat() are buggy with a trailing
@@ -1507,7 +1503,7 @@ win32_stat(const char *path, Stat_t *sbuf)
path = PerlDir_mapA(path);
l = strlen(path);
- if (!sloppy) {
+ if (!w32_sloppystat) {
/* We must open & close the file once; otherwise file attribute changes */
/* might not yet have propagated to "other" hard links of the same file. */
/* This also gives us an opportunity to determine the number of links. */
@@ -4681,6 +4677,11 @@ Perl_sys_intern_init(pTHX)
w32_timerid = 0;
w32_message_hwnd = CAST_HWND__(INVALID_HANDLE_VALUE);
w32_poll_count = 0;
+#ifdef PERL_IS_MINIPERL
+ w32_sloppystat = TRUE;
+#else
+ w32_sloppystat = FALSE;
+#endif
for (i=0; i < SIG_SIZE; i++) {
w32_sighandler[i] = SIG_DFL;
}
@@ -4748,6 +4749,7 @@ Perl_sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst)
dst->timerid = 0;
dst->message_hwnd = CAST_HWND__(INVALID_HANDLE_VALUE);
dst->poll_count = 0;
+ dst->sloppystat = src->sloppystat;
Copy(src->sigtable,dst->sigtable,SIG_SIZE,Sighandler_t);
}
# endif /* USE_ITHREADS */
diff --git a/win32/win32.h b/win32/win32.h
index e997651c15..9b79e009f1 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -504,6 +504,7 @@ struct interp_intern {
UINT timerid;
unsigned poll_count;
Sighandler_t sigtable[SIG_SIZE];
+ bool sloppystat;
};
#define WIN32_POLL_INTERVAL 32768
@@ -537,6 +538,7 @@ struct interp_intern {
#define w32_init_socktype (PL_sys_intern.thr_intern.Winit_socktype)
#define w32_use_showwindow (PL_sys_intern.thr_intern.Wuse_showwindow)
#define w32_showwindow (PL_sys_intern.thr_intern.Wshowwindow)
+#define w32_sloppystat (PL_sys_intern.sloppystat)
#ifdef USE_ITHREADS
void win32_wait_for_children(pTHX);