465 Commits

Author SHA1 Message Date
Dave Cottlehuber
c848ae4cda cmake: skip jemalloc on FreeBSD
FreeBSD is the upstream for jemalloc so it's the system malloc already
2021-02-22 16:15:02 +00:00
Markus Pilman
a3bd2652c2 revert compile boost to old behavior for windows 2021-02-17 09:30:32 -07:00
Markus Pilman
d13e240496 use libcoroutine for Windows
The Windows CI still doesn't have boost context installed
so we use the old implementation for now
2021-02-17 09:23:41 -07:00
Markus Pilman
f514194aec Merge remote-tracking branch 'origin/master' into features/coroutine2 2021-02-17 09:03:07 -07:00
A.J. Beamon
601a548cfe Revert "Move new config to config.h.cmake"
This reverts commit 2951ebb4e7e3d630ab22038606a999437f3e8cee.
2021-02-08 14:01:02 -08:00
A.J. Beamon
2951ebb4e7 Move new config to config.h.cmake 2021-02-08 13:34:17 -08:00
A.J. Beamon
85ec192169 Remove bad merge line 2021-02-08 13:02:55 -08:00
A.J. Beamon
aaf0a9aa7b Merge branch 'release-6.3' into merge-release-6.3-into-master
# Conflicts:
#	build/docker-compose.yaml
#	cmake/ConfigureCompiler.cmake
#	fdbclient/FileBackupAgent.actor.cpp
#	fdbrpc/AsyncFileCached.actor.h
#	fdbrpc/IAsyncFile.h
#	fdbrpc/IRateControl.h
#	fdbrpc/simulator.h
#	fdbserver/KeyValueStoreSQLite.actor.cpp
#	fdbserver/storageserver.actor.cpp
#	fdbservice/ServiceBase.cpp
2021-02-08 12:58:34 -08:00
A.J. Beamon
b70c69e099 Address review note that some variables need to be set earlier. 2021-02-08 10:42:07 -08:00
Markus Pilman
c2fa9b100d fix bootstrap command arguments 2021-02-08 10:30:18 -07:00
Markus Pilman
6e571ab87b Merge branch 'master' of github.com:apple/foundationdb into features/coroutine2 2021-02-08 10:25:29 -07:00
A.J. Beamon
67e783acf8 Merge branch 'release-6.2' into merge-release-6.2-into-release-6.3
# Conflicts:
#	cmake/CompileBoost.cmake
#	cmake/FDBComponents.cmake
#	fdbrpc/AsyncFileCached.actor.h
#	fdbrpc/simulator.h
#	fdbserver/KeyValueStoreSQLite.actor.cpp
#	fdbserver/Knobs.cpp
#	fdbserver/Knobs.h
#	fdbserver/storageserver.actor.cpp
#	flow/Knobs.h
#	flow/network.h
2021-02-08 09:20:28 -08:00
Alvin Moore
c357b36f9a
Merge pull request #4277 from sfc-gh-mpilman/bugfix/fix-jemalloc-link-order
Fix order of jemalloc libraries
2021-02-06 21:03:55 -05:00
Andrew Noyes
75f8725392 Add test for using an external client 2021-02-05 01:24:45 +00:00
Markus Pilman
9b2bab96f1 add comment explaining the change 2021-02-04 15:39:42 -07:00
Markus Pilman
aae947ad0b Fix order of jemalloc libraries
PIC library has to be first
2021-02-04 15:13:41 -07:00
Andrew Noyes
e4a55908ff
Merge pull request #4222 from sfc-gh-mpilman/features/jemalloc
Replace standard malloc with jemalloc
2021-02-04 12:47:29 -08:00
Markus Pilman
7b489da13b introduce USE_JEMALLOC and some refactoring 2021-02-04 11:53:28 -07:00
Markus Pilman
f4370adfcb use INTERFACE for interface target 2021-02-04 11:22:45 -07:00
Markus Pilman
04f6a3bb00 fixed broken CompileBoost.cmake 2021-02-02 08:58:42 -07:00
Markus Pilman
54e20873b7 Don't attempt download&compile of boost on WIN32
This takes forever on Windows and we want to only
support docker anyways. Currently boost compilation
on Windows doesn't work properly and it's probably
not worth fixing this
2021-02-01 16:29:02 -07:00
Markus Pilman
0805902770 Merge branch 'release-6.2' of github.com:apple/foundationdb into features/add-jemalloc-boost 2021-02-01 11:27:12 -07:00
Christophe Chevalier
ff0667b28d winbuild: define BOOST_USE_WINDOWS_H, WIN32_LEAN_AND_MEAN and NOMINMAX to fix various macro expansions issues
- NOMINMAX to fix confusion between std::max(..) and max(..) macro redefinition
- BOOST_USE_WINDOWS_H to prevent boost from redefining win32 APIs
- WIN32_LEAN_AND_MEAN to fix include ordering issues with winsock.h
2021-01-30 15:15:02 +01:00
Markus Pilman
8bec456591 find boost in docker image 2021-01-29 11:51:38 -07:00
Markus Pilman
5dea9caedb use BOOST_ROOT (for backwards compatability) 2021-01-28 09:25:26 -07:00
Markus Pilman
7c64e3943b compile boost for sanitizers 2021-01-27 19:13:02 -07:00
Markus Pilman
0696c2d9b4 several bug fixes 2021-01-27 18:22:48 -07:00
Markus Pilman
1f8222d1b7 install boost in docker image and make sure cmake finds it 2021-01-27 16:37:04 -07:00
Markus Pilman
2e9db80db9 fix macOS compilation 2021-01-27 11:35:50 -07:00
Markus Pilman
75102d152a don't use user-config on macOS and Win32 2021-01-27 10:44:19 -07:00
Andrew Noyes
341069fcce WIP asan on boost coroutine2 2021-01-26 17:10:13 -07:00
Markus Pilman
529fadbf96 Compile boost and first version of coro thread pool 2021-01-26 17:06:08 -07:00
Markus Pilman
c870903c38 fix jemalloc dependencies 2021-01-26 11:37:09 -07:00
Markus Pilman
97c5e13091 added debug message to figure out why CI is failing 2021-01-26 11:13:14 -07:00
Andrew Noyes
0ef44739ea Fix OPEN_FOR_IDE build in preparation for using clang-tidy 2021-01-26 02:04:11 +00:00
Kao Makino
29976f0b41 Fix minor issues for aarch64 2021-01-25 12:10:57 -08:00
Russell Sears
85e21c1ba1 CMake support for BoringSSL 2021-01-22 22:45:51 +00:00
Andrew Noyes
58b4a9b907 Resolve conflicts 2021-01-21 20:59:44 +00:00
Markus Pilman
b149069b58 link statically against jemalloc 2021-01-21 13:35:27 -07:00
Andrew Noyes
281151ff20 Merge remote-tracking branch 'upstream/release-6.2' into anoyes/merge-6.2-to-6.3
Commit conflict markers for now
2021-01-21 17:54:26 +00:00
Andrew Noyes
ff7d306b09 Merge branch 'release-6.3' into anoyes/merge-6.3-to-master
Include conflict markers for now. Will resolve.
2021-01-15 18:04:09 +00:00
Andrew Noyes
ddb5b0b050 Backport correctness package 2021-01-15 00:34:47 +00:00
Andrew Noyes
e2e9b70206 Remove -Wno-unused-value 2021-01-06 22:09:38 +00:00
Markus Pilman
dae8ea24ad Move compiler definitions into config file 2020-11-25 15:06:59 -07:00
David Youngworth
d64cf8b9e3 Merge branch 6.3 into master 2020-11-17 11:22:45 -08:00
Andrew Noyes
3b1e785e5b Remove -Wno-unused-value for clang 2020-11-09 18:44:50 +00:00
Markus Pilman
864581c3b7 Merge remote-tracking branch 'origin/release-6.3' into features/versioned-packages 2020-11-05 15:54:39 -07:00
Markus Pilman
80d5b6c0c9
Merge pull request #4015 from xis19/release-6.3
Fix the CPack MacOS X package
2020-11-05 15:52:22 -07:00
Markus Pilman
703b2e276a addressed review comments 2020-11-05 15:50:24 -07:00
Daniel Smith
7d1db8a66e Restore building RocksDB by default with GCC 2020-11-05 09:11:58 -08:00