Jason Rhinelander
e3d9801d1b
Merge branch 'dev' into debian/sid
2019-12-13 16:06:32 -04:00
Jeff
093880696d
Merge pull request #967 from jagerman/clang-format-20191212
...
Offer ritual sacrifice to clang-format
2019-12-12 20:33:30 -05:00
Jeff
0a2ebf5281
Merge pull request #961 from notlesh/more-travis-hacks
...
Fix for travis-ci xenial build
2019-12-12 20:33:15 -05:00
Jason Rhinelander
68d8adcd8b
Offer ritual sacrifice to clang-format
2019-12-12 21:32:00 -04:00
Stephen Shelton
332f33b049
Remove FS_LIB conditionals
2019-12-12 12:58:46 -07:00
Stephen Shelton
5ce260fce1
Use vendored fs::filesystem on all platforms
2019-12-12 12:29:03 -07:00
Stephen Shelton
8f6dd132ff
Make format (on recent version-related code)
2019-12-12 10:10:27 -07:00
Stephen Shelton
5d3cb8f405
Include error code in log output in Identity::EnsureKeys()
2019-12-12 10:09:57 -07:00
Stephen Shelton
a4aef312ae
make format (or format-verify, at least)
2019-12-12 10:09:57 -07:00
Stephen Shelton
616ce88cc3
Comment-out ios build for now
2019-12-12 10:09:57 -07:00
Stephen Shelton
e3c752f4ab
Another attempt to make travis-ci's xenial happy
2019-12-12 10:09:57 -07:00
Stephen Shelton
0dbbf30de5
Fix for travis-ci xenial build
2019-12-12 10:09:57 -07:00
Jeff
54111ed2a7
Merge pull request #966 from jagerman/aligned-buffer-simplify
...
Aligned buffer simplify
2019-12-12 11:21:48 -05:00
Jason Rhinelander
d4a5dc66ac
Change alignment to std::max_align_t
...
This will typically be stricter alignment (16 byte on amd64) which seems
useful for the intended use case here.
2019-12-12 12:15:13 -04:00
Jason Rhinelander
460d64fc0f
Simplify AlignedBuffer alignment implementation
...
This simplifies the use of std::aligned_storage with just using an
`alignas` on AlignedBuffer itself so that the (only) data member gets
the proper alignment and saves a bunch of reinterpret_casts in favour of
just having the std::array as an ordinary member.
2019-12-12 12:12:45 -04:00
Jeff
97e854e4ed
Merge pull request #965 from jagerman/version-generation
...
Put version info into a compiled file
2019-12-12 07:00:17 -05:00
Jason Rhinelander
638fb25b47
Put version info into a compiled file
...
This rewrites the version info using lokid's approach of compiling it
into a .cpp file that gets generated as part of the build (*not* during
the configure stage).
Among other things, this means that changing the version no longer
invalidates ccache or cmake dependencies, and because it depends on
`.git/index` git commits will cause the version to be regenerated,
making the commit tag more reliable (currently if you rebuild without
running cmake your git commit tag doesn't update).
2019-12-11 22:40:07 -04:00
Jason Rhinelander
99d27a4886
Add missing ev_libuv (now needed everywhere)
2019-12-11 19:19:28 -04:00
Jason Rhinelander
da6486a946
Merge pull request #964 from notlesh/fix_version_typo
...
Remove typo in version changes
2019-12-11 19:19:10 -04:00
Stephen Shelton
211a5f7a03
Remove typo in version changes
2019-12-11 16:17:34 -07:00
Jeff
27a5904d68
Merge pull request #963 from majestrate/consolidate-versions-2019-12-11
...
consolidate versions
2019-12-11 17:30:19 -05:00
Jeff Becker
4fdff7f233
consolidate versions
2019-12-11 17:06:44 -05:00
Jeff
a573ff5256
Merge pull request #962 from majestrate/win32-tun-libu-2019-12-11
...
win32 tun and libuv for win32
2019-12-11 16:57:01 -05:00
Jeff Becker
f259cca0ba
remove mutexes
2019-12-11 16:49:00 -05:00
Jeff Becker
85e911fed0
fug
2019-12-11 16:36:13 -05:00
Jeff Becker
7a78160bf0
final change
2019-12-11 16:34:03 -05:00
Jeff Becker
5729d0bff5
more
2019-12-11 16:31:49 -05:00
Jeff Becker
c4f08e5145
finish remaining changes
2019-12-11 16:18:47 -05:00
Jeff Becker
abf9544ddc
make libuv on win32 work
2019-12-11 16:05:40 -05:00
Jeff
0b9eb13f5f
Merge pull request #960 from notlesh/aligned_buffer_iszero_optimization
...
Optimize AlignedBuffer:::IsZero()
2019-12-10 14:22:49 -05:00
Jeff
0082a343cd
Merge pull request #959 from majestrate/dev
...
fixes for travis
2019-12-10 14:22:29 -05:00
Stephen Shelton
e2e9e63467
Optimize AlignedBuffer:::IsZero()
2019-12-10 11:50:52 -07:00
Jeff Becker
95eee4081a
trypushback
2019-12-10 11:49:32 -07:00
Jeff Becker
cdfdfa1068
use thread queue
2019-12-10 11:49:32 -07:00
Jeff Becker
8455d5d1cf
more cleanup
2019-12-10 11:49:32 -07:00
Jeff Becker
b286230d40
limit timer calls
2019-12-10 11:49:32 -07:00
Jeff Becker
35672e6d8c
call timers with queuer if set
2019-12-10 11:49:32 -07:00
Jeff Becker
cec36b62b5
make logic and net thread one in the same
2019-12-10 11:49:32 -07:00
Jeff Becker
581306e35f
prevent crash on exit
2019-12-10 11:49:32 -07:00
Jeff Becker
d77840d78d
more travis config tweaks
2019-12-10 11:49:32 -07:00
Jeff Becker
d9ddbae564
allow windows to fail
2019-12-10 11:49:32 -07:00
Jeff Becker
c9d38d421b
clang fixes
2019-12-10 11:49:32 -07:00
Jeff Becker
1ddc2b40aa
another attempt at travis fix
2019-12-10 11:49:32 -07:00
Jeff Becker
f29083f765
more travis fixes
2019-12-10 11:49:32 -07:00
Jeff Becker
4f87a95f66
fixes for travis
2019-12-10 11:49:32 -07:00
Jeff Becker
12e141d2de
trypushback
2019-12-10 11:07:09 -05:00
Jeff Becker
5202bd703a
use thread queue
2019-12-10 11:05:19 -05:00
Jeff Becker
54e10450cf
more cleanup
2019-12-10 10:43:27 -05:00
Jeff Becker
700882a0cc
limit timer calls
2019-12-10 10:29:39 -05:00
Jeff Becker
38628ca153
call timers with queuer if set
2019-12-10 10:26:57 -05:00
