Skip to content

threads::diff: use separate git_repository objects #4754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethomson merged 2 commits into from
Aug 19, 2018
Merged

threads::diff: use separate git_repository objects #4754

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d191948
threads::diff: use separate git_repository objects
ethomson Aug 5, 2018
2afd018
threads::iterator: use separate repository objects
ethomson Aug 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
threads::diff: use separate git_repository objects 
Our thread policies state that we cannot re-use the `git_repository`
across threads.  Our tests cannot deviate from that.
  • Loading branch information
@ethomson
ethomson committed Aug 5, 2018
commit d1919485a5541fb3171d6fa835c7c0de41243dea
27 changes: 17 additions & 10 deletions tests/threads/diff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,26 +76,29 @@ static void free_trees(void)
static void *run_index_diffs(void *arg)
{
int thread = *(int *)arg;
git_repository *repo;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_diff *diff = NULL;
size_t i;
int exp[4] = { 0, 0, 0, 0 };

cl_git_pass(git_repository_open(&repo, git_repository_path(_repo)));

switch (thread & 0x03) {
case 0: /* diff index to workdir */;
cl_git_pass(git_diff_index_to_workdir(&diff, _repo, NULL, &opts));
cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, &opts));
break;
case 1: /* diff tree 'a' to index */;
cl_git_pass(git_diff_tree_to_index(&diff, _repo, _a, NULL, &opts));
cl_git_pass(git_diff_tree_to_index(&diff, repo, _a, NULL, &opts));
break;
case 2: /* diff tree 'b' to index */;
cl_git_pass(git_diff_tree_to_index(&diff, _repo, _b, NULL, &opts));
cl_git_pass(git_diff_tree_to_index(&diff, repo, _b, NULL, &opts));
break;
case 3: /* diff index to workdir (explicit index) */;
{
git_index *idx;
cl_git_pass(git_repository_index(&idx, _repo));
cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts));
cl_git_pass(git_repository_index(&idx, repo));
cl_git_pass(git_diff_index_to_workdir(&diff, repo, idx, &opts));
git_index_free(idx);
break;
}
Expand Down Expand Up @@ -132,6 +135,7 @@ static void *run_index_diffs(void *arg)
}

git_diff_free(diff);
git_repository_free(repo);
giterr_clear();

return arg;
Expand All @@ -152,8 +156,10 @@ static void *run_index_diffs_with_modifier(void *arg)
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_diff *diff = NULL;
git_index *idx = NULL;
git_repository *repo;

cl_git_pass(git_repository_index(&idx, _repo));
cl_git_pass(git_repository_open(&repo, git_repository_path(_repo)));
cl_git_pass(git_repository_index(&idx, repo));

/* have first thread altering the index as we go */
if (thread == 0) {
Expand All @@ -176,17 +182,17 @@ static void *run_index_diffs_with_modifier(void *arg)

switch (thread & 0x03) {
case 0: /* diff index to workdir */;
cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts));
cl_git_pass(git_diff_index_to_workdir(&diff, repo, idx, &opts));
break;
case 1: /* diff tree 'a' to index */;
cl_git_pass(git_diff_tree_to_index(&diff, _repo, _a, idx, &opts));
cl_git_pass(git_diff_tree_to_index(&diff, repo, _a, idx, &opts));
break;
case 2: /* diff tree 'b' to index */;
cl_git_pass(git_diff_tree_to_index(&diff, _repo, _b, idx, &opts));
cl_git_pass(git_diff_tree_to_index(&diff, repo, _b, idx, &opts));
break;
case 3: /* diff index to workdir reversed */;
opts.flags |= GIT_DIFF_REVERSE;
cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts));
cl_git_pass(git_diff_index_to_workdir(&diff, repo, idx, &opts));
break;
}

Expand All @@ -196,6 +202,7 @@ static void *run_index_diffs_with_modifier(void *arg)

done:
git_index_free(idx);
git_repository_free(repo);
giterr_clear();

return arg;
Expand Down