aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-12-04 14:46:31 -05:00
Code

Feature: Assign default instance if any on new if type is not instance

Browse Source
This commit is contained in:
Philipp Schafft 2019-09-15 09:03:50 +00:00
parent 4b9211e0cf
commit 0018338afc
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libigloo.c
View File

@ -28,6 +28,7 @@ typedef struct igloo_instance_tag igloo_instance_t;
#define igloo_RO_PRIVATETYPES igloo_RO_TYPE(igloo_instance_t) #define igloo_RO_PRIVATETYPES igloo_RO_TYPE(igloo_instance_t)
#include "../include/igloo/ro.h" #include "../include/igloo/ro.h"
#include "../include/igloo/error.h"
#include "private.h" #include "private.h"
struct igloo_instance_tag { struct igloo_instance_tag {
@ -35,9 +36,18 @@ struct igloo_instance_tag {
}; };
static size_t igloo_initialize__refc; static size_t igloo_initialize__refc;
static igloo_ro_t default_instance = igloo_RO_NULL;
static void igloo_initialize__free(igloo_ro_t self) static void igloo_initialize__free(igloo_ro_t self)
{ {
if (igloo_RO_IS_SAME(default_instance, self)) {
/* This is hacky, but needed to avoid free-before-unlock. */
igloo_RO__GETBASE(default_instance)->wrefc--;
default_instance = igloo_RO_NULL;
}
igloo_initialize__refc--; igloo_initialize__refc--;
if (igloo_initialize__refc) if (igloo_initialize__refc)
return; return;
@ -75,5 +85,22 @@ igloo_ro_t igloo_initialize(void)
igloo_initialize__refc++; igloo_initialize__refc++;
if (igloo_RO_IS_NULL(default_instance)) {
if (igloo_ro_weak_ref(ret) == igloo_ERROR_NONE) {
default_instance = (igloo_ro_t)ret;
}
}
return (igloo_ro_t)ret; return (igloo_ro_t)ret;
} }
igloo_ro_t igloo_get_default_instance(void)
{
if (igloo_RO_IS_NULL(default_instance))
return igloo_RO_NULL;
if (igloo_ro_ref(default_instance) != igloo_ERROR_NONE)
return igloo_RO_NULL;
return default_instance;
}

5
src/private.h
View File

@ -38,7 +38,8 @@ void igloo_log_shutdown(void);
/* Instance type internal forwarding */ /* Instance type internal forwarding */
const igloo_ro_type_t **igloo_instance_type; const igloo_ro_type_t **igloo_instance_type;
#define igloo_IS_INSTANCE(x) (igloo_RO_GET_TYPE((x)) == *igloo_instance_type) #define igloo_IS_INSTANCE(x) (igloo_RO_GET_TYPE((x)) == *igloo_instance_type)
#define igloo_IS_INSTANCE_TYPE(x) ((x) == *igloo_instance_type)
/* Basic interface */ /* Basic interface */
#define igloo_interface_base(type) \ #define igloo_interface_base(type) \
@ -67,4 +68,6 @@ size_t igloo_private__vsnprintf_Hstrlen(const char *str, int is_alt, int allow_s
void igloo_private__vsnprintf(char *str, size_t size, const char *format, va_list ap); void igloo_private__vsnprintf(char *str, size_t size, const char *format, va_list ap);
void igloo_private__snprintf(char *str, size_t size, const char *format, ...); void igloo_private__snprintf(char *str, size_t size, const char *format, ...);
igloo_ro_t igloo_get_default_instance(void);
#endif #endif

3
src/ro.c
View File

@ -113,6 +113,9 @@ igloo_ro_t igloo_ro_new__raw(const igloo_ro_type_t *type, const char *name,
} }
base->instance = instance; base->instance = instance;
} else {
if (!igloo_IS_INSTANCE_TYPE(type))
base->instance = igloo_get_default_instance();
} }
return (igloo_ro_t)base; return (igloo_ro_t)base;