Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-27 21:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: modernize lib/bitset_stats.c

Browse Source
This commit is contained in:
Akim Demaille
2018-10-10 22:43:34 +02:00
parent 8e4ca87228
commit 099339df0a
1 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/bitset_stats.c
View File

@@ -108,18 +108,15 @@ static void
bitset_percent_histogram_print (FILE *file, const char *name, const char *msg,
unsigned n_bins, unsigned *bins)
{
unsigned i;
unsigned total;
total = 0;
for (i = 0; i < n_bins; i++)
unsigned total = 0;
for (unsigned i = 0; i < n_bins; i++)
total += bins[i];
if (!total)
return;
fprintf (file, "%s %s", name, msg);
for (i = 0; i < n_bins; i++)
for (unsigned i = 0; i < n_bins; i++)
fprintf (file, "%.0f-%.0f%%\t%8u (%5.1f%%)\n",
i * 100.0 / n_bins,
(i + 1) * 100.0 / n_bins, bins[i],
@@ -132,26 +129,27 @@ static void
bitset_log_histogram_print (FILE *file, const char *name, const char *msg,
unsigned n_bins, unsigned *bins)
{
unsigned i;
unsigned total;
unsigned max_width;
total = 0;
for (i = 0; i < n_bins; i++)
unsigned total = 0;
for (unsigned i = 0; i < n_bins; i++)
total += bins[i];
if (!total)
return;
/* Determine number of useful bins. */
{
unsigned i;
for (i = n_bins; i > 3 && ! bins[i - 1]; i--)
continue;
n_bins = i;
}
/* 2 * ceil (log10 (2) * (N - 1)) + 1. */
max_width = 2 * (unsigned) (0.30103 * (n_bins - 1) + 0.9999) + 1;
unsigned max_width = 2 * (unsigned) (0.30103 * (n_bins - 1) + 0.9999) + 1;
fprintf (file, "%s %s", name, msg);
{
unsigned i;
for (i = 0; i < 2; i++)
fprintf (file, "%*d\t%8u (%5.1f%%)\n",
max_width, i, bins[i], 100.0 * bins[i] / total);
@@ -163,6 +161,7 @@ bitset_log_histogram_print (FILE *file, const char *name, const char *msg,
(1UL << i) - 1,
bins[i],
(100.0 * bins[i]) / total);
}
}
@@ -205,8 +204,6 @@ bitset_stats_print_1 (FILE *file, const char *name,
static void
bitset_stats_print (FILE *file, bool verbose ATTRIBUTE_UNUSED)
{
int i;
if (!bitset_stats_info)
return;
@@ -215,7 +212,7 @@ bitset_stats_print (FILE *file, bool verbose ATTRIBUTE_UNUSED)
if (bitset_stats_info->runs > 1)
fprintf (file, _("Accumulated runs = %u\n"), bitset_stats_info->runs);
for (i = 0; i < BITSET_TYPE_NUM; i++)
for (int i = 0; i < BITSET_TYPE_NUM; i++)
bitset_stats_print_1 (file, bitset_type_names[i],
&bitset_stats_info->types[i]);
}
@@ -242,15 +239,13 @@ bitset_stats_disable (void)
void
bitset_stats_read (const char *file_name)
{
FILE *file;
if (!bitset_stats_info)
return;
if (!file_name)
file_name = BITSET_STATS_FILE;
file = fopen (file_name, "r");
FILE *file = fopen (file_name, "r");
if (file)
{
if (fread (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
@@ -272,15 +267,13 @@ bitset_stats_read (const char *file_name)
void
bitset_stats_write (const char *file_name)
{
FILE *file;
if (!bitset_stats_info)
return;
if (!file_name)
file_name = BITSET_STATS_FILE;
file = fopen (file_name, "w");
FILE *file = fopen (file_name, "w");
if (file)
{
if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
@@ -573,15 +566,14 @@ static bitset_bindex
bitset_stats_list (bitset bset, bitset_bindex *list,
bitset_bindex num, bitset_bindex *next)
{
bitset_bindex count;
bitset_bindex count = BITSET_LIST_ (bset->s.bset, list, num, next);
BITSET_STATS_LISTS_INC (bset->s.bset);
bitset_bindex tmp;
bitset_bindex size;
bitset_bindex i;
count = BITSET_LIST_ (bset->s.bset, list, num, next);
BITSET_STATS_LISTS_INC (bset->s.bset);
/* Log histogram of number of set bits. */
for (i = 0, tmp = count; tmp; tmp >>= 1, i++)
continue;
@@ -677,9 +669,6 @@ bitset_stats_bytes (void)
bitset
bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
{
size_t bytes;
bitset sbset;
bset->b.vtable = &bitset_stats_vtable;
/* Disable cache. */
@@ -691,6 +680,8 @@ bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
/* Set up the actual bitset implementation that
we are a wrapper over. */
size_t bytes;
bitset sbset;
switch (type)
{
default: