From: Quentin Rameau <quinq@fifth.space>
To: musl@lists.openwall.com
Subject: Re: [musl] [Patch 1/1] vfprintf: optimize vfprintf performance
Date: Mon, 15 May 2023 10:31:38 +0200 [thread overview]
Message-ID: <20230515103138.07f4c02e.quinq@fifth.space> (raw)
In-Reply-To: <tencent_ADC50904D30BB73CB7C279C76FE6716D280A@qq.com>
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!
prev parent reply other threads:[~2023-05-15 8:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 2:10 =?gb18030?B?ODQ3NTY3MTYx?=
2023-05-15 8:31 ` Quentin Rameau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230515103138.07f4c02e.quinq@fifth.space \
--to=quinq@fifth.space \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).