Skip to content

Commit

Permalink
prop: Add PROP_TAG_ROOT_VECTOR for resolving property roots
Browse files Browse the repository at this point in the history
  • Loading branch information
@andoma
andoma committed Mar 20, 2016
1 parent ebc1d07 commit e61b62f
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 31 deletions.
5 changes: 5 additions & 0 deletions src/prop/prop.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ void prop_init_late(void);
#define PROP_SUB_ALT_PATH 0x80000


typedef struct prop_root {
prop_t *p;
const char *name;
} prop_root_t;

enum {
PROP_TAG_END = 0,
Expand All @@ -161,6 +165,7 @@ enum {
PROP_TAG_COURIER,
PROP_TAG_ROOT,
PROP_TAG_NAMED_ROOT,
PROP_TAG_ROOT_VECTOR,
PROP_TAG_MUTEX,
PROP_TAG_LOCKMGR,
PROP_TAG_NAMESTR,
Expand Down
80 changes: 49 additions & 31 deletions src/prop/prop_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2639,38 +2639,42 @@ prop_subfind(prop_t *p, const char **name, int follow_symlinks,
}


LIST_HEAD(prop_root_list, prop_root);
LIST_HEAD(prop_root_node_list, prop_root_node);

/**
*
*/
typedef struct prop_root {
typedef struct prop_root_node {
prop_t *p;
const char *name;
LIST_ENTRY(prop_root) link;
} prop_root_t;
LIST_ENTRY(prop_root_node) link;
} prop_root_node_t;



/**
*
*/
static prop_t *
prop_resolve_tree(const char *name, struct prop_root_list *prl)
prop_resolve_tree(const char *name, struct prop_root_node_list *prl,
struct prop_root *prv, int prvlen)
{
prop_t *p;
prop_root_t *pr;

if(!strcmp(name, "global")) {
p = prop_global;
return p->hp_type == PROP_ZOMBIE ? NULL : p;
prop_root_node_t *pr;

if(!strcmp(name, "global"))
return prop_global;

for(int i = 0; i < prvlen; i++, prv++) {
if(prv->p != NULL && !strcmp(prv->name, name))
return prv->p;
}

LIST_FOREACH(pr, prl, link) {
p = pr->p;
prop_t *p = pr->p;
if(p->hp_name != NULL && !strcmp(name, p->hp_name))
return p->hp_type == PROP_ZOMBIE ? NULL : p;
if(pr->name != NULL && !strcmp(name, pr->name))
return p->hp_type == PROP_ZOMBIE ? NULL : p;
return p;
if(pr->name != NULL && !strcmp(name, pr->name))
return p;
}
return NULL;
}
Expand All @@ -2688,10 +2692,12 @@ prop_get_by_name(const char **name, int follow_symlinks, ...)
#endif
{
prop_t *p;
prop_root_t *pr;
struct prop_root_list proproots;
prop_root_node_t *pr;
struct prop_root_node_list proproots;
int tag;
va_list ap;
prop_root_t *prv = NULL;
int prvlen = 0;

va_start(ap, follow_symlinks);

Expand All @@ -2702,34 +2708,39 @@ prop_get_by_name(const char **name, int follow_symlinks, ...)
switch(tag) {

case PROP_TAG_ROOT:
pr = alloca(sizeof(prop_root_t));
pr = alloca(sizeof(prop_root_node_t));
pr->p = va_arg(ap, prop_t *);
pr->name = NULL;
if(pr->p != NULL)
LIST_INSERT_HEAD(&proproots, pr, link);
break;

case PROP_TAG_NAMED_ROOT:
pr = alloca(sizeof(prop_root_t));
pr = alloca(sizeof(prop_root_node_t));
pr->p = va_arg(ap, prop_t *);
pr->name = va_arg(ap, const char *);
if(pr->p != NULL && pr->name != NULL)
LIST_INSERT_HEAD(&proproots, pr, link);
break;

case PROP_TAG_ROOT_VECTOR:
prv = va_arg(ap, prop_root_t *);
prvlen = va_arg(ap, int);
break;

case PROP_TAG_END:
break;

default:
abort();
}
} while(tag);

va_end(ap);

p = prop_resolve_tree(name[0], &proproots);
p = prop_resolve_tree(name[0], &proproots, prv, prvlen);

if(p == NULL)
if(p == NULL || p->hp_type == PROP_ZOMBIE)
return NULL;

name++;
Expand Down Expand Up @@ -2799,7 +2810,7 @@ prop_subscribe_ex(const char *file, int line, int flags, ...)
prop_subscribe(int flags, ...)
#endif
{
prop_t *p, *value, *canonical, *c;
prop_t *value, *canonical, *c;
prop_sub_t *s, *t;
int direct = !!(flags & (PROP_SUB_DIRECT_UPDATE | PROP_SUB_INTERNAL));
int notify_now = !(flags & PROP_SUB_NO_INITIAL_UPDATE);
Expand All @@ -2809,8 +2820,8 @@ prop_subscribe_ex(const char *file, int line, int flags, ...)
prop_courier_t *pc = NULL;
void *lock = NULL;
lockmgr_fn_t *lockmgr = NULL;
prop_root_t *pr;
struct prop_root_list proproots;
prop_root_node_t *pr;
struct prop_root_node_list proproots;
void *cb = NULL;
prop_trampoline_t *trampoline = NULL;
int dolock = !(flags & PROP_SUB_DONTLOCK);
Expand All @@ -2824,6 +2835,9 @@ prop_subscribe_ex(const char *file, int line, int flags, ...)

struct prop_proxy_connection *ppc = NULL;

prop_root_t *prv = NULL;
int prvlen = 0;

LIST_INIT(&proproots);

do {
Expand Down Expand Up @@ -2940,21 +2954,26 @@ prop_subscribe_ex(const char *file, int line, int flags, ...)
break;

case PROP_TAG_ROOT:
pr = alloca(sizeof(prop_root_t));
pr = alloca(sizeof(prop_root_node_t));
pr->p = va_arg(ap, prop_t *);
pr->name = NULL;
if(pr->p != NULL)
LIST_INSERT_HEAD(&proproots, pr, link);
break;

case PROP_TAG_NAMED_ROOT:
pr = alloca(sizeof(prop_root_t));
pr = alloca(sizeof(prop_root_node_t));
pr->p = va_arg(ap, prop_t *);
pr->name = va_arg(ap, const char *);
if(pr->p != NULL && pr->name != NULL)
LIST_INSERT_HEAD(&proproots, pr, link);
break;

case PROP_TAG_ROOT_VECTOR:
prv = va_arg(ap, prop_root_t *);
prvlen = va_arg(ap, int);
break;

case PROP_TAG_MUTEX:
lock = va_arg(ap, void *);
break;
Expand All @@ -2977,7 +2996,6 @@ prop_subscribe_ex(const char *file, int line, int flags, ...)
abort();
}
} while(tag);


va_end(ap);

Expand All @@ -2996,18 +3014,18 @@ prop_subscribe_ex(const char *file, int line, int flags, ...)
}

} else {

prop_t *p;
if(flags & PROP_SUB_ALT_PATH) {
p = LIST_FIRST(&proproots) ? LIST_FIRST(&proproots)->p : NULL;
} else {
p = prop_resolve_tree(name[0], &proproots);
p = prop_resolve_tree(name[0], &proproots, prv, prvlen);
name++;
}

if(dolock)
hts_mutex_lock(&prop_mutex);

if(p == NULL) {
if(p == NULL || p->hp_type == PROP_ZOMBIE) {
canonical = value = NULL;

} else if(p->hp_type == PROP_PROXY) {
Expand Down

0 comments on commit e61b62f

Please sign in to comment.