From 468c4ebf60932833fdb0f3070891a80738027bcb Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Sun, 11 Feb 2018 15:16:41 +0100 Subject: [PATCH 1/6] Switch to use the frozen stdx-allocator --- .gitmodules | 5 ++++- dub.json | 5 +++-- src/dcd/server/autocomplete/util.d | 2 +- src/dcd/server/main.d | 4 ++-- stdx-allocator | 1 + 5 files changed, 11 insertions(+), 6 deletions(-) create mode 160000 stdx-allocator diff --git a/.gitmodules b/.gitmodules index 6c4c1f4..59e5312 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,4 +10,7 @@ branch = master [submodule "dsymbol"] path = dsymbol - url = https://github.com/dlang-community/dsymbol.git \ No newline at end of file + url = https://github.com/dlang-community/dsymbol.git +[submodule "stdx-allocator"] + path = stdx-allocator + url = https://github.com/dlang-community/stdx-allocator diff --git a/dub.json b/dub.json index 0948bc9..38c7ba0 100644 --- a/dub.json +++ b/dub.json @@ -7,9 +7,10 @@ ], "license": "GPL-3.0", "dependencies": { - "dsymbol": "~>0.3.0-alpha.1", + "dsymbol": "~>0.3.0-alpha.2", "libdparse": "~>0.8.0-alpha.3", - "msgpack-d": "~>1.0.0-beta.3" + "msgpack-d": "~>1.0.0-beta.3", + "stdx-allocator": "~>2.077.0" }, "versions": ["built_with_dub"], "configurations": [ diff --git a/src/dcd/server/autocomplete/util.d b/src/dcd/server/autocomplete/util.d index 8a3df97..ad397ba 100644 --- a/src/dcd/server/autocomplete/util.d +++ b/src/dcd/server/autocomplete/util.d @@ -19,7 +19,7 @@ module dcd.server.autocomplete.util; import std.algorithm; -import std.experimental.allocator; +import stdx.allocator; import std.experimental.logger; import std.range; import std.string; diff --git a/src/dcd/server/main.d b/src/dcd/server/main.d index c669d12..edad504 100644 --- a/src/dcd/server/main.d +++ b/src/dcd/server/main.d @@ -24,8 +24,8 @@ import std.array; import std.conv; import std.datetime.stopwatch : AutoStart, StopWatch; import std.exception : enforce; -import std.experimental.allocator; -import std.experimental.allocator.mallocator; +import stdx.allocator; +import stdx.allocator.mallocator; import std.experimental.logger; import std.file; import std.getopt; diff --git a/stdx-allocator b/stdx-allocator new file mode 160000 index 0000000..7487970 --- /dev/null +++ b/stdx-allocator @@ -0,0 +1 @@ +Subproject commit 7487970b58f4a2c0d495679329a8a2857111f3fd From 9e275ebcb78f0f400304f90748e4b80f28bde412 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Sun, 11 Feb 2018 15:17:27 +0100 Subject: [PATCH 2/6] Bump git submodules --- containers | 2 +- dsymbol | 2 +- libdparse | 2 +- msgpack-d | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/containers b/containers index 0ed30c2..6c5504c 160000 --- a/containers +++ b/containers @@ -1 +1 @@ -Subproject commit 0ed30c2626270a18b420bc04143b7a9c2eea0f42 +Subproject commit 6c5504cc80b75192b24cebe93209521c03f806d8 diff --git a/dsymbol b/dsymbol index 89f6ee8..f6ba349 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit 89f6ee88bf8d0fc0df232cba56bf797f5b3b0487 +Subproject commit f6ba349cc9f2310072cbd9bc9b405ec2978edc42 diff --git a/libdparse b/libdparse index 687c0ca..68b71f9 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 687c0ca751747ebe498c183da1a3ee3119d57932 +Subproject commit 68b71f9c04940993f68bce2511244d55a3a8a648 diff --git a/msgpack-d b/msgpack-d index e6a5a69..5009409 160000 --- a/msgpack-d +++ b/msgpack-d @@ -1 +1 @@ -Subproject commit e6a5a69d2f86f2a0f7f7dad9de7080a55a929e46 +Subproject commit 500940918243cf0468028e552605204c6aa46807 From 152e21904b28a777fecdbfff1fc18320c29b9446 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Sun, 11 Feb 2018 16:14:34 +0100 Subject: [PATCH 3/6] Bump dependencies --- dsymbol | 2 +- dub.json | 4 ++-- libdparse | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dsymbol b/dsymbol index f6ba349..5b90412 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit f6ba349cc9f2310072cbd9bc9b405ec2978edc42 +Subproject commit 5b90412457ac5f1d67c04e4da01587edfd529ad5 diff --git a/dub.json b/dub.json index 38c7ba0..b3c8581 100644 --- a/dub.json +++ b/dub.json @@ -7,8 +7,8 @@ ], "license": "GPL-3.0", "dependencies": { - "dsymbol": "~>0.3.0-alpha.2", - "libdparse": "~>0.8.0-alpha.3", + "dsymbol": "~>0.3.0-alpha.3", + "libdparse": "~>0.8.0-alpha.4", "msgpack-d": "~>1.0.0-beta.3", "stdx-allocator": "~>2.077.0" }, diff --git a/libdparse b/libdparse index 68b71f9..f3323ce 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 68b71f9c04940993f68bce2511244d55a3a8a648 +Subproject commit f3323ce90a41c24cf874fd257ccbf6cc0b1be285 From de348b4100088d76171682bf79537976cf959923 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Sun, 11 Feb 2018 16:17:44 +0100 Subject: [PATCH 4/6] Bump dependencies --- dub.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index b3c8581..60c4964 100644 --- a/dub.json +++ b/dub.json @@ -7,10 +7,10 @@ ], "license": "GPL-3.0", "dependencies": { - "dsymbol": "~>0.3.0-alpha.3", + "dsymbol": "~>0.3.0-beta.3", "libdparse": "~>0.8.0-alpha.4", "msgpack-d": "~>1.0.0-beta.3", - "stdx-allocator": "~>2.077.0" + "stdx-allocator": "~>2.77.0" }, "versions": ["built_with_dub"], "configurations": [ From b45c78a5925e67e295bd7512ba1ce856b35fd67e Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Sun, 11 Feb 2018 16:41:51 +0100 Subject: [PATCH 5/6] Add stdx-allocator to build.bat --- build.bat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.bat b/build.bat index 651724e..da5c4c9 100644 --- a/build.bat +++ b/build.bat @@ -18,6 +18,10 @@ for /r "libdparse/src" %%F in (*.d) do call set libdparse_modules=%%libdparse_mo set msgspack_modules= for /r "msgpack-d/src" %%F in (*.d) do call set msgspack_modules=%%msgspack_modules%% "%%F" +set stdx_allocator= +for /r "stdx-allocator/source/stdx/allocator" %%F in (*.d) do call set stdx_allocator=%%stdx_allocator%% "%%F" +for /r "stdx-allocator/source/stdx/allocator/building_blocks" %%F in (*.d) do call set stdx_allocator=%%stdx_allocator%% "%%F" + set client_name=bin\dcd-client set server_name=bin\dcd-server @@ -38,9 +42,11 @@ set server_name=bin\dcd-server %common_modules%^ %containers_modules%^ %msgspack_modules%^ + %stdx_allocator%^ -Icontainers/src^ -Imsgpack-d/src^ -Ilibdparse/src^ + -Istdx-allocator/source^ -wi -O -release^ -of%server_name% From 2fbb5aa6e16f620d89fd9bc9a0adc51d846cc8ee Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 11 Feb 2018 17:18:42 +0100 Subject: [PATCH 6/6] update makefile --- makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefile b/makefile index 00be4b2..df5e3fb 100644 --- a/makefile +++ b/makefile @@ -12,6 +12,7 @@ LDC := ldc2 DPARSE_DIR := libdparse DSYMBOL_DIR := dsymbol +STDXALLOC_DIR := stdx-allocator githash: git log -1 --format="%H" > githash.txt @@ -57,6 +58,7 @@ SERVER_SRC := \ $(shell find src/dcd/common -name "*.d")\ $(shell find src/dcd/server -name "*.d")\ $(shell find ${DSYMBOL_DIR}/src -name "*.d")\ + $(shell find ${STDXALLOC_DIR}/source -name "*.d")\ ${DPARSE_DIR}/src/dparse/ast.d\ ${DPARSE_DIR}/src/dparse/entities.d\ ${DPARSE_DIR}/src/dparse/lexer.d\ @@ -82,6 +84,7 @@ DMD_SERVER_FLAGS := -Icontainers/src\ -Imsgpack-d/src\ -I${DPARSE_DIR}/src\ -I${DSYMBOL_DIR}/src\ + -I${STDXALLOC_DIR}/source\ -J.\ -wi\ -O\