rugged 1.1.1 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (277) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +1 -0
  3. data/README.md +1 -1
  4. data/ext/rugged/rugged.c +7 -4
  5. data/ext/rugged/rugged_object.c +1 -1
  6. data/ext/rugged/rugged_repo.c +3 -3
  7. data/lib/rugged/repository.rb +2 -2
  8. data/lib/rugged/version.rb +1 -1
  9. data/vendor/libgit2/CMakeLists.txt +11 -6
  10. data/vendor/libgit2/COPYING +109 -1
  11. data/vendor/libgit2/cmake/Findfutimens.cmake +14 -0
  12. data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +4 -0
  13. data/vendor/libgit2/cmake/SelectHashes.cmake +1 -0
  14. data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +101 -0
  15. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +17 -5
  16. data/vendor/libgit2/deps/ntlmclient/crypt.h +14 -9
  17. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +20 -20
  18. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +3 -3
  19. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +37 -36
  20. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +4 -3
  21. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +178 -51
  22. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +74 -5
  23. data/vendor/libgit2/deps/ntlmclient/ntlm.c +150 -118
  24. data/vendor/libgit2/deps/ntlmclient/ntlm.h +13 -9
  25. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +16 -3
  26. data/vendor/libgit2/deps/ntlmclient/unicode.h +10 -4
  27. data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +16 -27
  28. data/vendor/libgit2/deps/ntlmclient/unicode_builtin.h +20 -0
  29. data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +28 -52
  30. data/vendor/libgit2/deps/ntlmclient/unicode_iconv.h +22 -0
  31. data/vendor/libgit2/include/git2/attr.h +89 -0
  32. data/vendor/libgit2/include/git2/blame.h +93 -42
  33. data/vendor/libgit2/include/git2/blob.h +14 -2
  34. data/vendor/libgit2/include/git2/branch.h +25 -0
  35. data/vendor/libgit2/include/git2/cert.h +42 -5
  36. data/vendor/libgit2/include/git2/checkout.h +28 -12
  37. data/vendor/libgit2/include/git2/commit.h +35 -19
  38. data/vendor/libgit2/include/git2/common.h +14 -4
  39. data/vendor/libgit2/include/git2/deprecated.h +206 -6
  40. data/vendor/libgit2/include/git2/diff.h +34 -19
  41. data/vendor/libgit2/include/git2/errors.h +6 -6
  42. data/vendor/libgit2/include/git2/filter.h +57 -17
  43. data/vendor/libgit2/include/git2/graph.h +20 -2
  44. data/vendor/libgit2/include/git2/index.h +2 -2
  45. data/vendor/libgit2/include/git2/odb.h +29 -0
  46. data/vendor/libgit2/include/git2/patch.h +8 -0
  47. data/vendor/libgit2/include/git2/rebase.h +25 -1
  48. data/vendor/libgit2/include/git2/refs.h +6 -2
  49. data/vendor/libgit2/include/git2/remote.h +59 -6
  50. data/vendor/libgit2/include/git2/revparse.h +5 -5
  51. data/vendor/libgit2/include/git2/status.h +115 -59
  52. data/vendor/libgit2/include/git2/submodule.h +9 -0
  53. data/vendor/libgit2/include/git2/sys/commit_graph.h +174 -0
  54. data/vendor/libgit2/include/git2/sys/filter.h +49 -28
  55. data/vendor/libgit2/include/git2/sys/midx.h +74 -0
  56. data/vendor/libgit2/include/git2/sys/odb_backend.h +7 -0
  57. data/vendor/libgit2/include/git2/sys/transport.h +1 -0
  58. data/vendor/libgit2/include/git2/tag.h +12 -0
  59. data/vendor/libgit2/include/git2/tree.h +0 -14
  60. data/vendor/libgit2/include/git2/types.h +9 -0
  61. data/vendor/libgit2/include/git2/version.h +4 -4
  62. data/vendor/libgit2/include/git2/worktree.h +1 -0
  63. data/vendor/libgit2/src/CMakeLists.txt +25 -4
  64. data/vendor/libgit2/src/alloc.c +21 -8
  65. data/vendor/libgit2/src/allocators/failalloc.c +92 -0
  66. data/vendor/libgit2/src/allocators/failalloc.h +23 -0
  67. data/vendor/libgit2/src/allocators/stdalloc.c +41 -10
  68. data/vendor/libgit2/src/allocators/win32_leakcheck.c +118 -0
  69. data/vendor/libgit2/src/allocators/{win32_crtdbg.h → win32_leakcheck.h} +3 -3
  70. data/vendor/libgit2/src/annotated_commit.c +21 -9
  71. data/vendor/libgit2/src/apply.c +16 -7
  72. data/vendor/libgit2/src/array.h +11 -11
  73. data/vendor/libgit2/src/attr.c +181 -74
  74. data/vendor/libgit2/src/attr_file.c +84 -39
  75. data/vendor/libgit2/src/attr_file.h +32 -11
  76. data/vendor/libgit2/src/attrcache.c +42 -37
  77. data/vendor/libgit2/src/attrcache.h +4 -5
  78. data/vendor/libgit2/src/blame.c +11 -5
  79. data/vendor/libgit2/src/blob.c +35 -24
  80. data/vendor/libgit2/src/branch.c +69 -17
  81. data/vendor/libgit2/src/buffer.c +334 -25
  82. data/vendor/libgit2/src/buffer.h +153 -2
  83. data/vendor/libgit2/src/cache.c +2 -2
  84. data/vendor/libgit2/src/cache.h +7 -7
  85. data/vendor/libgit2/src/cc-compat.h +10 -2
  86. data/vendor/libgit2/src/checkout.c +48 -26
  87. data/vendor/libgit2/src/cherrypick.c +6 -2
  88. data/vendor/libgit2/src/clone.c +41 -47
  89. data/vendor/libgit2/src/commit.c +41 -28
  90. data/vendor/libgit2/src/commit_graph.c +1209 -0
  91. data/vendor/libgit2/src/commit_graph.h +162 -0
  92. data/vendor/libgit2/src/commit_list.c +46 -0
  93. data/vendor/libgit2/src/commit_list.h +2 -0
  94. data/vendor/libgit2/src/common.h +25 -2
  95. data/vendor/libgit2/src/config.c +37 -15
  96. data/vendor/libgit2/src/config_cache.c +5 -3
  97. data/vendor/libgit2/src/config_file.c +16 -8
  98. data/vendor/libgit2/src/config_parse.c +4 -6
  99. data/vendor/libgit2/src/crlf.c +16 -6
  100. data/vendor/libgit2/src/date.c +4 -3
  101. data/vendor/libgit2/src/delta.c +1 -1
  102. data/vendor/libgit2/src/describe.c +6 -3
  103. data/vendor/libgit2/src/diff.c +11 -8
  104. data/vendor/libgit2/src/diff_driver.c +21 -17
  105. data/vendor/libgit2/src/diff_file.c +2 -6
  106. data/vendor/libgit2/src/diff_generate.c +46 -17
  107. data/vendor/libgit2/src/diff_print.c +19 -6
  108. data/vendor/libgit2/src/diff_stats.c +7 -5
  109. data/vendor/libgit2/src/diff_tform.c +9 -8
  110. data/vendor/libgit2/src/diff_xdiff.c +4 -2
  111. data/vendor/libgit2/src/diff_xdiff.h +1 -1
  112. data/vendor/libgit2/src/errors.c +24 -19
  113. data/vendor/libgit2/src/features.h.in +5 -1
  114. data/vendor/libgit2/src/fetch.c +5 -2
  115. data/vendor/libgit2/src/fetchhead.c +8 -4
  116. data/vendor/libgit2/src/filebuf.c +9 -7
  117. data/vendor/libgit2/src/filter.c +206 -110
  118. data/vendor/libgit2/src/filter.h +24 -5
  119. data/vendor/libgit2/src/futils.c +5 -5
  120. data/vendor/libgit2/src/futils.h +1 -1
  121. data/vendor/libgit2/src/graph.c +64 -9
  122. data/vendor/libgit2/src/hash/sha1/collisiondetect.c +3 -3
  123. data/vendor/libgit2/src/hash/sha1/common_crypto.c +3 -3
  124. data/vendor/libgit2/src/hash/sha1/generic.h +1 -1
  125. data/vendor/libgit2/src/hash/sha1/mbedtls.c +12 -12
  126. data/vendor/libgit2/src/hash/sha1/openssl.c +3 -3
  127. data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +0 -2
  128. data/vendor/libgit2/src/hash/sha1/win32.c +15 -11
  129. data/vendor/libgit2/src/hash.c +16 -13
  130. data/vendor/libgit2/src/hash.h +1 -1
  131. data/vendor/libgit2/src/hashsig.c +23 -10
  132. data/vendor/libgit2/src/ident.c +13 -3
  133. data/vendor/libgit2/src/ignore.c +35 -19
  134. data/vendor/libgit2/src/index.c +106 -70
  135. data/vendor/libgit2/src/index.h +1 -1
  136. data/vendor/libgit2/src/indexer.c +31 -29
  137. data/vendor/libgit2/src/integer.h +64 -2
  138. data/vendor/libgit2/src/iterator.c +36 -24
  139. data/vendor/libgit2/src/iterator.h +1 -1
  140. data/vendor/libgit2/src/khash.h +2 -11
  141. data/vendor/libgit2/src/{settings.c → libgit2.c} +117 -50
  142. data/vendor/libgit2/src/libgit2.h +15 -0
  143. data/vendor/libgit2/src/mailmap.c +23 -10
  144. data/vendor/libgit2/src/map.h +3 -3
  145. data/vendor/libgit2/src/merge.c +70 -30
  146. data/vendor/libgit2/src/merge.h +2 -1
  147. data/vendor/libgit2/src/merge_driver.c +19 -13
  148. data/vendor/libgit2/src/merge_file.c +11 -3
  149. data/vendor/libgit2/src/message.c +3 -1
  150. data/vendor/libgit2/src/midx.c +471 -10
  151. data/vendor/libgit2/src/midx.h +28 -1
  152. data/vendor/libgit2/src/mwindow.c +103 -59
  153. data/vendor/libgit2/src/mwindow.h +3 -3
  154. data/vendor/libgit2/src/net.c +127 -3
  155. data/vendor/libgit2/src/net.h +16 -2
  156. data/vendor/libgit2/src/netops.c +6 -4
  157. data/vendor/libgit2/src/netops.h +2 -2
  158. data/vendor/libgit2/src/notes.c +10 -10
  159. data/vendor/libgit2/src/object.c +22 -14
  160. data/vendor/libgit2/src/odb.c +285 -48
  161. data/vendor/libgit2/src/odb.h +16 -2
  162. data/vendor/libgit2/src/odb_loose.c +28 -18
  163. data/vendor/libgit2/src/odb_mempack.c +1 -1
  164. data/vendor/libgit2/src/odb_pack.c +391 -114
  165. data/vendor/libgit2/src/oid.c +5 -4
  166. data/vendor/libgit2/src/pack-objects.c +54 -48
  167. data/vendor/libgit2/src/pack.c +329 -119
  168. data/vendor/libgit2/src/pack.h +25 -7
  169. data/vendor/libgit2/src/patch.c +14 -7
  170. data/vendor/libgit2/src/patch_generate.c +2 -2
  171. data/vendor/libgit2/src/patch_parse.c +2 -1
  172. data/vendor/libgit2/src/path.c +98 -53
  173. data/vendor/libgit2/src/path.h +79 -6
  174. data/vendor/libgit2/src/pathspec.c +8 -8
  175. data/vendor/libgit2/src/pool.c +13 -7
  176. data/vendor/libgit2/src/posix.c +11 -3
  177. data/vendor/libgit2/src/reader.c +10 -6
  178. data/vendor/libgit2/src/rebase.c +93 -49
  179. data/vendor/libgit2/src/refdb.c +30 -13
  180. data/vendor/libgit2/src/refdb_fs.c +121 -69
  181. data/vendor/libgit2/src/reflog.c +19 -14
  182. data/vendor/libgit2/src/refs.c +76 -41
  183. data/vendor/libgit2/src/refspec.c +32 -12
  184. data/vendor/libgit2/src/remote.c +272 -102
  185. data/vendor/libgit2/src/remote.h +2 -1
  186. data/vendor/libgit2/src/repository.c +176 -103
  187. data/vendor/libgit2/src/repository.h +12 -1
  188. data/vendor/libgit2/src/reset.c +7 -6
  189. data/vendor/libgit2/src/revert.c +6 -2
  190. data/vendor/libgit2/src/revparse.c +14 -9
  191. data/vendor/libgit2/src/revwalk.c +32 -15
  192. data/vendor/libgit2/src/runtime.c +162 -0
  193. data/vendor/libgit2/src/runtime.h +62 -0
  194. data/vendor/libgit2/src/settings.h +11 -0
  195. data/vendor/libgit2/src/signature.c +6 -5
  196. data/vendor/libgit2/src/sortedcache.h +10 -8
  197. data/vendor/libgit2/src/stash.c +3 -1
  198. data/vendor/libgit2/src/status.c +7 -4
  199. data/vendor/libgit2/src/strarray.c +2 -1
  200. data/vendor/libgit2/src/streams/mbedtls.c +14 -17
  201. data/vendor/libgit2/src/streams/mbedtls.h +1 -1
  202. data/vendor/libgit2/src/streams/openssl.c +101 -201
  203. data/vendor/libgit2/src/streams/openssl.h +9 -1
  204. data/vendor/libgit2/src/streams/openssl_dynamic.c +309 -0
  205. data/vendor/libgit2/src/streams/openssl_dynamic.h +348 -0
  206. data/vendor/libgit2/src/streams/openssl_legacy.c +203 -0
  207. data/vendor/libgit2/src/streams/openssl_legacy.h +63 -0
  208. data/vendor/libgit2/src/streams/registry.c +5 -6
  209. data/vendor/libgit2/src/streams/socket.c +6 -2
  210. data/vendor/libgit2/src/streams/stransport.c +6 -3
  211. data/vendor/libgit2/src/streams/tls.c +5 -3
  212. data/vendor/libgit2/src/submodule.c +128 -62
  213. data/vendor/libgit2/src/submodule.h +9 -9
  214. data/vendor/libgit2/src/sysdir.c +4 -6
  215. data/vendor/libgit2/src/tag.c +47 -11
  216. data/vendor/libgit2/src/thread.c +140 -0
  217. data/vendor/libgit2/src/thread.h +479 -0
  218. data/vendor/libgit2/src/threadstate.c +83 -0
  219. data/vendor/libgit2/src/threadstate.h +24 -0
  220. data/vendor/libgit2/src/trace.c +2 -2
  221. data/vendor/libgit2/src/trace.h +17 -13
  222. data/vendor/libgit2/src/transaction.c +19 -8
  223. data/vendor/libgit2/src/transport.c +3 -3
  224. data/vendor/libgit2/src/transports/auth.c +1 -1
  225. data/vendor/libgit2/src/transports/auth_negotiate.c +11 -4
  226. data/vendor/libgit2/src/transports/auth_ntlm.c +10 -6
  227. data/vendor/libgit2/src/transports/credential.c +15 -7
  228. data/vendor/libgit2/src/transports/git.c +1 -3
  229. data/vendor/libgit2/src/transports/http.c +19 -17
  230. data/vendor/libgit2/src/transports/http.h +1 -0
  231. data/vendor/libgit2/src/transports/httpclient.c +53 -26
  232. data/vendor/libgit2/src/transports/httpclient.h +1 -1
  233. data/vendor/libgit2/src/transports/local.c +3 -3
  234. data/vendor/libgit2/src/transports/smart.c +12 -7
  235. data/vendor/libgit2/src/transports/smart.h +1 -1
  236. data/vendor/libgit2/src/transports/smart_protocol.c +11 -5
  237. data/vendor/libgit2/src/transports/ssh.c +51 -17
  238. data/vendor/libgit2/src/transports/winhttp.c +41 -31
  239. data/vendor/libgit2/src/tree.c +100 -77
  240. data/vendor/libgit2/src/tree.h +1 -0
  241. data/vendor/libgit2/src/tsort.c +0 -2
  242. data/vendor/libgit2/src/unix/map.c +3 -1
  243. data/vendor/libgit2/src/unix/pthread.h +2 -1
  244. data/vendor/libgit2/src/utf8.c +150 -0
  245. data/vendor/libgit2/src/utf8.h +52 -0
  246. data/vendor/libgit2/src/util.c +53 -129
  247. data/vendor/libgit2/src/util.h +33 -39
  248. data/vendor/libgit2/src/vector.c +23 -19
  249. data/vendor/libgit2/src/vector.h +4 -2
  250. data/vendor/libgit2/src/win32/findfile.c +4 -2
  251. data/vendor/libgit2/src/win32/map.c +1 -1
  252. data/vendor/libgit2/src/win32/msvc-compat.h +9 -1
  253. data/vendor/libgit2/src/win32/path_w32.c +22 -24
  254. data/vendor/libgit2/src/win32/path_w32.h +0 -1
  255. data/vendor/libgit2/src/win32/posix_w32.c +7 -1
  256. data/vendor/libgit2/src/win32/precompiled.h +0 -1
  257. data/vendor/libgit2/src/win32/reparse.h +4 -4
  258. data/vendor/libgit2/src/win32/thread.c +24 -15
  259. data/vendor/libgit2/src/win32/thread.h +1 -1
  260. data/vendor/libgit2/src/win32/w32_buffer.c +3 -3
  261. data/vendor/libgit2/src/win32/w32_common.h +18 -9
  262. data/vendor/libgit2/src/win32/{w32_crtdbg_stacktrace.c → w32_leakcheck.c} +269 -33
  263. data/vendor/libgit2/src/win32/w32_leakcheck.h +222 -0
  264. data/vendor/libgit2/src/win32/w32_util.h +6 -6
  265. data/vendor/libgit2/src/worktree.c +27 -16
  266. data/vendor/libgit2/src/zstream.c +1 -1
  267. metadata +32 -16
  268. data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
  269. data/vendor/libgit2/src/buf_text.c +0 -316
  270. data/vendor/libgit2/src/buf_text.h +0 -122
  271. data/vendor/libgit2/src/global.c +0 -363
  272. data/vendor/libgit2/src/global.h +0 -41
  273. data/vendor/libgit2/src/thread-utils.c +0 -58
  274. data/vendor/libgit2/src/thread-utils.h +0 -369
  275. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -127
  276. data/vendor/libgit2/src/win32/w32_stack.c +0 -188
  277. data/vendor/libgit2/src/win32/w32_stack.h +0 -140
@@ -1,188 +0,0 @@
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 "w32_stack.h"
9
-
10
- #if defined(GIT_MSVC_CRTDBG)
11
- #include "Windows.h"
12
- #include "Dbghelp.h"
13
- #include "win32/posix.h"
14
- #include "hash.h"
15
-
16
- static bool g_win32_stack_initialized = false;
17
- static HANDLE g_win32_stack_process = INVALID_HANDLE_VALUE;
18
- static git_win32__stack__aux_cb_alloc g_aux_cb_alloc = NULL;
19
- static git_win32__stack__aux_cb_lookup g_aux_cb_lookup = NULL;
20
-
21
- int git_win32__stack__set_aux_cb(
22
- git_win32__stack__aux_cb_alloc cb_alloc,
23
- git_win32__stack__aux_cb_lookup cb_lookup)
24
- {
25
- g_aux_cb_alloc = cb_alloc;
26
- g_aux_cb_lookup = cb_lookup;
27
-
28
- return 0;
29
- }
30
-
31
- void git_win32__stack_init(void)
32
- {
33
- if (!g_win32_stack_initialized) {
34
- g_win32_stack_process = GetCurrentProcess();
35
- SymSetOptions(SYMOPT_LOAD_LINES);
36
- SymInitialize(g_win32_stack_process, NULL, TRUE);
37
- g_win32_stack_initialized = true;
38
- }
39
- }
40
-
41
- void git_win32__stack_cleanup(void)
42
- {
43
- if (g_win32_stack_initialized) {
44
- SymCleanup(g_win32_stack_process);
45
- g_win32_stack_process = INVALID_HANDLE_VALUE;
46
- g_win32_stack_initialized = false;
47
- }
48
- }
49
-
50
- int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip)
51
- {
52
- if (!g_win32_stack_initialized) {
53
- git_error_set(GIT_ERROR_INVALID, "git_win32_stack not initialized.");
54
- return GIT_ERROR;
55
- }
56
-
57
- memset(pdata, 0, sizeof(*pdata));
58
- pdata->nr_frames = RtlCaptureStackBackTrace(
59
- skip+1, GIT_WIN32__STACK__MAX_FRAMES, pdata->frames, NULL);
60
-
61
- /* If an "aux" data provider was registered, ask it to capture
62
- * whatever data it needs and give us an "aux_id" to it so that
63
- * we can refer to it later when reporting.
64
- */
65
- if (g_aux_cb_alloc)
66
- (g_aux_cb_alloc)(&pdata->aux_id);
67
-
68
- return 0;
69
- }
70
-
71
- int git_win32__stack_compare(
72
- git_win32__stack__raw_data *d1,
73
- git_win32__stack__raw_data *d2)
74
- {
75
- return memcmp(d1, d2, sizeof(*d1));
76
- }
77
-
78
- int git_win32__stack_format(
79
- char *pbuf, size_t buf_len,
80
- const git_win32__stack__raw_data *pdata,
81
- const char *prefix, const char *suffix)
82
- {
83
- #define MY_MAX_FILENAME 255
84
-
85
- /* SYMBOL_INFO has char FileName[1] at the end. The docs say to
86
- * to malloc it with extra space for your desired max filename.
87
- */
88
- struct {
89
- SYMBOL_INFO symbol;
90
- char extra[MY_MAX_FILENAME + 1];
91
- } s;
92
-
93
- IMAGEHLP_LINE64 line;
94
- size_t buf_used = 0;
95
- unsigned int k;
96
- char detail[MY_MAX_FILENAME * 2]; /* filename plus space for function name and formatting */
97
- size_t detail_len;
98
-
99
- if (!g_win32_stack_initialized) {
100
- git_error_set(GIT_ERROR_INVALID, "git_win32_stack not initialized.");
101
- return GIT_ERROR;
102
- }
103
-
104
- if (!prefix)
105
- prefix = "\t";
106
- if (!suffix)
107
- suffix = "\n";
108
-
109
- memset(pbuf, 0, buf_len);
110
-
111
- memset(&s, 0, sizeof(s));
112
- s.symbol.MaxNameLen = MY_MAX_FILENAME;
113
- s.symbol.SizeOfStruct = sizeof(SYMBOL_INFO);
114
-
115
- memset(&line, 0, sizeof(line));
116
- line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
117
-
118
- for (k=0; k < pdata->nr_frames; k++) {
119
- DWORD64 frame_k = (DWORD64)pdata->frames[k];
120
- DWORD dwUnused;
121
-
122
- if (SymFromAddr(g_win32_stack_process, frame_k, 0, &s.symbol) &&
123
- SymGetLineFromAddr64(g_win32_stack_process, frame_k, &dwUnused, &line)) {
124
- const char *pslash;
125
- const char *pfile;
126
-
127
- pslash = strrchr(line.FileName, '\\');
128
- pfile = ((pslash) ? (pslash+1) : line.FileName);
129
- p_snprintf(detail, sizeof(detail), "%s%s:%d> %s%s",
130
- prefix, pfile, line.LineNumber, s.symbol.Name, suffix);
131
- } else {
132
- /* This happens when we cross into another module.
133
- * For example, in CLAR tests, this is typically
134
- * the CRT startup code. Just print an unknown
135
- * frame and continue.
136
- */
137
- p_snprintf(detail, sizeof(detail), "%s??%s", prefix, suffix);
138
- }
139
- detail_len = strlen(detail);
140
-
141
- if (buf_len < (buf_used + detail_len + 1)) {
142
- /* we don't have room for this frame in the buffer, so just stop. */
143
- break;
144
- }
145
-
146
- memcpy(&pbuf[buf_used], detail, detail_len);
147
- buf_used += detail_len;
148
- }
149
-
150
- /* "aux_id" 0 is reserved to mean no aux data. This is needed to handle
151
- * allocs that occur before the aux callbacks were registered.
152
- */
153
- if (pdata->aux_id > 0) {
154
- p_snprintf(detail, sizeof(detail), "%saux_id: %d%s",
155
- prefix, pdata->aux_id, suffix);
156
- detail_len = strlen(detail);
157
- if ((buf_used + detail_len + 1) < buf_len) {
158
- memcpy(&pbuf[buf_used], detail, detail_len);
159
- buf_used += detail_len;
160
- }
161
-
162
- /* If an "aux" data provider is still registered, ask it to append its detailed
163
- * data to the end of ours using the "aux_id" it gave us when this de-duped
164
- * item was created.
165
- */
166
- if (g_aux_cb_lookup)
167
- (g_aux_cb_lookup)(pdata->aux_id, &pbuf[buf_used], (buf_len - buf_used - 1));
168
- }
169
-
170
- return GIT_OK;
171
- }
172
-
173
- int git_win32__stack(
174
- char * pbuf, size_t buf_len,
175
- int skip,
176
- const char *prefix, const char *suffix)
177
- {
178
- git_win32__stack__raw_data data;
179
- int error;
180
-
181
- if ((error = git_win32__stack_capture(&data, skip)) < 0)
182
- return error;
183
- if ((error = git_win32__stack_format(pbuf, buf_len, &data, prefix, suffix)) < 0)
184
- return error;
185
- return 0;
186
- }
187
-
188
- #endif
@@ -1,140 +0,0 @@
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
- #ifndef INCLUDE_win32_w32_stack_h__
9
- #define INCLUDE_win32_w32_stack_h__
10
-
11
- #include "common.h"
12
-
13
- #if defined(GIT_MSVC_CRTDBG)
14
-
15
- /**
16
- * This type defines a callback to be used to augment a C stacktrace
17
- * with "aux" data. This can be used, for example, to allow LibGit2Sharp
18
- * (or other interpreted consumer libraries) to give us C# stacktrace
19
- * data for the PInvoke.
20
- *
21
- * This callback will be called during crtdbg-instrumented allocs.
22
- *
23
- * @param aux_id [out] A returned "aux_id" representing a unique
24
- * (de-duped at the C# layer) stacktrace. "aux_id" 0 is reserved
25
- * to mean no aux stacktrace data.
26
- */
27
- typedef void (*git_win32__stack__aux_cb_alloc)(unsigned int *aux_id);
28
-
29
- /**
30
- * This type defines a callback to be used to augment the output of
31
- * a stacktrace. This will be used to request the C# layer format
32
- * the C# stacktrace associated with "aux_id" into the provided
33
- * buffer.
34
- *
35
- * This callback will be called during leak reporting.
36
- *
37
- * @param aux_id The "aux_id" key associated with a stacktrace.
38
- * @param aux_msg A buffer where a formatted message should be written.
39
- * @param aux_msg_len The size of the buffer.
40
- */
41
- typedef void (*git_win32__stack__aux_cb_lookup)(unsigned int aux_id, char *aux_msg, size_t aux_msg_len);
42
-
43
- /**
44
- * Register an "aux" data provider to augment our C stacktrace data.
45
- *
46
- * This can be used, for example, to allow LibGit2Sharp (or other
47
- * interpreted consumer libraries) to give us the C# stacktrace of
48
- * the PInvoke.
49
- *
50
- * If you choose to use this feature, it should be registered during
51
- * initialization and not changed for the duration of the process.
52
- */
53
- GIT_EXTERN(int) git_win32__stack__set_aux_cb(
54
- git_win32__stack__aux_cb_alloc cb_alloc,
55
- git_win32__stack__aux_cb_lookup cb_lookup);
56
-
57
- /**
58
- * Maximum number of stackframes to record for a
59
- * single stacktrace.
60
- */
61
- #define GIT_WIN32__STACK__MAX_FRAMES 30
62
-
63
- /**
64
- * Wrapper containing the raw unprocessed stackframe
65
- * data for a single stacktrace and any "aux_id".
66
- *
67
- * I put the aux_id first so leaks will be sorted by it.
68
- * So, for example, if a specific callstack in C# leaks
69
- * a repo handle, all of the pointers within the associated
70
- * repo pointer will be grouped together.
71
- */
72
- typedef struct {
73
- unsigned int aux_id;
74
- unsigned int nr_frames;
75
- void *frames[GIT_WIN32__STACK__MAX_FRAMES];
76
- } git_win32__stack__raw_data;
77
-
78
-
79
- /**
80
- * Load symbol table data. This should be done in the primary
81
- * thread at startup (under a lock if there are other threads
82
- * active).
83
- */
84
- void git_win32__stack_init(void);
85
-
86
- /**
87
- * Cleanup symbol table data. This should be done in the
88
- * primary thead at shutdown (under a lock if there are other
89
- * threads active).
90
- */
91
- void git_win32__stack_cleanup(void);
92
-
93
-
94
- /**
95
- * Capture raw stack trace data for the current process/thread.
96
- *
97
- * @param skip Number of initial frames to skip. Pass 0 to
98
- * begin with the caller of this routine. Pass 1 to begin
99
- * with its caller. And so on.
100
- */
101
- int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip);
102
-
103
- /**
104
- * Compare 2 raw stacktraces with the usual -1,0,+1 result.
105
- * This includes any "aux_id" values in the comparison, so that
106
- * our de-dup is also "aux" context relative.
107
- */
108
- int git_win32__stack_compare(
109
- git_win32__stack__raw_data *d1,
110
- git_win32__stack__raw_data *d2);
111
-
112
- /**
113
- * Format raw stacktrace data into buffer WITHOUT using any mallocs.
114
- *
115
- * @param prefix String written before each frame; defaults to "\t".
116
- * @param suffix String written after each frame; defaults to "\n".
117
- */
118
- int git_win32__stack_format(
119
- char *pbuf, size_t buf_len,
120
- const git_win32__stack__raw_data *pdata,
121
- const char *prefix, const char *suffix);
122
-
123
- /**
124
- * Convenience routine to capture and format stacktrace into
125
- * a buffer WITHOUT using any mallocs. This is primarily a
126
- * wrapper for testing.
127
- *
128
- * @param skip Number of initial frames to skip. Pass 0 to
129
- * begin with the caller of this routine. Pass 1 to begin
130
- * with its caller. And so on.
131
- * @param prefix String written before each frame; defaults to "\t".
132
- * @param suffix String written after each frame; defaults to "\n".
133
- */
134
- int git_win32__stack(
135
- char * pbuf, size_t buf_len,
136
- int skip,
137
- const char *prefix, const char *suffix);
138
-
139
- #endif /* GIT_MSVC_CRTDBG */
140
- #endif