Commit c9beca569c9356828c551fa4cb0a1ea5496a4fbd
2018-07-22T12:43:13
tog's blame_thread needs to hold mutex while closing repo
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/tog/tog.c b/tog/tog.c
index 9906028..0f6ba49 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1389,18 +1389,18 @@ blame_thread(void *arg)
err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
blame_cb, ta->cb_args);
- got_repo_close(ta->repo);
- ta->repo = NULL;
- *ta->complete = 1;
- if (err)
- return (void *)err;
if (pthread_mutex_lock(a->mutex) != 0)
return (void *)got_error_from_errno();
- err = draw_blame(tog_blame_view.window, a->commit_id, a->f, a->path,
- a->lines, a->nlines, 1, *a->selected_line, a->first_displayed_line,
- a->last_displayed_line, &eof, LINES);
+ got_repo_close(ta->repo);
+ ta->repo = NULL;
+ *ta->complete = 1;
+ if (!err)
+ err = draw_blame(tog_blame_view.window, a->commit_id, a->f,
+ a->path, a->lines, a->nlines, 1, *a->selected_line,
+ a->first_displayed_line, a->last_displayed_line, &eof,
+ LINES);
if (pthread_mutex_unlock(a->mutex) != 0 && err == NULL)
err = got_error_from_errno();
@@ -1593,7 +1593,6 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
struct got_object *obj = NULL, *pobj = NULL;
pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
struct tog_blame blame;
- int blame_running = 0;
struct got_object_id_queue blamed_commits;
struct got_object_qid *blamed_commit = NULL;
@@ -1706,7 +1705,6 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
goto done;
}
thread_err = stop_blame(&blame);
- blame_running = 0;
done = 0;
if (pthread_mutex_lock(&mutex) != 0) {
err = got_error_from_errno();
@@ -1737,7 +1735,6 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
&done, path, blamed_commit->id, repo);
if (err)
break;
- blame_running = 1;
break;
}
case 'B': {
@@ -1751,7 +1748,6 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
goto done;
}
thread_err = stop_blame(&blame);
- blame_running = 0;
done = 0;
if (pthread_mutex_lock(&mutex) != 0) {
err = got_error_from_errno();
@@ -1768,7 +1764,6 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
&done, path, blamed_commit->id, repo);
if (err)
break;
- blame_running = 1;
break;
}
case KEY_ENTER:
@@ -1817,7 +1812,7 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
done:
if (pobj)
got_object_close(pobj);
- if (blame_running)
+ if (blame.thread)
thread_err = stop_blame(&blame);
while (!SIMPLEQ_EMPTY(&blamed_commits)) {
blamed_commit = SIMPLEQ_FIRST(&blamed_commits);