Use unlocked I/O for a minor performance improvement on hosts like

GNU/Linux and Solaris that support unlocked I/O.  The basic idea
is to use the gnlib unlocked-io module, and to prefer putc and
puts to printf when either will work (since the latter doesn't
come in an unlocked flavor).
* bootstrap (gnulib_modules): Add unlocked-io.
* data/c.m4 (yysymprint): Prefer puts and putc to printf.
* data/glr.c (YYFPUTC, YYFPUTS, YYDPUTS): New macros.
Prefer them to YYFPRINTF and YYDPRINTF if either will do,
and similarly for puts and putc and printf.
* data/yacc.c: Likewise.
* lib/bitset.c (bitset_print): Likewise.
* lib/bitset.h [USE_UNLOCKED_IO]: Include unlocked-io.h.
* lib/bitsetv.c (bitsetv_dump, debug-bitsetv): Prefer putc and puts
to printf.
* lib/lbitset.c (debug_lbitset): Likewise.
* src/closure.c (print_firsts, print_fderives): Likewise.
* src/gram.c (grammar_dump): Likewise.
* src/lalr.c (look_ahead_tokens_print): Likewise.
* src/output.c (escaped_output): Likewise.
(user_actions_output): Coalesce two printfs.
* src/parse-gram.h (%printer): Prefer putc and puts to printf.
* src/reduce.c (reduce_print): Likewise.
* src/state.c (state_rule_look_ahead_tokens_print): Likewise.
* src/system.h: Include unlocked-io.h rathe than stdio.h.
This commit is contained in:
Paul Eggert
2005-10-02 21:24:12 +00:00
parent edb8f44f06
commit fb9c0b3360
17 changed files with 118 additions and 60 deletions

View File

@@ -75,7 +75,7 @@ print_firsts (void)
{
symbol_number i, j;
fprintf (stderr, "FIRSTS\n");
fputs ("FIRSTS\n", stderr);
for (i = ntokens; i < nsyms; i++)
{
bitset_iterator iter;
@@ -86,7 +86,7 @@ print_firsts (void)
symbols[j + ntokens]->tag);
}
}
fprintf (stderr, "\n\n");
fputs ("\n\n", stderr);
}
@@ -96,7 +96,7 @@ print_fderives (void)
int i;
rule_number r;
fprintf (stderr, "FDERIVES\n");
fputs ("FDERIVES\n", stderr);
for (i = ntokens; i < nsyms; i++)
{
bitset_iterator iter;
@@ -107,7 +107,7 @@ print_fderives (void)
rule_rhs_print (&rules[r], stderr);
}
}
fprintf (stderr, "\n\n");
fputs ("\n\n", stderr);
}
/*------------------------------------------------------------------.

View File

@@ -247,23 +247,24 @@ grammar_dump (FILE *out, const char *title)
ntokens, nvars, nsyms, nrules, nritems);
fprintf (out, "Variables\n---------\n\n");
fputs (("Variables\n---------\n\n"
"Value Sprec Sassoc Tag\n"),
out);
{
symbol_number i;
fprintf (out, "Value Sprec Sassoc Tag\n");
for (i = ntokens; i < nsyms; i++)
fprintf (out, "%5d %5d %5d %s\n",
i,
symbols[i]->prec, symbols[i]->assoc,
symbols[i]->tag);
fprintf (out, "\n\n");
}
fputs ("\n\n", out);
fprintf (out, "Rules\n-----\n\n");
fputs (("Rules\n-----\n\n"
"Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"),
out);
{
rule_number i;
fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
for (i = 0; i < nrules + nuseless_productions; i++)
{
rule *rule_i = &rules[i];
@@ -287,9 +288,9 @@ grammar_dump (FILE *out, const char *title)
fprintf (out, " [%d]\n", item_number_as_rule_number (*rp));
}
}
fprintf (out, "\n\n");
fputs ("\n\n", out);
fprintf (out, "Rules interpreted\n-----------------\n\n");
fputs ("Rules interpreted\n-----------------\n\n", out);
{
rule_number r;
for (r = 0; r < nrules + nuseless_productions; r++)
@@ -298,7 +299,7 @@ grammar_dump (FILE *out, const char *title)
rule_print (&rules[r], out);
}
}
fprintf (out, "\n\n");
fputs ("\n\n", out);
}

View File

@@ -410,7 +410,7 @@ look_ahead_tokens_print (FILE *out)
{
state_number i;
int j, k;
fprintf (out, "Look-ahead tokens: BEGIN\n");
fputs ("Look-ahead tokens: BEGIN\n", out);
for (i = 0; i < nstates; ++i)
{
reductions *reds = states[i]->reductions;
@@ -434,7 +434,7 @@ look_ahead_tokens_print (FILE *out)
reds->rules[j]->number);
};
}
fprintf (out, "Look-ahead tokens: END\n");
fputs ("Look-ahead tokens: END\n", out);
}
void

View File

@@ -119,7 +119,7 @@ static void
escaped_output (FILE *out, char const *string)
{
char const *p;
fprintf (out, "[[");
fputs ("[[", out);
for (p = quotearg_style (c_quoting_style, string); *p; p++)
switch (*p)
@@ -131,7 +131,7 @@ escaped_output (FILE *out, char const *string)
default: fputc (*p, out); break;
}
fprintf (out, "]]");
fputs ("]]", out);
}
@@ -302,8 +302,7 @@ user_actions_output (FILE *out)
fprintf (out, "]b4_syncline(%d, ",
rules[r].action_location.start.line);
escaped_output (out, rules[r].action_location.start.file);
fprintf (out, ")[\n");
fprintf (out, " %s\n break;\n\n",
fprintf (out, ")[\n %s\n break;\n\n",
rules[r].action);
}
fputs ("]])\n\n", out);

View File

@@ -181,7 +181,7 @@ static int current_prec = 0;
%type <integer> INT
%printer { fprintf (stderr, "%d", $$); } INT
%type <symbol> ID symbol string_as_id
%printer { fprintf (stderr, "%s", $$->tag); } ID symbol string_as_id
%printer { fputs ($$->tag, stderr); } ID symbol string_as_id
%type <symbol> ID_COLON
%printer { fprintf (stderr, "%s:", $$->tag); } ID_COLON
%type <assoc> precedence_declarator

View File

@@ -407,7 +407,7 @@ reduce_print (void)
"%d useless rules",
nuseless_productions),
nuseless_productions);
fprintf (stderr, "\n");
fputc ('\n', stderr);
}
void

View File

@@ -237,13 +237,13 @@ state_rule_look_ahead_tokens_print (state *s, rule *r, FILE *out)
bitset_iterator biter;
int k;
char const *sep = "";
fprintf (out, " [");
fputs (" [", out);
BITSET_FOR_EACH (biter, reds->look_ahead_tokens[red], k, 0)
{
fprintf (out, "%s%s", sep, symbols[k]->tag);
sep = ", ";
}
fprintf (out, "]");
fputc (']', out);
}
}

View File

@@ -26,10 +26,11 @@
#include <limits.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "unlocked-io.h"
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif