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

Commit

Permalink
Merge branch 'master' into query-stats
Browse files Browse the repository at this point in the history
  • Loading branch information
thewilsonator authored Nov 17, 2018
2 parents 7bccec6 + 6f27f55 commit ddb496d
Show file tree
Hide file tree
Showing 281 changed files with 13,015 additions and 10,875 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
parallelism: 2
steps:
- checkout
- run:
command: ./.circleci/run.sh install-deps
name: Install DMD
- run:
command: ./.circleci/run.sh setup-repos
name: Clone DMD
- run:
command: ./.circleci/run.sh install-deps
name: Install DMD
- run:
command: ./.circleci/run.sh style
name: Check code style
Expand Down
7 changes: 4 additions & 3 deletions .circleci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -uexo pipefail

HOST_DMD_VER=2.072.2 # same as in dmd/src/posix.mak
HOST_DMD_VER=2.079.1
CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
N=4
CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
Expand Down Expand Up @@ -31,10 +31,11 @@ download() {
}

install_deps() {
sudo apt-get update
if [ $MODEL -eq 32 ]; then
sudo apt-get update
sudo apt-get install g++-multilib
sudo apt-get install -y g++-multilib
fi
sudo apt-get install -y gdb

download "https://dlang.org/install.sh" "https://nightlies.dlang.org/install.sh" "install.sh"

Expand Down
3 changes: 1 addition & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
root = true

[*.{c,h,d,di,dd}]
end_of_line = lf
[*.{c,cpp,h,d,di,dd}]
insert_final_newline = true
indent_style = space
indent_size = 4
Expand Down
1 change: 0 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ src/core/sys/linux/* @Burgos @redstar @MartinNowak
src/core/sys/netbsd/* @nrTQgc @joakim-noah
src/core/sys/dragonflybsd/* @dkgroot
src/core/sys/openbsd/* @redstar
src/core/sys/osx/* @jacob-carlborg @klickverbot @etcimon @MartinNowak
src/core/sys/posix/* @CyberShadow @MartinNowak @joakim-noah @redstar
src/core/sys/solaris/* @redstar
src/core/sys/windows/* @CyberShadow
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ DRuntime: Runtime Library for the D Programming Language

[![GitHub tag](https://img.shields.io/github/tag/dlang/druntime.svg?maxAge=86400)](https://github.com/dlang/druntime/releases)
[![Bugzilla Issues](https://img.shields.io/badge/issues-Bugzilla-green.svg)](https://issues.dlang.org/buglist.cgi?component=druntime&list_id=220148&product=D&resolution=---)
[![Build status](https://img.shields.io/circleci/project/dlang/druntime.svg?maxAge=86400)](https://circleci.com/gh/dlang/druntime)
[![CircleCI](https://circleci.com/gh/dlang/druntime/tree/master.svg?style=svg)](https://circleci.com/gh/dlang/druntime/tree/master)
[![Code coverage](https://img.shields.io/codecov/c/github/dlang/druntime.svg?maxAge=86400)](https://codecov.io/gh/dlang/druntime)
[![Issue Stats](https://img.shields.io/issuestats/p/github/dlang/druntime.svg?maxAge=2592000)](http://www.issuestats.com/github/dlang/druntime)
[![license](https://img.shields.io/github/license/dlang/druntime.svg)](https://github.com/dlang/druntime/blob/master/LICENSE.txt)
Expand Down
8 changes: 4 additions & 4 deletions benchmark/arrayops/arrayops.d
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
* Authors: Martin Nowak
*/
import core.cpuid, std.algorithm, std.datetime, std.meta, std.stdio, std.string,
std.range;
import core.cpuid, std.algorithm, std.meta, std.stdio, std.string, std.range;
import std.datetime.stopwatch : benchmark, StopWatch, AutoStart;

float[6] getLatencies(T, string op)()
{
Expand All @@ -33,7 +33,7 @@ float[6] getLatencies(T, string op)()
.replace("c", "c[off .. off + len]");
mixin(op ~ ";");
}
latency = min(latency, sw.peek.nsecs);
latency = min(latency, sw.peek.total!"nsecs");
}
}
float[6] res = latencies[] / 1024;
Expand Down Expand Up @@ -69,7 +69,7 @@ float[4] getThroughput(T, string op)()
.replace("c", "c[off .. off + len]");
mixin(op ~ ";");
}
immutable nsecs = sw.peek.nsecs;
immutable nsecs = sw.peek.total!"nsecs";
runMasked({latency = min(latency, nsecs);});
}
}
Expand Down
12 changes: 6 additions & 6 deletions benchmark/gcbench/conmsg.d
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
import std.algorithm, std.concurrency, std.conv, std.file, std.json, std.range;

JSONValue buildVal(in dchar[] word)
JSONValue buildVal(in dchar[] word) pure
{
JSONValue[string] res;
res["word"] = word.to!string;
Expand Down Expand Up @@ -35,27 +35,27 @@ void producer(Tid consumer)

void serialize(in JSONValue val, ref ubyte[] buf)
{
with (JSON_TYPE) switch (val.type)
with (JSONType) switch (val.type)
{
case OBJECT:
case object:
foreach (k, v; val.object)
{
buf ~= cast(ubyte[])k;
serialize(v, buf);
}
break;

case ARRAY:
case array:
foreach (v; val.array)
serialize(v, buf);
break;

case UINTEGER:
case uinteger:
ulong v = val.uinteger;
buf ~= (cast(ubyte*)&v)[0 .. v.sizeof];
break;

case STRING:
case string:
buf ~= cast(ubyte[])val.str;
break;

Expand Down
3 changes: 3 additions & 0 deletions changelog/array.dd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Added `core.stdcpp.array`.

Added `core.stdcpp.array`, which links against C++ `std::array`
39 changes: 0 additions & 39 deletions changelog/backtrace_debug_info_macos.dd

This file was deleted.

3 changes: 0 additions & 3 deletions changelog/cpp_destroy.dd

This file was deleted.

3 changes: 0 additions & 3 deletions changelog/getsect.dd

This file was deleted.

3 changes: 3 additions & 0 deletions changelog/string_view.dd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Added `core.stdcpp.string_view`.

Added `core.stdcpp.string_view`, which links against C++ `std::string_view`
8 changes: 8 additions & 0 deletions dub.sdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name "druntime"
license "BSL-1.0"
description "D Runtime Library"
authors "DLang Community"
copyright "Copyright © 1999-2018, The D Language Foundation"

targetType "library"
targetPath "generated"
22 changes: 7 additions & 15 deletions mak/COPY
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ COPY=\
$(IMPDIR)\core\stdc\wchar_.d \
$(IMPDIR)\core\stdc\wctype.d \
\
$(IMPDIR)\core\stdcpp\typeinfo.d \
$(IMPDIR)\core\stdcpp\array.d \
$(IMPDIR)\core\stdcpp\exception.d \
$(IMPDIR)\core\stdcpp\string_view.d \
$(IMPDIR)\core\stdcpp\typeinfo.d \
$(IMPDIR)\core\stdcpp\xutility.d \
\
$(IMPDIR)\core\sys\darwin\execinfo.d \
$(IMPDIR)\core\sys\darwin\pthread.d \
Expand Down Expand Up @@ -83,8 +86,10 @@ COPY=\
$(IMPDIR)\core\sys\freebsd\sys\elf_common.d \
$(IMPDIR)\core\sys\freebsd\sys\event.d \
$(IMPDIR)\core\sys\freebsd\sys\link_elf.d \
$(IMPDIR)\core\sys\freebsd\sys\mount.d \
$(IMPDIR)\core\sys\freebsd\sys\mman.d \
$(IMPDIR)\core\sys\freebsd\time.d \
$(IMPDIR)\core\sys\freebsd\unistd.d \
\
$(IMPDIR)\core\sys\dragonflybsd\dlfcn.d \
$(IMPDIR)\core\sys\dragonflybsd\execinfo.d \
Expand Down Expand Up @@ -138,20 +143,6 @@ COPY=\
\
$(IMPDIR)\core\sys\openbsd\dlfcn.d \
\
$(IMPDIR)\core\sys\osx\execinfo.d \
$(IMPDIR)\core\sys\osx\pthread.d \
\
$(IMPDIR)\core\sys\osx\mach\dyld.d \
$(IMPDIR)\core\sys\osx\mach\getsect.d \
$(IMPDIR)\core\sys\osx\mach\kern_return.d \
$(IMPDIR)\core\sys\osx\mach\loader.d \
$(IMPDIR)\core\sys\osx\mach\port.d \
$(IMPDIR)\core\sys\osx\mach\semaphore.d \
$(IMPDIR)\core\sys\osx\mach\thread_act.d \
\
$(IMPDIR)\core\sys\osx\sys\cdefs.d \
$(IMPDIR)\core\sys\osx\sys\mman.d \
\
$(IMPDIR)\core\sys\posix\arpa\inet.d \
$(IMPDIR)\core\sys\posix\aio.d \
$(IMPDIR)\core\sys\posix\config.d \
Expand All @@ -170,6 +161,7 @@ COPY=\
$(IMPDIR)\core\sys\posix\semaphore.d \
$(IMPDIR)\core\sys\posix\setjmp.d \
$(IMPDIR)\core\sys\posix\signal.d \
$(IMPDIR)\core\sys\posix\spawn.d \
$(IMPDIR)\core\sys\posix\stdio.d \
$(IMPDIR)\core\sys\posix\stdlib.d \
$(IMPDIR)\core\sys\posix\syslog.d \
Expand Down
3 changes: 2 additions & 1 deletion mak/DOCS
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ DOCS=\
$(DOCDIR)\core_stdc_wchar_.html \
$(DOCDIR)\core_stdc_wctype.html \
\
$(DOCDIR)\core_stdcpp_array.html \
$(DOCDIR)\core_stdcpp_string_view.html \
$(DOCDIR)\core_stdcpp_exception.html \
$(DOCDIR)\core_stdcpp_typeinfo.html \
\
Expand Down Expand Up @@ -140,7 +142,6 @@ DOCS=\
$(DOCDIR)\rt_util_container_common.html \
$(DOCDIR)\rt_util_container_hashtab.html \
$(DOCDIR)\rt_util_container_treap.html \
$(DOCDIR)\rt_util_hash.html \
$(DOCDIR)\rt_util_random.html \
$(DOCDIR)\rt_util_typeinfo.html \
$(DOCDIR)\rt_util_utf.html \
8 changes: 7 additions & 1 deletion mak/SRCS
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ SRCS=\
src\core\stdc\time.d \
src\core\stdc\wchar_.d \
\
src\core\stdcpp\array.d \
src\core\stdcpp\string_view.d \
src\core\stdcpp\xutility.d \
\
src\core\sync\barrier.d \
src\core\sync\condition.d \
src\core\sync\config.d \
Expand All @@ -69,7 +73,9 @@ SRCS=\
src\core\sys\freebsd\sys\event.d \
src\core\sys\freebsd\sys\link_elf.d \
src\core\sys\freebsd\sys\mman.d \
src\core\sys\freebsd\sys\mount.d \
src\core\sys\freebsd\time.d \
src\core\sys\freebsd\unistd.d \
\
src\core\sys\dragonflybsd\dlfcn.d \
src\core\sys\dragonflybsd\execinfo.d \
Expand Down Expand Up @@ -100,6 +106,7 @@ SRCS=\
\
src\core\sys\posix\dirent.d \
src\core\sys\posix\signal.d \
src\core\sys\posix\spawn.d \
src\core\sys\posix\netdb.d \
src\core\sys\posix\netinet\in_.d \
src\core\sys\posix\arpa\inet.d \
Expand Down Expand Up @@ -347,7 +354,6 @@ SRCS=\
src\rt\backtrace\macho.d \
\
src\rt\util\array.d \
src\rt\util\hash.d \
src\rt\util\random.d \
src\rt\util\typeinfo.d \
src\rt\util\utf.d \
Expand Down
Loading

0 comments on commit ddb496d

Please sign in to comment.