Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit a026ea4

Browse files
RazvanN7RazvanN7
authored
Merge pull request #3370 from Geod24/gc-to-core-internal
Move gc package to core.internal
2 parents ac6dbca + cd44ac9 commit a026ea4

File tree

14 files changed

+60
-71
lines changed

14 files changed

+60
-71
lines changed

‎CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ src/core/runtime.d @MartinNowak @Abscissa
2727
src/core/simd.d @WalterBright @MartinNowak
2828
src/core/stdc/* @schveiguy @ibuclaw
2929
src/core/stdcpp/* @WalterBright @Darredevil @TurkeyMan
30-
src/core/sync/* @MartinNowak @Geod24 @WalterBright @ZombineDev
30+
src/core/sync/* @MartinNowak @Geod24 @WalterBright @PetarKirov
3131
src/core/sys/bionic/* @joakim-noah
3232
src/core/sys/darwin/* @jacob-carlborg @klickverbot @etcimon @MartinNowak
3333
src/core/sys/freebsd/* @redstar @MartinNowak @Calrama @jmdavis
@@ -38,11 +38,11 @@ src/core/sys/openbsd/* @redstar
3838
src/core/sys/posix/* @CyberShadow @MartinNowak @joakim-noah @redstar
3939
src/core/sys/solaris/* @redstar
4040
src/core/sys/windows/* @CyberShadow
41-
src/core/thread.d @MartinNowak @Burgos @jpf91 @ZombineDev
41+
src/core/thread.d @MartinNowak @Burgos @jpf91 @PetarKirov
4242
src/core/time.d @jmdavis @schveiguy @CyberShadow
4343

4444
src/etc* @deadalnix @MartinNowak
45-
src/gc* @rainers @DmitryOlshansky @MartinNowak @leandro-lucarella-sociomantic
45+
src/core/internal/gc/* @rainers @DmitryOlshansky @MartinNowak @llucax
4646

4747
src/object.d @andralex @MartinNowak
4848

‎mak/COPY

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ COPY=\
6161
$(IMPDIR)\core\internal\elf\dl.d \
6262
$(IMPDIR)\core\internal\elf\io.d \
6363
\
64+
$(IMPDIR)\core\internal\gc\bits.d \
65+
$(IMPDIR)\core\internal\gc\os.d \
66+
$(IMPDIR)\core\internal\gc\pooltable.d \
67+
$(IMPDIR)\core\internal\gc\proxy.d \
68+
$(IMPDIR)\core\internal\gc\impl\conservative\gc.d \
69+
$(IMPDIR)\core\internal\gc\impl\manual\gc.d \
70+
$(IMPDIR)\core\internal\gc\impl\proto\gc.d \
71+
\
6472
$(IMPDIR)\core\internal\container\array.d \
6573
$(IMPDIR)\core\internal\container\common.d \
6674
$(IMPDIR)\core\internal\container\hashtab.d \

‎mak/DOCS

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -513,17 +513,13 @@ DOCS=\
513513
\
514514
$(DOCDIR)\etc_linux_memoryerror.html \
515515
\
516-
$(DOCDIR)\gc_bits.html \
517-
$(DOCDIR)\gc_pooltable.html \
518-
$(DOCDIR)\gc_os.html \
519-
$(DOCDIR)\gc_proxy.html \
520-
\
521-
\
522-
$(DOCDIR)\gc_impl_conservative_gc.html \
523-
\
524-
$(DOCDIR)\gc_impl_manual_gc.html \
525-
\
526-
$(DOCDIR)\gc_impl_proto_gc.html \
516+
$(DOCDIR)\core_internal_gc_bits.html \
517+
$(DOCDIR)\core_internal_gc_os.html \
518+
$(DOCDIR)\core_internal_gc_pooltable.html \
519+
$(DOCDIR)\core_internal_gc_proxy.html \
520+
$(DOCDIR)\core_internal_gc_impl_conservative_gc.html \
521+
$(DOCDIR)\core_internal_gc_impl_manual_gc.html \
522+
$(DOCDIR)\core_internal_gc_impl_proto_gc.html \
527523
\
528524
$(DOCDIR)\rt_aApply.html \
529525
$(DOCDIR)\rt_aApplyR.html \

‎mak/SRCS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ SRCS=\
6666
src\core\internal\elf\dl.d \
6767
src\core\internal\elf\io.d \
6868
\
69+
src\core\internal\gc\bits.d \
70+
src\core\internal\gc\os.d \
71+
src\core\internal\gc\pooltable.d \
72+
src\core\internal\gc\proxy.d \
73+
src\core\internal\gc\impl\conservative\gc.d \
74+
src\core\internal\gc\impl\manual\gc.d \
75+
src\core\internal\gc\impl\proto\gc.d \
76+
\
6977
src\core\internal\util\array.d \
7078
src\core\internal\util\math.d \
7179
\
@@ -510,14 +518,6 @@ SRCS=\
510518
src\core\thread\context.d \
511519
src\core\thread\package.d \
512520
\
513-
src\gc\bits.d \
514-
src\gc\impl\conservative\gc.d \
515-
src\gc\os.d \
516-
src\gc\pooltable.d \
517-
src\gc\proxy.d \
518-
src\gc\impl\manual\gc.d \
519-
src\gc\impl\proto\gc.d \
520-
\
521521
src\rt\aApply.d \
522522
src\rt\aApplyR.d \
523523
src\rt\aaA.d \

‎posix.mak

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,21 @@ $(DOCDIR)/core_internal_container_%.html : src/core/internal/container/%.d $(DMD
171171
$(DOCDIR)/core_internal_elf_%.html : src/core/internal/elf/%.d $(DMD)
172172
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
173173

174+
$(DOCDIR)/core_internal_gc_%.html : src/core/internal/gc/%.d $(DMD)
175+
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
176+
177+
$(DOCDIR)/core_internal_gc_impl_%.html : src/core/internal/gc/impl/%.d $(DMD)
178+
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
179+
180+
$(DOCDIR)/core_internal_gc_impl_conservative_%.html : src/core/internal/gc/impl/conservative/%.d $(DMD)
181+
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
182+
183+
$(DOCDIR)/core_internal_gc_impl_manual_%.html : src/core/internal/gc/impl/manual/%.d $(DMD)
184+
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
185+
186+
$(DOCDIR)/core_internal_gc_impl_proto_%.html : src/core/internal/gc/impl/proto/%.d $(DMD)
187+
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
188+
174189
$(DOCDIR)/core_internal_util_%.html : src/core/internal/util/%.d $(DMD)
175190
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
176191

‎src/gc/bits.d renamed to ‎src/core/internal/gc/bits.d

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
/**
22
* Contains a bitfield used by the GC.
33
*
4-
* Copyright: Copyright Digital Mars 2005 - 2013.
4+
* Copyright: D Language Foundation 2005 - 2021.
55
* License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
66
* Authors: Walter Bright, David Friedman, Sean Kelly
77
*/
8-
9-
/* Copyright Digital Mars 2005 - 2013.
10-
* Distributed under the Boost Software License, Version 1.0.
11-
* (See accompanying file LICENSE or copy at
12-
* http://www.boost.org/LICENSE_1_0.txt)
13-
*/
14-
module gc.bits;
8+
module core.internal.gc.bits;
159

1610

1711
import core.bitop;

‎src/gc/impl/conservative/gc.d renamed to ‎src/core/internal/gc/impl/conservative/gc.d

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
/**
22
* Contains the garbage collector implementation.
33
*
4-
* Copyright: Copyright Digital Mars 2001 - 2016.
4+
* Copyright: D Language Foundation 2001 - 2021.
55
* License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
66
* Authors: Walter Bright, David Friedman, Sean Kelly
77
*/
8-
9-
/* Copyright Digital Mars 2005 - 2016.
10-
* Distributed under the Boost Software License, Version 1.0.
11-
* (See accompanying file LICENSE or copy at
12-
* http://www.boost.org/LICENSE_1_0.txt)
13-
*/
14-
module gc.impl.conservative.gc;
8+
module core.internal.gc.impl.conservative.gc;
159

1610
// D Programming Language Garbage Collector implementation
1711

@@ -35,8 +29,8 @@ module gc.impl.conservative.gc;
3529
/***************************************************/
3630
version = COLLECT_PARALLEL; // parallel scanning
3731

38-
import gc.bits;
39-
import gc.os;
32+
import core.internal.gc.bits;
33+
import core.internal.gc.os;
4034
import core.gc.config;
4135
import core.gc.gcinterface;
4236

@@ -1238,7 +1232,7 @@ struct Gcx
12381232
debug(INVARIANT) bool inCollection;
12391233
uint disabled; // turn off collections if >0
12401234

1241-
import gc.pooltable;
1235+
import core.internal.gc.pooltable;
12421236
private @property size_t npools() pure const nothrow { return pooltable.length; }
12431237
PoolTable!Pool pooltable;
12441238

‎src/gc/impl/manual/gc.d renamed to ‎src/core/internal/gc/impl/manual/gc.d

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@
1717
* License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
1818
* Authors: Sean Kelly
1919
*/
20-
21-
/* Copyright Sean Kelly 2005 - 2016.
22-
* Distributed under the Boost Software License, Version 1.0.
23-
* (See accompanying file LICENSE or copy at
24-
* http://www.boost.org/LICENSE_1_0.txt)
25-
*/
26-
module gc.impl.manual.gc;
20+
module core.internal.gc.impl.manual.gc;
2721

2822
import core.gc.gcinterface;
2923

‎src/gc/impl/proto/gc.d renamed to ‎src/core/internal/gc/impl/proto/gc.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
module gc.impl.proto.gc;
2+
module core.internal.gc.impl.proto.gc;
33

44
import core.gc.gcinterface;
55

‎src/gc/os.d renamed to ‎src/core/internal/gc/os.d

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
/**
22
* Contains OS-level routines needed by the garbage collector.
33
*
4-
* Copyright: Copyright Digital Mars 2005 - 2013.
4+
* Copyright: D Language Foundation 2005 - 2021.
55
* License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
66
* Authors: Walter Bright, David Friedman, Sean Kelly, Leandro Lucarella
77
*/
8-
9-
/* Copyright Digital Mars 2005 - 2013.
10-
* Distributed under the Boost Software License, Version 1.0.
11-
* (See accompanying file LICENSE or copy at
12-
* http://www.boost.org/LICENSE_1_0.txt)
13-
*/
14-
module gc.os;
8+
module core.internal.gc.os;
159

1610

1711
version (Windows)
@@ -123,7 +117,7 @@ else static if (is(typeof(malloc))) // else version (GC_Use_Alloc_Malloc)
123117
// after PAGESIZE bytes used by the GC.
124118

125119

126-
import gc.impl.conservative.gc;
120+
import core.internal.gc.impl.conservative.gc;
127121

128122

129123
const size_t PAGE_MASK = PAGESIZE - 1;

0 commit comments

Comments
 (0)