<tt>Steve,</tt> <tt>This patch strips down the gen_tables.c to make the preprocessor output slightly smaller. This is not necessary for the other two patches to work but I thought it would be best to remove unused code. </tt> <tt> Thanks, Clayton Clayton Shotwell Software Engineer clshotwe@rockwellcollins.com </tt><a href=www.rockwellcollins.com><tt>www.rockwellcollins.com</tt></a><tt> </tt> <tt>diff -urN a/lib/gen_tables.c b/lib/gen_tables.c</tt> <tt>--- a/lib/gen_tables.c 2013-07-29 16:37:01.000000000 -0500</tt> <tt>+++ b/lib/gen_tables.c 2013-08-19 10:09:03.060041420 -0500</tt> <tt>@@ -54,19 +54,6 @@</tt> <tt> #define SHMGET 23</tt> <tt> #define SHMCTL 24</tt> <tt> </tt> <tt>-</tt> <tt>-/* The ratio of table size to number of non-empty elements allowed for a</tt> <tt>- "direct" s2i table; if the ratio would be bigger, bsearch tables are used</tt> <tt>- instead.</tt> <tt>-</tt> <tt>- 2 looks like a lot at a first glance, but the bsearch tables need twice as</tt> <tt>- much space per element, so with the ratio equal to 2 the direct table uses</tt> <tt>- no more memory and is faster. */</tt> <tt>-#define DIRECT_THRESHOLD 2</tt> <tt>-</tt> <tt>-/* Allow more than one string defined for a single integer value */</tt> <tt>-static bool allow_duplicate_ints; /* = false; */</tt> <tt>-</tt> <tt> struct value {</tt> <tt> int val;</tt> <tt> const char *s;</tt> <tt>@@ -83,335 +70,11 @@</tt> <tt> </tt> <tt> #define NUM_VALUES (sizeof(values) / sizeof(*values))</tt> <tt> </tt> <tt>-/* Compare two "struct value" members by name. */</tt> <tt>-static int</tt> <tt>-cmp_value_strings(const void *xa, const void *xb)</tt> <tt>-{</tt> <tt>- const struct value *a, *b;</tt> <tt>-</tt> <tt>- a = xa;</tt> <tt>- b = xb;</tt> <tt>- return strcmp(a->s, b->s);</tt> <tt>-}</tt> <tt>-</tt> <tt>-/* Compare two "struct value" members by value. */</tt> <tt>-static int</tt> <tt>-cmp_value_vals(const void *xa, const void *xb)</tt> <tt>-{</tt> <tt>- const struct value *a, *b;</tt> <tt>-</tt> <tt>- a = xa;</tt> <tt>- b = xb;</tt> <tt>- if (a->val > b->val)</tt> <tt>- return 1;</tt> <tt>- if (a->val < b->val)</tt> <tt>- return -1;</tt> <tt>- /* Preserve the original order if there is an ambiguity, to always use</tt> <tt>- the first specified value. */</tt> <tt>- if (a->orig_index > b->orig_index)</tt> <tt>- return 1;</tt> <tt>- if (a->orig_index < b->orig_index)</tt> <tt>- return -1;</tt> <tt>- return 0;</tt> <tt>-}</tt> <tt>-</tt> <tt>-/* Compare two "struct value" members by orig_index. */</tt> <tt>-static int</tt> <tt>-cmp_value_orig_index(const void *xa, const void *xb)</tt> <tt>-{</tt> <tt>- const struct value *a, *b;</tt> <tt>-</tt> <tt>- a = xa;</tt> <tt>- b = xb;</tt> <tt>- if (a->orig_index > b->orig_index)</tt> <tt>- return 1;</tt> <tt>- if (a->orig_index < b->orig_index)</tt> <tt>- return -1;</tt> <tt>- return 0;</tt> <tt>-}</tt> <tt>-</tt> <tt>-/* Output the string table, initialize values[*]->s_offset. */</tt> <tt>-static void</tt> <tt>-output_strings(const char *prefix)</tt> <tt>-{</tt> <tt>- size_t i, offset;</tt> <tt>-</tt> <tt>- offset = 0;</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- values[i].s_offset = offset;</tt> <tt>- offset += strlen(values[i].s) + 1;</tt> <tt>- }</tt> <tt>- printf("static const char %s_strings[] = \"", prefix);</tt> <tt>- assert(NUM_VALUES > 0);</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- const char *c;</tt> <tt>-</tt> <tt>- if (i != 0 && i % 10 == 0)</tt> <tt>- fputs("\"\n"</tt> <tt>- "\t\"", stdout);</tt> <tt>- for (c = values[i].s; *c != '\0'; c++) {</tt> <tt>- assert(*c != '"' && *c != '\\'</tt> <tt>- && isprint((unsigned char)*c));</tt> <tt>- putc(*c, stdout);</tt> <tt>- }</tt> <tt>- if (i != NUM_VALUES - 1)</tt> <tt>- fputs("\\0", stdout);</tt> <tt>- }</tt> <tt>- fputs("\";\n", stdout);</tt> <tt>-}</tt> <tt>-</tt> <tt>-/* Output the string to integer mapping code.</tt> <tt>- Assume strings are all uppsercase or all lowercase if specified by</tt> <tt>- parameters; in that case, make the search case-insensitive.</tt> <tt>- values must be sorted by strings. */</tt> <tt>-static void</tt> <tt>-output_s2i(const char *prefix, bool uppercase, bool lowercase)</tt> <tt>-{</tt> <tt>- size_t i;</tt> <tt>-</tt> <tt>- for (i = 0; i < NUM_VALUES - 1; i++) {</tt> <tt>- assert(strcmp(values[i].s, values[i + 1].s) <= 0);</tt> <tt>- if (strcmp(values[i].s, values[i + 1].s) == 0) {</tt> <tt>- fprintf(stderr, "Duplicate value `%s': %d, %d\n",</tt> <tt>- values[i].s, values[i].val, values[i + 1].val);</tt> <tt>- abort();</tt> <tt>- }</tt> <tt>- }</tt> <tt>- printf("static const unsigned %s_s2i_s[] = {", prefix);</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- if (i % 10 == 0)</tt> <tt>- fputs("\n\t", stdout);</tt> <tt>- assert(values[i].s_offset <= UINT_MAX);</tt> <tt>- printf("%zu,", values[i].s_offset);</tt> <tt>- }</tt> <tt>- printf("\n"</tt> <tt>- "};\n"</tt> <tt>- "static const int %s_s2i_i[] = {", prefix);</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- if (i % 10 == 0)</tt> <tt>- fputs("\n\t", stdout);</tt> <tt>- printf("%d,", values[i].val);</tt> <tt>- }</tt> <tt>- fputs("\n"</tt> <tt>- "};\n", stdout);</tt> <tt>- assert(!(uppercase && lowercase));</tt> <tt>- if (uppercase) {</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- const char *c;</tt> <tt>-</tt> <tt>- for (c = values[i].s; *c != '\0'; c++)</tt> <tt>- assert(isascii((unsigned char)*c)</tt> <tt>- && !GT_ISLOWER(*c));</tt> <tt>- }</tt> <tt>- } else if (lowercase) {</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- const char *c;</tt> <tt>-</tt> <tt>- for (c = values[i].s; *c != '\0'; c++)</tt> <tt>- assert(isascii((unsigned char)*c)</tt> <tt>- && !GT_ISUPPER(*c));</tt> <tt>- }</tt> <tt>- }</tt> <tt>- if (uppercase || lowercase) {</tt> <tt>- printf("static int %s_s2i(const char *s, int *value) {\n"</tt> <tt>- "\tsize_t len, i;\n"</tt> <tt>- "\tlen = strlen(s);\n"</tt> <tt>- "\t{ char copy[len + 1];\n"</tt> <tt>- "\tfor (i = 0; i < len; i++) {\n"</tt> <tt>- "\t\tchar c = s[i];\n", prefix);</tt> <tt>- if (uppercase)</tt> <tt>- fputs("\t\tcopy[i] = GT_ISLOWER(c) ? c - 'a' + 'A' "</tt> <tt>- ": c;\n", stdout);</tt> <tt>- else</tt> <tt>- fputs("\t\tcopy[i] = GT_ISUPPER(c) ? c - 'A' + 'a' "</tt> <tt>- ": c;\n", stdout);</tt> <tt>- printf("\t}\n"</tt> <tt>- "\tcopy[i] = 0;\n"</tt> <tt>- "\treturn s2i__(%s_strings, %s_s2i_s, %s_s2i_i, %zu, "</tt> <tt>- "copy, value);\n"</tt> <tt>- "\t}\n"</tt> <tt>- "}\n", prefix, prefix, prefix, NUM_VALUES);</tt> <tt>- } else</tt> <tt>- printf("static int %s_s2i(const char *s, int *value) {\n"</tt> <tt>- "\treturn s2i__(%s_strings, %s_s2i_s, %s_s2i_i, %zu, s, "</tt> <tt>- "value);\n"</tt> <tt>- "}\n", prefix, prefix, prefix, prefix, NUM_VALUES);</tt> <tt>-}</tt> <tt>-</tt> <tt>-/* Output the string to integer mapping table.</tt> <tt>- values must be sorted by strings. */</tt> <tt>-static void</tt> <tt>-output_i2s(const char *prefix)</tt> <tt>-{</tt> <tt>- struct value *unique_values;</tt> <tt>- int min_val, max_val;</tt> <tt>- size_t i, n;</tt> <tt>-</tt> <tt>- assert(NUM_VALUES > 0);</tt> <tt>- for (i = 0; i < NUM_VALUES - 1; i++) {</tt> <tt>- assert(values[i].val <= values[i + 1].val);</tt> <tt>- if (!allow_duplicate_ints</tt> <tt>- && values[i].val == values[i + 1].val) {</tt> <tt>- fprintf(stderr, "Duplicate value %d: `%s', `%s'\n",</tt> <tt>- values[i].val, values[i].s, values[i + 1].s);</tt> <tt>- abort();</tt> <tt>- }</tt> <tt>- }</tt> <tt>-</tt> <tt>- unique_values = malloc(NUM_VALUES * sizeof(*unique_values));</tt> <tt>- assert(unique_values != NULL);</tt> <tt>- n = 0;</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- if (n == 0 || unique_values[n - 1].val != values[i].val) {</tt> <tt>- unique_values[n] = values[i];</tt> <tt>- n++;</tt> <tt>- }</tt> <tt>- }</tt> <tt>-</tt> <tt>- min_val = unique_values[0].val;</tt> <tt>- max_val = unique_values[n - 1].val;</tt> <tt>- if (((double)max_val - (double)min_val) / n <= DIRECT_THRESHOLD) {</tt> <tt>- int next_index;</tt> <tt>-</tt> <tt>- printf("static const unsigned %s_i2s_direct[] = {", prefix);</tt> <tt>- next_index = min_val;</tt> <tt>- i = 0;</tt> <tt>- for (;;) {</tt> <tt>- if ((next_index - min_val) % 10 == 0)</tt> <tt>- fputs("\n\t", stdout);</tt> <tt>- while (unique_values[i].val < next_index)</tt> <tt>- /* This can happen if (allow_duplicate_ints) */</tt> <tt>- i++;</tt> <tt>- if (unique_values[i].val == next_index) {</tt> <tt>- assert(unique_values[i].s_offset <= UINT_MAX);</tt> <tt>- printf("%zu,", unique_values[i].s_offset);</tt> <tt>- } else</tt> <tt>- fputs("-1u,", stdout);</tt> <tt>- if (next_index == max_val)</tt> <tt>- /* Done like this to avoid integer overflow */</tt> <tt>- break;</tt> <tt>- next_index++;</tt> <tt>- }</tt> <tt>- printf("\n"</tt> <tt>- "};\n"</tt> <tt>- "static const char *%s_i2s(int v) {\n"</tt> <tt>- "\treturn i2s_direct__(%s_strings, %s_i2s_direct, %d, "</tt> <tt>- "%d, v);\n"</tt> <tt>- "}\n", prefix, prefix, prefix, min_val, max_val);</tt> <tt>- } else {</tt> <tt>- printf("static const int %s_i2s_i[] = {", prefix);</tt> <tt>- for (i = 0; i < n; i++) {</tt> <tt>- if (i % 10 == 0)</tt> <tt>- fputs("\n\t", stdout);</tt> <tt>- printf("%d,", unique_values[i].val);</tt> <tt>- }</tt> <tt>- printf("\n"</tt> <tt>- "};\n"</tt> <tt>- "static const unsigned %s_i2s_s[] = {", prefix);</tt> <tt>- for (i = 0; i < n; i++) {</tt> <tt>- if (i % 10 == 0)</tt> <tt>- fputs("\n\t", stdout);</tt> <tt>- assert(unique_values[i].s_offset <= UINT_MAX);</tt> <tt>- printf("%zu,", unique_values[i].s_offset);</tt> <tt>- }</tt> <tt>- printf("\n"</tt> <tt>- "};\n"</tt> <tt>- "static const char *%s_i2s(int v) {\n"</tt> <tt>- "\treturn i2s_bsearch__(%s_strings, %s_i2s_i, %s_i2s_s, "</tt> <tt>- "%zu, v);\n"</tt> <tt>- "}\n", prefix, prefix, prefix, prefix, n);</tt> <tt>- }</tt> <tt>- free(unique_values);</tt> <tt>-}</tt> <tt>-</tt> <tt>-/* Output the string to integer mapping table as a transtab[].</tt> <tt>- values must be sorted in the desired order. */</tt> <tt>-static void</tt> <tt>-output_i2s_transtab(const char *prefix)</tt> <tt>-{</tt> <tt>- size_t i;</tt> <tt>- char *uc_prefix;</tt> <tt>-</tt> <tt>- printf("static const struct transtab %s_table[] = {", prefix);</tt> <tt>- for (i = 0; i < NUM_VALUES; i++) {</tt> <tt>- if (i % 10 == 0)</tt> <tt>- fputs("\n\t", stdout);</tt> <tt>- printf("{%d,%zu},", values[i].val, values[i].s_offset);</tt> <tt>- }</tt> <tt>- uc_prefix = strdup(prefix);</tt> <tt>- assert(uc_prefix != NULL);</tt> <tt>- for (i = 0; uc_prefix[i] != '\0'; i++)</tt> <tt>- uc_prefix[i] = toupper((unsigned char)uc_prefix[i]);</tt> <tt>- printf("\n"</tt> <tt>- "};\n"</tt> <tt>- "#define %s_NUM_ENTRIES "</tt> <tt>- "(sizeof(%s_table) / sizeof(*%s_table))\n", uc_prefix, prefix,</tt> <tt>- prefix);</tt> <tt>- free(uc_prefix);</tt> <tt>-}</tt> <tt>-</tt> <tt> int</tt> <tt> main(int argc, char **argv)</tt> <tt> {</tt> <tt>- bool gen_i2s, gen_i2s_transtab, gen_s2i, uppercase, lowercase;</tt> <tt>- char *prefix;</tt> <tt>- size_t i;</tt> <tt>-</tt> <tt> /* This is required by gen_tables.h */</tt> <tt> assert(NUM_VALUES <= (SSIZE_MAX / 2 + 1));</tt> <tt> </tt> <tt>- /* To make sure GT_ISUPPER and GT_ISLOWER work. */</tt> <tt>- assert('Z' == 'A' + 25 && 'z' == 'a' + 25);</tt> <tt>- gen_i2s = false;</tt> <tt>- gen_i2s_transtab = false;</tt> <tt>- gen_s2i = false;</tt> <tt>- uppercase = false;</tt> <tt>- lowercase = false;</tt> <tt>- prefix = NULL;</tt> <tt>- assert (argc > 1);</tt> <tt>- for (i = 1; i < (size_t)argc; i++) {</tt> <tt>- if (strcmp(argv[i], "--i2s") == 0)</tt> <tt>- gen_i2s = true;</tt> <tt>- else if (strcmp(argv[i], "--i2s-transtab") == 0)</tt> <tt>- gen_i2s_transtab = true;</tt> <tt>- else if (strcmp(argv[i], "--s2i") == 0)</tt> <tt>- gen_s2i = true;</tt> <tt>- else if (strcmp(argv[i], "--uppercase") == 0)</tt> <tt>- uppercase = true;</tt> <tt>- else if (strcmp(argv[i], "--lowercase") == 0)</tt> <tt>- lowercase = true;</tt> <tt>- else if (strcmp(argv[i], "--duplicate-ints") == 0)</tt> <tt>- allow_duplicate_ints = true;</tt> <tt>- else {</tt> <tt>- assert(*argv[i] != '-');</tt> <tt>- assert(prefix == NULL);</tt> <tt>- prefix = argv[i];</tt> <tt>- }</tt> <tt>- }</tt> <tt>- assert(prefix != NULL);</tt> <tt>- assert(!(uppercase && lowercase));</tt> <tt>-</tt> <tt>- printf("/* This is a generated file, see Makefile.am for its "</tt> <tt>- "inputs. */\n");</tt> <tt>- for (i = 0; i < NUM_VALUES; i++)</tt> <tt>- values[i].orig_index = i;</tt> <tt>- qsort(values, NUM_VALUES, sizeof(*values), cmp_value_strings);</tt> <tt>- /* FIXME? if (gen_s2i), sort the strings in some other order</tt> <tt>- (e.g. "first 4 nodes in BFS of the bsearch tree first") to use the</tt> <tt>- cache better. */</tt> <tt>- /* FIXME? If the only thing generated is a transtab, keep the strings</tt> <tt>- in the original order to use the cache better. */</tt> <tt>- output_strings(prefix);</tt> <tt>- if (gen_s2i)</tt> <tt>- output_s2i(prefix, uppercase, lowercase);</tt> <tt>- if (gen_i2s) {</tt> <tt>- qsort(values, NUM_VALUES, sizeof(*values), cmp_value_vals);</tt> <tt>- output_i2s(prefix);</tt> <tt>- }</tt> <tt>- if (gen_i2s_transtab) {</tt> <tt>- qsort(values, NUM_VALUES, sizeof(*values),</tt> <tt>- cmp_value_orig_index);</tt> <tt>- output_i2s_transtab(prefix);</tt> <tt>- }</tt> <tt> return EXIT_SUCCESS;</tt> <tt> }</tt>