mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 08:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Storable: use utf8_to_bytes_overwrite() if available

Browse Source 
This is simpler and saves a malloc each time.

Note that this code could use plain utf8_to_bytes() on older perls, but
it is less convenient, so would require more code; I don't think the
performance gain is worth it.
This commit is contained in:
Karl Williamson 2025-01-30 05:24:44 -07:00 committed by Karl Williamson
parent f5c469ad87
commit 023bce476a
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dist/Storable/Storable.xs vendored
View File

@ -2960,6 +2960,19 @@ static int store_hash(pTHX_ stcxt_t *cxt, SV *xsv)
keyval = SvPV(key, keylen_tmp);
keylen = keylen_tmp;
if (SvUTF8(key)) {
#ifdef utf8_to_bytes_overwrite
/* If we are able to downgrade here; that means that we have a
* key which only had chars 0-255, but was utf8 encoded. */
if (utf8_to_bytes_overwrite( (U8**) &keyval, &keylen_tmp)) {
keylen = keylen_tmp;
flags |= SHV_K_WASUTF8;
}
else {
flags |= SHV_K_UTF8;
}
#else
const char *keysave = keyval;
bool is_utf8 = TRUE;
@ -2982,6 +2995,7 @@ static int store_hash(pTHX_ stcxt_t *cxt, SV *xsv)
to assign back to keylen. */
flags |= SHV_K_UTF8;
}
#endif
}
if (flagged_hash) {
@ -3000,8 +3014,12 @@ static int store_hash(pTHX_ stcxt_t *cxt, SV *xsv)
WLEN(keylen);
if (keylen)
WRITE(keyval, keylen);
#ifndef utf8_to_bytes_overwrite
if (flags & SHV_K_WASUTF8)
Safefree (keyval);
#endif
}
/*

2
dist/Storable/lib/Storable.pm vendored
View File

@ -30,7 +30,7 @@ our @EXPORT_OK = qw(
our ($canonical, $forgive_me);
BEGIN {
our $VERSION = '3.38';
our $VERSION = '3.39';
}
our $recursion_limit;