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

Update: Improved igloo_ro_convert() interface

Browse Source
This commit is contained in:
Philipp Schafft 2019-09-14 12:41:27 +00:00
parent 8ccb5c7b12
commit 87768a34ee
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/igloo/ro.h
View File

@ -354,7 +354,9 @@ igloo_ro_t igloo_ro_clone(igloo_ro_t self, igloo_ro_cf_t required, igloo_ro
* name, associated * name, associated
* See igloo_ro_new(). * See igloo_ro_new().
*/ */
igloo_ro_t igloo_ro_convert(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated); igloo_ro_t igloo_ro_convert_ext(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated);
igloo_ro_t igloo_ro_convert_simple(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed);
#define igloo_ro_convert(self, type) igloo_RO_TO_TYPE(igloo_ro_convert_simple((self), igloo_RO_GET_TYPE_BY_SYMBOL(type), igloo_RO_CF_NONE, igloo_RO_CF_DEFAULT), type)
/* Request a specific interface from the object. /* Request a specific interface from the object.
* *

34
src/ro.c
View File

@ -373,7 +373,7 @@ igloo_ro_t igloo_ro_clone(igloo_ro_t self, igloo_ro_cf_t required, igloo_ro
return ret; return ret;
} }
igloo_ro_t igloo_ro_convert(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated) static igloo_ro_t igloo_ro_convert_ext__no_lock(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated)
{ {
igloo_ro_base_t *base = igloo_RO__GETBASE(self); igloo_ro_base_t *base = igloo_RO__GETBASE(self);
igloo_ro_t ret = igloo_RO_NULL; igloo_ro_t ret = igloo_RO_NULL;
@ -381,14 +381,11 @@ igloo_ro_t igloo_ro_convert(igloo_ro_t self, const igloo_ro_type_t *type, i
if (!base || !type) if (!base || !type)
return igloo_RO_NULL; return igloo_RO_NULL;
igloo_thread_mutex_lock(&(base->lock));
if (!base->refc) { if (!base->refc) {
igloo_thread_mutex_unlock(&(base->lock));
return igloo_RO_NULL; return igloo_RO_NULL;
} }
if (base->type == type) { if (base->type == type) {
igloo_thread_mutex_unlock(&(base->lock));
return igloo_ro_clone(self, required, allowed, name, associated); return igloo_ro_clone(self, required, allowed, name, associated);
} }
@ -403,6 +400,35 @@ igloo_ro_t igloo_ro_convert(igloo_ro_t self, const igloo_ro_type_t *type, i
if (igloo_RO_IS_NULL(ret)) if (igloo_RO_IS_NULL(ret))
if (type->type_convertcb) if (type->type_convertcb)
ret = type->type_convertcb(self, type, required, allowed, name, associated, base->instance); ret = type->type_convertcb(self, type, required, allowed, name, associated, base->instance);
return ret;
}
igloo_ro_t igloo_ro_convert_ext(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated)
{
igloo_ro_base_t *base = igloo_RO__GETBASE(self);
igloo_ro_t ret;
if (!base || !type)
return igloo_RO_NULL;
igloo_thread_mutex_lock(&(base->lock));
ret = igloo_ro_convert_ext__no_lock(self, type, required, allowed, name, associated);
igloo_thread_mutex_unlock(&(base->lock));
return ret;
}
igloo_ro_t igloo_ro_convert_simple(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed)
{
igloo_ro_base_t *base = igloo_RO__GETBASE(self);
igloo_ro_t ret;
if (!base || !type)
return igloo_RO_NULL;
igloo_thread_mutex_lock(&(base->lock));
ret = igloo_ro_convert_ext__no_lock(self, type, required, allowed, base->name, base->associated);
igloo_thread_mutex_unlock(&(base->lock)); igloo_thread_mutex_unlock(&(base->lock));
return ret; return ret;