Skip to content

Commit

Permalink
proc: optimize single-symbol delimiters to spead up seq_put_decimal_ull
Browse files Browse the repository at this point in the history
A delimiter is a string which is printed before a number.  A
syngle-symbol delimiters can be printed by set_putc() and this works
faster than printing by set_puts().

== test_proc.c

int main(int argc, char **argv)
{
	int n, i, fd;
	char buf[16384];

	n = atoi(argv[1]);
	for (i = 0; i < n; i++) {
		fd = open(argv[2], O_RDONLY);
		if (fd < 0)
			return 1;
		if (read(fd, buf, sizeof(buf)) <= 0)
			return 1;
		close(fd);
	}

	return 0;
}
==

$ time ./test_proc  1000000 /proc/1/stat

== Before patch ==
  real	0m3.820s
  user	0m0.337s
  sys	0m3.394s

== After patch ==
  real	0m3.110s
  user	0m0.324s
  sys	0m2.700s

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Andrei Vagin <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
avagin authored and torvalds committed Apr 11, 2018
1 parent f664066 commit 48dffbf
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions fs/seq_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -693,12 +693,12 @@ void seq_put_decimal_ull_width(struct seq_file *m, const char *delimiter,
if (m->count + 2 >= m->size) /* we'll write 2 bytes at least */
goto overflow;

len = strlen(delimiter);
if (m->count + len >= m->size)
goto overflow;

memcpy(m->buf + m->count, delimiter, len);
m->count += len;
if (delimiter && delimiter[0]) {
if (delimiter[1] == 0)
seq_putc(m, delimiter[0]);
else
seq_puts(m, delimiter);
}

if (!width)
width = 1;
Expand Down Expand Up @@ -782,12 +782,12 @@ void seq_put_decimal_ll(struct seq_file *m, const char *delimiter, long long num
if (m->count + 3 >= m->size) /* we'll write 2 bytes at least */
goto overflow;

len = strlen(delimiter);
if (m->count + len >= m->size)
goto overflow;

memcpy(m->buf + m->count, delimiter, len);
m->count += len;
if (delimiter && delimiter[0]) {
if (delimiter[1] == 0)
seq_putc(m, delimiter[0]);
else
seq_puts(m, delimiter);
}

if (m->count + 2 >= m->size)
goto overflow;
Expand Down

0 comments on commit 48dffbf

Please sign in to comment.