Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion mak/COPY
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ COPY=\
$(IMPDIR)\core\memory.d \
$(IMPDIR)\core\runtime.d \
$(IMPDIR)\core\simd.d \
$(IMPDIR)\core\thread.d \
$(IMPDIR)\core\time.d \
$(IMPDIR)\core\vararg.d \
$(IMPDIR)\core\volatile.d \
Expand Down Expand Up @@ -434,4 +433,8 @@ COPY=\
$(IMPDIR)\core\sys\windows\wtsapi32.d \
$(IMPDIR)\core\sys\windows\wtypes.d \
\
$(IMPDIR)\core\thread\fiber.d \
$(IMPDIR)\core\thread\osthread.d \
$(IMPDIR)\core\thread\package.d \
\
$(IMPDIR)\etc\linux\memoryerror.d
6 changes: 4 additions & 2 deletions mak/DOCS
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ DOCS=\
$(DOCDIR)\core_memory.html \
$(DOCDIR)\core_runtime.html \
$(DOCDIR)\core_simd.html \
$(DOCDIR)\core_thread.html \
$(DOCDIR)\core_time.html \
$(DOCDIR)\core_vararg.html \
$(DOCDIR)\core_volatile.html \
Expand Down Expand Up @@ -75,7 +74,10 @@ DOCS=\
$(DOCDIR)\core_sys_darwin_mach_semaphore.html \
$(DOCDIR)\core_sys_darwin_mach_thread_act.html \
$(DOCDIR)\core_sys_darwin_netinet_in_.html \
\
\
$(DOCDIR)\core_thread_fiber.html \
$(DOCDIR)\core_thread_osthread.html \
\
$(DOCDIR)\rt_aaA.html \
$(DOCDIR)\rt_aApply.html \
$(DOCDIR)\rt_aApplyR.html \
Expand Down
5 changes: 4 additions & 1 deletion mak/SRCS
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ SRCS=\
src\core\memory.d \
src\core\runtime.d \
src\core\simd.d \
src\core\thread.d \
src\core\time.d \
src\core\vararg.d \
src\core\volatile.d \
Expand Down Expand Up @@ -432,6 +431,10 @@ SRCS=\
src\core\sys\windows\wtsapi32.d \
src\core\sys\windows\wtypes.d \
\
src\core\thread\fiber.d \
src\core\thread\osthread.d \
src\core\thread\package.d \
\
src\gc\bits.d \
src\gc\impl\conservative\gc.d \
src\gc\os.d \
Expand Down
14 changes: 11 additions & 3 deletions mak/WINDOWS
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ copydir: $(IMPDIR)
@if not exist $(IMPDIR)\core\sys\posix\sys mkdir $(IMPDIR)\core\sys\posix\sys
@if not exist $(IMPDIR)\core\sys\solaris\sys mkdir $(IMPDIR)\core\sys\solaris\sys
@if not exist $(IMPDIR)\core\sys\windows mkdir $(IMPDIR)\core\sys\windows
@if not exist $(IMPDIR)\core\sys\windows mkdir $(IMPDIR)\core\sys\windows
@if not exist $(IMPDIR)\core\thread mkdir $(IMPDIR)\core\thread
@if not exist $(IMPDIR)\etc\linux mkdir $(IMPDIR)\etc\linux

copy: $(COPY)
Expand Down Expand Up @@ -99,9 +101,6 @@ $(IMPDIR)\core\runtime.d : src\core\runtime.d
$(IMPDIR)\core\simd.d : src\core\simd.d
copy $** $@

$(IMPDIR)\core\thread.d : src\core\thread.d
copy $** $@

$(IMPDIR)\core\time.d : src\core\time.d
copy $** $@

Expand Down Expand Up @@ -1272,5 +1271,14 @@ $(IMPDIR)\core\sys\windows\wtsapi32.d : src\core\sys\windows\wtsapi32.d
$(IMPDIR)\core\sys\windows\wtypes.d : src\core\sys\windows\wtypes.d
copy $** $@

$(IMPDIR)\core\thread\fiber.d : src\core\thread\fiber.d
copy $** $@

$(IMPDIR)\core\thread\osthread.d : src\core\thread\osthread.d
copy $** $@

$(IMPDIR)\core\thread\package.d : src\core\thread\package.d
copy $** $@

$(IMPDIR)\etc\linux\memoryerror.d : src\etc\linux\memoryerror.d
copy $** $@
3 changes: 3 additions & 0 deletions posix.mak
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ $(DOCDIR)/core_sys_darwin_mach_%.html : src/core/sys/darwin/mach/%.d $(DMD)
$(DOCDIR)/core_sys_darwin_netinet_%.html : src/core/sys/darwin/netinet/%.d $(DMD)
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<

$(DOCDIR)/core_thread_%.html : src/core/thread/%.d $(DMD)
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<

$(DOCDIR)/rt_%.html : src/rt/%.d $(DMD)
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<

Expand Down
1 change: 1 addition & 0 deletions src/core/internal/spinlock.d
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ shared struct SpinLock
/// yield with backoff
void yield(size_t k)
{
import core.time;
if (k < pauseThresh)
return pause();
else if (k < 32)
Expand Down
Loading