public inbox for util-linux@vger.kernel.org
 help / color / mirror / Atom feed
From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 04/34] hexdump: use unlocked io, and avoid use of printf()
Date: Sun,  7 Jul 2013 20:54:19 +0100	[thread overview]
Message-ID: <1373226889-3451-5-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1373226889-3451-1-git-send-email-kerolasa@iki.fi>

This makes common cases about 35-50% quicker.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 text-utils/display.c   | 11 ++++++-----
 text-utils/hexsyntax.c |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/text-utils/display.c b/text-utils/display.c
index 41ddd8d..21a59c2 100644
--- a/text-utils/display.c
+++ b/text-utils/display.c
@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "unlocked-io.h"
 #include "hexdump.h"
 #include "xalloc.h"
 #include "c.h"
@@ -110,13 +111,13 @@ print(PR *pr, unsigned char *bp) {
 		break;
 	    }
 	case F_P:
-		(void)printf(pr->fmt, isprint(*bp) ? *bp : '.');
+		putchar(isprint(*bp) ? *bp : '.');
 		break;
 	case F_STR:
 		(void)printf(pr->fmt, (char *)bp);
 		break;
 	case F_TEXT:
-		(void)printf("%s", pr->fmt);
+		fputs(pr->fmt, stdout);
 		break;
 	case F_U:
 		conv_u(pr, bp);
@@ -213,7 +214,7 @@ void display(void)
 				(void)printf(pr->fmt, (int64_t)eaddress);
 				break;
 			case F_TEXT:
-				(void)printf("%s", pr->fmt);
+				fputs(pr->fmt, stdout);
 				break;
 			}
 	}
@@ -250,7 +251,7 @@ get(void)
 			if (!need && vflag != ALL &&
 			    !memcmp(curp, savp, nread)) {
 				if (vflag != DUP)
-					(void)printf("*\n");
+					fputs("*\n", stdout);
 				return(NULL);
 			}
 			if (need > 0)
@@ -281,7 +282,7 @@ get(void)
 				return(curp);
 			}
 			if (vflag == WAIT)
-				(void)printf("*\n");
+				fputs("*\n", stdout);
 			vflag = DUP;
 			address += blocksize;
 			need = blocksize;
diff --git a/text-utils/hexsyntax.c b/text-utils/hexsyntax.c
index 2910ca5..a97ce11 100644
--- a/text-utils/hexsyntax.c
+++ b/text-utils/hexsyntax.c
@@ -43,6 +43,7 @@
 #include <err.h>
 #include <limits.h>
 #include <getopt.h>
+#include "unlocked-io.h"
 #include "hexdump.h"
 #include "nls.h"
 #include "strutils.h"
-- 
1.8.3.2


  parent reply	other threads:[~2013-07-07 19:55 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-07 19:54 [PATCH 00/34] pull: make printing quicker, and clang analysis Sami Kerola
2013-07-07 19:54 ` [PATCH 01/34] sfdisk: make unhiding as complete as possible Sami Kerola
2013-07-07 19:54 ` [PATCH 02/34] docs: add missing options to sfdisk manual Sami Kerola
2013-07-07 19:54 ` [PATCH 03/34] include: copy unlocked-io.h from gnulib Sami Kerola
2013-07-08 20:21   ` Kay Sievers
2013-07-09  6:37     ` Sami Kerola
2013-07-09  9:16       ` Kay Sievers
2013-07-13 22:10         ` Sami Kerola
2013-07-07 19:54 ` Sami Kerola [this message]
2013-07-07 19:54 ` [PATCH 05/34] text-utils: use unlocked io Sami Kerola
2013-07-07 19:54 ` [PATCH 06/34] misc-utils: " Sami Kerola
2013-07-07 19:54 ` [PATCH 07/34] scriptreplay: " Sami Kerola
2013-07-07 19:54 ` [PATCH 09/34] utmpdump: use unlocked io, and avoid use of printf() Sami Kerola
2013-07-07 19:54 ` [PATCH 10/34] dmesg: inform user --show-delta and iso8601 time format does not mix Sami Kerola
2013-07-07 19:54 ` [PATCH 11/34] lib/loopdev: assigned value is never read [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 12/34] lib/mbsalign: initializations values are " Sami Kerola
2013-07-07 19:54 ` [PATCH 13/34] libmount: fix memory leak [clang-analyzer] Sami Kerola
2013-07-08  8:02   ` Karel Zak
2013-07-07 19:54 ` [PATCH 14/34] ipcs: assigned values are never read [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 15/34] lscpu: fix memory leak [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 16/34] more: assigned value is never read [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 17/34] utmpdump: assigned values are " Sami Kerola
2013-07-07 19:54 ` [PATCH 18/34] mkfs.cramfs: argument to free() is a constant address [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 19/34] eject: assigned value is never read [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 20/34] chfn: " Sami Kerola
2013-07-07 19:54 ` [PATCH 21/34] mesg: " Sami Kerola
2013-07-08  8:23   ` Karel Zak
2013-07-07 19:54 ` [PATCH 22/34] rev: " Sami Kerola
2013-07-07 19:54 ` [PATCH 23/34] column: " Sami Kerola
2013-07-07 19:54 ` [PATCH 24/34] hwclock: " Sami Kerola
2013-07-07 19:54 ` [PATCH 25/34] dmesg: " Sami Kerola
2013-07-07 19:54 ` [PATCH 26/34] login: " Sami Kerola
2013-07-07 19:54 ` [PATCH 27/34] sfdisk: " Sami Kerola
2013-07-07 19:54 ` [PATCH 28/34] sulogin: fix memory leak [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 29/34] agetty: " Sami Kerola
2013-07-07 19:54 ` [PATCH 30/34] dmesg: add missing initializer [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 31/34] ul: use correct types Sami Kerola
2013-07-07 19:54 ` [PATCH 32/34] ul: use string printing function Sami Kerola
2013-07-07 19:54 ` [PATCH 33/34] column: dereference of null pointer [clang-analyzer] Sami Kerola
2013-07-07 19:54 ` [PATCH 34/34] more: use variable lenght printf field width to print blanks Sami Kerola
2013-07-09 12:58 ` [PATCH 00/34] pull: make printing quicker, and clang analysis Karel Zak

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=1373226889-3451-5-git-send-email-kerolasa@iki.fi \
    --to=kerolasa@iki.fi \
    --cc=util-linux@vger.kernel.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox