rugged 1.1.1 → 1.4.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE +1 -0
- data/README.md +1 -1
- data/ext/rugged/extconf.rb +2 -2
- data/ext/rugged/rugged.c +7 -4
- data/ext/rugged/rugged_config.c +7 -2
- data/ext/rugged/rugged_object.c +1 -1
- data/ext/rugged/rugged_remote.c +17 -0
- data/ext/rugged/rugged_repo.c +3 -3
- data/lib/rugged/repository.rb +2 -2
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +103 -271
- data/vendor/libgit2/COPYING +149 -24
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +13 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +14 -0
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -96
- data/vendor/libgit2/cmake/SelectHashes.cmake +39 -48
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +101 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +32 -20
- data/vendor/libgit2/deps/ntlmclient/crypt.h +14 -9
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +20 -20
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +3 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +37 -36
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +4 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +178 -51
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +74 -5
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +154 -122
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +17 -13
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +17 -4
- data/vendor/libgit2/deps/ntlmclient/unicode.h +10 -4
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +16 -27
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.h +20 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +28 -52
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.h +22 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +106 -2
- data/vendor/libgit2/include/git2/blame.h +97 -43
- data/vendor/libgit2/include/git2/blob.h +33 -2
- data/vendor/libgit2/include/git2/branch.h +27 -0
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +43 -6
- data/vendor/libgit2/include/git2/checkout.h +32 -13
- data/vendor/libgit2/include/git2/clone.h +4 -4
- data/vendor/libgit2/include/git2/commit.h +37 -19
- data/vendor/libgit2/include/git2/common.h +46 -5
- data/vendor/libgit2/include/git2/config.h +19 -3
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +326 -6
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +50 -121
- data/vendor/libgit2/include/git2/email.h +127 -0
- data/vendor/libgit2/include/git2/errors.h +7 -6
- data/vendor/libgit2/include/git2/filter.h +69 -18
- data/vendor/libgit2/include/git2/graph.h +21 -2
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +13 -7
- data/vendor/libgit2/include/git2/indexer.h +19 -0
- data/vendor/libgit2/include/git2/merge.h +23 -3
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/notes.h +2 -2
- data/vendor/libgit2/include/git2/object.h +23 -0
- data/vendor/libgit2/include/git2/odb.h +65 -6
- data/vendor/libgit2/include/git2/odb_backend.h +1 -1
- data/vendor/libgit2/include/git2/oidarray.h +5 -8
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +16 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +34 -2
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +8 -4
- data/vendor/libgit2/include/git2/remote.h +246 -46
- data/vendor/libgit2/include/git2/repository.h +25 -18
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +5 -5
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +124 -62
- data/vendor/libgit2/include/git2/stdint.h +3 -3
- data/vendor/libgit2/include/git2/submodule.h +16 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +174 -0
- data/vendor/libgit2/include/git2/sys/email.h +45 -0
- data/vendor/libgit2/include/git2/sys/filter.h +49 -28
- data/vendor/libgit2/include/git2/sys/midx.h +74 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +9 -5
- data/vendor/libgit2/include/git2/sys/remote.h +31 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +26 -34
- data/vendor/libgit2/include/git2/tag.h +13 -0
- data/vendor/libgit2/include/git2/tree.h +4 -17
- data/vendor/libgit2/include/git2/types.h +16 -7
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +13 -2
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +192 -290
- data/vendor/libgit2/src/alloc.c +21 -8
- data/vendor/libgit2/src/allocators/failalloc.c +92 -0
- data/vendor/libgit2/src/allocators/failalloc.h +23 -0
- data/vendor/libgit2/src/allocators/stdalloc.c +41 -10
- data/vendor/libgit2/src/allocators/win32_leakcheck.c +118 -0
- data/vendor/libgit2/src/allocators/{win32_crtdbg.h → win32_leakcheck.h} +3 -3
- data/vendor/libgit2/src/annotated_commit.c +21 -9
- data/vendor/libgit2/src/annotated_commit.h +1 -1
- data/vendor/libgit2/src/apply.c +34 -25
- data/vendor/libgit2/src/apply.h +2 -2
- data/vendor/libgit2/src/array.h +11 -11
- data/vendor/libgit2/src/attr.c +204 -82
- data/vendor/libgit2/src/attr_file.c +105 -52
- data/vendor/libgit2/src/attr_file.h +36 -15
- data/vendor/libgit2/src/attrcache.c +55 -45
- data/vendor/libgit2/src/attrcache.h +4 -5
- data/vendor/libgit2/src/blame.c +15 -9
- data/vendor/libgit2/src/blame_git.c +2 -2
- data/vendor/libgit2/src/blob.c +76 -52
- data/vendor/libgit2/src/blob.h +1 -1
- data/vendor/libgit2/src/branch.c +203 -110
- data/vendor/libgit2/src/branch.h +15 -3
- data/vendor/libgit2/src/buf.c +126 -0
- data/vendor/libgit2/src/buf.h +50 -0
- data/vendor/libgit2/src/cache.c +2 -2
- data/vendor/libgit2/src/cache.h +7 -7
- data/vendor/libgit2/src/cc-compat.h +11 -9
- data/vendor/libgit2/src/checkout.c +118 -91
- data/vendor/libgit2/src/cherrypick.c +16 -12
- data/vendor/libgit2/src/clone.c +97 -103
- data/vendor/libgit2/src/commit.c +167 -84
- data/vendor/libgit2/src/commit.h +24 -1
- data/vendor/libgit2/src/commit_graph.c +1224 -0
- data/vendor/libgit2/src/commit_graph.h +169 -0
- data/vendor/libgit2/src/commit_list.c +48 -3
- data/vendor/libgit2/src/commit_list.h +2 -0
- data/vendor/libgit2/src/common.h +35 -5
- data/vendor/libgit2/src/config.c +119 -64
- data/vendor/libgit2/src/config.h +15 -2
- data/vendor/libgit2/src/config_cache.c +5 -3
- data/vendor/libgit2/src/config_file.c +120 -100
- data/vendor/libgit2/src/config_mem.c +9 -9
- data/vendor/libgit2/src/config_parse.c +29 -27
- data/vendor/libgit2/src/crlf.c +36 -23
- data/vendor/libgit2/src/date.c +13 -19
- data/vendor/libgit2/src/date.h +33 -0
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/describe.c +32 -21
- data/vendor/libgit2/src/diff.c +71 -183
- data/vendor/libgit2/src/diff.h +2 -4
- data/vendor/libgit2/src/diff_driver.c +53 -51
- data/vendor/libgit2/src/diff_driver.h +3 -3
- data/vendor/libgit2/src/diff_file.c +31 -26
- data/vendor/libgit2/src/diff_generate.c +76 -23
- data/vendor/libgit2/src/diff_generate.h +5 -3
- data/vendor/libgit2/src/diff_print.c +120 -95
- data/vendor/libgit2/src/diff_stats.c +47 -34
- data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
- data/vendor/libgit2/src/diff_tform.c +18 -16
- data/vendor/libgit2/src/diff_xdiff.c +7 -10
- data/vendor/libgit2/src/diff_xdiff.h +1 -1
- data/vendor/libgit2/src/email.c +315 -0
- data/vendor/libgit2/src/email.h +25 -0
- data/vendor/libgit2/src/errors.c +37 -32
- data/vendor/libgit2/src/features.h.in +11 -2
- data/vendor/libgit2/src/fetch.c +77 -26
- data/vendor/libgit2/src/fetch.h +1 -1
- data/vendor/libgit2/src/fetchhead.c +27 -23
- data/vendor/libgit2/src/filebuf.c +36 -34
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +278 -132
- data/vendor/libgit2/src/filter.h +46 -6
- data/vendor/libgit2/src/fs_path.c +2071 -0
- data/vendor/libgit2/src/fs_path.h +772 -0
- data/vendor/libgit2/src/futils.c +96 -90
- data/vendor/libgit2/src/futils.h +27 -15
- data/vendor/libgit2/src/graph.c +64 -9
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +5 -5
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +5 -5
- data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
- data/vendor/libgit2/src/hash/sha1/generic.h +1 -1
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +13 -13
- data/vendor/libgit2/src/hash/sha1/openssl.c +5 -5
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +9 -11
- data/vendor/libgit2/src/hash/sha1/win32.c +21 -17
- data/vendor/libgit2/src/hash/sha1.h +3 -1
- data/vendor/libgit2/src/hash.c +71 -36
- data/vendor/libgit2/src/hash.h +13 -13
- data/vendor/libgit2/src/hashsig.c +23 -10
- data/vendor/libgit2/src/ident.c +30 -20
- data/vendor/libgit2/src/ignore.c +63 -46
- data/vendor/libgit2/src/ignore.h +2 -2
- data/vendor/libgit2/src/index.c +184 -149
- data/vendor/libgit2/src/index.h +7 -4
- data/vendor/libgit2/src/indexer.c +143 -89
- data/vendor/libgit2/src/integer.h +64 -2
- data/vendor/libgit2/src/iterator.c +93 -73
- data/vendor/libgit2/src/iterator.h +6 -6
- data/vendor/libgit2/src/khash.h +3 -12
- data/vendor/libgit2/src/{settings.c → libgit2.c} +165 -56
- data/vendor/libgit2/src/libgit2.h +15 -0
- data/vendor/libgit2/src/mailmap.c +60 -45
- data/vendor/libgit2/src/map.h +3 -3
- data/vendor/libgit2/src/merge.c +104 -61
- data/vendor/libgit2/src/merge.h +3 -15
- data/vendor/libgit2/src/merge_driver.c +21 -15
- data/vendor/libgit2/src/merge_file.c +24 -6
- data/vendor/libgit2/src/message.c +21 -8
- data/vendor/libgit2/src/midx.c +501 -18
- data/vendor/libgit2/src/midx.h +29 -2
- data/vendor/libgit2/src/mwindow.c +103 -59
- data/vendor/libgit2/src/mwindow.h +3 -3
- data/vendor/libgit2/src/net.c +405 -71
- data/vendor/libgit2/src/net.h +26 -5
- data/vendor/libgit2/src/netops.c +7 -5
- data/vendor/libgit2/src/netops.h +3 -3
- data/vendor/libgit2/src/notes.c +40 -49
- data/vendor/libgit2/src/object.c +68 -20
- data/vendor/libgit2/src/object.h +1 -1
- data/vendor/libgit2/src/odb.c +320 -80
- data/vendor/libgit2/src/odb.h +17 -3
- data/vendor/libgit2/src/odb_loose.c +96 -86
- data/vendor/libgit2/src/odb_mempack.c +19 -6
- data/vendor/libgit2/src/odb_pack.c +402 -125
- data/vendor/libgit2/src/oid.c +16 -8
- data/vendor/libgit2/src/oid.h +15 -0
- data/vendor/libgit2/src/oidarray.c +10 -1
- data/vendor/libgit2/src/pack-objects.c +90 -69
- data/vendor/libgit2/src/pack-objects.h +11 -6
- data/vendor/libgit2/src/pack.c +337 -127
- data/vendor/libgit2/src/pack.h +25 -7
- data/vendor/libgit2/src/patch.c +17 -10
- data/vendor/libgit2/src/patch.h +1 -0
- data/vendor/libgit2/src/patch_generate.c +29 -13
- data/vendor/libgit2/src/patch_generate.h +5 -5
- data/vendor/libgit2/src/patch_parse.c +26 -25
- data/vendor/libgit2/src/path.c +86 -1768
- data/vendor/libgit2/src/path.h +39 -635
- data/vendor/libgit2/src/pathspec.c +12 -12
- data/vendor/libgit2/src/pathspec.h +2 -2
- data/vendor/libgit2/src/pool.c +13 -7
- data/vendor/libgit2/src/posix.c +14 -6
- data/vendor/libgit2/src/posix.h +1 -0
- data/vendor/libgit2/src/pqueue.h +1 -1
- data/vendor/libgit2/src/proxy.c +4 -1
- data/vendor/libgit2/src/proxy.h +1 -1
- data/vendor/libgit2/src/push.c +30 -35
- data/vendor/libgit2/src/push.h +4 -16
- data/vendor/libgit2/src/rand.c +226 -0
- data/vendor/libgit2/src/rand.h +37 -0
- data/vendor/libgit2/src/reader.c +18 -14
- data/vendor/libgit2/src/reader.h +2 -2
- data/vendor/libgit2/src/rebase.c +177 -132
- data/vendor/libgit2/src/refdb.c +30 -13
- data/vendor/libgit2/src/refdb_fs.c +548 -222
- data/vendor/libgit2/src/reflog.c +19 -14
- data/vendor/libgit2/src/refs.c +107 -72
- data/vendor/libgit2/src/refs.h +2 -2
- data/vendor/libgit2/src/refspec.c +53 -38
- data/vendor/libgit2/src/refspec.h +5 -2
- data/vendor/libgit2/src/regexp.c +1 -1
- data/vendor/libgit2/src/remote.c +960 -486
- data/vendor/libgit2/src/remote.h +16 -10
- data/vendor/libgit2/src/repository.c +702 -422
- data/vendor/libgit2/src/repository.h +26 -8
- data/vendor/libgit2/src/reset.c +16 -12
- data/vendor/libgit2/src/revert.c +16 -12
- data/vendor/libgit2/src/revparse.c +66 -48
- data/vendor/libgit2/src/revwalk.c +39 -22
- data/vendor/libgit2/src/runtime.c +162 -0
- data/vendor/libgit2/src/runtime.h +62 -0
- data/vendor/libgit2/src/settings.h +11 -0
- data/vendor/libgit2/src/signature.c +18 -11
- data/vendor/libgit2/src/signature.h +1 -1
- data/vendor/libgit2/src/sortedcache.c +1 -1
- data/vendor/libgit2/src/sortedcache.h +10 -8
- data/vendor/libgit2/src/stash.c +39 -38
- data/vendor/libgit2/src/status.c +11 -5
- data/vendor/libgit2/src/{buffer.c → str.c} +459 -136
- data/vendor/libgit2/src/str.h +357 -0
- data/vendor/libgit2/src/strarray.c +2 -1
- data/vendor/libgit2/src/streams/mbedtls.c +22 -23
- data/vendor/libgit2/src/streams/mbedtls.h +1 -1
- data/vendor/libgit2/src/streams/openssl.c +101 -201
- data/vendor/libgit2/src/streams/openssl.h +9 -1
- data/vendor/libgit2/src/streams/openssl_dynamic.c +309 -0
- data/vendor/libgit2/src/streams/openssl_dynamic.h +348 -0
- data/vendor/libgit2/src/streams/openssl_legacy.c +203 -0
- data/vendor/libgit2/src/streams/openssl_legacy.h +63 -0
- data/vendor/libgit2/src/streams/registry.c +5 -6
- data/vendor/libgit2/src/streams/socket.c +6 -2
- data/vendor/libgit2/src/streams/stransport.c +6 -3
- data/vendor/libgit2/src/streams/tls.c +5 -3
- data/vendor/libgit2/src/submodule.c +290 -212
- data/vendor/libgit2/src/submodule.h +10 -10
- data/vendor/libgit2/src/sysdir.c +70 -56
- data/vendor/libgit2/src/sysdir.h +15 -10
- data/vendor/libgit2/src/tag.c +72 -34
- data/vendor/libgit2/src/thread.c +140 -0
- data/vendor/libgit2/src/thread.h +479 -0
- data/vendor/libgit2/src/threadstate.c +84 -0
- data/vendor/libgit2/src/threadstate.h +24 -0
- data/vendor/libgit2/src/trace.c +3 -16
- data/vendor/libgit2/src/trace.h +17 -30
- data/vendor/libgit2/src/trailer.c +2 -2
- data/vendor/libgit2/src/transaction.c +20 -9
- data/vendor/libgit2/src/transport.c +13 -13
- data/vendor/libgit2/src/transports/auth.c +8 -10
- data/vendor/libgit2/src/transports/auth.h +2 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +23 -17
- data/vendor/libgit2/src/transports/auth_ntlm.c +20 -16
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/transports/credential.c +15 -7
- data/vendor/libgit2/src/transports/git.c +10 -14
- data/vendor/libgit2/src/transports/http.c +56 -34
- data/vendor/libgit2/src/transports/http.h +3 -3
- data/vendor/libgit2/src/transports/httpclient.c +106 -79
- data/vendor/libgit2/src/transports/httpclient.h +1 -1
- data/vendor/libgit2/src/transports/local.c +127 -119
- data/vendor/libgit2/src/transports/smart.c +61 -144
- data/vendor/libgit2/src/transports/smart.h +26 -32
- data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
- data/vendor/libgit2/src/transports/smart_protocol.c +68 -44
- data/vendor/libgit2/src/transports/ssh.c +100 -131
- data/vendor/libgit2/src/transports/winhttp.c +86 -82
- data/vendor/libgit2/src/tree-cache.c +5 -5
- data/vendor/libgit2/src/tree-cache.h +2 -2
- data/vendor/libgit2/src/tree.c +150 -116
- data/vendor/libgit2/src/tree.h +1 -0
- data/vendor/libgit2/src/tsort.c +0 -2
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +1 -4
- data/vendor/libgit2/src/unix/pthread.h +2 -1
- data/vendor/libgit2/src/unix/realpath.c +0 -2
- data/vendor/libgit2/src/utf8.c +150 -0
- data/vendor/libgit2/src/utf8.h +52 -0
- data/vendor/libgit2/src/util.c +68 -144
- data/vendor/libgit2/src/util.h +36 -68
- data/vendor/libgit2/src/vector.c +23 -19
- data/vendor/libgit2/src/vector.h +5 -3
- data/vendor/libgit2/src/win32/findfile.c +172 -114
- data/vendor/libgit2/src/win32/findfile.h +7 -4
- data/vendor/libgit2/src/win32/map.c +1 -1
- data/vendor/libgit2/src/win32/msvc-compat.h +9 -1
- data/vendor/libgit2/src/win32/path_w32.c +162 -33
- data/vendor/libgit2/src/win32/path_w32.h +2 -1
- data/vendor/libgit2/src/win32/posix.h +6 -7
- data/vendor/libgit2/src/win32/posix_w32.c +26 -33
- data/vendor/libgit2/src/win32/precompiled.h +0 -1
- data/vendor/libgit2/src/win32/reparse.h +4 -4
- data/vendor/libgit2/src/win32/thread.c +24 -15
- data/vendor/libgit2/src/win32/thread.h +1 -1
- data/vendor/libgit2/src/win32/w32_buffer.c +5 -6
- data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
- data/vendor/libgit2/src/win32/w32_common.h +18 -9
- data/vendor/libgit2/src/win32/{w32_crtdbg_stacktrace.c → w32_leakcheck.c} +269 -33
- data/vendor/libgit2/src/win32/w32_leakcheck.h +222 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -6
- data/vendor/libgit2/src/worktree.c +138 -105
- data/vendor/libgit2/src/worktree.h +1 -1
- data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
- data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
- data/vendor/libgit2/src/xdiff/xemit.c +23 -7
- data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
- data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
- data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
- data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
- data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
- data/vendor/libgit2/src/xdiff/xutils.c +18 -7
- data/vendor/libgit2/src/zstream.c +6 -6
- data/vendor/libgit2/src/zstream.h +4 -4
- metadata +60 -24
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
- data/vendor/libgit2/src/buf_text.c +0 -316
- data/vendor/libgit2/src/buf_text.h +0 -122
- data/vendor/libgit2/src/buffer.h +0 -222
- data/vendor/libgit2/src/global.c +0 -363
- data/vendor/libgit2/src/global.h +0 -41
- data/vendor/libgit2/src/thread-utils.c +0 -58
- data/vendor/libgit2/src/thread-utils.h +0 -369
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -127
- data/vendor/libgit2/src/win32/w32_stack.c +0 -188
- data/vendor/libgit2/src/win32/w32_stack.h +0 -140
@@ -0,0 +1,479 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
#ifndef INCLUDE_thread_h__
|
8
|
+
#define INCLUDE_thread_h__
|
9
|
+
|
10
|
+
#if defined(GIT_THREADS)
|
11
|
+
|
12
|
+
#if defined(__clang__)
|
13
|
+
|
14
|
+
# if (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 1))
|
15
|
+
# error Atomic primitives do not exist on this version of clang; configure libgit2 with -DUSE_THREADS=OFF
|
16
|
+
# else
|
17
|
+
# define GIT_BUILTIN_ATOMIC
|
18
|
+
# endif
|
19
|
+
|
20
|
+
#elif defined(__GNUC__)
|
21
|
+
|
22
|
+
# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1))
|
23
|
+
# error Atomic primitives do not exist on this version of gcc; configure libgit2 with -DUSE_THREADS=OFF
|
24
|
+
# elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
|
25
|
+
# define GIT_BUILTIN_ATOMIC
|
26
|
+
# else
|
27
|
+
# define GIT_BUILTIN_SYNC
|
28
|
+
# endif
|
29
|
+
|
30
|
+
#endif
|
31
|
+
|
32
|
+
#endif /* GIT_THREADS */
|
33
|
+
|
34
|
+
/* Common operations even if threading has been disabled */
|
35
|
+
typedef struct {
|
36
|
+
#if defined(GIT_WIN32)
|
37
|
+
volatile long val;
|
38
|
+
#else
|
39
|
+
volatile int val;
|
40
|
+
#endif
|
41
|
+
} git_atomic32;
|
42
|
+
|
43
|
+
#ifdef GIT_ARCH_64
|
44
|
+
|
45
|
+
typedef struct {
|
46
|
+
#if defined(GIT_WIN32)
|
47
|
+
volatile __int64 val;
|
48
|
+
#else
|
49
|
+
volatile int64_t val;
|
50
|
+
#endif
|
51
|
+
} git_atomic64;
|
52
|
+
|
53
|
+
typedef git_atomic64 git_atomic_ssize;
|
54
|
+
|
55
|
+
#define git_atomic_ssize_set git_atomic64_set
|
56
|
+
#define git_atomic_ssize_add git_atomic64_add
|
57
|
+
#define git_atomic_ssize_get git_atomic64_get
|
58
|
+
|
59
|
+
#else
|
60
|
+
|
61
|
+
typedef git_atomic32 git_atomic_ssize;
|
62
|
+
|
63
|
+
#define git_atomic_ssize_set git_atomic32_set
|
64
|
+
#define git_atomic_ssize_add git_atomic32_add
|
65
|
+
#define git_atomic_ssize_get git_atomic32_get
|
66
|
+
|
67
|
+
#endif
|
68
|
+
|
69
|
+
#ifdef GIT_THREADS
|
70
|
+
|
71
|
+
#ifdef GIT_WIN32
|
72
|
+
# include "win32/thread.h"
|
73
|
+
#else
|
74
|
+
# include "unix/pthread.h"
|
75
|
+
#endif
|
76
|
+
|
77
|
+
/*
|
78
|
+
* Atomically sets the contents of *a to be val.
|
79
|
+
*/
|
80
|
+
GIT_INLINE(void) git_atomic32_set(git_atomic32 *a, int val)
|
81
|
+
{
|
82
|
+
#if defined(GIT_WIN32)
|
83
|
+
InterlockedExchange(&a->val, (LONG)val);
|
84
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
85
|
+
__atomic_store_n(&a->val, val, __ATOMIC_SEQ_CST);
|
86
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
87
|
+
__sync_lock_test_and_set(&a->val, val);
|
88
|
+
#else
|
89
|
+
# error "Unsupported architecture for atomic operations"
|
90
|
+
#endif
|
91
|
+
}
|
92
|
+
|
93
|
+
/*
|
94
|
+
* Atomically increments the contents of *a by 1, and stores the result back into *a.
|
95
|
+
* @return the result of the operation.
|
96
|
+
*/
|
97
|
+
GIT_INLINE(int) git_atomic32_inc(git_atomic32 *a)
|
98
|
+
{
|
99
|
+
#if defined(GIT_WIN32)
|
100
|
+
return InterlockedIncrement(&a->val);
|
101
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
102
|
+
return __atomic_add_fetch(&a->val, 1, __ATOMIC_SEQ_CST);
|
103
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
104
|
+
return __sync_add_and_fetch(&a->val, 1);
|
105
|
+
#else
|
106
|
+
# error "Unsupported architecture for atomic operations"
|
107
|
+
#endif
|
108
|
+
}
|
109
|
+
|
110
|
+
/*
|
111
|
+
* Atomically adds the contents of *a and addend, and stores the result back into *a.
|
112
|
+
* @return the result of the operation.
|
113
|
+
*/
|
114
|
+
GIT_INLINE(int) git_atomic32_add(git_atomic32 *a, int32_t addend)
|
115
|
+
{
|
116
|
+
#if defined(GIT_WIN32)
|
117
|
+
return InterlockedAdd(&a->val, addend);
|
118
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
119
|
+
return __atomic_add_fetch(&a->val, addend, __ATOMIC_SEQ_CST);
|
120
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
121
|
+
return __sync_add_and_fetch(&a->val, addend);
|
122
|
+
#else
|
123
|
+
# error "Unsupported architecture for atomic operations"
|
124
|
+
#endif
|
125
|
+
}
|
126
|
+
|
127
|
+
/*
|
128
|
+
* Atomically decrements the contents of *a by 1, and stores the result back into *a.
|
129
|
+
* @return the result of the operation.
|
130
|
+
*/
|
131
|
+
GIT_INLINE(int) git_atomic32_dec(git_atomic32 *a)
|
132
|
+
{
|
133
|
+
#if defined(GIT_WIN32)
|
134
|
+
return InterlockedDecrement(&a->val);
|
135
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
136
|
+
return __atomic_sub_fetch(&a->val, 1, __ATOMIC_SEQ_CST);
|
137
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
138
|
+
return __sync_sub_and_fetch(&a->val, 1);
|
139
|
+
#else
|
140
|
+
# error "Unsupported architecture for atomic operations"
|
141
|
+
#endif
|
142
|
+
}
|
143
|
+
|
144
|
+
/*
|
145
|
+
* Atomically gets the contents of *a.
|
146
|
+
* @return the contents of *a.
|
147
|
+
*/
|
148
|
+
GIT_INLINE(int) git_atomic32_get(git_atomic32 *a)
|
149
|
+
{
|
150
|
+
#if defined(GIT_WIN32)
|
151
|
+
return (int)InterlockedCompareExchange(&a->val, 0, 0);
|
152
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
153
|
+
return __atomic_load_n(&a->val, __ATOMIC_SEQ_CST);
|
154
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
155
|
+
return __sync_val_compare_and_swap(&a->val, 0, 0);
|
156
|
+
#else
|
157
|
+
# error "Unsupported architecture for atomic operations"
|
158
|
+
#endif
|
159
|
+
}
|
160
|
+
|
161
|
+
GIT_INLINE(void *) git_atomic__compare_and_swap(
|
162
|
+
void * volatile *ptr, void *oldval, void *newval)
|
163
|
+
{
|
164
|
+
#if defined(GIT_WIN32)
|
165
|
+
return InterlockedCompareExchangePointer((volatile PVOID *)ptr, newval, oldval);
|
166
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
167
|
+
void *foundval = oldval;
|
168
|
+
__atomic_compare_exchange(ptr, &foundval, &newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
|
169
|
+
return foundval;
|
170
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
171
|
+
return __sync_val_compare_and_swap(ptr, oldval, newval);
|
172
|
+
#else
|
173
|
+
# error "Unsupported architecture for atomic operations"
|
174
|
+
#endif
|
175
|
+
}
|
176
|
+
|
177
|
+
GIT_INLINE(volatile void *) git_atomic__swap(
|
178
|
+
void * volatile *ptr, void *newval)
|
179
|
+
{
|
180
|
+
#if defined(GIT_WIN32)
|
181
|
+
return InterlockedExchangePointer(ptr, newval);
|
182
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
183
|
+
void * foundval = NULL;
|
184
|
+
__atomic_exchange(ptr, &newval, &foundval, __ATOMIC_SEQ_CST);
|
185
|
+
return foundval;
|
186
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
187
|
+
return (volatile void *)__sync_lock_test_and_set(ptr, newval);
|
188
|
+
#else
|
189
|
+
# error "Unsupported architecture for atomic operations"
|
190
|
+
#endif
|
191
|
+
}
|
192
|
+
|
193
|
+
GIT_INLINE(volatile void *) git_atomic__load(void * volatile *ptr)
|
194
|
+
{
|
195
|
+
#if defined(GIT_WIN32)
|
196
|
+
void *newval = NULL, *oldval = NULL;
|
197
|
+
return (volatile void *)InterlockedCompareExchangePointer((volatile PVOID *)ptr, newval, oldval);
|
198
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
199
|
+
return (volatile void *)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
|
200
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
201
|
+
return (volatile void *)__sync_val_compare_and_swap(ptr, 0, 0);
|
202
|
+
#else
|
203
|
+
# error "Unsupported architecture for atomic operations"
|
204
|
+
#endif
|
205
|
+
}
|
206
|
+
|
207
|
+
#ifdef GIT_ARCH_64
|
208
|
+
|
209
|
+
/*
|
210
|
+
* Atomically adds the contents of *a and addend, and stores the result back into *a.
|
211
|
+
* @return the result of the operation.
|
212
|
+
*/
|
213
|
+
GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend)
|
214
|
+
{
|
215
|
+
#if defined(GIT_WIN32)
|
216
|
+
return InterlockedAdd64(&a->val, addend);
|
217
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
218
|
+
return __atomic_add_fetch(&a->val, addend, __ATOMIC_SEQ_CST);
|
219
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
220
|
+
return __sync_add_and_fetch(&a->val, addend);
|
221
|
+
#else
|
222
|
+
# error "Unsupported architecture for atomic operations"
|
223
|
+
#endif
|
224
|
+
}
|
225
|
+
|
226
|
+
/*
|
227
|
+
* Atomically sets the contents of *a to be val.
|
228
|
+
*/
|
229
|
+
GIT_INLINE(void) git_atomic64_set(git_atomic64 *a, int64_t val)
|
230
|
+
{
|
231
|
+
#if defined(GIT_WIN32)
|
232
|
+
InterlockedExchange64(&a->val, val);
|
233
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
234
|
+
__atomic_store_n(&a->val, val, __ATOMIC_SEQ_CST);
|
235
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
236
|
+
__sync_lock_test_and_set(&a->val, val);
|
237
|
+
#else
|
238
|
+
# error "Unsupported architecture for atomic operations"
|
239
|
+
#endif
|
240
|
+
}
|
241
|
+
|
242
|
+
/*
|
243
|
+
* Atomically gets the contents of *a.
|
244
|
+
* @return the contents of *a.
|
245
|
+
*/
|
246
|
+
GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
|
247
|
+
{
|
248
|
+
#if defined(GIT_WIN32)
|
249
|
+
return (int64_t)InterlockedCompareExchange64(&a->val, 0, 0);
|
250
|
+
#elif defined(GIT_BUILTIN_ATOMIC)
|
251
|
+
return __atomic_load_n(&a->val, __ATOMIC_SEQ_CST);
|
252
|
+
#elif defined(GIT_BUILTIN_SYNC)
|
253
|
+
return __sync_val_compare_and_swap(&a->val, 0, 0);
|
254
|
+
#else
|
255
|
+
# error "Unsupported architecture for atomic operations"
|
256
|
+
#endif
|
257
|
+
}
|
258
|
+
|
259
|
+
#endif
|
260
|
+
|
261
|
+
#else
|
262
|
+
|
263
|
+
#define git_threads_global_init git__noop
|
264
|
+
|
265
|
+
#define git_thread unsigned int
|
266
|
+
#define git_thread_create(thread, start_routine, arg) git__noop()
|
267
|
+
#define git_thread_join(id, status) git__noop()
|
268
|
+
|
269
|
+
/* Pthreads Mutex */
|
270
|
+
#define git_mutex unsigned int
|
271
|
+
#define git_mutex_init(a) git__noop()
|
272
|
+
#define git_mutex_init(a) git__noop()
|
273
|
+
#define git_mutex_lock(a) git__noop()
|
274
|
+
#define git_mutex_unlock(a) git__noop()
|
275
|
+
#define git_mutex_free(a) git__noop()
|
276
|
+
|
277
|
+
/* Pthreads condition vars */
|
278
|
+
#define git_cond unsigned int
|
279
|
+
#define git_cond_init(c) git__noop()
|
280
|
+
#define git_cond_free(c) git__noop()
|
281
|
+
#define git_cond_wait(c, l) git__noop()
|
282
|
+
#define git_cond_signal(c) git__noop()
|
283
|
+
#define git_cond_broadcast(c) git__noop()
|
284
|
+
|
285
|
+
/* Pthreads rwlock */
|
286
|
+
#define git_rwlock unsigned int
|
287
|
+
#define git_rwlock_init(a) git__noop()
|
288
|
+
#define git_rwlock_rdlock(a) git__noop()
|
289
|
+
#define git_rwlock_rdunlock(a) git__noop()
|
290
|
+
#define git_rwlock_wrlock(a) git__noop()
|
291
|
+
#define git_rwlock_wrunlock(a) git__noop()
|
292
|
+
#define git_rwlock_free(a) git__noop()
|
293
|
+
#define GIT_RWLOCK_STATIC_INIT 0
|
294
|
+
|
295
|
+
|
296
|
+
GIT_INLINE(void) git_atomic32_set(git_atomic32 *a, int val)
|
297
|
+
{
|
298
|
+
a->val = val;
|
299
|
+
}
|
300
|
+
|
301
|
+
GIT_INLINE(int) git_atomic32_inc(git_atomic32 *a)
|
302
|
+
{
|
303
|
+
return ++a->val;
|
304
|
+
}
|
305
|
+
|
306
|
+
GIT_INLINE(int) git_atomic32_add(git_atomic32 *a, int32_t addend)
|
307
|
+
{
|
308
|
+
a->val += addend;
|
309
|
+
return a->val;
|
310
|
+
}
|
311
|
+
|
312
|
+
GIT_INLINE(int) git_atomic32_dec(git_atomic32 *a)
|
313
|
+
{
|
314
|
+
return --a->val;
|
315
|
+
}
|
316
|
+
|
317
|
+
GIT_INLINE(int) git_atomic32_get(git_atomic32 *a)
|
318
|
+
{
|
319
|
+
return (int)a->val;
|
320
|
+
}
|
321
|
+
|
322
|
+
GIT_INLINE(void *) git_atomic__compare_and_swap(
|
323
|
+
void * volatile *ptr, void *oldval, void *newval)
|
324
|
+
{
|
325
|
+
void *foundval = *ptr;
|
326
|
+
if (foundval == oldval)
|
327
|
+
*ptr = newval;
|
328
|
+
return foundval;
|
329
|
+
}
|
330
|
+
|
331
|
+
GIT_INLINE(volatile void *) git_atomic__swap(
|
332
|
+
void * volatile *ptr, void *newval)
|
333
|
+
{
|
334
|
+
volatile void *old = *ptr;
|
335
|
+
*ptr = newval;
|
336
|
+
return old;
|
337
|
+
}
|
338
|
+
|
339
|
+
GIT_INLINE(volatile void *) git_atomic__load(void * volatile *ptr)
|
340
|
+
{
|
341
|
+
return *ptr;
|
342
|
+
}
|
343
|
+
|
344
|
+
#ifdef GIT_ARCH_64
|
345
|
+
|
346
|
+
GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend)
|
347
|
+
{
|
348
|
+
a->val += addend;
|
349
|
+
return a->val;
|
350
|
+
}
|
351
|
+
|
352
|
+
GIT_INLINE(void) git_atomic64_set(git_atomic64 *a, int64_t val)
|
353
|
+
{
|
354
|
+
a->val = val;
|
355
|
+
}
|
356
|
+
|
357
|
+
GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
|
358
|
+
{
|
359
|
+
return (int64_t)a->val;
|
360
|
+
}
|
361
|
+
|
362
|
+
#endif
|
363
|
+
|
364
|
+
#endif
|
365
|
+
|
366
|
+
/*
|
367
|
+
* Atomically replace the contents of *ptr (if they are equal to oldval) with
|
368
|
+
* newval. ptr must point to a pointer or a value that is the same size as a
|
369
|
+
* pointer. This is semantically compatible with:
|
370
|
+
*
|
371
|
+
* #define git_atomic_compare_and_swap(ptr, oldval, newval) \
|
372
|
+
* ({ \
|
373
|
+
* void *foundval = *ptr; \
|
374
|
+
* if (foundval == oldval) \
|
375
|
+
* *ptr = newval; \
|
376
|
+
* foundval; \
|
377
|
+
* })
|
378
|
+
*
|
379
|
+
* @return the original contents of *ptr.
|
380
|
+
*/
|
381
|
+
#define git_atomic_compare_and_swap(ptr, oldval, newval) \
|
382
|
+
git_atomic__compare_and_swap((void * volatile *)ptr, oldval, newval)
|
383
|
+
|
384
|
+
/*
|
385
|
+
* Atomically replace the contents of v with newval. v must be the same size as
|
386
|
+
* a pointer. This is semantically compatible with:
|
387
|
+
*
|
388
|
+
* #define git_atomic_swap(v, newval) \
|
389
|
+
* ({ \
|
390
|
+
* volatile void *old = v; \
|
391
|
+
* v = newval; \
|
392
|
+
* old; \
|
393
|
+
* })
|
394
|
+
*
|
395
|
+
* @return the original contents of v.
|
396
|
+
*/
|
397
|
+
#define git_atomic_swap(v, newval) \
|
398
|
+
(void *)git_atomic__swap((void * volatile *)&(v), newval)
|
399
|
+
|
400
|
+
/*
|
401
|
+
* Atomically reads the contents of v. v must be the same size as a pointer.
|
402
|
+
* This is semantically compatible with:
|
403
|
+
*
|
404
|
+
* #define git_atomic_load(v) v
|
405
|
+
*
|
406
|
+
* @return the contents of v.
|
407
|
+
*/
|
408
|
+
#define git_atomic_load(v) \
|
409
|
+
(void *)git_atomic__load((void * volatile *)&(v))
|
410
|
+
|
411
|
+
#if defined(GIT_THREADS)
|
412
|
+
|
413
|
+
# if defined(GIT_WIN32)
|
414
|
+
# define GIT_MEMORY_BARRIER MemoryBarrier()
|
415
|
+
# elif defined(GIT_BUILTIN_ATOMIC)
|
416
|
+
# define GIT_MEMORY_BARRIER __atomic_thread_fence(__ATOMIC_SEQ_CST)
|
417
|
+
# elif defined(GIT_BUILTIN_SYNC)
|
418
|
+
# define GIT_MEMORY_BARRIER __sync_synchronize()
|
419
|
+
# endif
|
420
|
+
|
421
|
+
#else
|
422
|
+
|
423
|
+
# define GIT_MEMORY_BARRIER /* noop */
|
424
|
+
|
425
|
+
#endif
|
426
|
+
|
427
|
+
/* Thread-local data */
|
428
|
+
|
429
|
+
#if !defined(GIT_THREADS)
|
430
|
+
# define git_tlsdata_key int
|
431
|
+
#elif defined(GIT_WIN32)
|
432
|
+
# define git_tlsdata_key DWORD
|
433
|
+
#elif defined(_POSIX_THREADS)
|
434
|
+
# define git_tlsdata_key pthread_key_t
|
435
|
+
#else
|
436
|
+
# error unknown threading model
|
437
|
+
#endif
|
438
|
+
|
439
|
+
/**
|
440
|
+
* Create a thread-local data key. The destroy function will be
|
441
|
+
* called upon thread exit. On some platforms, it may be called
|
442
|
+
* when all threads have deleted their keys.
|
443
|
+
*
|
444
|
+
* Note that the tlsdata functions do not set an error message on
|
445
|
+
* failure; this is because the error handling in libgit2 is itself
|
446
|
+
* handled by thread-local data storage.
|
447
|
+
*
|
448
|
+
* @param key the tlsdata key
|
449
|
+
* @param destroy_fn function pointer called upon thread exit
|
450
|
+
* @return 0 on success, non-zero on failure
|
451
|
+
*/
|
452
|
+
int git_tlsdata_init(git_tlsdata_key *key, void (GIT_SYSTEM_CALL *destroy_fn)(void *));
|
453
|
+
|
454
|
+
/**
|
455
|
+
* Set a the thread-local value for the given key.
|
456
|
+
*
|
457
|
+
* @param key the tlsdata key to store data on
|
458
|
+
* @param value the pointer to store
|
459
|
+
* @return 0 on success, non-zero on failure
|
460
|
+
*/
|
461
|
+
int git_tlsdata_set(git_tlsdata_key key, void *value);
|
462
|
+
|
463
|
+
/**
|
464
|
+
* Get the thread-local value for the given key.
|
465
|
+
*
|
466
|
+
* @param key the tlsdata key to retrieve the value of
|
467
|
+
* @return the pointer stored with git_tlsdata_set
|
468
|
+
*/
|
469
|
+
void *git_tlsdata_get(git_tlsdata_key key);
|
470
|
+
|
471
|
+
/**
|
472
|
+
* Delete the given thread-local key.
|
473
|
+
*
|
474
|
+
* @param key the tlsdata key to dispose
|
475
|
+
* @return 0 on success, non-zero on failure
|
476
|
+
*/
|
477
|
+
int git_tlsdata_dispose(git_tlsdata_key key);
|
478
|
+
|
479
|
+
#endif
|
@@ -0,0 +1,84 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
|
8
|
+
#include "threadstate.h"
|
9
|
+
#include "runtime.h"
|
10
|
+
|
11
|
+
/**
|
12
|
+
* Handle the thread-local state
|
13
|
+
*
|
14
|
+
* `git_threadstate_global_init` will be called as part
|
15
|
+
* of `git_libgit2_init` (which itself must be called
|
16
|
+
* before calling any other function in the library).
|
17
|
+
*
|
18
|
+
* This function allocates a TLS index to store the per-
|
19
|
+
* thread state.
|
20
|
+
*
|
21
|
+
* Any internal method that requires thread-local state
|
22
|
+
* will then call `git_threadstate_get()` which returns a
|
23
|
+
* pointer to the thread-local state structure; this
|
24
|
+
* structure is lazily allocated on each thread.
|
25
|
+
*
|
26
|
+
* This mechanism will register a shutdown handler
|
27
|
+
* (`git_threadstate_global_shutdown`) which will free the
|
28
|
+
* TLS index. This shutdown handler will be called by
|
29
|
+
* `git_libgit2_shutdown`.
|
30
|
+
*/
|
31
|
+
|
32
|
+
static git_tlsdata_key tls_key;
|
33
|
+
|
34
|
+
static void threadstate_dispose(git_threadstate *threadstate)
|
35
|
+
{
|
36
|
+
if (!threadstate)
|
37
|
+
return;
|
38
|
+
|
39
|
+
if (threadstate->error_t.message != git_str__initstr)
|
40
|
+
git__free(threadstate->error_t.message);
|
41
|
+
threadstate->error_t.message = NULL;
|
42
|
+
}
|
43
|
+
|
44
|
+
static void GIT_SYSTEM_CALL threadstate_free(void *threadstate)
|
45
|
+
{
|
46
|
+
threadstate_dispose(threadstate);
|
47
|
+
git__free(threadstate);
|
48
|
+
}
|
49
|
+
|
50
|
+
static void git_threadstate_global_shutdown(void)
|
51
|
+
{
|
52
|
+
git_threadstate *threadstate;
|
53
|
+
|
54
|
+
threadstate = git_tlsdata_get(tls_key);
|
55
|
+
git_tlsdata_set(tls_key, NULL);
|
56
|
+
|
57
|
+
threadstate_dispose(threadstate);
|
58
|
+
git__free(threadstate);
|
59
|
+
|
60
|
+
git_tlsdata_dispose(tls_key);
|
61
|
+
}
|
62
|
+
|
63
|
+
int git_threadstate_global_init(void)
|
64
|
+
{
|
65
|
+
if (git_tlsdata_init(&tls_key, &threadstate_free) != 0)
|
66
|
+
return -1;
|
67
|
+
|
68
|
+
return git_runtime_shutdown_register(git_threadstate_global_shutdown);
|
69
|
+
}
|
70
|
+
|
71
|
+
git_threadstate *git_threadstate_get(void)
|
72
|
+
{
|
73
|
+
git_threadstate *threadstate;
|
74
|
+
|
75
|
+
if ((threadstate = git_tlsdata_get(tls_key)) != NULL)
|
76
|
+
return threadstate;
|
77
|
+
|
78
|
+
if ((threadstate = git__calloc(1, sizeof(git_threadstate))) == NULL ||
|
79
|
+
git_str_init(&threadstate->error_buf, 0) < 0)
|
80
|
+
return NULL;
|
81
|
+
|
82
|
+
git_tlsdata_set(tls_key, threadstate);
|
83
|
+
return threadstate;
|
84
|
+
}
|
@@ -0,0 +1,24 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
#ifndef INCLUDE_threadstate_h__
|
8
|
+
#define INCLUDE_threadstate_h__
|
9
|
+
|
10
|
+
#include "common.h"
|
11
|
+
|
12
|
+
typedef struct {
|
13
|
+
git_error *last_error;
|
14
|
+
git_error error_t;
|
15
|
+
git_str error_buf;
|
16
|
+
char oid_fmt[GIT_OID_HEXSZ+1];
|
17
|
+
} git_threadstate;
|
18
|
+
|
19
|
+
extern int git_threadstate_global_init(void);
|
20
|
+
extern git_threadstate *git_threadstate_get(void);
|
21
|
+
|
22
|
+
#define GIT_THREADSTATE (git_threadstate_get())
|
23
|
+
|
24
|
+
#endif
|
data/vendor/libgit2/src/trace.c
CHANGED
@@ -7,32 +7,19 @@
|
|
7
7
|
|
8
8
|
#include "trace.h"
|
9
9
|
|
10
|
-
#include "
|
11
|
-
#include "
|
10
|
+
#include "str.h"
|
11
|
+
#include "runtime.h"
|
12
12
|
#include "git2/trace.h"
|
13
13
|
|
14
|
-
#ifdef GIT_TRACE
|
15
|
-
|
16
14
|
struct git_trace_data git_trace__data = {0};
|
17
15
|
|
18
|
-
#endif
|
19
|
-
|
20
16
|
int git_trace_set(git_trace_level_t level, git_trace_cb callback)
|
21
17
|
{
|
22
|
-
|
23
|
-
assert(level == 0 || callback != NULL);
|
18
|
+
GIT_ASSERT_ARG(level == 0 || callback != NULL);
|
24
19
|
|
25
20
|
git_trace__data.level = level;
|
26
21
|
git_trace__data.callback = callback;
|
27
22
|
GIT_MEMORY_BARRIER;
|
28
23
|
|
29
24
|
return 0;
|
30
|
-
#else
|
31
|
-
GIT_UNUSED(level);
|
32
|
-
GIT_UNUSED(callback);
|
33
|
-
|
34
|
-
git_error_set(GIT_ERROR_INVALID,
|
35
|
-
"this version of libgit2 was not built with tracing.");
|
36
|
-
return -1;
|
37
|
-
#endif
|
38
25
|
}
|
data/vendor/libgit2/src/trace.h
CHANGED
@@ -10,9 +10,7 @@
|
|
10
10
|
#include "common.h"
|
11
11
|
|
12
12
|
#include <git2/trace.h>
|
13
|
-
#include "
|
14
|
-
|
15
|
-
#ifdef GIT_TRACE
|
13
|
+
#include "str.h"
|
16
14
|
|
17
15
|
struct git_trace_data {
|
18
16
|
git_trace_level_t level;
|
@@ -23,42 +21,31 @@ extern struct git_trace_data git_trace__data;
|
|
23
21
|
|
24
22
|
GIT_INLINE(void) git_trace__write_fmt(
|
25
23
|
git_trace_level_t level,
|
26
|
-
const char *fmt,
|
24
|
+
const char *fmt,
|
25
|
+
va_list ap)
|
27
26
|
{
|
28
27
|
git_trace_cb callback = git_trace__data.callback;
|
29
|
-
|
30
|
-
va_list ap;
|
28
|
+
git_str message = GIT_STR_INIT;
|
31
29
|
|
32
|
-
|
33
|
-
git_buf_vprintf(&message, fmt, ap);
|
34
|
-
va_end(ap);
|
30
|
+
git_str_vprintf(&message, fmt, ap);
|
35
31
|
|
36
|
-
callback(level,
|
32
|
+
callback(level, git_str_cstr(&message));
|
37
33
|
|
38
|
-
|
34
|
+
git_str_dispose(&message);
|
39
35
|
}
|
40
36
|
|
41
|
-
#define git_trace_level()
|
42
|
-
#define git_trace(l, ...) { \
|
43
|
-
if (git_trace__data.level >= l && \
|
44
|
-
git_trace__data.callback != NULL) { \
|
45
|
-
git_trace__write_fmt(l, __VA_ARGS__); \
|
46
|
-
} \
|
47
|
-
}
|
48
|
-
|
49
|
-
#else
|
37
|
+
#define git_trace_level() (git_trace__data.level)
|
50
38
|
|
51
|
-
GIT_INLINE(void)
|
52
|
-
git_trace_level_t level,
|
53
|
-
const char *fmt, ...)
|
39
|
+
GIT_INLINE(void) git_trace(git_trace_level_t level, const char *fmt, ...)
|
54
40
|
{
|
55
|
-
|
56
|
-
|
41
|
+
if (git_trace__data.level >= level &&
|
42
|
+
git_trace__data.callback != NULL) {
|
43
|
+
va_list ap;
|
44
|
+
|
45
|
+
va_start(ap, fmt);
|
46
|
+
git_trace__write_fmt(level, fmt, ap);
|
47
|
+
va_end(ap);
|
48
|
+
}
|
57
49
|
}
|
58
50
|
|
59
|
-
#define git_trace_level() ((git_trace_level_t)0)
|
60
|
-
#define git_trace git_trace__null
|
61
|
-
|
62
|
-
#endif
|
63
|
-
|
64
51
|
#endif
|
@@ -258,7 +258,7 @@ static size_t find_trailer_end(const char *buf, size_t len)
|
|
258
258
|
return len - ignore_non_trailer(buf, len);
|
259
259
|
}
|
260
260
|
|
261
|
-
static char *extract_trailer_block(const char *message, size_t*
|
261
|
+
static char *extract_trailer_block(const char *message, size_t *len)
|
262
262
|
{
|
263
263
|
size_t patch_start = find_patch_start(message);
|
264
264
|
size_t trailer_end = find_trailer_end(message, patch_start);
|
@@ -286,7 +286,7 @@ enum trailer_state {
|
|
286
286
|
S_VALUE = 4,
|
287
287
|
S_VALUE_NL = 5,
|
288
288
|
S_VALUE_END = 6,
|
289
|
-
S_IGNORE = 7
|
289
|
+
S_IGNORE = 7
|
290
290
|
};
|
291
291
|
|
292
292
|
#define NEXT(st) { state = (st); ptr++; continue; }
|