Skip to content

global: adjust init count under lock #4645

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
pks-t merged 1 commit into from
May 9, 2018
Merged

global: adjust init count under lock #4645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions src/global.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@ int git_libgit2_init(void)
{
int ret, err;

ret = git_atomic_inc(&git__n_inits);

if ((err = pthread_mutex_lock(&_init_mutex)) != 0)
return err;

ret = git_atomic_inc(&git__n_inits);
err = pthread_once(&_once_init, init_once);
err |= pthread_mutex_unlock(&_init_mutex);

Expand All @@ -289,13 +289,13 @@ int git_libgit2_shutdown(void)
{
void *ptr = NULL;
pthread_once_t new_once = PTHREAD_ONCE_INIT;
int ret;
int error, ret;

if ((ret = git_atomic_dec(&git__n_inits)) != 0)
return ret;
if ((error = pthread_mutex_lock(&_init_mutex)) != 0)
return error;

if ((ret = pthread_mutex_lock(&_init_mutex)) != 0)
return ret;
if ((ret = git_atomic_dec(&git__n_inits)) != 0)
goto out;

/* Shut down any subsystems that have global state */
shutdown_common();
Expand All @@ -310,10 +310,11 @@ int git_libgit2_shutdown(void)
git_mutex_free(&git__mwindow_mutex);
_once_init = new_once;

if ((ret = pthread_mutex_unlock(&_init_mutex)) != 0)
return ret;
out:
if ((error = pthread_mutex_unlock(&_init_mutex)) != 0)
return error;

return 0;
return ret;
}

git_global_st *git__global_state(void)
Expand Down