From: Ivan Maidanski Date: Wed, 24 Aug 2011 09:36:53 +0000 (+0400) Subject: Remove references to old missing gc_alloc.h and gc_local_alloc.h files. X-Git-Tag: gc7_2~138^2~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7c3f81f637bd17caa433f911161aecd3bbfec54;p=gc Remove references to old missing gc_alloc.h and gc_local_alloc.h files. Remove unused HPUX GC_test_and_clear implementation. (Apply commit 6f07a01) * 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. --- diff --git a/ChangeLog b/ChangeLog index 9d4a52e7..e03f8f60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2011-08-24 Ivan Maidanski + + * 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. + * Makefile.in: Regenerate. + 2011-08-14 Ivan Maidanski (really Petter Urkedal) * configure.ac: Remove checks for ar and ranlib. diff --git a/Makefile.am b/Makefile.am index 6dd29808..30106f9a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -169,7 +169,7 @@ EXTRA_DIST += README.QUICK # :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 \ diff --git a/Makefile.direct b/Makefile.direct index 707a94e2..ac934256 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -96,11 +96,9 @@ 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_amiga_redirects.h \ + include/gc_backptr.h include/gc_gcj.h include/private/dbg_mlc.h \ + include/private/specific.h include/leak_detector.h \ + include/gc_amiga_redirects.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 \ diff --git a/Makefile.dj b/Makefile.dj index aa10badd..38dd688d 100644 --- a/Makefile.dj +++ b/Makefile.dj @@ -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) diff --git a/Makefile.in b/Makefile.in index 324b7fd2..1829c8f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -564,8 +564,8 @@ EXTRA_DIST = gc_cpp.cpp README.QUICK BCC_MAKEFILE NT_MAKEFILE \ NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \ CMakeLists.txt tests/CMakeLists.txt 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/MacOS.c MacProjects.sit.hqx \ - mach_dep.c extra/setjmp_t.c extra/threadlibs.c extra/AmigaOS.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 \ Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \ include/private/msvc_dbg.h extra/msvc_dbg.c cord/cordbscs.c \ diff --git a/doc/gcdescr.html b/doc/gcdescr.html index 29e946cc..68448e61 100644 --- a/doc/gcdescr.html +++ b/doc/gcdescr.html @@ -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. GC_malloc only uses thread-local allocation in version 7 and later. -In earlier versions, GC_MALLOC (all caps) may be directed -to use thread-local allocation by defining GC_REDIRECT_TO_LOCAL -and then include gc_local_alloc.h.

For some more details see here, and the technical report entitled diff --git a/doc/gcinterface.html b/doc/gcinterface.html index bb0995d8..c78f6a9e 100644 --- a/doc/gcinterface.html +++ b/doc/gcinterface.html @@ -158,12 +158,6 @@ for details.

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 e.g. -GC_LOCAL_MALLOC and see gc_local_alloc.h; -for later versions enabling thread-local allocations when the collector -library is built changes the -implementation of GC_MALLOC, so the client doesn't need to -change.

If your platform supports it, you should build the collector with parallel marking support @@ -242,9 +236,6 @@ Users of the SGI extended STL or its derivatives (including most g++ versions) may instead be able to include new_gc_alloc.h before including STL header files. This is increasingly discouraged. -(gc_alloc.h corresponds to now obsolete versions of the -SGI STL.) This interface is no longer recommended, but it has existed -for much longer.

This defines SGI-style allocators

    diff --git a/doc/scale.html b/doc/scale.html index 59da7bcf..3d976ea4 100644 --- a/doc/scale.html +++ b/doc/scale.html @@ -52,11 +52,8 @@ implementation of GC_malloc_many, so that free lists can be built, and memory can be cleared, by more than one thread concurrently.
  • 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 gc_local_alloc.h. 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.

    Memory returned from thread-local allocators is completely interchangeable with that returned by the standard allocators. It may be used by other diff --git a/hpux_test_and_clear.s b/hpux_test_and_clear.s deleted file mode 100644 index f09b2114..00000000 --- a/hpux_test_and_clear.s +++ /dev/null @@ -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 diff --git a/tests/test_cpp.cc b/tests/test_cpp.cc index ce683af4..9352b6a9 100644 --- a/tests/test_cpp.cc +++ b/tests/test_cpp.cc @@ -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().allocate(1); int **xptr = traceable_allocator().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 diff --git a/windows-untested/vc60/gc.dsp b/windows-untested/vc60/gc.dsp index 0d6e8a54..9c20a58c 100644 --- a/windows-untested/vc60/gc.dsp +++ b/windows-untested/vc60/gc.dsp @@ -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 @@ -253,10 +249,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 diff --git a/windows-untested/vc60/libgc.dsp b/windows-untested/vc60/libgc.dsp index 16e64ca1..01c376ce 100644 --- a/windows-untested/vc60/libgc.dsp +++ b/windows-untested/vc60/libgc.dsp @@ -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 @@ -234,10 +230,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 diff --git a/windows-untested/vc70/gc.vcproj b/windows-untested/vc70/gc.vcproj index 39f56e4e..f1a4c837 100644 --- a/windows-untested/vc70/gc.vcproj +++ b/windows-untested/vc70/gc.vcproj @@ -240,9 +240,6 @@ - - @@ -270,9 +267,6 @@ - - diff --git a/windows-untested/vc70/libgc.vcproj b/windows-untested/vc70/libgc.vcproj index 9728b68a..d5f1d84f 100644 --- a/windows-untested/vc70/libgc.vcproj +++ b/windows-untested/vc70/libgc.vcproj @@ -203,9 +203,6 @@ - - @@ -227,9 +224,6 @@ - - diff --git a/windows-untested/vc71/gc.vcproj b/windows-untested/vc71/gc.vcproj index 924a76e4..2e86d0f5 100644 --- a/windows-untested/vc71/gc.vcproj +++ b/windows-untested/vc71/gc.vcproj @@ -722,9 +722,6 @@ - - @@ -752,9 +749,6 @@ - - diff --git a/windows-untested/vc71/libgc.vcproj b/windows-untested/vc71/libgc.vcproj index 0e2c9b54..62e13bbd 100644 --- a/windows-untested/vc71/libgc.vcproj +++ b/windows-untested/vc71/libgc.vcproj @@ -683,9 +683,6 @@ - - @@ -707,9 +704,6 @@ - -