summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-23
|\
* | devblogGravatar Joey Hess2013-09-23
| |
| * Added a commentGravatar http://joeyh.name/2013-09-23
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawknwkXgi8SnK4QT32ANl3GMKvFLyQGeHqo2013-09-23
|/
* move stuff into .androidGravatar Joey Hess2013-09-23
| | | | This simplifies my schroot bind mounts
* Merge branch 'android-rebuild'Gravatar Joey Hess2013-09-23
|\
| * java needs /proc mounted in the chroot? why am I surprised?Gravatar Joey Hess2013-09-23
| |
| * env sanitizationGravatar Joey Hess2013-09-23
| |
| * fix cdGravatar Joey Hess2013-09-23
| |
* | updateGravatar Joey Hess2013-09-22
| |
| * work around stupid licence promptGravatar Joey Hess2013-09-22
| |
* | blog the last 3 days and nightsGravatar Joey Hess2013-09-22
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-22
|\ \
| | * pin termGravatar Joey Hess2013-09-22
| | |
| | * Merge branch 'master' into android-rebuildGravatar Joey Hess2013-09-22
| | |\ | |_|/ |/| |
| | * need gettext to build gnupgGravatar Joey Hess2013-09-22
| | |
| | * pin rsyncGravatar Joey Hess2013-09-22
| | |
| | * grrGravatar Joey Hess2013-09-22
| | |
| | * pin opensshGravatar Joey Hess2013-09-22
| | |
| | * fix clonesGravatar Joey Hess2013-09-22
| | |
| | * working on getting make androidapp to work nowGravatar Joey Hess2013-09-22
| | |
* | | explicit cryptohash depGravatar Joey Hess2013-09-22
| | |
| | * oopsGravatar Joey Hess2013-09-22
| | |
| | * fix cdGravatar Joey Hess2013-09-22
| | |
| * | Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82013-09-23
| | |
| | * one more EvilSplicer hack for the nightGravatar Joey Hess2013-09-22
| | |
* | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-22
|\| |
| | * Merge remote-tracking branch 'orca/android-rebuild' into android-rebuildGravatar Joey Hess2013-09-22
| | |\
| | | * Merge remote-tracking branch 'in/android-rebuild' into android-rebuildGravatar Joey Hess2013-09-23
| | | |\
| | | * \ Merge remote-tracking branch 'in/master' into android-rebuildGravatar Joey Hess2013-09-23
| | | |\ \
| | | | | * fix unix-timeGravatar Joey Hess2013-09-23
| | | | | |
* | | | | | Use cryptohash rather than SHA for hashing.Gravatar Joey Hess2013-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a massive win on OSX, which doesn't have a sha256sum normally. Only use external hash commands when the file is > 1 mb, since cryptohash is quite close to them in speed. SHA is still used to calculate HMACs. I don't quite understand cryptohash's API for those. Used the following benchmark to arrive at the 1 mb number. 1 mb file: benchmarking sha256/internal mean: 13.86696 ms, lb 13.83010 ms, ub 13.93453 ms, ci 0.950 std dev: 249.3235 us, lb 162.0448 us, ub 458.1744 us, ci 0.950 found 5 outliers among 100 samples (5.0%) 4 (4.0%) high mild 1 (1.0%) high severe variance introduced by outliers: 10.415% variance is moderately inflated by outliers benchmarking sha256/external mean: 14.20670 ms, lb 14.17237 ms, ub 14.27004 ms, ci 0.950 std dev: 230.5448 us, lb 150.7310 us, ub 427.6068 us, ci 0.950 found 3 outliers among 100 samples (3.0%) 2 (2.0%) high mild 1 (1.0%) high severe 2 mb file: benchmarking sha256/internal mean: 26.44270 ms, lb 26.23701 ms, ub 26.63414 ms, ci 0.950 std dev: 1.012303 ms, lb 925.8921 us, ub 1.122267 ms, ci 0.950 variance introduced by outliers: 35.540% variance is moderately inflated by outliers benchmarking sha256/external mean: 26.84521 ms, lb 26.77644 ms, ub 26.91433 ms, ci 0.950 std dev: 347.7867 us, lb 210.6283 us, ub 571.3351 us, ci 0.950 found 6 outliers among 100 samples (6.0%) import Crypto.Hash import Data.ByteString.Lazy as L import Criterion.Main import Common testfile :: FilePath testfile = "/run/shm/data" -- on ram disk main = defaultMain [ bgroup "sha256" [ bench "internal" $ whnfIO internal , bench "external" $ whnfIO external ] ] sha256 :: L.ByteString -> Digest SHA256 sha256 = hashlazy internal :: IO String internal = show . sha256 <$> L.readFile testfile external :: IO String external = do s <- readProcess "sha256sum" [testfile] return $ fst $ separate (== ' ') s
| | * | | | cabal install from local git-annex cabal fileGravatar Joey Hess2013-09-22
| | | |_|/ | | |/| |
| * | | | Added a commentGravatar John2013-09-22
| | | | |
| | * | | reorderGravatar Joey Hess2013-09-22
| | | | |
| | * | | addGravatar Joey Hess2013-09-22
| | | | |
| | * | | hamlet requires shapespeareGravatar Joey Hess2013-09-22
| | | | | | | | | | | | | | | | | | | | also, disable forced reinstalls, which hide such problems
| * | | | Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82013-09-22
|/ / / /
* | | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-22
|\ \ \ \ | | |_|/ | |/| |
| | * | set git config stuff so it can commit (hate hate hate that)Gravatar Joey Hess2013-09-22
| | | |
* | | | tip about offline archive drivesGravatar Joey Hess2013-09-22
| | | |
| | * | cd to work dirGravatar Joey Hess2013-09-22
| | | |
| | * | fix broken EvilSplicer changeGravatar Joey Hess2013-09-22
| | |/
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSbvo_NbY-ev1VKtzwo7nEqUmvRO6rXGA2013-09-22
| | |
| | * cd to homeGravatar Joey Hess2013-09-22
| | |
| | * Merge branch 'android-rebuild' of git://git-annex.branchable.com into ↵Gravatar Joey Hess2013-09-22
| | |\ | | | | | | | | | | | | android-rebuild
| | * | successfully builds (except XMPP)Gravatar Joey Hess2013-09-22
| | | |
| | | * create home dirGravatar Joey Hess2013-09-22
| | | |
| | | * apt-get cleanGravatar Joey Hess2013-09-22
| | | |
| | | * umount /procGravatar Joey Hess2013-09-22
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 08:47:23 +0000