Skip to content

enable using libxxhash (1.1-maint only)#5404

Merged
ThomasWaldmann merged 4 commits intoborgbackup:1.1-maintfrom
ThomasWaldmann:libxxh-1.1
Oct 10, 2020
Merged

enable using libxxhash (1.1-maint only)#5404
ThomasWaldmann merged 4 commits intoborgbackup:1.1-maintfrom
ThomasWaldmann:libxxh-1.1

Conversation

@ThomasWaldmann
Copy link
Member

@ThomasWaldmann ThomasWaldmann commented Oct 9, 2020

similar to the code we already have in master branch.

thanks to @LocutusOfBorg !

fixes #5400.

@codecov-io
Copy link

codecov-io commented Oct 9, 2020

Codecov Report

Merging #5404 into 1.1-maint will increase coverage by 0.73%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##           1.1-maint    #5404      +/-   ##
=============================================
+ Coverage      79.52%   80.25%   +0.73%     
=============================================
  Files             27       27              
  Lines          10359    10359              
  Branches        1827     1827              
=============================================
+ Hits            8238     8314      +76     
+ Misses          1603     1532      -71     
+ Partials         518      513       -5     
Impacted Files Coverage Δ
src/borg/archiver.py 82.05% <0.00%> (+0.09%) ⬆️
src/borg/repository.py 85.42% <0.00%> (+0.19%) ⬆️
src/borg/helpers.py 88.51% <0.00%> (+0.36%) ⬆️
src/borg/archive.py 82.53% <0.00%> (+0.97%) ⬆️
src/borg/platform/base.py 83.17% <0.00%> (+3.73%) ⬆️
src/borg/platform/__init__.py 89.47% <0.00%> (+15.78%) ⬆️
src/borg/xattr.py 82.21% <0.00%> (+22.59%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 109c87a...40fb6b3. Read the comment docs.

i tested it with libxxhash 0.6.5 on debian buster [amd64], it worked.

but for ARM it requires an important fix that was released in 0.7.2.
when including .h (as usual), one runs into this:

building 'borg.algorithms.checksums' extension
    gcc -pthread -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -fPIC -I/home/user/w/borg-env/include -I/home/user/.pyenv/versions/3.5.3/include/python3.5m -c src/borg/algorithms/checksums.c -o build/temp.linux-x86_64-3.5/src/borg/algorithms/checksums.o
    src/borg/algorithms/checksums.c:838:17: error: field ‘state’ has incomplete type
       XXH64_state_t state;
                     ^~~~~

when including .c, it works!
@ThomasWaldmann
Copy link
Member Author

@LocutusOfBorg i did some testing on misc. OSes and dists and think this is ready to merge. What do you think?

@ThomasWaldmann
Copy link
Member Author

@ThomasWaldmann ThomasWaldmann merged commit 83f0ef7 into borgbackup:1.1-maint Oct 10, 2020
@ThomasWaldmann ThomasWaldmann deleted the libxxh-1.1 branch October 10, 2020 09:30
@LocutusOfBorg
Copy link
Contributor

yay thanks a lot!!!

@LocutusOfBorg
Copy link
Contributor

Also ppa for xenial, bionic, focal and groovy are good now
https://launchpad.net/~costamagnagianfranco/+archive/ubuntu/borgbackup/+packages

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants