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

Import of 2003-06-08 libbitset <http://mail.gnu.org/archive/html/bison-patches/2003-06/msg00005.html>

Browse Source
This commit is contained in:
Paul Eggert
2003-06-02 10:19:35 +00:00
parent f7f37a7a0b
commit 598c90ee77
2 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/abitset.c
View File

@@ -1,10 +1,10 @@
/* Array bitsets. /* Array bitsets.
Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. Copyright (C) 2002, 2003 Free Software Foundation, Inc.
Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz). Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
This program is free software: you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
@@ -13,9 +13,13 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <config.h> #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "abitset.h" #include "abitset.h"
#include <stddef.h> #include <stddef.h>
@@ -30,13 +34,14 @@
static bitset_bindex static bitset_bindex
abitset_resize (bitset src, bitset_bindex size) abitset_resize (bitset src ATTRIBUTE_UNUSED,
bitset_bindex size ATTRIBUTE_UNUSED)
{ {
/* These bitsets have a fixed size. */ if (BITSET_SIZE_ (src) == size)
if (BITSET_SIZE_ (src) != size) return size;
abort ();
return size; /* These bitsets have a fixed size. */
abort ();
} }
/* Find list of up to NUM bits set in BSET starting from and including /* Find list of up to NUM bits set in BSET starting from and including

82
lib/bitset_stats.c
View File

@@ -1,10 +1,10 @@
/* Bitset statistics. /* Bitset statistics.
Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 2002 Free Software Foundation, Inc.
Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz). Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
This program is free software: you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
@@ -13,30 +13,38 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* This file is a wrapper bitset implementation for the other bitset /* This file is a wrapper bitset implementation for the other bitset
implementations. It provides bitset compatibility checking and implementations. It provides bitset compatibility checking and
statistics gathering without having to instrument the bitset statistics gathering without having to instrument the bitset
implementations. When statistics gathering is enabled, the bitset implementations. When statistics gathering is enabled, the bitset
operations get vectored through here and we then call the appropriate operations get vectored through here and we then call the appropriate
routines. */ routines.
*/
#include <config.h> #ifdef HAVE_CONFIG_H
#include "config.h"
#include "bitset_stats.h" #endif
#include "bbitset.h" #include "bbitset.h"
#include "abitset.h" #include "abitset.h"
#include "ebitset.h" #include "ebitset.h"
#include "lbitset.h" #include "lbitset.h"
#include "vbitset.h" #include "vbitset.h"
#include "bitset_stats.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_GETTEXT_H
#include "gettext.h" #include "gettext.h"
#define _(Msgid) gettext (Msgid) #define _(Msgid) gettext (Msgid)
#else
#define _(Msgid) Msgid
#endif
/* Configuration macros. */ /* Configuration macros. */
#define BITSET_STATS_FILE "bitset.dat" #define BITSET_STATS_FILE "bitset.dat"
@@ -46,29 +54,29 @@
/* Accessor macros. */ /* Accessor macros. */
#define BITSET_STATS_ALLOCS_INC(TYPE) \ #define BITSET_STATS_ALLOCS_INC(TYPE) \
bitset_stats_info->types[(TYPE)].allocs++ bitset_stats_info->types[(TYPE)].allocs++
#define BITSET_STATS_FREES_INC(BSET) \ #define BITSET_STATS_FREES_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].frees++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].frees++
#define BITSET_STATS_SETS_INC(BSET) \ #define BITSET_STATS_SETS_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].sets++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].sets++
#define BITSET_STATS_CACHE_SETS_INC(BSET) \ #define BITSET_STATS_CACHE_SETS_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_sets++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_sets++
#define BITSET_STATS_RESETS_INC(BSET) \ #define BITSET_STATS_RESETS_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].resets++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].resets++
#define BITSET_STATS_CACHE_RESETS_INC(BSET) \ #define BITSET_STATS_CACHE_RESETS_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_resets++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_resets++
#define BITSET_STATS_TESTS_INC(BSET) \ #define BITSET_STATS_TESTS_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].tests++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].tests++
#define BITSET_STATS_CACHE_TESTS_INC(BSET) \ #define BITSET_STATS_CACHE_TESTS_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_tests++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].cache_tests++
#define BITSET_STATS_LISTS_INC(BSET) \ #define BITSET_STATS_LISTS_INC(BSET) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].lists++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].lists++
#define BITSET_STATS_LIST_COUNTS_INC(BSET, I) \ #define BITSET_STATS_LIST_COUNTS_INC(BSET, I) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_counts[(I)]++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_counts[(I)]++
#define BITSET_STATS_LIST_SIZES_INC(BSET, I) \ #define BITSET_STATS_LIST_SIZES_INC(BSET, I) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_sizes[(I)]++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_sizes[(I)]++
#define BITSET_STATS_LIST_DENSITY_INC(BSET, I) \ #define BITSET_STATS_LIST_DENSITY_INC(BSET, I) \
bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_density[(I)]++ bitset_stats_info->types[BITSET_TYPE_ (BSET)].list_density[(I)]++
@@ -156,8 +164,8 @@ bitset_log_histogram_print (FILE *file, const char *name, const char *msg,
for (; i < n_bins; i++) for (; i < n_bins; i++)
fprintf (file, "%*lu-%lu\t%8u (%5.1f%%)\n", fprintf (file, "%*lu-%lu\t%8u (%5.1f%%)\n",
max_width - ((unsigned int) (0.30103 * (i) + 0.9999) + 1), max_width - ((unsigned int) (0.30103 * (i) + 0.9999) + 1),
1UL << (i - 1), (unsigned long) 1 << (i - 1),
(1UL << i) - 1, ((unsigned long) 1 << i) - 1,
bins[i], bins[i],
(100.0 * bins[i]) / total); (100.0 * bins[i]) / total);
} }
@@ -237,17 +245,17 @@ bitset_stats_disable (void)
/* Read bitset statistics file. */ /* Read bitset statistics file. */
void void
bitset_stats_read (const char *file_name) bitset_stats_read (const char *filename)
{ {
FILE *file; FILE *file;
if (!bitset_stats_info) if (!bitset_stats_info)
return; return;
if (!file_name) if (!filename)
file_name = BITSET_STATS_FILE; filename = BITSET_STATS_FILE;
file = fopen (file_name, "r"); file = fopen (filename, "r");
if (file) if (file)
{ {
if (fread (&bitset_stats_info_data, sizeof (bitset_stats_info_data), if (fread (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
@@ -267,17 +275,17 @@ bitset_stats_read (const char *file_name)
/* Write bitset statistics file. */ /* Write bitset statistics file. */
void void
bitset_stats_write (const char *file_name) bitset_stats_write (const char *filename)
{ {
FILE *file; FILE *file;
if (!bitset_stats_info) if (!bitset_stats_info)
return; return;
if (!file_name) if (!filename)
file_name = BITSET_STATS_FILE; filename = BITSET_STATS_FILE;
file = fopen (file_name, "w"); file = fopen (filename, "w");
if (file) if (file)
{ {
if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data), if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
@@ -692,32 +700,32 @@ bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
we are a wrapper over. */ we are a wrapper over. */
switch (type) switch (type)
{ {
default:
abort ();
case BITSET_ARRAY: case BITSET_ARRAY:
bytes = abitset_bytes (n_bits); bytes = abitset_bytes (n_bits);
sbset = xcalloc (1, bytes); sbset = (bitset) xcalloc (1, bytes);
abitset_init (sbset, n_bits); abitset_init (sbset, n_bits);
break; break;
case BITSET_LIST: case BITSET_LIST:
bytes = lbitset_bytes (n_bits); bytes = lbitset_bytes (n_bits);
sbset = xcalloc (1, bytes); sbset = (bitset) xcalloc (1, bytes);
lbitset_init (sbset, n_bits); lbitset_init (sbset, n_bits);
break; break;
case BITSET_TABLE: case BITSET_TABLE:
bytes = ebitset_bytes (n_bits); bytes = ebitset_bytes (n_bits);
sbset = xcalloc (1, bytes); sbset = (bitset) xcalloc (1, bytes);
ebitset_init (sbset, n_bits); ebitset_init (sbset, n_bits);
break; break;
case BITSET_VARRAY: case BITSET_VARRAY:
bytes = vbitset_bytes (n_bits); bytes = vbitset_bytes (n_bits);
sbset = xcalloc (1, bytes); sbset = (bitset) xcalloc (1, bytes);
vbitset_init (sbset, n_bits); vbitset_init (sbset, n_bits);
break; break;
default:
abort ();
} }
bset->s.bset = sbset; bset->s.bset = sbset;