Commit acc467de9f8d96beea6d93a31fdb95b3a551cd11
2010-06-15T19:39:15
xkbcomp: Use fread() instead of getc() So, it turns out that if you're parsing a fairly large amount of data, using getc() to get all the input rather than, say, read(), is some kind of remarkably daft and unperformant idea. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
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 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
diff --git a/src/xkbcomp/xkbscan.c b/src/xkbcomp/xkbscan.c
index a9eb23b..0490512 100644
--- a/src/xkbcomp/xkbscan.c
+++ b/src/xkbcomp/xkbscan.c
@@ -46,9 +46,11 @@ int scanInt;
char *scanStr = NULL;
static int scanStrLine = 0;
-#define BUFSIZE 512
+#define BUFSIZE 4096
static int nInBuf = 0;
-static char buf[BUFSIZE];
+static char readBuf[BUFSIZE];
+static int readBufPos = 0;
+static int readBufLen = 0;
#ifdef DEBUG
static char *
@@ -264,6 +266,32 @@ tokText(int tok)
}
#endif
+static char
+scanchar(void)
+{
+ if (readBufPos >= readBufLen) {
+ readBufLen = fread(readBuf, 1, BUFSIZE, yyin);
+ readBufPos = 0;
+ if (!readBufLen)
+ return EOF;
+ if (feof(yyin))
+ readBuf[readBufLen] = EOF;
+ }
+
+ return readBuf[readBufPos++];
+}
+
+static void
+unscanchar(char c)
+{
+ if (readBuf[--readBufPos] != c) {
+ fprintf(stderr, "UNGETCHAR FAILED! Put back %c, was expecting %c at "
+ "position %d, buf is '%s'\n", c, readBuf[readBufPos],
+ readBufPos, readBuf);
+ _exit(94);
+ }
+}
+
int
setScanState(char *file, int line)
{
@@ -277,14 +305,15 @@ setScanState(char *file, int line)
static int
yyGetString(void)
{
- int ch;
+ int ch, i;
+ char buf[1024];
- nInBuf = 0;
- while (((ch = getc(yyin)) != EOF) && (ch != '"'))
+ i = 0;
+ while (((ch = scanchar()) != EOF) && (ch != '"'))
{
if (ch == '\\')
{
- if ((ch = getc(yyin)) != EOF)
+ if ((ch = scanchar()) != EOF)
{
if (ch == 'n')
ch = '\n';
@@ -304,7 +333,7 @@ yyGetString(void)
{
int tmp, stop;
ch = stop = 0;
- if (((tmp = getc(yyin)) != EOF) && (isdigit(tmp))
+ if (((tmp = scanchar()) != EOF) && (isdigit(tmp))
&& (tmp != '8') && (tmp != '9'))
{
ch = (ch * 8) + (tmp - '0');
@@ -312,11 +341,11 @@ yyGetString(void)
else
{
stop = 1;
- ungetc(tmp, yyin);
+ unscanchar(tmp);
}
if (!stop)
{
- if (((tmp = getc(yyin)) != EOF)
+ if (((tmp = scanchar()) != EOF)
&& (isdigit(tmp)) && (tmp != '8') && (tmp != '9'))
{
ch = (ch * 8) + (tmp - '0');
@@ -324,12 +353,12 @@ yyGetString(void)
else
{
stop = 1;
- ungetc(tmp, yyin);
+ unscanchar(tmp);
}
}
if (!stop)
{
- if (((tmp = getc(yyin)) != EOF)
+ if (((tmp = scanchar()) != EOF)
&& (isdigit(tmp)) && (tmp != '8') && (tmp != '9'))
{
ch = (ch * 8) + (tmp - '0');
@@ -337,7 +366,7 @@ yyGetString(void)
else
{
stop = 1;
- ungetc(tmp, yyin);
+ unscanchar(tmp);
}
}
}
@@ -345,12 +374,12 @@ yyGetString(void)
else
return ERROR_TOK;
}
- if (nInBuf < BUFSIZE - 1)
- buf[nInBuf++] = ch;
+ if (i < sizeof(buf) - 1)
+ buf[i++] = ch;
}
if (ch == '"')
{
- buf[nInBuf++] = '\0';
+ buf[i++] = '\0';
if (scanStr)
uFree(scanStr);
scanStr = strdup(buf);
@@ -363,14 +392,15 @@ yyGetString(void)
static int
yyGetKeyName(void)
{
- int ch;
+ int ch, i;
+ char buf[1024];
- nInBuf = 0;
- while (((ch = getc(yyin)) != EOF) && (ch != '>'))
+ i = 0;
+ while (((ch = scanchar()) != EOF) && (ch != '>'))
{
if (ch == '\\')
{
- if ((ch = getc(yyin)) != EOF)
+ if ((ch = scanchar()) != EOF)
{
if (ch == 'n')
ch = '\n';
@@ -390,7 +420,7 @@ yyGetKeyName(void)
{
int tmp, stop;
ch = stop = 0;
- if (((tmp = getc(yyin)) != EOF) && (isdigit(tmp))
+ if (((tmp = scanchar()) != EOF) && (isdigit(tmp))
&& (tmp != '8') && (tmp != '9'))
{
ch = (ch * 8) + (tmp - '0');
@@ -398,9 +428,9 @@ yyGetKeyName(void)
else
{
stop = 1;
- ungetc(tmp, yyin);
+ unscanchar(tmp);
}
- if ((!stop) && ((tmp = getc(yyin)) != EOF)
+ if ((!stop) && ((tmp = scanchar()) != EOF)
&& (isdigit(tmp)) && (tmp != '8') && (tmp != '9'))
{
ch = (ch * 8) + (tmp - '0');
@@ -408,9 +438,9 @@ yyGetKeyName(void)
else
{
stop = 1;
- ungetc(tmp, yyin);
+ unscanchar(tmp);
}
- if ((!stop) && ((tmp = getc(yyin)) != EOF)
+ if ((!stop) && ((tmp = scanchar()) != EOF)
&& (isdigit(tmp)) && (tmp != '8') && (tmp != '9'))
{
ch = (ch * 8) + (tmp - '0');
@@ -418,7 +448,7 @@ yyGetKeyName(void)
else
{
stop = 1;
- ungetc(tmp, yyin);
+ unscanchar(tmp);
}
}
}
@@ -426,12 +456,12 @@ yyGetKeyName(void)
return ERROR_TOK;
}
- if (nInBuf < BUFSIZE - 1)
- buf[nInBuf++] = ch;
+ if (i < sizeof(buf) - 1)
+ buf[i++] = ch;
}
- if ((ch == '>') && (nInBuf < 5))
+ if ((ch == '>') && (i < 5))
{
- buf[nInBuf++] = '\0';
+ buf[i++] = '\0';
if (scanStr)
uFree(scanStr);
scanStr = strdup(buf);
@@ -543,17 +573,18 @@ static int numKeywords = sizeof(keywords) / sizeof(struct _Keyword);
static int
yyGetIdent(int first)
{
- int ch, i, found;
+ int ch, i, j, found;
int rtrn = IDENT;
+ char buf[1024];
buf[0] = first;
- nInBuf = 1;
- while (((ch = getc(yyin)) != EOF) && (isalnum(ch) || (ch == '_')))
+ j = 1;
+ while (((ch = scanchar()) != EOF) && (isalnum(ch) || (ch == '_')))
{
- if (nInBuf < BUFSIZE - 1)
- buf[nInBuf++] = ch;
+ if (j < sizeof(buf) - 1)
+ buf[j++] = ch;
}
- buf[nInBuf++] = '\0';
+ buf[j++] = '\0';
found = 0;
for (i = 0; (!found) && (i < numKeywords); i++)
@@ -574,7 +605,7 @@ yyGetIdent(int first)
}
if ((ch != EOF) && (!isspace(ch)))
- ungetc(ch, yyin);
+ unscanchar(ch);
else if (ch == '\n')
lineNum++;
@@ -585,10 +616,11 @@ static int
yyGetNumber(int ch)
{
int isFloat = 0;
+ char buf[1024];
buf[0] = ch;
nInBuf = 1;
- while (((ch = getc(yyin)) != EOF)
+ while (((ch = scanchar()) != EOF)
&& (isxdigit(ch) || ((nInBuf == 1) && (ch == 'x'))))
{
buf[nInBuf++] = ch;
@@ -597,14 +629,14 @@ yyGetNumber(int ch)
{
isFloat = 1;
buf[nInBuf++] = ch;
- while (((ch = getc(yyin)) != EOF) && (isxdigit(ch)))
+ while (((ch = scanchar()) != EOF) && (isxdigit(ch)))
{
buf[nInBuf++] = ch;
}
}
buf[nInBuf++] = '\0';
if ((ch != EOF) && (!isspace(ch)))
- ungetc(ch, yyin);
+ unscanchar(ch);
if (isFloat)
{
@@ -629,7 +661,7 @@ yylex(void)
do
{
- ch = getc(yyin);
+ ch = scanchar();
if (ch == '\n')
{
lineNum++;
@@ -638,26 +670,26 @@ yylex(void)
{ /* handle shell style '#' comments */
do
{
- ch = getc(yyin);
+ ch = scanchar();
}
while ((ch != '\n') && (ch != EOF));
lineNum++;
}
else if (ch == '/')
{ /* handle C++ style double-/ comments */
- int newch = getc(yyin);
+ int newch = scanchar();
if (newch == '/')
{
do
{
- ch = getc(yyin);
+ ch = scanchar();
}
while ((ch != '\n') && (ch != EOF));
lineNum++;
}
else if (newch != EOF)
{
- ungetc(newch, yyin);
+ unscanchar(newch);
}
}
}