experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-optimized yang cardinality

Browse source 
Misc rearrangements
This commit is contained in:
Olof hagsand 2024-05-02 13:29:59 +02:00
parent d2f3405ab6
commit fcdfbd23cc
6 changed files with 46 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/src/clixon_yang_cardinality.c
View file

@ -468,7 +468,7 @@ static const struct ycard *_yc_search[Y_SPEC][Y_SPEC] = {{0,},{0,}};
* and = 0 in the following vector.
* Example: Y_REFINE
*/
static int _yc_exist[Y_SPEC] = {0,};
static const struct ycard *_yc_exist[Y_SPEC] = {NULL,}; /* First */
/*! Check cardinality, ie if each yang node has the expected nr of children
*
@ -492,7 +492,7 @@ yang_cardinality(clixon_handle h,
yang_stmt *ys = NULL;
int pk;
int ck;
int i;
const struct ycard *yc0;
const struct ycard *yc;
int order;
yang_stmt *yprev = NULL;
@ -500,7 +500,7 @@ yang_cardinality(clixon_handle h,
int yc_count[Y_SPEC] = {0,};
pk = yang_keyword_get(yt);
if (_yc_exist[pk] == 0)
if ((yc0 = _yc_exist[pk]) == NULL)
goto ok;
/* 1) For all children, if neither in 0..n, 0..1, 1 or 1..n ->ERROR
* Also: check monotonically increasing order
@ -534,18 +534,15 @@ yang_cardinality(clixon_handle h,
}
if (order < yc->yc_order)
order = yc->yc_order;
yc_count[yang_keyword_get(ys)]++; /* used in loop (2) */
/* 4) Recurse */
if (yang_cardinality(h, ys, modname) < 0)
goto done;
yprev = ys;
}
/* 2) For all in 1 and 1..n list, if 0 such children -> ERROR
*/
ys = NULL;
while ((ys = yn_each(yt, ys)) != NULL) {
yc_count[yang_keyword_get(ys)]++;
}
for (i=0; i<Y_SPEC; i++){
yc = _yc_search[pk][i];
if (yc == NULL)
continue;
for (yc = yc0; (int)yc->yc_parent && yc->yc_parent == pk; yc++){
if (yc->yc_min &&
yang_find(yt, yc->yc_child, NULL) == NULL){
clixon_err(OE_YANG, 0, "%s: \"%s\" is missing but is mandatory child of \"%s\"",
@ -565,13 +562,6 @@ yang_cardinality(clixon_handle h,
}
}
}
/* 4) Recurse */
i = 0;
while (i < yang_len_get(yt)){ /* Note, children may be removed cant use yn_each */
ys = yang_child_i(yt, i++);
if (yang_cardinality(h, ys, modname) < 0)
goto done;
}
ok:
retval = 0;
done:
@ -620,7 +610,8 @@ yang_cardinality_init(clixon_handle h)
const struct ycard *yc;
for (yc = &_yclist[0]; (int)yc->yc_parent; yc++){
_yc_exist[yc->yc_parent] = 1;
if (_yc_exist[yc->yc_parent] == NULL)
_yc_exist[yc->yc_parent] = yc;
_yc_search[yc->yc_parent][yc->yc_child] = yc;
}
return 0;