* [musl] [Patch 1/1] vfprintf: optimize vfprintf performance
@ 2023-05-15 2:10 =?gb18030?B?ODQ3NTY3MTYx?=
2023-05-15 8:31 ` Quentin Rameau
0 siblings, 1 reply; 2+ messages in thread
From: =?gb18030?B?ODQ3NTY3MTYx?= @ 2023-05-15 2:10 UTC (permalink / raw)
To: =?gb18030?B?bXVzbA==?=
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb18030", Size: 3186 bytes --]
As we discussed earlier£¬
https://www.openwall.com/lists/musl/2023/05/06/1
https://www.openwall.com/lists/musl/2023/05/06/2
https://www.openwall.com/lists/musl/2023/05/06/3
https://www.openwall.com/lists/musl/2023/05/06/4
https://www.openwall.com/lists/musl/2023/05/06/5
https://www.openwall.com/lists/musl/2023/05/07/1
https://www.openwall.com/lists/musl/2023/05/07/2
I made a patch to get nl_arg when we see '$' ranther than visit the format anyway£¬could you please help me review it£¿
diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c old mode 100644 new mode 100755 index 9b961e7f..3294e23b --- a/src/stdio/vfprintf.c +++ b/src/stdio/vfprintf.c @@ -427,7 +427,7 @@ static int getint(char **s) { return i; } -static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type) +static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type, union arg* nl_arg_ptr) { char *a, *z, *s=(char *)fmt; unsigned l10n=0, fl; @@ -462,6 +462,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, if (l) continue; if (isdigit(s[1]) && s[2]=='$') { + if (nl_arg_ptr == NULL) { + nl_arg_ptr = nl_arg; + if (printf_core(0, fmt, ap, nl_arg, nl_type, nl_arg_ptr) < 0) { + return -1; + } + } l10n=1; argpos = s[1]-'0'; s+=3; @@ -477,6 +483,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, /* Read field width */ if (*s=='*') { if (isdigit(s[1]) && s[2]=='$') { + if (nl_arg_ptr == NULL) { + nl_arg_ptr = nl_arg; + if (printf_core(0, fmt, ap, nl_arg, nl_type, nl_arg_ptr) < 0) { + return -1; + } + } l10n=1; nl_type[s[1]-'0'] = INT; w = nl_arg[s[1]-'0'].i; @@ -491,6 +503,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, /* Read precision */ if (*s=='.' && s[1]=='*') { if (isdigit(s[2]) && s[3]=='$') { + if (nl_arg_ptr == NULL) { + nl_arg_ptr = nl_arg; + if (printf_core(0, fmt, ap, nl_arg, nl_type, nl_arg_ptr) < 0) { + return -1; + } + } nl_type[s[2]-'0'] = INT; p = nl_arg[s[2]-'0'].i; s+=4; @@ -659,16 +677,13 @@ int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap) va_list ap2; int nl_type[NL_ARGMAX+1] = {0}; union arg nl_arg[NL_ARGMAX+1]; + union arg* nl_arg_ptr = NULL; unsigned char internal_buf[80], *saved_buf = 0; int olderr; int ret; /* the copy allows passing va_list* even if va_list is an array */ va_copy(ap2, ap); - if (printf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) { - va_end(ap2); - return -1; - } FLOCK(f); olderr = f->flags & F_ERR; @@ -680,7 +695,7 @@ int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap) f->wpos = f->wbase = f->wend = 0; } if (!f->wend && __towrite(f)) ret = -1; - else ret = printf_core(f, fmt, &ap2, nl_arg, nl_type); + else ret = printf_core(f, fmt, &ap2, nl_arg, nl_type, nl_arg_ptr); if (saved_buf) { f->write(f, 0, 0); if (!f->wpos) ret = -1;
[-- Attachment #2: Type: text/html, Size: 19974 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [musl] [Patch 1/1] vfprintf: optimize vfprintf performance
2023-05-15 2:10 [musl] [Patch 1/1] vfprintf: optimize vfprintf performance =?gb18030?B?ODQ3NTY3MTYx?=
@ 2023-05-15 8:31 ` Quentin Rameau
0 siblings, 0 replies; 2+ messages in thread
From: Quentin Rameau @ 2023-05-15 8:31 UTC (permalink / raw)
To: musl
Hi 847567161
> I made a patch to get nl_arg when we see '$' ranther than visit the format anyway,could you please help me review it?
>
> diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c old mode 100644 new mode 100755 index 9b961e7f..3294e23b --- a/src/stdio/vfprintf.c +++ b/src/stdio/vfprintf.c @@ -427,7 +427,7 @@ static int getint(char **s) { return i; } -static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type) +static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type, union arg* nl_arg_ptr) { char *a, *z, *s=(char *)fmt; unsigned l10n=0, fl; @@ -462,6 +462,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, if (l) continue; if (isdigit(s[1]) && s[2]=='$') { + if (nl_arg_ptr == NULL) { + nl_arg_ptr = nl_arg; + if (printf_core(0, fmt, ap, nl_arg, nl_type, nl_arg_ptr) < 0) { + return -1; + } + } l10n=1; argpos = s[1]-'0'; s+=3; @@ -477,6 +483,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, /* Read field width */ if (*s=='*') { if (isdigit(s[1]) && s[2]=='$') { + if (nl_arg_ptr == NULL) { + nl_arg_ptr = nl_arg; + if (printf_core(0, fmt, ap, nl_arg, nl_type, nl_arg_ptr) < 0) { + return -1; + } + } l10n=1; nl_type[s[1]-'0'] = INT; w = nl_arg[s[1]-'0'].i; @@ -491,6 +503,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, /* Read precision */ if (*s=='.' && s[1]=='*') { if (isdigit(s[2]) && s[3]=='$') { + if (nl_arg_ptr == NULL) { + nl_arg_ptr = nl_arg; + if (printf_core(0, fmt, ap, nl_arg, nl_type, nl_arg_ptr) < 0) { + return -1; + } + } nl_type[s[2]-'0'] = INT; p = nl_arg[s[2]-'0'].i; s+=4; @@ -659,16 +677,13 @@ int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap) va_list ap2; int nl_type[NL_ARGMAX+1] = {0}; union arg nl_arg[NL_ARGMAX+1]; + union arg* nl_arg_ptr = NULL; unsigned char internal_buf[80], *saved_buf = 0; int olderr; int ret; /* the copy allows passing va_list* even if va_list is an array */ va_copy(ap2, ap); - if (printf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) { - va_end(ap2); - return -1; - } FLOCK(f); olderr = f->flags & F_ERR; @@ -680,7 +695,7 @@ int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap) f->wpos = f->wbase = f->wend = 0; } if (!f->wend && __towrite(f)) ret = -1; - else ret = printf_core(f, fmt, &ap2, nl_arg, nl_type); + else ret = printf_core(f, fmt, &ap2, nl_arg, nl_type, nl_arg_ptr); if (saved_buf) { f->write(f, 0, 0); if (!f->wpos) ret = -1;
Could you try sending it in a more readable way?
One way would be to commit the diff and sending it with git-send-email
but attaching a diff file, or simply inlining the patch as plain-text
would also work.
Thank you!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-15 8:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-15 2:10 [musl] [Patch 1/1] vfprintf: optimize vfprintf performance =?gb18030?B?ODQ3NTY3MTYx?=
2023-05-15 8:31 ` Quentin Rameau
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).