From: Wouter Wijngaards Date: Wed, 9 Apr 2008 12:29:53 +0000 (+0000) Subject: statistics cumulative option. X-Git-Tag: release-0.11~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eeb7cc78cad27f125872046d9ad23ec39b1b3ab;p=thirdparty%2Funbound.git statistics cumulative option. git-svn-id: file:///svn/unbound/trunk@1024 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/daemon/worker.c b/daemon/worker.c index 58a930d24..96e178f62 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -883,8 +883,10 @@ void worker_stat_timer_cb(void* arg) server_stats_log(&worker->stats, worker->thread_num); mesh_stats(worker->env.mesh, "mesh has"); worker_mem_report(worker, NULL); - server_stats_init(&worker->stats); - mesh_stats_clear(worker->env.mesh); + if(!worker->daemon->cfg->stat_cumulative) { + server_stats_init(&worker->stats); + mesh_stats_clear(worker->env.mesh); + } /* start next timer */ worker_restart_timer(worker); } diff --git a/doc/Changelog b/doc/Changelog index d5f7ffbe3..a626bf222 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -3,6 +3,7 @@ --with-libevent=/home/wouter/libev-3.2 libev-3.2 is a little faster than libevent-1.4.3-stable (about 5%). - unused commpoints not listed in epoll list. + - statistics-cumulative option so that the values are not reset. 8 April 2008: Wouter - unbound tries to set the ulimit fds when started as server. diff --git a/doc/example.conf b/doc/example.conf index 0ba916eb0..1edf1f873 100644 --- a/doc/example.conf +++ b/doc/example.conf @@ -18,6 +18,9 @@ server: # print statistics to the log (for every thread) every N seconds. # Set to "" or 0 to disable. Default is disabled. # statistics-interval: 0 + + # enable cumulative statistics, without clearing them after printing. + # statistics-cumulative: no # number of threads to create. 1 disables threading. # num-threads: 1 diff --git a/doc/unbound.conf.5 b/doc/unbound.conf.5 index 213feea78..2c525215c 100644 --- a/doc/unbound.conf.5 +++ b/doc/unbound.conf.5 @@ -88,6 +88,10 @@ see The number of seconds between printing statistics to the log for every thread. Disable with value 0 or "". Default is disabled. .TP +.B statistics-cumulative: \fI +If enabled, statistics are cumulative since starting unbound, without clearing +the statistics counters after logging the statistics. Default is no. +.TP .B num\-threads: \fI The number of threads to create to serve clients. Use 1 for no threading. .TP diff --git a/util/config_file.c b/util/config_file.c index 46ab27bce..41a28cedf 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -71,6 +71,7 @@ config_create() /* the defaults if no config is present */ cfg->verbosity = 1; cfg->stat_interval = 0; + cfg->stat_cumulative = 0; cfg->num_threads = 1; cfg->port = UNBOUND_DNS_PORT; cfg->do_ip4 = 1; diff --git a/util/config_file.h b/util/config_file.h index 9ad387dbb..0f849ed0d 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -52,8 +52,11 @@ struct config_str2list; struct config_file { /** verbosity level as specified in the config file */ int verbosity; + /** statistics interval (in seconds) */ int stat_interval; + /** if false, statistics values are reset after printing them */ + int stat_cumulative; /** number of threads to create */ int num_threads; diff --git a/util/configlexer.c b/util/configlexer.c index fdcdfa3f5..33c3b90a9 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -365,8 +365,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 90 -#define YY_END_OF_BUFFER 91 +#define YY_NUM_RULES 91 +#define YY_END_OF_BUFFER 92 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -374,94 +374,96 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[783] = +static yyconst flex_int16_t yy_accept[794] = { 0, - 1, 1, 74, 74, 78, 78, 82, 82, 86, 86, - 91, 89, 1, 72, 73, 2, 77, 90, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 74, 75, 90, 76, 90, - 78, 79, 80, 90, 85, 82, 83, 84, 90, 86, - 87, 88, 90, 89, 0, 1, 2, 2, 2, 2, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 74, 0, - 78, 0, 85, 0, 82, 86, 0, 89, 89, 89, - - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 44, 89, 89, 89, 89, 6, 89, 89, 89, - - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 19, 89, 89, 11, 12, - 89, 14, 13, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 3, 89, 89, - - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 81, 89, - 89, 89, 89, 89, 89, 89, 89, 22, 89, 89, - 89, 89, 89, 89, 23, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 56, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 55, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - - 89, 89, 89, 89, 20, 89, 89, 89, 89, 89, - 89, 89, 89, 21, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 16, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 45, 46, 43, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 5, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 70, - 69, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 24, 89, 89, 89, 89, 89, 89, 68, 89, 89, - - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 40, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 4, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 15, 89, 48, 49, - 47, 89, 89, 89, 89, 54, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 60, 89, - 89, 89, 89, 89, 89, 89, 89, 30, 89, 89, - 89, 89, 89, 53, 89, 89, 89, 89, 89, 89, - - 89, 89, 89, 57, 89, 89, 89, 89, 89, 89, - 7, 89, 89, 89, 89, 89, 89, 89, 89, 62, - 89, 89, 89, 89, 52, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 31, 32, 89, 65, 89, 89, - 26, 89, 89, 89, 89, 8, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 66, 25, 27, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 42, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 10, - 89, 89, 89, 89, 89, 89, 9, 28, 89, 89, - - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 33, 89, 89, 89, 29, 89, - 89, 58, 59, 89, 89, 61, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 17, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 18, - 89, 71, 37, 89, 89, 64, 50, 89, 89, 39, - 38, 89, 34, 89, 63, 89, 89, 89, 35, 89, - 89, 51, 41, 36, 89, 89, 89, 89, 89, 89, - 67, 0 + 1, 1, 75, 75, 79, 79, 83, 83, 87, 87, + 92, 90, 1, 73, 74, 2, 78, 91, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 75, 76, 91, 77, 91, + 79, 80, 81, 91, 86, 83, 84, 85, 91, 87, + 88, 89, 91, 90, 0, 1, 2, 2, 2, 2, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 75, 0, + 79, 0, 86, 0, 83, 87, 0, 90, 90, 90, + + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 44, 90, 90, 90, 90, 6, 90, 90, 90, + + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 19, 90, 90, 11, 12, + 90, 14, 13, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 3, 90, 90, + + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 82, 90, + 90, 90, 90, 90, 90, 90, 90, 22, 90, 90, + 90, 90, 90, 90, 23, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 56, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 55, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + + 90, 90, 90, 90, 20, 90, 90, 90, 90, 90, + 90, 90, 90, 21, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 16, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 45, 46, 43, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 5, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 70, + 69, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 24, 90, 90, 90, 90, 90, 90, 68, 90, 90, + + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 40, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 4, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 15, 90, 48, + 49, 47, 90, 90, 90, 90, 54, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 60, 90, 90, 90, 90, 90, 90, 90, 90, 30, + 90, 90, 90, 90, 90, 53, 90, 90, 90, 90, + + 90, 90, 90, 90, 90, 57, 90, 90, 90, 90, + 90, 90, 7, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 62, 90, 90, 90, 90, 52, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 31, 32, 90, + 65, 90, 90, 26, 90, 90, 90, 90, 8, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 66, 25, 27, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 42, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 10, 90, 90, 90, 90, 90, + + 90, 9, 28, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 33, 90, 90, 90, 29, 90, 90, 90, 58, 59, + 90, 90, 61, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 17, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 18, 90, 90, + 71, 37, 90, 90, 64, 50, 90, 90, 39, 38, + 90, 34, 90, 90, 63, 90, 90, 90, 35, 90, + 72, 90, 51, 41, 36, 90, 90, 90, 90, 90, + 90, 67, 0 + } ; static yyconst flex_int32_t yy_ec[256] = @@ -504,18 +506,18 @@ static yyconst flex_int32_t yy_meta[39] = 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[794] = +static yyconst flex_int16_t yy_base[805] = { 0, 0, 0, 36, 39, 43, 50, 62, 74, 55, 67, - 1615, 1601, 49, 1616, 1616, 81, 1616, 88, 32, 83, + 1637, 1623, 49, 1638, 1638, 81, 1638, 88, 32, 83, 76, 78, 60, 89, 94, 86, 87, 95, 88, 97, - 103, 104, 112, 98, 121, 1600, 1616, 1616, 1616, 57, - 1599, 1616, 1616, 116, 1598, 1608, 1616, 1616, 136, 1596, - 1616, 1616, 127, 1595, 142, 146, 0, 149, 0, 0, + 103, 104, 112, 98, 121, 1622, 1638, 1638, 1638, 57, + 1621, 1638, 1638, 116, 1620, 1630, 1638, 1638, 136, 1618, + 1638, 1638, 127, 1617, 142, 146, 0, 149, 0, 0, 142, 144, 137, 146, 153, 150, 151, 152, 155, 158, 157, 159, 165, 171, 170, 172, 173, 175, 174, 176, - 114, 180, 185, 183, 187, 188, 195, 194, 1594, 207, - 1593, 210, 1592, 221, 1602, 1590, 211, 209, 208, 217, + 114, 180, 185, 183, 187, 188, 195, 194, 1616, 207, + 1615, 210, 1614, 221, 1624, 1612, 211, 209, 208, 217, 218, 232, 220, 221, 219, 222, 226, 227, 228, 234, 238, 243, 230, 253, 254, 260, 189, 256, 246, 247, @@ -526,7 +528,7 @@ static yyconst flex_int16_t yy_base[794] = 348, 346, 344, 350, 352, 369, 356, 355, 357, 359, 360, 361, 362, 376, 366, 377, 378, 381, 386, 387, 388, 390, 391, 406, 389, 402, 409, 405, 407, 410, - 413, 1589, 411, 415, 417, 418, 1588, 419, 425, 421, + 413, 1611, 411, 415, 417, 418, 1610, 419, 425, 421, 422, 433, 424, 437, 435, 428, 444, 439, 446, 447, 448, 449, 450, 456, 460, 451, 462, 459, 464, 467, @@ -534,161 +536,163 @@ static yyconst flex_int16_t yy_base[794] = 484, 493, 498, 500, 502, 505, 512, 508, 513, 515, 509, 511, 517, 519, 518, 530, 523, 531, 525, 532, 538, 536, 540, 534, 541, 543, 545, 548, 551, 557, - 547, 554, 558, 565, 560, 1587, 550, 566, 1586, 1585, - 569, 1584, 1583, 575, 572, 573, 574, 577, 582, 586, + 547, 554, 558, 565, 560, 1609, 550, 566, 1608, 1607, + 569, 1606, 1605, 575, 572, 573, 574, 577, 582, 586, 587, 584, 594, 589, 596, 599, 597, 603, 605, 606, - 607, 609, 613, 610, 620, 614, 621, 1582, 616, 624, + 607, 609, 613, 610, 620, 614, 621, 1604, 616, 624, 623, 629, 630, 631, 637, 633, 634, 635, 638, 646, 649, 639, 643, 648, 654, 650, 657, 659, 660, 661, - 662, 665, 666, 668, 671, 672, 674, 676, 1581, 689, - 688, 682, 686, 690, 694, 693, 696, 1580, 697, 701, - 702, 704, 714, 708, 1579, 705, 716, 717, 710, 718, + 662, 665, 666, 668, 671, 672, 674, 676, 1603, 689, + 688, 682, 686, 690, 694, 693, 696, 1602, 697, 701, + 702, 704, 714, 708, 1601, 705, 716, 717, 710, 718, 721, 723, 722, 729, 735, 731, 733, 734, 736, 742, - 740, 741, 743, 1578, 746, 753, 755, 747, 758, 760, - 751, 761, 744, 766, 768, 769, 770, 771, 1577, 774, + 740, 741, 743, 1600, 746, 753, 755, 747, 758, 760, + 751, 761, 744, 766, 768, 769, 770, 771, 1599, 774, 773, 772, 777, 793, 784, 794, 796, 790, 797, 804, 800, 798, 806, 807, 808, 809, 811, 813, 818, 820, - 822, 824, 826, 828, 1576, 836, 838, 842, 834, 840, - 845, 841, 846, 1575, 847, 849, 848, 850, 851, 853, + 822, 824, 826, 828, 1598, 836, 838, 842, 834, 840, + 845, 841, 846, 1597, 847, 849, 848, 850, 851, 853, 854, 855, 856, 861, 863, 867, 869, 880, 881, 878, - 1574, 882, 884, 886, 888, 895, 889, 891, 892, 893, - 896, 897, 898, 902, 903, 917, 1573, 1572, 1571, 915, - 905, 904, 913, 921, 914, 922, 924, 925, 926, 1570, + 1596, 882, 884, 886, 888, 895, 889, 891, 892, 893, + 896, 897, 898, 902, 903, 917, 1595, 1594, 1593, 915, + 905, 904, 913, 921, 914, 922, 924, 925, 926, 1592, 930, 931, 932, 935, 936, 938, 940, 941, 943, 949, - 939, 948, 951, 956, 960, 952, 961, 962, 963, 1569, - 1568, 966, 965, 970, 978, 977, 969, 984, 985, 986, - 1567, 992, 989, 993, 990, 991, 994, 1566, 995, 1000, - - 1003, 1005, 997, 1012, 1013, 1016, 1022, 1019, 1021, 1028, - 1029, 1565, 1030, 1036, 1023, 1034, 1040, 1037, 1038, 1039, - 1041, 1042, 1043, 1045, 1053, 1046, 1063, 1051, 1564, 1049, - 1061, 1059, 1065, 1068, 1069, 1075, 1081, 1079, 1088, 1073, - 1085, 1077, 1092, 1090, 1091, 1094, 1563, 1095, 1562, 1561, - 1560, 1103, 1097, 776, 1100, 1559, 1104, 1107, 1105, 1109, - 1110, 1115, 1114, 1112, 1116, 1130, 1119, 1122, 1131, 1132, - 1124, 1134, 1136, 1138, 1139, 1140, 1142, 1145, 1558, 1146, - 1147, 1155, 1149, 1160, 1161, 1162, 1164, 1557, 1166, 1168, - 1169, 1171, 1172, 1556, 1173, 1174, 1177, 1179, 1184, 1194, - - 1185, 1196, 1181, 1555, 1198, 1201, 1188, 1190, 1202, 1209, - 1554, 1205, 1210, 1213, 1211, 1215, 1217, 1218, 1219, 1553, - 1220, 1221, 1224, 1233, 1552, 1232, 1231, 1222, 1237, 1238, - 1240, 1243, 1245, 1247, 1548, 1544, 1250, 1543, 1257, 1259, - 1542, 1261, 1267, 1263, 1254, 1538, 1265, 1266, 1271, 1272, - 1273, 1274, 1276, 1277, 1278, 1279, 1280, 1282, 1289, 1287, - 1291, 1293, 1295, 1301, 1300, 1297, 1302, 1537, 1533, 1532, - 1305, 1306, 1313, 1317, 1307, 1310, 1318, 1323, 1329, 1531, - 1319, 1330, 1332, 1322, 1338, 1339, 1340, 1342, 1344, 1525, - 1341, 1345, 1347, 1348, 1352, 1356, 1497, 1496, 1355, 1364, - - 1366, 1368, 1371, 1362, 1377, 1374, 1376, 1378, 1379, 1382, - 1381, 1358, 1384, 1385, 1495, 1388, 1389, 1395, 1492, 1390, - 1392, 1491, 1490, 1398, 1400, 1489, 1402, 1403, 1405, 1408, - 1410, 1412, 1411, 1413, 1415, 1420, 1488, 1427, 1430, 1422, - 1418, 1435, 1439, 1424, 1440, 1444, 1447, 1448, 1450, 1487, - 1451, 1486, 1485, 1455, 1456, 1484, 1432, 1441, 1458, 1326, - 1320, 1464, 1281, 1465, 1252, 1457, 1467, 1471, 1246, 1473, - 1475, 1175, 857, 491, 1459, 1468, 1479, 1481, 1480, 1483, - 276, 1616, 1511, 1517, 1523, 1529, 136, 1535, 1541, 1547, - 83, 1552, 1558 - + 939, 948, 951, 956, 960, 952, 961, 962, 963, 1591, + 1590, 966, 965, 970, 978, 977, 969, 984, 985, 986, + 1589, 992, 991, 989, 990, 993, 995, 1588, 998, 1001, + + 1003, 1004, 1006, 1010, 1014, 1019, 1021, 1023, 1027, 1029, + 1030, 1587, 1036, 1037, 1020, 1035, 1043, 1039, 1040, 1041, + 1042, 1045, 1046, 1048, 1049, 1051, 1053, 1056, 1586, 1062, + 1068, 1064, 1065, 1066, 1069, 1073, 1079, 1082, 1080, 1090, + 1087, 1088, 1078, 1096, 1093, 1094, 1100, 1585, 1106, 1584, + 1583, 1582, 1108, 1095, 776, 1110, 1581, 1097, 1112, 1101, + 1104, 1118, 1119, 1120, 1122, 1123, 1132, 1124, 1128, 1135, + 1136, 1126, 1138, 1140, 1142, 1144, 1146, 1145, 1148, 1150, + 1580, 1154, 1152, 1166, 1159, 1151, 1167, 1170, 1173, 1579, + 1174, 1162, 1177, 1179, 1180, 1578, 1181, 1182, 1185, 1186, + + 1189, 1191, 1192, 1202, 1193, 1577, 1198, 1206, 1196, 1207, + 1209, 1210, 1576, 1217, 1183, 1218, 1212, 1220, 1221, 1222, + 1227, 1226, 1575, 1223, 1228, 1233, 1243, 1574, 1240, 1245, + 1239, 1241, 1247, 1249, 1250, 1251, 1252, 1573, 1572, 1256, + 1571, 1261, 1263, 1570, 1266, 1272, 1268, 1270, 1569, 1271, + 1273, 1277, 1274, 1278, 1279, 1281, 1283, 1284, 1280, 1287, + 1286, 1294, 1295, 1297, 1299, 1300, 1302, 1308, 1307, 1304, + 1309, 1565, 1561, 1560, 1310, 1312, 1320, 1324, 1313, 1325, + 1317, 1327, 1330, 1332, 1559, 1333, 1334, 1340, 1341, 1343, + 1342, 1349, 1350, 1351, 1555, 1344, 1346, 1357, 1352, 1363, + + 1365, 1554, 1550, 1367, 1354, 1368, 1372, 1377, 1379, 1374, + 1385, 1382, 1384, 1383, 1386, 1389, 1390, 1391, 1393, 1392, + 1549, 1396, 1397, 1406, 1548, 1398, 1408, 1400, 1542, 1514, + 1409, 1403, 1513, 1413, 1415, 1417, 1420, 1421, 1422, 1423, + 1425, 1429, 1432, 1512, 1426, 1441, 1445, 1438, 1434, 1451, + 1455, 1442, 1452, 1459, 1462, 1463, 1465, 1509, 1466, 1469, + 1508, 1507, 1471, 1472, 1506, 1505, 1456, 1476, 1502, 1501, + 1479, 1446, 1481, 1483, 1436, 1473, 1487, 1489, 1430, 1492, + 1229, 1493, 1013, 857, 491, 1484, 1495, 1496, 1498, 1497, + 1500, 276, 1638, 1528, 1534, 1540, 1546, 136, 1552, 1558, + + 1564, 83, 1569, 1575 } ; -static yyconst flex_int16_t yy_def[794] = +static yyconst flex_int16_t yy_def[805] = { 0, - 782, 1, 783, 783, 784, 784, 785, 785, 786, 786, - 782, 787, 782, 782, 782, 788, 782, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 789, 782, 782, 782, 789, - 790, 782, 782, 790, 791, 782, 782, 782, 791, 792, - 782, 782, 792, 787, 787, 782, 793, 788, 793, 788, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 789, 789, - 790, 790, 791, 791, 782, 792, 792, 787, 787, 787, - - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 787, 787, 787, 787, 787, 787, 787, 787, 787, - 787, 0, 782, 782, 782, 782, 782, 782, 782, 782, - 782, 782, 782 - + 793, 1, 794, 794, 795, 795, 796, 796, 797, 797, + 793, 798, 793, 793, 793, 799, 793, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 800, 793, 793, 793, 800, + 801, 793, 793, 801, 802, 793, 793, 793, 802, 803, + 793, 793, 803, 798, 798, 793, 804, 799, 804, 799, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 800, 800, + 801, 801, 802, 802, 793, 803, 803, 798, 798, 798, + + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 0, 793, 793, 793, 793, 793, 793, 793, + + 793, 793, 793, 793 } ; -static yyconst flex_int16_t yy_nxt[1655] = +static yyconst flex_int16_t yy_nxt[1677] = { 0, 12, 13, 14, 14, 15, 16, 17, 12, 12, 12, 12, 12, 18, 19, 12, 20, 21, 12, 22, 12, @@ -776,7 +780,7 @@ static yyconst flex_int16_t yy_nxt[1655] = 413, 407, 410, 55, 406, 55, 414, 55, 415, 409, 55, 412, 55, 55, 420, 416, 417, 418, 55, 411, 55, 55, 55, 55, 55, 55, 55, 419, 55, 55, - 593, 432, 425, 427, 429, 423, 55, 422, 421, 426, + 595, 432, 425, 427, 429, 423, 55, 422, 421, 426, 430, 424, 55, 428, 431, 55, 55, 433, 55, 55, 55, 437, 55, 434, 439, 435, 55, 438, 55, 55, @@ -800,81 +804,83 @@ static yyconst flex_int16_t yy_nxt[1655] = 517, 55, 55, 519, 522, 528, 523, 524, 529, 55, 55, 526, 520, 527, 521, 525, 55, 55, 55, 534, - 530, 55, 55, 55, 55, 55, 55, 55, 531, 55, - 535, 533, 55, 536, 532, 55, 541, 55, 544, 537, - 542, 538, 543, 539, 55, 55, 540, 547, 55, 548, - 549, 55, 550, 55, 55, 55, 546, 553, 545, 551, - 55, 55, 55, 554, 552, 556, 55, 557, 55, 55, - 55, 55, 55, 55, 55, 55, 565, 55, 55, 555, - 558, 55, 559, 55, 566, 55, 571, 560, 572, 561, - 562, 55, 563, 55, 567, 55, 569, 55, 570, 564, - 55, 55, 577, 568, 574, 55, 580, 55, 578, 55, - 573, 55, 579, 55, 576, 581, 582, 55, 575, 585, - - 55, 583, 55, 55, 55, 588, 55, 55, 589, 55, - 591, 594, 55, 584, 587, 55, 55, 55, 590, 55, - 596, 55, 55, 586, 55, 592, 55, 55, 55, 602, - 603, 55, 598, 599, 55, 595, 55, 597, 600, 606, - 601, 604, 55, 55, 55, 607, 55, 611, 55, 608, - 55, 55, 55, 609, 55, 612, 605, 55, 55, 55, - 613, 55, 614, 617, 618, 610, 620, 55, 619, 616, - 621, 615, 55, 55, 55, 625, 55, 623, 55, 624, - 55, 55, 626, 55, 55, 55, 55, 55, 631, 55, - 622, 55, 634, 55, 627, 635, 55, 55, 632, 628, - - 55, 633, 55, 629, 630, 636, 55, 638, 55, 637, - 55, 639, 641, 55, 55, 640, 646, 55, 642, 643, - 644, 55, 55, 55, 645, 55, 648, 55, 649, 55, - 55, 55, 55, 55, 55, 653, 55, 656, 651, 652, - 657, 650, 655, 55, 55, 55, 659, 647, 658, 55, - 55, 654, 55, 660, 661, 55, 662, 55, 55, 55, - 664, 666, 55, 667, 55, 665, 55, 663, 668, 55, - 669, 55, 670, 55, 671, 55, 672, 55, 55, 55, - 675, 673, 674, 55, 55, 55, 55, 680, 55, 55, - 55, 55, 55, 55, 55, 677, 678, 679, 681, 55, - - 676, 55, 686, 55, 684, 55, 690, 55, 691, 55, - 683, 685, 55, 55, 55, 682, 687, 55, 55, 55, - 688, 696, 55, 689, 697, 55, 692, 693, 698, 55, - 55, 55, 55, 694, 55, 55, 695, 699, 55, 701, - 702, 55, 55, 700, 55, 704, 703, 705, 707, 706, - 55, 55, 55, 55, 55, 708, 55, 55, 715, 55, - 55, 710, 709, 711, 55, 712, 719, 55, 55, 716, - 55, 713, 717, 718, 55, 714, 55, 720, 55, 722, - 55, 721, 723, 55, 725, 726, 55, 724, 55, 55, - 55, 55, 727, 55, 55, 732, 55, 55, 731, 729, - - 55, 55, 55, 735, 55, 733, 737, 55, 728, 730, - 55, 740, 55, 738, 55, 55, 734, 55, 736, 742, - 55, 741, 55, 55, 55, 55, 750, 55, 739, 747, - 55, 744, 55, 743, 55, 745, 55, 751, 752, 55, - 746, 753, 55, 749, 55, 754, 756, 55, 748, 755, - 757, 55, 55, 55, 758, 760, 55, 759, 761, 55, - 55, 763, 55, 55, 764, 762, 765, 55, 55, 55, - 55, 55, 767, 766, 768, 769, 55, 55, 772, 55, - 55, 770, 773, 55, 774, 55, 771, 55, 775, 777, - 776, 55, 55, 55, 781, 55, 55, 55, 55, 55, - - 55, 55, 55, 55, 55, 778, 779, 55, 55, 55, - 780, 36, 36, 36, 36, 36, 36, 41, 41, 41, - 41, 41, 41, 45, 45, 45, 45, 45, 45, 50, - 50, 50, 50, 50, 50, 58, 58, 55, 58, 58, - 58, 89, 89, 55, 55, 55, 89, 91, 91, 55, - 55, 91, 96, 96, 55, 55, 55, 96, 59, 59, - 55, 59, 59, 59, 55, 55, 55, 55, 55, 55, + 530, 55, 55, 55, 55, 55, 535, 55, 531, 537, + 55, 533, 536, 55, 532, 55, 55, 542, 55, 538, + 543, 544, 55, 539, 540, 55, 55, 545, 549, 541, + 548, 55, 55, 55, 550, 55, 546, 547, 551, 55, + 552, 55, 55, 554, 555, 553, 557, 55, 55, 55, + 558, 55, 55, 55, 55, 55, 556, 55, 55, 566, + 55, 55, 559, 55, 560, 55, 570, 567, 55, 561, + 568, 562, 563, 564, 55, 573, 55, 55, 55, 572, + 55, 55, 565, 571, 575, 55, 579, 582, 569, 580, + 55, 55, 55, 581, 55, 574, 576, 583, 578, 55, + + 55, 577, 55, 587, 585, 55, 55, 55, 55, 55, + 584, 590, 55, 55, 586, 593, 55, 589, 55, 591, + 55, 596, 55, 594, 55, 598, 588, 600, 597, 592, + 55, 55, 55, 599, 55, 55, 55, 605, 55, 604, + 55, 601, 602, 606, 55, 608, 603, 55, 55, 609, + 55, 613, 55, 610, 55, 611, 55, 55, 55, 614, + 55, 607, 55, 55, 55, 615, 55, 616, 620, 612, + 617, 55, 621, 622, 55, 619, 618, 623, 55, 55, + 624, 625, 55, 626, 628, 55, 55, 627, 630, 55, + 629, 55, 55, 55, 55, 55, 634, 55, 55, 637, + + 638, 55, 639, 55, 55, 55, 635, 631, 55, 636, + 55, 632, 633, 641, 55, 643, 640, 644, 55, 55, + 650, 55, 55, 642, 55, 648, 645, 647, 649, 55, + 55, 651, 55, 55, 55, 55, 646, 653, 55, 55, + 55, 55, 657, 655, 652, 55, 660, 654, 656, 659, + 661, 55, 55, 55, 658, 55, 662, 55, 665, 55, + 663, 55, 55, 55, 55, 666, 670, 668, 55, 671, + 664, 669, 672, 55, 673, 55, 667, 674, 55, 675, + 55, 676, 55, 55, 55, 55, 55, 679, 678, 55, + 55, 55, 55, 55, 685, 55, 55, 677, 55, 55, + + 680, 682, 683, 681, 684, 686, 55, 55, 691, 55, + 689, 55, 55, 695, 55, 696, 55, 687, 688, 55, + 55, 55, 55, 690, 55, 55, 692, 701, 693, 55, + 694, 702, 55, 697, 698, 703, 55, 55, 705, 55, + 699, 700, 55, 704, 55, 55, 55, 708, 707, 709, + 706, 711, 55, 55, 55, 55, 55, 712, 55, 710, + 714, 55, 55, 55, 55, 715, 55, 713, 721, 55, + 716, 717, 718, 722, 719, 55, 720, 55, 725, 55, + 55, 727, 724, 723, 55, 726, 55, 728, 729, 55, + 730, 55, 732, 733, 55, 55, 55, 55, 55, 731, + + 734, 55, 55, 55, 55, 55, 736, 738, 55, 55, + 55, 742, 55, 735, 740, 55, 737, 744, 55, 745, + 55, 55, 748, 741, 749, 55, 743, 55, 739, 55, + 750, 746, 55, 55, 55, 55, 747, 55, 55, 755, + 758, 55, 55, 752, 55, 751, 55, 753, 55, 759, + 55, 754, 761, 55, 55, 757, 762, 55, 55, 760, + 756, 763, 765, 55, 55, 764, 766, 55, 55, 768, + 769, 55, 767, 770, 55, 55, 772, 55, 55, 773, + 771, 55, 775, 55, 55, 55, 774, 777, 55, 776, + 779, 55, 778, 55, 781, 55, 55, 780, 783, 55, + + 784, 55, 782, 785, 55, 55, 786, 55, 55, 55, + 55, 792, 55, 55, 55, 787, 788, 55, 55, 55, + 55, 55, 789, 790, 55, 55, 55, 791, 36, 36, + 36, 36, 36, 36, 41, 41, 41, 41, 41, 41, + 45, 45, 45, 45, 45, 45, 50, 50, 50, 50, + 50, 50, 58, 58, 55, 58, 58, 58, 89, 89, + 55, 55, 55, 89, 91, 91, 55, 55, 91, 96, + 96, 55, 55, 55, 96, 59, 59, 55, 59, 59, + 59, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - - 55, 55, 97, 95, 94, 92, 90, 55, 97, 95, - 94, 92, 90, 55, 782, 11, 782, 782, 782, 782, - 782, 782, 782, 782, 782, 782, 782, 782, 782, 782, - 782, 782, 782, 782, 782, 782, 782, 782, 782, 782, - 782, 782, 782, 782, 782, 782, 782, 782, 782, 782, - 782, 782, 782, 782 + 55, 55, 55, 55, 97, 95, 94, 92, 90, 55, + 97, 95, 94, 92, 90, 55, 793, 11, 793, 793, + 793, 793, 793, 793, 793, 793, 793, 793, 793, 793, + 793, 793, 793, 793, 793, 793, 793, 793, 793, 793, + 793, 793, 793, 793, 793, 793, 793, 793, 793, 793, + 793, 793, 793, 793, 793, 793 } ; -static yyconst flex_int16_t yy_chk[1655] = +static yyconst flex_int16_t yy_chk[1677] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -884,13 +890,13 @@ static yyconst flex_int16_t yy_chk[1655] = 13, 4, 6, 6, 13, 5, 6, 9, 9, 9, 40, 40, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 23, 23, 7, 8, 8, 8, 8, 10, - 8, 23, 16, 791, 16, 16, 8, 16, 21, 18, + 8, 23, 16, 802, 16, 16, 8, 16, 21, 18, 22, 18, 18, 16, 18, 20, 20, 21, 26, 27, 29, 24, 21, 20, 22, 24, 25, 28, 28, 30, 34, 25, 26, 27, 24, 31, 32, 27, 30, 44, 29, 32, 44, 30, 33, 33, 81, 28, 34, 31, - 53, 53, 31, 35, 35, 32, 787, 49, 35, 49, + 53, 53, 31, 35, 35, 32, 798, 49, 35, 49, 49, 33, 49, 55, 81, 55, 55, 56, 55, 63, 58, 56, 58, 58, 61, 58, 62, 61, 64, 62, 65, 58, 66, 67, 68, 65, 63, 69, 68, 71, @@ -906,7 +912,7 @@ static yyconst flex_int16_t yy_chk[1655] = 111, 111, 107, 102, 103, 112, 108, 102, 119, 120, 114, 112, 113, 102, 102, 114, 115, 116, 118, 122, 121, 115, 116, 123, 118, 121, 125, 119, 120, 124, - 126, 124, 127, 125, 128, 130, 132, 127, 781, 128, + 126, 124, 127, 125, 128, 130, 132, 127, 792, 128, 122, 129, 123, 129, 131, 134, 134, 135, 126, 131, 132, 136, 133, 130, 127, 133, 140, 137, 142, 129, @@ -931,7 +937,7 @@ static yyconst flex_int16_t yy_chk[1655] = 213, 211, 214, 221, 221, 218, 222, 229, 219, 223, 223, 222, 224, 224, 225, 226, 231, 227, 225, 228, - 226, 227, 230, 774, 228, 232, 229, 230, 232, 231, + 226, 227, 230, 785, 228, 232, 229, 230, 232, 231, 233, 233, 234, 232, 235, 234, 232, 236, 235, 237, 238, 241, 236, 242, 237, 239, 238, 240, 239, 243, 245, 244, 240, 245, 243, 247, 242, 249, 241, 235, @@ -961,8 +967,8 @@ static yyconst flex_int16_t yy_chk[1655] = 360, 354, 361, 362, 360, 363, 373, 356, 365, 368, 366, 359, 362, 371, 358, 366, 367, 367, 368, 361, 369, 365, 370, 372, 373, 369, 370, 371, 374, 363, - 375, 376, 377, 378, 382, 381, 380, 372, 554, 383, - 554, 385, 378, 381, 383, 376, 385, 375, 374, 380, + 375, 376, 377, 378, 382, 381, 380, 372, 555, 383, + 555, 385, 378, 381, 383, 376, 385, 375, 374, 380, 384, 377, 388, 382, 384, 384, 386, 386, 387, 389, 392, 390, 391, 387, 392, 388, 390, 391, 393, 394, @@ -970,7 +976,7 @@ static yyconst flex_int16_t yy_chk[1655] = 399, 393, 400, 393, 401, 393, 402, 394, 403, 396, 404, 402, 401, 406, 403, 407, 409, 404, 406, 408, 407, 400, 410, 412, 408, 409, 411, 411, 413, 415, - 417, 416, 418, 419, 417, 420, 421, 422, 423, 773, + 417, 416, 418, 419, 417, 420, 421, 422, 423, 784, 410, 421, 412, 424, 422, 425, 419, 413, 416, 426, 418, 427, 424, 420, 415, 423, 427, 428, 429, 425, 430, 430, 428, 429, 432, 433, 433, 434, 434, 426, @@ -986,78 +992,80 @@ static yyconst flex_int16_t yy_chk[1655] = 474, 487, 484, 476, 479, 485, 479, 482, 486, 486, 485, 484, 477, 484, 478, 483, 488, 489, 490, 492, - 487, 493, 495, 496, 492, 494, 497, 499, 488, 503, - 493, 490, 500, 494, 489, 501, 500, 502, 503, 495, - 501, 496, 502, 497, 504, 505, 499, 506, 506, 507, - 508, 508, 509, 509, 507, 515, 505, 513, 504, 510, - 510, 511, 513, 514, 511, 516, 516, 517, 514, 518, - 519, 520, 517, 521, 522, 523, 523, 524, 526, 515, - 518, 530, 518, 528, 524, 525, 530, 518, 531, 519, - 520, 532, 521, 531, 525, 527, 527, 533, 528, 522, - 534, 535, 536, 526, 533, 540, 538, 536, 537, 542, - 532, 538, 537, 537, 535, 539, 540, 541, 534, 543, - - 539, 541, 544, 545, 543, 546, 546, 548, 548, 553, - 552, 555, 555, 542, 545, 552, 557, 559, 548, 558, - 558, 560, 561, 544, 564, 553, 563, 562, 565, 564, - 565, 567, 560, 561, 568, 557, 571, 559, 562, 568, - 563, 566, 566, 569, 570, 569, 572, 573, 573, 570, - 574, 575, 576, 571, 577, 574, 567, 578, 580, 581, - 575, 583, 575, 578, 580, 572, 582, 582, 581, 577, - 583, 576, 584, 585, 586, 587, 587, 585, 589, 586, - 590, 591, 589, 592, 593, 595, 596, 772, 595, 597, - 584, 598, 598, 603, 590, 599, 599, 601, 596, 591, - - 607, 597, 608, 592, 593, 600, 600, 602, 602, 601, - 605, 603, 606, 606, 609, 605, 612, 612, 607, 608, - 609, 610, 613, 615, 610, 614, 614, 616, 615, 617, - 618, 619, 621, 622, 628, 619, 623, 623, 617, 618, - 624, 616, 622, 627, 626, 624, 627, 613, 626, 629, - 630, 621, 631, 628, 629, 632, 630, 633, 769, 634, - 632, 634, 637, 637, 765, 633, 645, 631, 639, 639, - 640, 640, 642, 642, 643, 644, 644, 647, 648, 643, - 648, 645, 647, 649, 650, 651, 652, 653, 653, 654, - 655, 656, 657, 763, 658, 650, 651, 652, 654, 660, - - 649, 659, 659, 661, 657, 662, 663, 663, 664, 666, - 656, 658, 665, 664, 667, 655, 660, 671, 672, 675, - 661, 672, 676, 662, 673, 673, 665, 666, 674, 674, - 677, 681, 761, 667, 684, 678, 671, 675, 760, 677, - 678, 679, 682, 676, 683, 681, 679, 682, 684, 683, - 685, 686, 687, 691, 688, 685, 689, 692, 693, 693, - 694, 687, 686, 688, 695, 689, 699, 699, 696, 694, - 712, 691, 695, 696, 704, 692, 700, 700, 701, 702, - 702, 701, 703, 703, 705, 706, 706, 704, 707, 705, - 708, 709, 707, 711, 710, 712, 713, 714, 711, 709, - - 716, 717, 720, 716, 721, 713, 718, 718, 708, 710, - 724, 724, 725, 720, 727, 728, 714, 729, 717, 727, - 730, 725, 731, 733, 732, 734, 735, 735, 721, 732, - 741, 729, 736, 728, 740, 730, 744, 736, 738, 738, - 731, 739, 739, 734, 757, 740, 742, 742, 733, 741, - 743, 743, 745, 758, 744, 746, 746, 745, 747, 747, - 748, 749, 749, 751, 751, 748, 754, 754, 755, 766, - 759, 775, 758, 755, 759, 762, 762, 764, 767, 767, - 776, 764, 768, 768, 770, 770, 766, 771, 771, 776, - 775, 777, 779, 778, 780, 780, 756, 753, 752, 750, - - 737, 726, 723, 722, 719, 777, 778, 715, 698, 697, - 779, 783, 783, 783, 783, 783, 783, 784, 784, 784, - 784, 784, 784, 785, 785, 785, 785, 785, 785, 786, - 786, 786, 786, 786, 786, 788, 788, 690, 788, 788, - 788, 789, 789, 680, 670, 669, 789, 790, 790, 668, - 646, 790, 792, 792, 641, 638, 636, 792, 793, 793, - 635, 793, 793, 793, 625, 620, 611, 604, 594, 588, - 579, 556, 551, 550, 549, 547, 529, 512, 498, 491, - 481, 480, 460, 449, 448, 447, 431, 414, 405, 379, - 364, 345, 338, 329, 298, 273, 272, 270, 269, 266, - - 197, 192, 96, 95, 93, 91, 89, 54, 50, 46, - 45, 41, 36, 12, 11, 782, 782, 782, 782, 782, - 782, 782, 782, 782, 782, 782, 782, 782, 782, 782, - 782, 782, 782, 782, 782, 782, 782, 782, 782, 782, - 782, 782, 782, 782, 782, 782, 782, 782, 782, 782, - 782, 782, 782, 782 + 487, 494, 495, 493, 492, 496, 493, 497, 488, 494, + 499, 490, 493, 500, 489, 501, 502, 500, 503, 495, + 501, 502, 504, 496, 497, 783, 505, 503, 507, 499, + 506, 506, 515, 507, 508, 508, 504, 505, 509, 509, + 510, 510, 511, 513, 514, 511, 516, 516, 513, 514, + 517, 518, 519, 520, 521, 517, 515, 522, 523, 523, + 524, 525, 518, 526, 518, 527, 527, 524, 528, 518, + 525, 519, 520, 521, 530, 531, 532, 533, 534, 530, + 531, 535, 522, 528, 533, 536, 537, 539, 526, 538, + 543, 537, 539, 538, 538, 532, 534, 540, 536, 541, + + 542, 535, 540, 544, 542, 545, 546, 554, 544, 558, + 541, 547, 547, 560, 543, 553, 561, 546, 549, 549, + 553, 556, 556, 554, 559, 559, 545, 561, 558, 549, + 562, 563, 564, 560, 565, 566, 568, 566, 572, 565, + 569, 562, 563, 567, 567, 569, 564, 570, 571, 570, + 573, 574, 574, 571, 575, 572, 576, 578, 577, 575, + 579, 568, 580, 586, 583, 576, 582, 576, 580, 573, + 577, 585, 582, 583, 592, 579, 578, 584, 584, 587, + 585, 586, 588, 587, 589, 589, 591, 588, 592, 593, + 591, 594, 595, 597, 598, 615, 597, 599, 600, 600, + + 601, 601, 602, 602, 603, 605, 598, 593, 609, 599, + 607, 594, 595, 604, 604, 607, 603, 608, 608, 610, + 615, 611, 612, 605, 617, 612, 609, 611, 614, 614, + 616, 616, 618, 619, 620, 624, 610, 618, 622, 621, + 625, 781, 622, 620, 617, 626, 626, 619, 621, 625, + 627, 631, 629, 632, 624, 627, 629, 630, 632, 633, + 630, 634, 635, 636, 637, 633, 637, 635, 640, 640, + 631, 636, 642, 642, 643, 643, 634, 645, 645, 646, + 647, 647, 648, 650, 646, 651, 653, 651, 650, 652, + 654, 655, 659, 656, 657, 657, 658, 648, 661, 660, + + 652, 654, 655, 653, 656, 658, 662, 663, 663, 664, + 661, 665, 666, 667, 667, 668, 670, 659, 660, 669, + 668, 671, 675, 662, 676, 679, 664, 676, 665, 681, + 666, 677, 677, 669, 670, 678, 678, 680, 680, 682, + 671, 675, 683, 679, 684, 686, 687, 683, 682, 684, + 681, 687, 688, 689, 691, 690, 696, 688, 697, 686, + 690, 692, 693, 694, 699, 691, 705, 689, 698, 698, + 692, 693, 694, 699, 696, 700, 697, 701, 704, 704, + 706, 706, 701, 700, 707, 705, 710, 707, 708, 708, + 709, 709, 711, 712, 712, 714, 713, 711, 715, 710, + + 713, 716, 717, 718, 720, 719, 715, 717, 722, 723, + 726, 722, 728, 714, 719, 732, 716, 724, 724, 726, + 727, 731, 731, 720, 732, 734, 723, 735, 718, 736, + 734, 727, 737, 738, 739, 740, 728, 741, 745, 739, + 742, 742, 779, 736, 743, 735, 749, 737, 775, 743, + 748, 738, 746, 746, 752, 741, 747, 747, 772, 745, + 740, 748, 750, 750, 753, 749, 751, 751, 767, 753, + 754, 754, 752, 755, 755, 756, 757, 757, 759, 759, + 756, 760, 763, 763, 764, 776, 760, 767, 768, 764, + 771, 771, 768, 773, 774, 774, 786, 773, 777, 777, + + 778, 778, 776, 780, 780, 782, 782, 787, 788, 790, + 789, 791, 791, 770, 769, 786, 787, 766, 765, 762, + 761, 758, 788, 789, 744, 733, 730, 790, 794, 794, + 794, 794, 794, 794, 795, 795, 795, 795, 795, 795, + 796, 796, 796, 796, 796, 796, 797, 797, 797, 797, + 797, 797, 799, 799, 729, 799, 799, 799, 800, 800, + 725, 721, 703, 800, 801, 801, 702, 695, 801, 803, + 803, 685, 674, 673, 803, 804, 804, 672, 804, 804, + 804, 649, 644, 641, 639, 638, 628, 623, 613, 606, + 596, 590, 581, 557, 552, 551, 550, 548, 529, 512, + + 498, 491, 481, 480, 460, 449, 448, 447, 431, 414, + 405, 379, 364, 345, 338, 329, 298, 273, 272, 270, + 269, 266, 197, 192, 96, 95, 93, 91, 89, 54, + 50, 46, 45, 41, 36, 12, 11, 793, 793, 793, + 793, 793, 793, 793, 793, 793, 793, 793, 793, 793, + 793, 793, 793, 793, 793, 793, 793, 793, 793, 793, + 793, 793, 793, 793, 793, 793, 793, 793, 793, 793, + 793, 793, 793, 793, 793, 793 } ; static yy_state_type yy_last_accepting_state; @@ -1163,7 +1171,7 @@ static void config_end_include(void) #endif -#line 1166 "" +#line 1174 "" #define INITIAL 0 #define quotedstring 1 @@ -1320,7 +1328,7 @@ YY_DECL #line 99 "util/configlexer.lex" -#line 1323 "" +#line 1331 "" if ( !(yy_init) ) { @@ -1379,13 +1387,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 783 ) + if ( yy_current_state >= 794 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 1616 ); + while ( yy_base[yy_current_state] != 1638 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1765,38 +1773,43 @@ YY_RULE_SETUP { YDOUT; return VAR_STATISTICS_INTERVAL;} YY_BREAK case 72: -/* rule 72 can match eol */ YY_RULE_SETUP #line 171 "util/configlexer.lex" +{ YDOUT; return VAR_STATISTICS_CUMULATIVE;} + YY_BREAK +case 73: +/* rule 73 can match eol */ +YY_RULE_SETUP +#line 172 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 73: +case 74: YY_RULE_SETUP -#line 174 "util/configlexer.lex" +#line 175 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 175 "util/configlexer.lex" +#line 176 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 74: -YY_RULE_SETUP -#line 179 "util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 75: -/* rule 75 can match eol */ YY_RULE_SETUP #line 180 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 76: +/* rule 76 can match eol */ YY_RULE_SETUP #line 181 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 77: +YY_RULE_SETUP +#line 182 "util/configlexer.lex" { LEXOUT(("QE ")); BEGIN(INITIAL); @@ -1808,32 +1821,32 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 77: +case 78: YY_RULE_SETUP -#line 192 "util/configlexer.lex" +#line 193 "util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 193 "util/configlexer.lex" +#line 194 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 78: -YY_RULE_SETUP -#line 197 "util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 79: -/* rule 79 can match eol */ YY_RULE_SETUP #line 198 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 80: +/* rule 80 can match eol */ YY_RULE_SETUP #line 199 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 81: +YY_RULE_SETUP +#line 200 "util/configlexer.lex" { LEXOUT(("SQE ")); BEGIN(INITIAL); @@ -1845,37 +1858,37 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 81: +case 82: YY_RULE_SETUP -#line 210 "util/configlexer.lex" +#line 211 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 211 "util/configlexer.lex" +#line 212 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(INITIAL); } YY_BREAK -case 82: -YY_RULE_SETUP -#line 215 "util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 83: -/* rule 83 can match eol */ YY_RULE_SETUP #line 216 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 84: +/* rule 84 can match eol */ YY_RULE_SETUP #line 217 "util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 85: YY_RULE_SETUP #line 218 "util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 86: +YY_RULE_SETUP +#line 219 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include(yytext); @@ -1883,26 +1896,26 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 223 "util/configlexer.lex" +#line 224 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 86: -YY_RULE_SETUP -#line 227 "util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 87: -/* rule 87 can match eol */ YY_RULE_SETUP #line 228 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK case 88: +/* rule 88 can match eol */ YY_RULE_SETUP #line 229 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 89: +YY_RULE_SETUP +#line 230 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -1911,7 +1924,7 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 235 "util/configlexer.lex" +#line 236 "util/configlexer.lex" { yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (config_include_stack_ptr == 0) { @@ -1922,18 +1935,18 @@ case YY_STATE_EOF(INITIAL): } } YY_BREAK -case 89: +case 90: YY_RULE_SETUP -#line 245 "util/configlexer.lex" +#line 246 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); yylval.str = strdup(yytext); return STRING; } YY_BREAK -case 90: +case 91: YY_RULE_SETUP -#line 248 "util/configlexer.lex" +#line 249 "util/configlexer.lex" ECHO; YY_BREAK -#line 1936 "" +#line 1949 "" case YY_END_OF_BUFFER: { @@ -2215,7 +2228,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 783 ) + if ( yy_current_state >= 794 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2243,11 +2256,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 783 ) + if ( yy_current_state >= 794 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 782); + yy_is_jam = (yy_current_state == 793); return yy_is_jam ? 0 : yy_current_state; } @@ -2880,7 +2893,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 248 "util/configlexer.lex" +#line 249 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 3d29a5440..988e3ed23 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -168,6 +168,7 @@ use-syslog{COLON} { YDOUT; return VAR_USE_SYSLOG;} local-zone{COLON} { YDOUT; return VAR_LOCAL_ZONE;} local-data{COLON} { YDOUT; return VAR_LOCAL_DATA;} statistics-interval{COLON} { YDOUT; return VAR_STATISTICS_INTERVAL;} +statistics-cumulative{COLON} { YDOUT; return VAR_STATISTICS_CUMULATIVE;} {NEWLINE} { LEXOUT(("NL\n")); cfg_parser->line++;} /* Quoted strings. Strip leading and ending quotes */ diff --git a/util/configparser.c b/util/configparser.c index 6f8d528c9..4116b1a02 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -142,7 +142,8 @@ VAR_INTERFACE_AUTOMATIC = 331, VAR_STATISTICS_INTERVAL = 332, VAR_DO_DAEMONIZE = 333, - VAR_USE_CAPS_FOR_ID = 334 + VAR_USE_CAPS_FOR_ID = 334, + VAR_STATISTICS_CUMULATIVE = 335 }; #endif /* Tokens. */ @@ -223,6 +224,7 @@ #define VAR_STATISTICS_INTERVAL 332 #define VAR_DO_DAEMONIZE 333 #define VAR_USE_CAPS_FOR_ID 334 +#define VAR_STATISTICS_CUMULATIVE 335 @@ -281,7 +283,7 @@ typedef union YYSTYPE char* str; } /* Line 187 of yacc.c. */ -#line 285 "util/configparser.c" +#line 287 "util/configparser.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -294,7 +296,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 298 "util/configparser.c" +#line 300 "util/configparser.c" #ifdef short # undef short @@ -509,20 +511,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 139 +#define YYLAST 141 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 80 +#define YYNTOKENS 81 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 79 +#define YYNNTS 80 /* YYNRULES -- Number of rules. */ -#define YYNRULES 149 +#define YYNRULES 151 /* YYNRULES -- Number of states. */ -#define YYNSTATES 219 +#define YYNSTATES 222 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 334 +#define YYMAXUTOK 335 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -563,7 +565,7 @@ static const yytype_uint8 yytranslate[] = 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 + 75, 76, 77, 78, 79, 80 }; #if YYDEBUG @@ -578,77 +580,79 @@ static const yytype_uint16 yyprhs[] = 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, - 142, 144, 146, 149, 150, 152, 154, 156, 158, 161, - 162, 164, 166, 168, 171, 174, 177, 180, 183, 186, - 189, 192, 195, 198, 201, 204, 207, 210, 213, 216, - 219, 222, 225, 228, 231, 234, 237, 240, 243, 246, - 249, 252, 255, 258, 261, 264, 267, 270, 273, 276, - 279, 282, 285, 288, 291, 294, 297, 300, 303, 306, - 309, 312, 315, 319, 322, 325, 328, 331, 334, 337, - 340, 343, 346, 350, 353, 356, 359, 362, 365, 368 + 142, 144, 146, 148, 151, 152, 154, 156, 158, 160, + 163, 164, 166, 168, 170, 173, 176, 179, 182, 185, + 188, 191, 194, 197, 200, 203, 206, 209, 212, 215, + 218, 221, 224, 227, 230, 233, 236, 239, 242, 245, + 248, 251, 254, 257, 260, 263, 266, 269, 272, 275, + 278, 281, 284, 287, 290, 293, 296, 299, 302, 305, + 308, 311, 314, 317, 320, 324, 327, 330, 333, 336, + 339, 342, 345, 348, 351, 355, 358, 361, 364, 367, + 370, 373 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 81, 0, -1, -1, 81, 82, -1, 83, 84, -1, - 86, 87, -1, 89, 90, -1, 11, -1, 84, 85, - -1, -1, 92, -1, 93, -1, 95, -1, 98, -1, - 99, -1, 103, -1, 104, -1, 105, -1, 106, -1, - 96, -1, 109, -1, 110, -1, 111, -1, 112, -1, - 113, -1, 123, -1, 124, -1, 125, -1, 126, -1, - 127, -1, 100, -1, 128, -1, 129, -1, 132, -1, - 130, -1, 131, -1, 133, -1, 134, -1, 135, -1, - 139, -1, 118, -1, 119, -1, 120, -1, 121, -1, - 136, -1, 142, -1, 115, -1, 117, -1, 143, -1, - 145, -1, 146, -1, 147, -1, 101, -1, 122, -1, - 149, -1, 150, -1, 116, -1, 148, -1, 108, -1, - 97, -1, 114, -1, 140, -1, 144, -1, 137, -1, - 141, -1, 151, -1, 152, -1, 102, -1, 94, -1, - 107, -1, 138, -1, 39, -1, 87, 88, -1, -1, - 153, -1, 154, -1, 155, -1, 45, -1, 90, 91, - -1, -1, 156, -1, 157, -1, 158, -1, 13, 10, - -1, 12, 10, -1, 77, 10, -1, 14, 10, -1, - 17, 10, -1, 68, 10, -1, 15, 10, -1, 16, - 10, -1, 32, 10, -1, 61, 10, -1, 76, 10, - -1, 18, 10, -1, 19, 10, -1, 20, 10, -1, - 21, 10, -1, 78, 10, -1, 67, 10, -1, 22, - 10, -1, 23, 10, -1, 24, 10, -1, 25, 10, - -1, 26, 10, -1, 69, 10, -1, 55, 10, -1, - 65, 10, -1, 56, 10, -1, 49, 10, -1, 50, - 10, -1, 51, 10, -1, 52, 10, -1, 62, 10, - -1, 27, 10, -1, 28, 10, -1, 29, 10, -1, - 30, 10, -1, 31, 10, -1, 33, 10, -1, 34, - 10, -1, 36, 10, -1, 37, 10, -1, 35, 10, - -1, 42, 10, -1, 43, 10, -1, 44, 10, -1, - 53, 10, -1, 72, 10, -1, 79, 10, -1, 48, - 10, -1, 70, 10, -1, 73, 10, 10, -1, 54, - 10, -1, 57, 10, -1, 71, 10, -1, 58, 10, - -1, 59, 10, -1, 60, 10, -1, 66, 10, -1, - 63, 10, -1, 64, 10, -1, 74, 10, 10, -1, - 75, 10, -1, 38, 10, -1, 40, 10, -1, 41, - 10, -1, 38, 10, -1, 46, 10, -1, 47, 10, - -1 + 82, 0, -1, -1, 82, 83, -1, 84, 85, -1, + 87, 88, -1, 90, 91, -1, 11, -1, 85, 86, + -1, -1, 93, -1, 94, -1, 97, -1, 100, -1, + 101, -1, 105, -1, 106, -1, 107, -1, 108, -1, + 98, -1, 111, -1, 112, -1, 113, -1, 114, -1, + 115, -1, 125, -1, 126, -1, 127, -1, 128, -1, + 129, -1, 102, -1, 130, -1, 131, -1, 134, -1, + 132, -1, 133, -1, 135, -1, 136, -1, 137, -1, + 141, -1, 120, -1, 121, -1, 122, -1, 123, -1, + 138, -1, 144, -1, 117, -1, 119, -1, 145, -1, + 147, -1, 148, -1, 149, -1, 103, -1, 124, -1, + 151, -1, 152, -1, 118, -1, 150, -1, 110, -1, + 99, -1, 116, -1, 142, -1, 146, -1, 139, -1, + 143, -1, 153, -1, 154, -1, 104, -1, 95, -1, + 109, -1, 140, -1, 96, -1, 39, -1, 88, 89, + -1, -1, 155, -1, 156, -1, 157, -1, 45, -1, + 91, 92, -1, -1, 158, -1, 159, -1, 160, -1, + 13, 10, -1, 12, 10, -1, 77, 10, -1, 80, + 10, -1, 14, 10, -1, 17, 10, -1, 68, 10, + -1, 15, 10, -1, 16, 10, -1, 32, 10, -1, + 61, 10, -1, 76, 10, -1, 18, 10, -1, 19, + 10, -1, 20, 10, -1, 21, 10, -1, 78, 10, + -1, 67, 10, -1, 22, 10, -1, 23, 10, -1, + 24, 10, -1, 25, 10, -1, 26, 10, -1, 69, + 10, -1, 55, 10, -1, 65, 10, -1, 56, 10, + -1, 49, 10, -1, 50, 10, -1, 51, 10, -1, + 52, 10, -1, 62, 10, -1, 27, 10, -1, 28, + 10, -1, 29, 10, -1, 30, 10, -1, 31, 10, + -1, 33, 10, -1, 34, 10, -1, 36, 10, -1, + 37, 10, -1, 35, 10, -1, 42, 10, -1, 43, + 10, -1, 44, 10, -1, 53, 10, -1, 72, 10, + -1, 79, 10, -1, 48, 10, -1, 70, 10, -1, + 73, 10, 10, -1, 54, 10, -1, 57, 10, -1, + 71, 10, -1, 58, 10, -1, 59, 10, -1, 60, + 10, -1, 66, 10, -1, 63, 10, -1, 64, 10, + -1, 74, 10, 10, -1, 75, 10, -1, 38, 10, + -1, 40, 10, -1, 41, 10, -1, 38, 10, -1, + 46, 10, -1, 47, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 94, 94, 94, 95, 95, 96, 100, 105, 106, - 107, 107, 107, 108, 108, 108, 109, 109, 109, 110, - 110, 110, 111, 111, 111, 112, 112, 113, 113, 114, - 114, 115, 115, 116, 116, 117, 117, 118, 118, 119, - 119, 120, 120, 120, 121, 121, 121, 122, 122, 122, - 123, 123, 124, 124, 125, 125, 126, 126, 127, 127, - 127, 128, 128, 129, 129, 130, 130, 130, 131, 131, - 132, 134, 146, 147, 148, 148, 148, 150, 162, 163, - 164, 164, 164, 166, 175, 184, 195, 204, 217, 232, - 241, 250, 259, 268, 277, 286, 295, 304, 313, 322, - 336, 343, 350, 357, 365, 372, 379, 387, 395, 402, - 411, 420, 427, 434, 445, 453, 466, 475, 483, 496, - 505, 514, 523, 532, 545, 552, 562, 572, 582, 592, - 602, 609, 619, 632, 639, 657, 666, 675, 685, 695, - 702, 710, 723, 742, 749, 756, 763, 770, 777, 784 + 0, 95, 95, 95, 96, 96, 97, 101, 106, 107, + 108, 108, 108, 109, 109, 109, 110, 110, 110, 111, + 111, 111, 112, 112, 112, 113, 113, 114, 114, 115, + 115, 116, 116, 117, 117, 118, 118, 119, 119, 120, + 120, 121, 121, 121, 122, 122, 122, 123, 123, 123, + 124, 124, 125, 125, 126, 126, 127, 127, 128, 128, + 128, 129, 129, 130, 130, 131, 131, 131, 132, 132, + 133, 133, 135, 147, 148, 149, 149, 149, 151, 163, + 164, 165, 165, 165, 167, 176, 185, 196, 205, 214, + 227, 242, 251, 260, 269, 278, 287, 296, 305, 314, + 323, 332, 346, 353, 360, 367, 375, 382, 389, 397, + 405, 412, 421, 430, 437, 444, 455, 463, 476, 485, + 493, 506, 515, 524, 533, 542, 555, 562, 572, 582, + 592, 602, 612, 619, 629, 642, 649, 667, 676, 685, + 695, 705, 712, 720, 733, 752, 759, 766, 773, 780, + 787, 794 }; #endif @@ -681,10 +685,11 @@ static const char *const yytname[] = "VAR_CACHE_MAX_TTL", "VAR_HARDEN_DNNSEC_STRIPPED", "VAR_ACCESS_CONTROL", "VAR_LOCAL_ZONE", "VAR_LOCAL_DATA", "VAR_INTERFACE_AUTOMATIC", "VAR_STATISTICS_INTERVAL", "VAR_DO_DAEMONIZE", "VAR_USE_CAPS_FOR_ID", - "$accept", "toplevelvars", "toplevelvar", "serverstart", - "contents_server", "content_server", "stubstart", "contents_stub", - "content_stub", "forwardstart", "contents_forward", "content_forward", - "server_num_threads", "server_verbosity", "server_statistics_interval", + "VAR_STATISTICS_CUMULATIVE", "$accept", "toplevelvars", "toplevelvar", + "serverstart", "contents_server", "content_server", "stubstart", + "contents_stub", "content_stub", "forwardstart", "contents_forward", + "content_forward", "server_num_threads", "server_verbosity", + "server_statistics_interval", "server_statistics_cumulative", "server_port", "server_interface", "server_outgoing_interface", "server_outgoing_port", "server_outgoing_range", "server_outgoing_num_tcp", "server_incoming_num_tcp", @@ -726,28 +731,30 @@ static const yytype_uint16 yytoknum[] = 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 327, 328, 329, 330, 331, 332, 333, 334 + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 335 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 80, 81, 81, 82, 82, 82, 83, 84, 84, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 86, 87, 87, 88, 88, 88, 89, 90, 90, - 91, 91, 91, 92, 93, 94, 95, 96, 97, 98, + 0, 81, 82, 82, 83, 83, 83, 84, 85, 85, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 87, 88, 88, 89, 89, 89, 90, 91, + 91, 92, 92, 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 + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 159, 160 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -760,14 +767,15 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 0, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 2, 0, 1, 1, 1, 1, 2, + 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2 + 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, + 2, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -775,41 +783,42 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 7, 71, 77, 3, 9, 73, 79, + 2, 0, 1, 7, 72, 78, 3, 9, 74, 80, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 8, 10, 11, 68, 12, 19, - 59, 13, 14, 30, 52, 67, 15, 16, 17, 18, - 69, 58, 20, 21, 22, 23, 24, 60, 46, 56, - 47, 40, 41, 42, 43, 53, 25, 26, 27, 28, - 29, 31, 32, 34, 35, 33, 36, 37, 38, 44, - 63, 70, 39, 61, 64, 45, 48, 62, 49, 50, - 51, 57, 54, 55, 65, 66, 0, 0, 0, 72, - 74, 75, 76, 0, 0, 0, 78, 80, 81, 82, - 84, 83, 86, 89, 90, 87, 94, 95, 96, 97, - 100, 101, 102, 103, 104, 114, 115, 116, 117, 118, - 91, 119, 120, 123, 121, 122, 124, 125, 126, 130, - 109, 110, 111, 112, 127, 133, 106, 108, 134, 136, - 137, 138, 92, 113, 140, 141, 107, 139, 99, 88, - 105, 131, 135, 128, 0, 0, 143, 93, 85, 98, - 129, 144, 145, 146, 147, 148, 149, 132, 142 + 0, 0, 0, 0, 0, 8, 10, 11, 68, 71, + 12, 19, 59, 13, 14, 30, 52, 67, 15, 16, + 17, 18, 69, 58, 20, 21, 22, 23, 24, 60, + 46, 56, 47, 40, 41, 42, 43, 53, 25, 26, + 27, 28, 29, 31, 32, 34, 35, 33, 36, 37, + 38, 44, 63, 70, 39, 61, 64, 45, 48, 62, + 49, 50, 51, 57, 54, 55, 65, 66, 0, 0, + 0, 73, 75, 76, 77, 0, 0, 0, 79, 81, + 82, 83, 85, 84, 88, 91, 92, 89, 96, 97, + 98, 99, 102, 103, 104, 105, 106, 116, 117, 118, + 119, 120, 93, 121, 122, 125, 123, 124, 126, 127, + 128, 132, 111, 112, 113, 114, 129, 135, 108, 110, + 136, 138, 139, 140, 94, 115, 142, 143, 109, 141, + 101, 90, 107, 133, 137, 130, 0, 0, 145, 95, + 86, 100, 131, 87, 146, 147, 148, 149, 150, 151, + 134, 144 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 6, 7, 10, 74, 8, 11, 139, 9, - 12, 146, 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, 140, 141, 142, 147, 148, 149 + -1, 1, 6, 7, 10, 75, 8, 11, 141, 9, + 12, 148, 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, 142, 143, 144, 149, 150, 151 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -817,28 +826,29 @@ static const yytype_int16 yydefgoto[] = #define YYPACT_NINF -13 static const yytype_int16 yypact[] = { - -13, 68, -13, -13, -13, -13, -13, -13, -13, -13, - -12, 32, 31, 16, 17, 18, 19, 23, 24, 25, - 61, 64, 65, 66, 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, 98, 99, 100, 101, 102, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, -13, -13, -13, -13, -13, -13, + -13, 69, -13, -13, -13, -13, -13, -13, -13, -13, + -12, 33, 32, 16, 17, 18, 19, 23, 24, 25, + 62, 65, 66, 67, 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, 99, 100, 101, 102, 103, 105, 106, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, -13, -13, -13, -13, -13, + -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, + -13, -13, -13, -13, -13, -13, -13, -13, 124, 125, + 126, -13, -13, -13, -13, 127, 128, 129, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, 122, 123, 124, -13, - -13, -13, -13, 125, 126, 127, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, + -13, -13, -13, -13, -13, -13, 130, 131, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, 128, 129, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, -13, -13, -13 + -13, -13 }; /* YYPGOTO[NTERM-NUM]. */ @@ -851,7 +861,7 @@ static const yytype_int8 yypgoto[] = -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, -13, -13, -13 + -13, -13, -13, -13, -13, -13, -13, -13, -13, -13 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -863,18 +873,19 @@ static const yytype_uint8 yytable[] = { 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, 150, 151, 152, 153, - 39, 40, 41, 154, 155, 156, 42, 43, 44, 45, + 33, 34, 35, 36, 37, 38, 152, 153, 154, 155, + 39, 40, 41, 156, 157, 158, 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, 2, 143, - 136, 157, 137, 138, 158, 159, 160, 144, 145, 3, - 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, 4, 188, 189, - 190, 191, 192, 5, 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 + 66, 67, 68, 69, 70, 71, 72, 73, 74, 2, + 145, 138, 159, 139, 140, 160, 161, 162, 146, 147, + 3, 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, 4, 190, + 191, 192, 193, 194, 5, 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 }; static const yytype_uint8 yycheck[] = @@ -885,42 +896,44 @@ static const yytype_uint8 yycheck[] = 42, 43, 44, 10, 10, 10, 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, 0, 38, - 38, 10, 40, 41, 10, 10, 10, 46, 47, 11, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 0, + 38, 38, 10, 40, 41, 10, 10, 10, 46, 47, + 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 39, 10, + 10, 10, 10, 10, 45, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 39, 10, 10, - 10, 10, 10, 45, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 + 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 81, 0, 11, 39, 45, 82, 83, 86, 89, - 84, 87, 90, 12, 13, 14, 15, 16, 17, 18, + 0, 82, 0, 11, 39, 45, 83, 84, 87, 90, + 85, 88, 91, 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, 42, 43, 44, 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, 85, 92, 93, 94, 95, 96, + 76, 77, 78, 79, 80, 86, 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, 38, 40, 41, 88, - 153, 154, 155, 38, 46, 47, 91, 156, 157, 158, + 147, 148, 149, 150, 151, 152, 153, 154, 38, 40, + 41, 89, 155, 156, 157, 38, 46, 47, 92, 158, + 159, 160, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10 + 10, 10 }; #define yyerrok (yyerrstatus = 0) @@ -1735,14 +1748,14 @@ yyreduce: switch (yyn) { case 7: -#line 101 "util/configparser.y" +#line 102 "util/configparser.y" { OUTYY(("\nP(server:)\n")); } break; - case 71: -#line 135 "util/configparser.y" + case 72: +#line 136 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -1755,8 +1768,8 @@ yyreduce: } break; - case 77: -#line 151 "util/configparser.y" + case 78: +#line 152 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -1769,8 +1782,8 @@ yyreduce: } break; - case 83: -#line 167 "util/configparser.y" + case 84: +#line 168 "util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1780,8 +1793,8 @@ yyreduce: } break; - case 84: -#line 176 "util/configparser.y" + case 85: +#line 177 "util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1791,8 +1804,8 @@ yyreduce: } break; - case 85: -#line 185 "util/configparser.y" + case 86: +#line 186 "util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) @@ -1804,8 +1817,19 @@ yyreduce: } break; - case 86: -#line 196 "util/configparser.y" + case 87: +#line 197 "util/configparser.y" + { + OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str))); + if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[(2) - (2)].str), "yes")==0); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 88: +#line 206 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1815,8 +1839,8 @@ yyreduce: } break; - case 87: -#line 205 "util/configparser.y" + case 89: +#line 215 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -1830,8 +1854,8 @@ yyreduce: } break; - case 88: -#line 218 "util/configparser.y" + case 90: +#line 228 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -1847,8 +1871,8 @@ yyreduce: } break; - case 89: -#line 233 "util/configparser.y" + case 91: +#line 243 "util/configparser.y" { OUTYY(("P(server_outgoing_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1858,8 +1882,8 @@ yyreduce: } break; - case 90: -#line 242 "util/configparser.y" + case 92: +#line 252 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1869,8 +1893,8 @@ yyreduce: } break; - case 91: -#line 251 "util/configparser.y" + case 93: +#line 261 "util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1880,8 +1904,8 @@ yyreduce: } break; - case 92: -#line 260 "util/configparser.y" + case 94: +#line 270 "util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -1891,8 +1915,8 @@ yyreduce: } break; - case 93: -#line 269 "util/configparser.y" + case 95: +#line 279 "util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1902,8 +1926,8 @@ yyreduce: } break; - case 94: -#line 278 "util/configparser.y" + case 96: +#line 288 "util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1913,8 +1937,8 @@ yyreduce: } break; - case 95: -#line 287 "util/configparser.y" + case 97: +#line 297 "util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1924,8 +1948,8 @@ yyreduce: } break; - case 96: -#line 296 "util/configparser.y" + case 98: +#line 306 "util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1935,8 +1959,8 @@ yyreduce: } break; - case 97: -#line 305 "util/configparser.y" + case 99: +#line 315 "util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1946,8 +1970,8 @@ yyreduce: } break; - case 98: -#line 314 "util/configparser.y" + case 100: +#line 324 "util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1957,8 +1981,8 @@ yyreduce: } break; - case 99: -#line 323 "util/configparser.y" + case 101: +#line 333 "util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -1973,8 +1997,8 @@ yyreduce: } break; - case 100: -#line 337 "util/configparser.y" + case 102: +#line 347 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -1982,8 +2006,8 @@ yyreduce: } break; - case 101: -#line 344 "util/configparser.y" + case 103: +#line 354 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -1991,8 +2015,8 @@ yyreduce: } break; - case 102: -#line 351 "util/configparser.y" + case 104: +#line 361 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -2000,8 +2024,8 @@ yyreduce: } break; - case 103: -#line 358 "util/configparser.y" + case 105: +#line 368 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -2010,8 +2034,8 @@ yyreduce: } break; - case 104: -#line 366 "util/configparser.y" + case 106: +#line 376 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -2019,8 +2043,8 @@ yyreduce: } break; - case 105: -#line 373 "util/configparser.y" + case 107: +#line 383 "util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str))) @@ -2028,8 +2052,8 @@ yyreduce: } break; - case 106: -#line 380 "util/configparser.y" + case 108: +#line 390 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2038,8 +2062,8 @@ yyreduce: } break; - case 107: -#line 388 "util/configparser.y" + case 109: +#line 398 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2048,8 +2072,8 @@ yyreduce: } break; - case 108: -#line 396 "util/configparser.y" + case 110: +#line 406 "util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str))) @@ -2057,8 +2081,8 @@ yyreduce: } break; - case 109: -#line 403 "util/configparser.y" + case 111: +#line 413 "util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2068,8 +2092,8 @@ yyreduce: } break; - case 110: -#line 412 "util/configparser.y" + case 112: +#line 422 "util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2079,8 +2103,8 @@ yyreduce: } break; - case 111: -#line 421 "util/configparser.y" + case 113: +#line 431 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2088,8 +2112,8 @@ yyreduce: } break; - case 112: -#line 428 "util/configparser.y" + case 114: +#line 438 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2097,8 +2121,8 @@ yyreduce: } break; - case 113: -#line 435 "util/configparser.y" + case 115: +#line 445 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2110,8 +2134,8 @@ yyreduce: } break; - case 114: -#line 446 "util/configparser.y" + case 116: +#line 456 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size)) @@ -2120,8 +2144,8 @@ yyreduce: } break; - case 115: -#line 454 "util/configparser.y" + case 117: +#line 464 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2135,8 +2159,8 @@ yyreduce: } break; - case 116: -#line 467 "util/configparser.y" + case 118: +#line 477 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2146,8 +2170,8 @@ yyreduce: } break; - case 117: -#line 476 "util/configparser.y" + case 119: +#line 486 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size)) @@ -2156,8 +2180,8 @@ yyreduce: } break; - case 118: -#line 484 "util/configparser.y" + case 120: +#line 494 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2171,8 +2195,8 @@ yyreduce: } break; - case 119: -#line 497 "util/configparser.y" + case 121: +#line 507 "util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2182,8 +2206,8 @@ yyreduce: } break; - case 120: -#line 506 "util/configparser.y" + case 122: +#line 516 "util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2193,8 +2217,8 @@ yyreduce: } break; - case 121: -#line 515 "util/configparser.y" + case 123: +#line 525 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2204,8 +2228,8 @@ yyreduce: } break; - case 122: -#line 524 "util/configparser.y" + case 124: +#line 534 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg-> @@ -2215,8 +2239,8 @@ yyreduce: } break; - case 123: -#line 533 "util/configparser.y" + case 125: +#line 543 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2230,8 +2254,8 @@ yyreduce: } break; - case 124: -#line 546 "util/configparser.y" + case 126: +#line 556 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2239,8 +2263,8 @@ yyreduce: } break; - case 125: -#line 553 "util/configparser.y" + case 127: +#line 563 "util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2251,8 +2275,8 @@ yyreduce: } break; - case 126: -#line 563 "util/configparser.y" + case 128: +#line 573 "util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2263,8 +2287,8 @@ yyreduce: } break; - case 127: -#line 573 "util/configparser.y" + case 129: +#line 583 "util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2275,8 +2299,8 @@ yyreduce: } break; - case 128: -#line 583 "util/configparser.y" + case 130: +#line 593 "util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2287,8 +2311,8 @@ yyreduce: } break; - case 129: -#line 593 "util/configparser.y" + case 131: +#line 603 "util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2299,8 +2323,8 @@ yyreduce: } break; - case 130: -#line 603 "util/configparser.y" + case 132: +#line 613 "util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str))) @@ -2308,8 +2332,8 @@ yyreduce: } break; - case 131: -#line 610 "util/configparser.y" + case 133: +#line 620 "util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2320,8 +2344,8 @@ yyreduce: } break; - case 132: -#line 620 "util/configparser.y" + case 134: +#line 630 "util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 && @@ -2335,8 +2359,8 @@ yyreduce: } break; - case 133: -#line 633 "util/configparser.y" + case 135: +#line 643 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -2344,8 +2368,8 @@ yyreduce: } break; - case 134: -#line 640 "util/configparser.y" + case 136: +#line 650 "util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -2364,8 +2388,8 @@ yyreduce: } break; - case 135: -#line 658 "util/configparser.y" + case 137: +#line 668 "util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2375,8 +2399,8 @@ yyreduce: } break; - case 136: -#line 667 "util/configparser.y" + case 138: +#line 677 "util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2386,8 +2410,8 @@ yyreduce: } break; - case 137: -#line 676 "util/configparser.y" + case 139: +#line 686 "util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2398,8 +2422,8 @@ yyreduce: } break; - case 138: -#line 686 "util/configparser.y" + case 140: +#line 696 "util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2410,8 +2434,8 @@ yyreduce: } break; - case 139: -#line 696 "util/configparser.y" + case 141: +#line 706 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -2419,8 +2443,8 @@ yyreduce: } break; - case 140: -#line 703 "util/configparser.y" + case 142: +#line 713 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size)) @@ -2429,8 +2453,8 @@ yyreduce: } break; - case 141: -#line 711 "util/configparser.y" + case 143: +#line 721 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2444,8 +2468,8 @@ yyreduce: } break; - case 142: -#line 724 "util/configparser.y" + case 144: +#line 734 "util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && @@ -2465,8 +2489,8 @@ yyreduce: } break; - case 143: -#line 743 "util/configparser.y" + case 145: +#line 753 "util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str))) @@ -2474,8 +2498,8 @@ yyreduce: } break; - case 144: -#line 750 "util/configparser.y" + case 146: +#line 760 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->stubs->name); @@ -2483,8 +2507,8 @@ yyreduce: } break; - case 145: -#line 757 "util/configparser.y" + case 147: +#line 767 "util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str))) @@ -2492,8 +2516,8 @@ yyreduce: } break; - case 146: -#line 764 "util/configparser.y" + case 148: +#line 774 "util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str))) @@ -2501,8 +2525,8 @@ yyreduce: } break; - case 147: -#line 771 "util/configparser.y" + case 149: +#line 781 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->forwards->name); @@ -2510,8 +2534,8 @@ yyreduce: } break; - case 148: -#line 778 "util/configparser.y" + case 150: +#line 788 "util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str))) @@ -2519,8 +2543,8 @@ yyreduce: } break; - case 149: -#line 785 "util/configparser.y" + case 151: +#line 795 "util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str))) @@ -2530,7 +2554,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2534 "util/configparser.c" +#line 2558 "util/configparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2744,7 +2768,7 @@ yyreturn: } -#line 791 "util/configparser.y" +#line 801 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index e8ef803dc..cf11842a6 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -115,7 +115,8 @@ VAR_INTERFACE_AUTOMATIC = 331, VAR_STATISTICS_INTERVAL = 332, VAR_DO_DAEMONIZE = 333, - VAR_USE_CAPS_FOR_ID = 334 + VAR_USE_CAPS_FOR_ID = 334, + VAR_STATISTICS_CUMULATIVE = 335 }; #endif /* Tokens. */ @@ -196,6 +197,7 @@ #define VAR_STATISTICS_INTERVAL 332 #define VAR_DO_DAEMONIZE 333 #define VAR_USE_CAPS_FOR_ID 334 +#define VAR_STATISTICS_CUMULATIVE 335 @@ -207,7 +209,7 @@ typedef union YYSTYPE char* str; } /* Line 1489 of yacc.c. */ -#line 211 "util/configparser.h" +#line 213 "util/configparser.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/util/configparser.y b/util/configparser.y index 4f77b5569..4d4eabe33 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -89,6 +89,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_CACHE_MAX_TTL VAR_HARDEN_DNNSEC_STRIPPED VAR_ACCESS_CONTROL %token VAR_LOCAL_ZONE VAR_LOCAL_DATA VAR_INTERFACE_AUTOMATIC %token VAR_STATISTICS_INTERVAL VAR_DO_DAEMONIZE VAR_USE_CAPS_FOR_ID +%token VAR_STATISTICS_CUMULATIVE %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -129,7 +130,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_harden_dnssec_stripped | server_access_control | server_local_zone | server_local_data | server_interface_automatic | server_statistics_interval | server_do_daemonize | - server_use_caps_for_id + server_use_caps_for_id | server_statistics_cumulative ; stubstart: VAR_STUB_ZONE { @@ -192,6 +193,15 @@ server_statistics_interval: VAR_STATISTICS_INTERVAL STRING free($2); } ; +server_statistics_cumulative: VAR_STATISTICS_CUMULATIVE STRING + { + OUTYY(("P(server_statistics_cumulative:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->stat_cumulative = (strcmp($2, "yes")==0); + free($2); + } + ; server_port: VAR_PORT STRING { OUTYY(("P(server_port:%s)\n", $2));