Skip to content
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

Jump to bottom

Adding a safe reference counter for initialization/deinitialization #47

Merged
merged 4 commits into from
May 2, 2020
Merged

Adding a safe reference counter for initialization/deinitialization #47

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfa88fb
free application name
May 1, 2020
5a39276
move check to ipatch_close()
May 1, 2020
df450c3
Adding a safe counter reference for init/deinit
May 1, 2020
dd2b509
Add comment, fix typo
May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 38 additions & 11 deletions libinstpatch/misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ static TypePropInit type_props[] =
/* name of application using libInstPatch (for saving to files) */
char *ipatch_application_name = NULL;

static gboolean initialized = FALSE;
G_LOCK_DEFINE_STATIC(lock_init);
static int init_counter = 0;

/*-----------------------------------------------------------------------------
Initialization / deinitialization of libinstpatch library.
Expand All @@ -163,6 +164,9 @@ static gboolean initialized = FALSE;
call ipatch_init() before creating other tasks, then when the application is
complete, the main task should call ipatch_close() after the other tasks are
completed.

If the application make use of multiple libraries each dependent of libinstpatch,
for each call to ipatch_init() these libraries should call ipatch_close().
-----------------------------------------------------------------------------*/

/**
Expand All @@ -178,13 +182,16 @@ ipatch_init(void)
GType type;
int i;

if(initialized)
/* do nothing if the library is already initialized */
G_LOCK(lock_init);
init_counter++;
if(init_counter > 1)
{
/* library already initialized */
G_UNLOCK(lock_init);
return;
}

initialized = TRUE;

g_type_init();

if(!g_thread_supported())
Expand Down Expand Up @@ -470,6 +477,8 @@ ipatch_init(void)
"mime-type", "audio/x-gigasampler", NULL);
ipatch_type_set(IPATCH_TYPE_SLI_FILE,
"mime-type", "audio/x-spectralis", NULL);

G_UNLOCK(lock_init);
}

/**
Expand All @@ -481,11 +490,8 @@ ipatch_init(void)
static void
ipatch_deinit(void)
{
if (!initialized)
{
return;
}
initialized = FALSE;
g_free(ipatch_application_name);

/*-------------------------------------------------------------------------
Free internal systems
-------------------------------------------------------------------------*/
Expand Down Expand Up @@ -553,16 +559,37 @@ ipatch_deinit(void)
/**
* ipatch_close:
*
* Perform cleanup of libInstPatch prior to application close. Such as deleting
* temporary files.
* This should be called prior to application close.
*
* Decrement the reference counter and if it reaches 0 performs cleanup of
* libInstPatch, such as deleting temporary files and internal caches.
* If the counter is still > 0, the function return without doing cleanup
* (the library is still owned).
*
* Does nothing if the library is already deinitialized (or was not initialized).
* Since: 1.1.0
*/
void
ipatch_close(void)
{
/* do nothing if the library is already deinitialized */
G_LOCK(lock_init);
init_counter--;
if(init_counter != 0)
{
/* library still owned by a task, do nothing */
if(init_counter < 0)
{
init_counter = 0;
}
G_UNLOCK(lock_init);
return;
}

ipatch_sample_store_swap_close();
ipatch_deinit();

G_UNLOCK(lock_init);
}

static gboolean
Expand Down