Hash :
1c880887
Author :
Date :
2012-09-30T11:55:11
Don't scan and parse useless maps One physical xkb file may (and usually does) contain multiple maps. For example, the us symbols file contains a map for every variant. Currently, when we need a map from a file (specific or default), we parse the entire file into a list of XkbFile's, find the map we want and discard the others. This happens for every include statement. This is a lot of unnecessary work; this commit is a first step at making it better. What we do now is make yyparse return one map at a time; if we find what we want, we can stop looking and avoid processing the rest of the file. This moves some logic from include.c to parser.y (i.e. finding the correct map, named or default). It also necessarily removes the CheckDefaultMap check, which warned about a file which contains multiple default maps. We can live without it. Some stats with test/rulecomp (under valgrind and the benchmark): Before: ==2280== total heap usage: 288,665 allocs, 288,665 frees, 13,121,349 bytes allocated compiled 1000 keymaps in 10.849487353s After: ==1070== total heap usage: 100,197 allocs, 100,197 frees, 9,329,900 bytes allocated compiled 1000 keymaps in 5.258960549s Pretty good. Note: we still do some unnecessary work, by parsing and discarding the maps before the one we want. However dealing with this is more complicated (maybe using bison's push-parser and sniffing the token stream). Probably not worth it. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
Permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
%{
#include "xkbcomp-priv.h"
#include "parser-priv.h"
#pragma GCC diagnostic ignored "-Wmissing-noreturn"
#pragma GCC diagnostic ignored "-Wredundant-decls"
#pragma GCC diagnostic push
struct scanner_extra {
struct xkb_context *ctx;
const char *file_name;
char scanBuf[1024];
char *s;
};
static void
scanner_error_extra(struct YYLTYPE *loc, struct scanner_extra *extra,
const char *msg);
#define YY_USER_ACTION { \
yylloc->first_line = yylineno; \
yylloc->last_line = yylineno; \
}
#define APPEND_S(ch) do { \
if (yyextra->s - yyextra->scanBuf >= sizeof(yyextra->scanBuf) - 1) \
return ERROR_TOK; \
*yyextra->s++ = ch; \
} while (0)
%}
%option prefix="_xkbcommon_"
%option reentrant
%option extra-type="struct scanner_extra *"
%option bison-bridge bison-locations
%option yylineno
%option nounistd noyywrap noinput nounput
%option never-interactive
%option case-insensitive
%x S_STR
%%
"//"[^\n]*
"#"[^\n]*
\" yyextra->s = yyextra->scanBuf; BEGIN(S_STR);
<S_STR>\" {
BEGIN(INITIAL);
*yyextra->s = '\0';
yylval->str = strdup(yyextra->scanBuf);
return STRING;
}
<S_STR>\\[0-7]{1,3} {
/* octal escape sequence */
unsigned int result;
(void) sscanf( yytext + 1, "%o", &result );
if (result > 0xff) {
scanner_error_extra(yylloc, yyextra,
"Illegal octal escape");
return ERROR_TOK;
}
APPEND_S(result);
}
<S_STR>\\[0-9]+ {
scanner_error_extra(yylloc, yyextra,
"Illegal octal escape");
return ERROR_TOK;
}
<S_STR>\\n APPEND_S('\n');
<S_STR>\\t APPEND_S('\t');
<S_STR>\\r APPEND_S('\r');
<S_STR>\\b APPEND_S('\b');
<S_STR>\\f APPEND_S('\f');
<S_STR>\\v APPEND_S('\v');
<S_STR>\\e APPEND_S('\033');
<S_STR>. APPEND_S(yytext[0]);
\<[a-zA-Z0-9_+-]+\> {
/* We don't want the brackets. */
yytext[yyleng - 1] = '\0';
yytext++;
yylval->sval = xkb_atom_intern(yyextra->ctx, yytext);
return KEYNAME;
}
xkb_keymap return XKB_KEYMAP;
xkb_keycodes return XKB_KEYCODES;
xkb_types return XKB_TYPES;
xkb_symbols return XKB_SYMBOLS;
xkb_compat return XKB_COMPATMAP;
xkb_compat_map return XKB_COMPATMAP;
xkb_compatibility return XKB_COMPATMAP;
xkb_compatibility_map return XKB_COMPATMAP;
xkb_geometry return XKB_GEOMETRY;
xkb_semantics return XKB_SEMANTICS;
xkb_layout return XKB_LAYOUT;
include return INCLUDE;
override return OVERRIDE;
augment return AUGMENT;
replace return REPLACE;
alternate return ALTERNATE;
partial return PARTIAL;
default return DEFAULT;
hidden return HIDDEN;
virtual_modifiers return VIRTUAL_MODS;
type return TYPE;
interpret return INTERPRET;
action return ACTION_TOK;
key return KEY;
alias return ALIAS;
group return GROUP;
modmap return MODIFIER_MAP;
mod_map return MODIFIER_MAP;
modifier_map return MODIFIER_MAP;
indicator return INDICATOR;
shape return SHAPE;
row return ROW;
keys return KEYS;
section return SECTION;
overlay return OVERLAY;
text return TEXT;
outline return OUTLINE;
solid return SOLID;
logo return LOGO;
virtual return VIRTUAL;
alphanumeric_keys return ALPHANUMERIC_KEYS;
modifier_keys return MODIFIER_KEYS;
keypad_keys return KEYPAD_KEYS;
function_keys return FUNCTION_KEYS;
alternate_group return ALTERNATE_GROUP;
[a-zA-Z_][a-zA-Z_0-9]* yylval->str = strdup(yytext); return IDENT;
0x[a-fA-F0-9]+ |
[0-9]+ {
char *end;
yylval->num = strtoul(yytext, &end, 0);
return INTEGER;
}
[0-9]+\.[0-9]+ {
char *end;
yylval->num = strtod(yytext, &end);
return FLOAT;
}
"=" return EQUALS;
"+" return PLUS;
"-" return MINUS;
"/" return DIVIDE;
"*" return TIMES;
"{" return OBRACE;
"}" return CBRACE;
"(" return OPAREN;
")" return CPAREN;
"[" return OBRACKET;
"]" return CBRACKET;
"." return DOT;
"," return COMMA;
";" return SEMI;
"!" return EXCLAM;
"~" return INVERT;
[ \t\r\n\v]+
<<EOF>> return END_OF_FILE;
. return ERROR_TOK;
%%
#pragma GCC diagnostic pop
static void
scanner_error_extra(struct YYLTYPE *loc, struct scanner_extra *extra,
const char *msg)
{
log_err(extra->ctx, "%s: line %d of %s\n", msg,
loc->first_line,
extra->file_name ? extra->file_name : "(unknown)");
}
void
scanner_error(struct YYLTYPE *loc, void *scanner, const char *msg)
{
struct scanner_extra *extra = yyget_extra(scanner);
scanner_error_extra(loc, extra, msg);
}
static bool
init_scanner(yyscan_t *scanner, struct scanner_extra *extra,
struct xkb_context *ctx, const char *file_name)
{
memset(extra, 0, sizeof(*extra));
if (yylex_init_extra(extra, scanner) != 0)
return false;
extra->ctx = ctx;
extra->file_name = file_name;
return true;
}
static void
clear_scanner(yyscan_t scanner)
{
yylex_destroy(scanner);
}
XkbFile *
XkbParseString(struct xkb_context *ctx, const char *string,
const char *file_name)
{
yyscan_t scanner;
struct scanner_extra extra;
YY_BUFFER_STATE state;
XkbFile *xkb_file;
if (!init_scanner(&scanner, &extra, ctx, file_name))
return NULL;
state = yy_scan_string(string, scanner);
xkb_file = parse(ctx, scanner, NULL);
yy_delete_buffer(state, scanner);
clear_scanner(scanner);
return xkb_file;
}
XkbFile *
XkbParseFile(struct xkb_context *ctx, FILE *file,
const char *file_name, const char *map)
{
yyscan_t scanner;
struct scanner_extra extra;
YY_BUFFER_STATE state;
XkbFile *xkb_file;
if (!init_scanner(&scanner, &extra, ctx, file_name))
return NULL;
state = yy_create_buffer(file, YY_BUF_SIZE, scanner);
yy_switch_to_buffer(state, scanner);
xkb_file = parse(ctx, scanner, map);
yy_delete_buffer(state, scanner);
clear_scanner(scanner);
return xkb_file;
}