Commit 6c51014d by Edward Thomson

libgit2: provide init_count of the library

A function to provide the initialization count of the library; this is
subject to race conditions but is useful for a naive determination as to
whether the library has been initialized or not.
parent a5cb2cc9
...@@ -90,6 +90,11 @@ int git_libgit2_init(void) ...@@ -90,6 +90,11 @@ int git_libgit2_init(void)
return git_runtime_init(init_fns, ARRAY_SIZE(init_fns)); return git_runtime_init(init_fns, ARRAY_SIZE(init_fns));
} }
int git_libgit2_init_count(void)
{
return git_runtime_init_count();
}
int git_libgit2_shutdown(void) int git_libgit2_shutdown(void)
{ {
return git_runtime_shutdown(); return git_runtime_shutdown();
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#ifndef INCLUDE_libgit2_h__ #ifndef INCLUDE_libgit2_h__
#define INCLUDE_libgit2_h__ #define INCLUDE_libgit2_h__
extern int git_libgit2_init_count(void);
extern const char *git_libgit2__user_agent(void); extern const char *git_libgit2__user_agent(void);
extern const char *git_libgit2__ssl_ciphers(void); extern const char *git_libgit2__ssl_ciphers(void);
......
...@@ -127,6 +127,21 @@ int git_runtime_init(git_runtime_init_fn init_fns[], size_t cnt) ...@@ -127,6 +127,21 @@ int git_runtime_init(git_runtime_init_fn init_fns[], size_t cnt)
return ret; return ret;
} }
int git_runtime_init_count(void)
{
int ret;
if (init_lock() < 0)
return -1;
ret = git_atomic32_get(&init_count);
if (init_unlock() < 0)
return -1;
return ret;
}
int git_runtime_shutdown(void) int git_runtime_shutdown(void)
{ {
int ret; int ret;
......
...@@ -28,6 +28,15 @@ typedef void (*git_runtime_shutdown_fn)(void); ...@@ -28,6 +28,15 @@ typedef void (*git_runtime_shutdown_fn)(void);
*/ */
int git_runtime_init(git_runtime_init_fn init_fns[], size_t cnt); int git_runtime_init(git_runtime_init_fn init_fns[], size_t cnt);
/*
* Returns the number of initializations active (the number of calls to
* `git_runtime_init` minus the number of calls sto `git_runtime_shutdown`).
* If 0, the runtime is not currently initialized.
*
* @return The number of initializations performed or an error
*/
int git_runtime_init_count(void);
/** /**
* Shut down the runtime. If this is the last shutdown call, * Shut down the runtime. If this is the last shutdown call,
* such that there are no remaining `init` calls, then any * such that there are no remaining `init` calls, then any
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment