mirror of
https://git.savannah.gnu.org/git/gperf.git
synced 2025-12-02 21:19:24 +00:00
Use the standard operator new.
This commit is contained in:
@@ -1,5 +1,11 @@
|
|||||||
2002-10-03 Bruno Haible <bruno@clisp.org>
|
2002-10-03 Bruno Haible <bruno@clisp.org>
|
||||||
|
|
||||||
|
* src/new.cc: Remove file.
|
||||||
|
* src/Makefile.in (OBJECTS): Remove new.o.
|
||||||
|
(new.o): Remove rule.
|
||||||
|
* src/configure.in: Remove test for HAVE_THROW_DECL.
|
||||||
|
* acconfig.h: Remove file.
|
||||||
|
|
||||||
* src/trace.h: Remove file.
|
* src/trace.h: Remove file.
|
||||||
* src/trace.cc: Remove file.
|
* src/trace.cc: Remove file.
|
||||||
* src/Makefile.in (OBJECTS): Remove trace.o.
|
* src/Makefile.in (OBJECTS): Remove trace.o.
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
|
|
||||||
/* Define if the C++ compiler supports "throw ()" declarations. */
|
|
||||||
#undef HAVE_THROW_DECL
|
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ SHELL = /bin/sh
|
|||||||
|
|
||||||
VPATH = $(srcdir)
|
VPATH = $(srcdir)
|
||||||
|
|
||||||
OBJECTS = new.o options.o iterator.o main.o gen-perf.o key-list.o list-node.o \
|
OBJECTS = options.o iterator.o main.o gen-perf.o key-list.o list-node.o \
|
||||||
hash-table.o bool-array.o read-line.o vectors.o version.o
|
hash-table.o bool-array.o read-line.o vectors.o version.o
|
||||||
LIBS = ../lib/libgp.a @GPERF_LIBM@
|
LIBS = ../lib/libgp.a @GPERF_LIBM@
|
||||||
CPPFLAGS = -I. -I$(srcdir)/../lib
|
CPPFLAGS = -I. -I$(srcdir)/../lib
|
||||||
@@ -107,8 +107,6 @@ list-node.o : list-node.cc $(LIST_NODE_H) $(OPTIONS_H)
|
|||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/list-node.cc
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/list-node.cc
|
||||||
main.o : main.cc $(OPTIONS_H) $(GEN_PERF_H) $(CONFIG_H)
|
main.o : main.cc $(OPTIONS_H) $(GEN_PERF_H) $(CONFIG_H)
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/main.cc
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/main.cc
|
||||||
new.o : new.cc $(CONFIG_H)
|
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/new.cc
|
|
||||||
options.o : options.cc $(OPTIONS_H) $(ITERATOR_H) $(VECTORS_H) $(VERSION_H)
|
options.o : options.cc $(OPTIONS_H) $(ITERATOR_H) $(VECTORS_H) $(VERSION_H)
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/options.cc
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/options.cc
|
||||||
read-line.o : read-line.cc $(READ_LINE_H) $(OPTIONS_H)
|
read-line.o : read-line.cc $(READ_LINE_H) $(OPTIONS_H)
|
||||||
|
|||||||
@@ -39,19 +39,6 @@ CL_PROG_INSTALL
|
|||||||
dnl
|
dnl
|
||||||
dnl checks for compiler characteristics
|
dnl checks for compiler characteristics
|
||||||
dnl
|
dnl
|
||||||
AC_MSG_CHECKING([for working throw()])
|
|
||||||
AC_CACHE_VAL(gp_cv_cxx_throw_decl,[
|
|
||||||
AC_LANG_SAVE()
|
|
||||||
AC_LANG_CPLUSPLUS()
|
|
||||||
AC_TRY_COMPILE([#include <stdlib.h>
|
|
||||||
void operator delete (void* ptr) throw() {}], [],
|
|
||||||
gp_cv_cxx_throw_decl=yes, gp_cv_cxx_throw_decl=no)
|
|
||||||
AC_LANG_RESTORE()
|
|
||||||
])
|
|
||||||
AC_MSG_RESULT([$]gp_cv_cxx_throw_decl)
|
|
||||||
if test [$]gp_cv_cxx_throw_decl = yes; then
|
|
||||||
AC_DEFINE(HAVE_THROW_DECL)
|
|
||||||
fi
|
|
||||||
dnl
|
dnl
|
||||||
dnl checks for functions and declarations
|
dnl checks for functions and declarations
|
||||||
dnl
|
dnl
|
||||||
|
|||||||
84
src/new.cc
84
src/new.cc
@@ -1,84 +0,0 @@
|
|||||||
/* Defines a buffered memory allocation abstraction that reduces calls to
|
|
||||||
malloc.
|
|
||||||
Copyright (C) 1989-1998, 2002 Free Software Foundation, Inc.
|
|
||||||
written by Douglas C. Schmidt (schmidt@ics.uci.edu)
|
|
||||||
|
|
||||||
This file is part of GNU GPERF.
|
|
||||||
|
|
||||||
GNU GPERF is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 1, or (at your option)
|
|
||||||
any later version.
|
|
||||||
|
|
||||||
GNU GPERF is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with GNU GPERF; see the file COPYING. If not, write to the Free
|
|
||||||
Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h> /* declares malloc(), exit() */
|
|
||||||
|
|
||||||
/* Determine default alignment. If your C++ compiler does not
|
|
||||||
like this then try something like #define DEFAULT_ALIGNMENT 8. */
|
|
||||||
struct fooalign {char x; double d;};
|
|
||||||
const int ALIGNMENT = ((char *)&((struct fooalign *) 0)->d - (char *)0);
|
|
||||||
|
|
||||||
/* Provide an abstraction that cuts down on the number of
|
|
||||||
calls to NEW by buffering the memory pool from which
|
|
||||||
strings are allocated. */
|
|
||||||
|
|
||||||
void *
|
|
||||||
operator new (size_t size)
|
|
||||||
{
|
|
||||||
static char *buf_start = 0; /* Large array used to reduce calls to NEW. */
|
|
||||||
static char *buf_end = 0; /* Indicates end of BUF_START. */
|
|
||||||
static size_t buf_size = 4096; /* Size of buffer pointed to by BUF_START. */
|
|
||||||
char *temp;
|
|
||||||
|
|
||||||
/* Align this on correct boundaries, just to be safe... */
|
|
||||||
size = ((size + ALIGNMENT - 1) / ALIGNMENT) * ALIGNMENT;
|
|
||||||
|
|
||||||
/* If we are about to overflow our buffer we'll just grab another
|
|
||||||
chunk of memory. Since we never free the original memory it
|
|
||||||
doesn't matter that no one points to the beginning of that
|
|
||||||
chunk. Note we use a heuristic that grows the buffer either by
|
|
||||||
size of the request or by twice the previous size, whichever is
|
|
||||||
larger. */
|
|
||||||
|
|
||||||
if (buf_start + size >= buf_end)
|
|
||||||
{
|
|
||||||
buf_size *= 2;
|
|
||||||
if (buf_size < size)
|
|
||||||
buf_size = size;
|
|
||||||
if ((buf_start = (char *)malloc (buf_size)) != (char *)0)
|
|
||||||
buf_end = buf_start + buf_size;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fprintf (stderr, "Virtual memory exhausted in `operator new'\n");
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
temp = buf_start;
|
|
||||||
buf_start += size;
|
|
||||||
return temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* We need this deletion operator in order to make the linker happy.
|
|
||||||
Because `operator new' and `operator delete' always come together. */
|
|
||||||
|
|
||||||
void
|
|
||||||
operator delete (void *ptr)
|
|
||||||
#ifdef HAVE_THROW_DECL
|
|
||||||
throw()
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
// We cannot call free here, as it doesn't match the mallocs.
|
|
||||||
// free ((char *) ptr);
|
|
||||||
(void) ptr;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user