Remove references to old missing gc_alloc.h and gc_local_alloc.h files.

Remove unused HPUX GC_test_and_clear implementation.

* hpux_test_and_clear.s: Remove.
* Makefile.am (EXTRA_DIST): Remove hpux_test_and_clear.s.
* Makefile.direct (SRCS): Ditto.
* Makefile.dj (SRCS): Ditto.
* Makefile.dj (SRCS): Remove missing gcc_support.c,
include/gc_alloc.h, include/gc_local_alloc.h.
* doc/gcdescr.html: Remove information about gc_local_alloc.h.
* doc/gcinterface.html: Ditto.
* doc/scale.html: Ditto.
* doc/gcinterface.html: Remove information about gc_alloc.h.
* tests/test_cpp.cc: Don't include missing old gc_alloc.h (include
new_gc_alloc.h instead); don't test __GNUC__.
* tests/test_cpp.cc (main): Use gc_alloc class instead of alloc (don't
test __GNUC__).
* windows-untested/vc60/gc.dsp (SOURCE): Don't include missing
gc_alloc.h, gc_local_alloc.h.
* windows-untested/vc60/libgc.dsp (SOURCE): Ditto.
* windows-untested/vc70/gc.vcproj (Header Files): Ditto.
* windows-untested/vc70/libgc.vcproj (Header Files): Ditto.
* windows-untested/vc71/gc.vcproj (Header Files): Ditto.
* windows-untested/vc71/libgc.vcproj (Header Files): Ditto.
This commit is contained in:
Ivan Maidanski
2011-08-24 13:36:53 +04:00
parent 3d75c51a25
commit 6f07a01471
14 changed files with 10 additions and 96 deletions
+2 -2
View File
@@ -169,7 +169,7 @@ EXTRA_DIST += README.QUICK TODO
# :GOTCHA: deliberately we do not include 'Makefile'
EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE \
Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
WCC_MAKEFILE autogen.sh build_atomic_ops.sh build_atomic_ops.sh.cygwin \
NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE \
NT_X64_THREADS_MAKEFILE CMakeLists.txt tests/CMakeLists.txt
@@ -177,7 +177,7 @@ EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
# files used by makefiles other than Makefile.am
#
EXTRA_DIST += extra/add_gc_prefix.c extra/gc.c extra/gcname.c \
extra/if_mach.c extra/if_not_there.c hpux_test_and_clear.s gc.mak \
extra/if_mach.c extra/if_not_there.c gc.mak \
extra/MacOS.c MacProjects.sit.hqx mach_dep.c extra/setjmp_t.c \
extra/threadlibs.c extra/AmigaOS.c \
Mac_files/datastart.c Mac_files/dataend.c \
+2 -5
View File
@@ -96,11 +96,8 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
mips_ultrix_mach_dep.s \
include/new_gc_alloc.h include/gc_allocator.h \
include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \
include/gc_backptr.h \
hpux_test_and_clear.s include/gc_gcj.h \
include/private/dbg_mlc.h \
include/private/specific.h \
include/leak_detector.h \
include/gc_backptr.h include/gc_gcj.h include/private/dbg_mlc.h \
include/private/specific.h include/leak_detector.h \
include/gc_pthread_redirects.h ia64_save_regs_in_stack.s \
include/gc_config_macros.h include/private/pthread_support.h \
include/private/pthread_stop_world.h include/private/darwin_semaphore.h \
+2 -3
View File
@@ -52,11 +52,10 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \
include/gc_inline.h gc.man extra/threadlibs.c \
extra/if_mach.c extra/if_not_there.c gc_cpp.cc include/gc_cpp.h \
include/weakpointer.h include/private/gc_locks.h \
gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h \
mips_ultrix_mach_dep.s \
include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
include/private/solaris_threads.h include/gc_backptr.h \
hpux_test_and_clear.s include/gc_gcj.h \
include/gc_local_alloc.h include/private/dbg_mlc.h \
include/gc_gcj.h include/private/dbg_mlc.h \
include/private/specific.h \
include/leak_detector.h $(CORD_SRCS)
-3
View File
@@ -612,9 +612,6 @@ transferred back to the global free list.
Note that if the collector is configured for thread-local allocation,
GC versions before 7 do not invoke the thread-local allocator by default.
<TT>GC_malloc</tt> only uses thread-local allocation in version 7 and later.
In earlier versions, <TT>GC_MALLOC</tt> (all caps) may be directed
to use thread-local allocation by defining <TT>GC_REDIRECT_TO_LOCAL</tt>
and then include <TT>gc_local_alloc.h</tt>.
<P>
For some more details see <A HREF="scale.html">here</a>, and the
technical report entitled
-9
View File
@@ -158,12 +158,6 @@ for details.
<P>
If you are concerned with multiprocessor performance and scalability,
you should consider enabling and using thread local allocation.
For GC versions before 7.0, use <I>e.g.</i>
<TT>GC_LOCAL_MALLOC</tt> and see <TT>gc_local_alloc.h</tt>;
for later versions enabling thread-local allocations when the collector
library is built changes the
implementation of <TT>GC_MALLOC</tt>, so the client doesn't need to
change.
<P>
If your platform
supports it, you should build the collector with parallel marking support
@@ -242,9 +236,6 @@ Users of the <A HREF="http://www.sgi.com/tech/stl">SGI extended STL</a>
or its derivatives (including most g++ versions)
may instead be able to include <TT>new_gc_alloc.h</tt> before including
STL header files. This is increasingly discouraged.
(<TT>gc_alloc.h</tt> corresponds to now obsolete versions of the
SGI STL.) This interface is no longer recommended, but it has existed
for much longer.
<P>
This defines SGI-style allocators
<UL>
+2 -5
View File
@@ -52,11 +52,8 @@ implementation of <TT>GC_malloc_many</tt>, so that free lists can be
built, and memory can be cleared, by more than one thread concurrently.
<LI>
Building the collector with -DTHREAD_LOCAL_ALLOC adds support for thread
local allocation. Before GC version 7.0, it did not, by itself, cause
thread local allocation to be used. It simply allowed the use of the
interface in <TT>gc_local_alloc.h</tt>. Since version 7.0, this causes
GC_malloc, GC_malloc_atomic, and GC_gcj_malloc to be redefined to perform
thread-local allocation.
local allocation. This causes GC_malloc, GC_malloc_atomic, and
GC_gcj_malloc to be redefined to perform thread-local allocation.
<P>
Memory returned from thread-local allocators is completely interchangeable
with that returned by the standard allocators. It may be used by other
-21
View File
@@ -1,21 +0,0 @@
.SPACE $PRIVATE$
.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
.SPACE $TEXT$
.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
.IMPORT $global$,DATA
.IMPORT $$dyncall,MILLICODE
.SPACE $TEXT$
.SUBSPA $CODE$
.align 4
.EXPORT GC_test_and_clear,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
GC_test_and_clear
.PROC
.CALLINFO FRAME=0,NO_CALLS
.ENTRY
ldcw,co (%r26),%r28
bv,n 0(%r2)
.EXIT
.PROCEND
+2 -8
View File
@@ -40,10 +40,8 @@ few minutes to complete.
#ifdef USE_STD_ALLOCATOR
# include "gc_allocator.h"
#elif __GNUC__
# include "new_gc_alloc.h"
#else
# include "gc_alloc.h"
# include "new_gc_alloc.h"
#endif
extern "C" {
@@ -215,11 +213,7 @@ int APIENTRY WinMain(
xio = gc_allocator_ignore_off_page<int>().allocate(1);
int **xptr = traceable_allocator<int *>().allocate(1);
# else
# ifdef __GNUC__
int *x = (int *)gc_alloc::allocate(sizeof(int));
# else
int *x = (int *)alloc::allocate(sizeof(int));
# endif
int *x = (int *)gc_alloc::allocate(sizeof(int));
# endif
*x = 29;
# ifdef USE_STD_ALLOCATOR
-8
View File
@@ -213,10 +213,6 @@ SOURCE=..\..\include\gc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\gc_alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\gc_allocator.h
# End Source File
# Begin Source File
@@ -249,10 +245,6 @@ SOURCE=..\..\include\gc_inline.h
# End Source File
# Begin Source File
SOURCE=..\..\include\gc_local_alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\private\gc_locks.h
# End Source File
# Begin Source File
-8
View File
@@ -202,10 +202,6 @@ SOURCE=..\..\win32_threads.c
# PROP Default_Filter "h;hh;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\..\include\gc_alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\gc_allocator.h
# End Source File
# Begin Source File
@@ -230,10 +226,6 @@ SOURCE=..\..\include\gc_inline.h
# End Source File
# Begin Source File
SOURCE=..\..\include\gc_local_alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\gc_pthread_redirects.h
# End Source File
# Begin Source File
-6
View File
@@ -240,9 +240,6 @@
<File
RelativePath="..\..\include\gc.h">
</File>
<File
RelativePath="..\..\include\gc_alloc.h">
</File>
<File
RelativePath="..\..\include\gc_allocator.h">
</File>
@@ -267,9 +264,6 @@
<File
RelativePath="..\..\include\gc_inline.h">
</File>
<File
RelativePath="..\..\include\gc_local_alloc.h">
</File>
<File
RelativePath="..\..\include\private\gc_locks.h">
</File>
-6
View File
@@ -203,9 +203,6 @@
<Filter
Name="Header Files"
Filter="h;hh;hpp;hxx;hm;inl">
<File
RelativePath="..\..\include\gc_alloc.h">
</File>
<File
RelativePath="..\..\include\gc_allocator.h">
</File>
@@ -224,9 +221,6 @@
<File
RelativePath="..\..\include\gc_inline.h">
</File>
<File
RelativePath="..\..\include\gc_local_alloc.h">
</File>
<File
RelativePath="..\..\include\gc_pthread_redirects.h">
</File>
-6
View File
@@ -722,9 +722,6 @@
<File
RelativePath="..\..\include\gc.h">
</File>
<File
RelativePath="..\..\include\gc_alloc.h">
</File>
<File
RelativePath="..\..\include\gc_allocator.h">
</File>
@@ -749,9 +746,6 @@
<File
RelativePath="..\..\include\gc_inline.h">
</File>
<File
RelativePath="..\..\include\gc_local_alloc.h">
</File>
<File
RelativePath="..\..\include\private\gc_locks.h">
</File>
-6
View File
@@ -683,9 +683,6 @@
<Filter
Name="Header Files"
Filter="h;hh;hpp;hxx;hm;inl">
<File
RelativePath="..\..\include\gc_alloc.h">
</File>
<File
RelativePath="..\..\include\gc_allocator.h">
</File>
@@ -704,9 +701,6 @@
<File
RelativePath="..\..\include\gc_inline.h">
</File>
<File
RelativePath="..\..\include\gc_local_alloc.h">
</File>
<File
RelativePath="..\..\include\gc_pthread_redirects.h">
</File>