* Changed debug levels in clicon_debug() to be based on maskable flags
* Added flag names: `CLIXON_DBG_*`
* Added maskable flags that can be combined when debugging:
* `DEFAULT` = 1: Basic debug message, espcially initialization
* `MSG` = 2: Input and output packets, read datastore
* `DETAIL` = 4: Details: message dump in hex, xpath parse trees, etc
* `EXTRA` = 8: Extra detailed logs
* Test: some errors in yang-lib where content-id was in wrong place
This commit is contained in:
Olof hagsand
Olof Hagsand
parent
8342b74968
commit
da9bfcbb53
47 changed files with 425 additions and 210 deletions
|
|
@ -126,10 +126,16 @@
|
|||
#include "clixon_path.h"
|
||||
#include "clixon_instance_id_parse.h"
|
||||
|
||||
/*
|
||||
also called from yacc generated code *
|
||||
*/
|
||||
/* Enable for debugging, steals some cycles otherwise */
|
||||
#if 0
|
||||
#define _PARSE_DEBUG(s) clicon_debug(1,(s))
|
||||
#else
|
||||
#define _PARSE_DEBUG(s)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Also called from yacc generated code *
|
||||
*/
|
||||
void
|
||||
clixon_instance_id_parseerror(void *_iy,
|
||||
char *s)
|
||||
|
|
@ -160,7 +166,7 @@ static clixon_path *
|
|||
path_append(clixon_path *list,
|
||||
clixon_path *new)
|
||||
{
|
||||
clicon_debug(2, "%s()", __FUNCTION__);
|
||||
clicon_debug(CLIXON_DBG_DETAIL, "%s()", __FUNCTION__);
|
||||
if (new == NULL)
|
||||
return NULL;
|
||||
ADDQ(new, list);
|
||||
|
|
@ -175,7 +181,7 @@ static clixon_path *
|
|||
path_add_keyvalue(clixon_path *cp,
|
||||
cvec *cvk)
|
||||
{
|
||||
clicon_debug(2, "%s()", __FUNCTION__);
|
||||
clicon_debug(CLIXON_DBG_DETAIL, "%s()", __FUNCTION__);
|
||||
if (cp == NULL)
|
||||
goto done;
|
||||
cp->cp_cvk = cvk;
|
||||
|
|
@ -189,7 +195,7 @@ path_new(char *prefix,
|
|||
{
|
||||
clixon_path *cp = NULL;
|
||||
|
||||
clicon_debug(2, "%s(%s,%s)", __FUNCTION__, prefix, id);
|
||||
clicon_debug(CLIXON_DBG_DETAIL, "%s(%s,%s)", __FUNCTION__, prefix, id);
|
||||
if ((cp = malloc(sizeof(*cp))) == NULL){
|
||||
clicon_err(OE_UNIX, errno, "malloc");
|
||||
goto done;
|
||||
|
|
@ -219,7 +225,7 @@ keyval_pos(char *uint)
|
|||
char *reason=NULL;
|
||||
int ret;
|
||||
|
||||
clicon_debug(2, "%s(%s)", __FUNCTION__, uint);
|
||||
clicon_debug(CLIXON_DBG_DETAIL, "%s(%s)", __FUNCTION__, uint);
|
||||
if ((cvv = cvec_new(1)) == NULL) {
|
||||
clicon_err(OE_UNIX, errno, "cvec_new");
|
||||
goto done;
|
||||
|
|
@ -252,7 +258,7 @@ static cvec *
|
|||
keyval_add(cvec *cvv,
|
||||
cg_var *cv)
|
||||
{
|
||||
clicon_debug(2, "%s()", __FUNCTION__);
|
||||
clicon_debug(CLIXON_DBG_DETAIL, "%s()", __FUNCTION__);
|
||||
if (cv == NULL)
|
||||
goto done;
|
||||
if (cvv == NULL &&
|
||||
|
|
@ -278,7 +284,7 @@ keyval_set(char *name,
|
|||
{
|
||||
cg_var *cv = NULL;
|
||||
|
||||
clicon_debug(2, "%s(%s=%s)", __FUNCTION__, name, val);
|
||||
clicon_debug(CLIXON_DBG_DETAIL, "%s(%s=%s)", __FUNCTION__, name, val);
|
||||
if ((cv = cv_new(CGV_STRING)) == NULL){
|
||||
clicon_err(OE_UNIX, errno, "cv_new");
|
||||
goto done;
|
||||
|
|
@ -307,74 +313,74 @@ keyval_set(char *name,
|
|||
/*
|
||||
*/
|
||||
|
||||
start : list X_EOF { clicon_debug(3,"top"); _IY->iy_top=$1; YYACCEPT; }
|
||||
start : list X_EOF { _PARSE_DEBUG("top"); _IY->iy_top=$1; YYACCEPT; }
|
||||
;
|
||||
|
||||
list : list SLASH element { if (($$ = path_append($1, $3)) == NULL) YYABORT;
|
||||
clicon_debug(3,"list = list / element");}
|
||||
_PARSE_DEBUG("list = list / element");}
|
||||
| SLASH element { if (($$ = path_append(NULL, $2)) == NULL) YYABORT;
|
||||
clicon_debug(3,"list = / element");}
|
||||
_PARSE_DEBUG("list = / element");}
|
||||
;
|
||||
|
||||
element : node_id element2 { $$ = path_add_keyvalue($1, $2);
|
||||
clicon_debug(3,"element = node_id element2");}
|
||||
_PARSE_DEBUG("element = node_id element2");}
|
||||
;
|
||||
|
||||
node_id : IDENTIFIER { $$ = path_new(NULL, $1); free($1);
|
||||
clicon_debug(3,"node_id = IDENTIFIER");}
|
||||
_PARSE_DEBUG("node_id = IDENTIFIER");}
|
||||
| prefix COLON IDENTIFIER { $$ = path_new($1, $3); free($1); free($3);
|
||||
clicon_debug(3,"node_id = prefix : IDENTIFIER");}
|
||||
_PARSE_DEBUG("node_id = prefix : IDENTIFIER");}
|
||||
;
|
||||
|
||||
prefix : IDENTIFIER { $$=$1; clicon_debug(3,"prefix = IDENTIFIER");}
|
||||
prefix : IDENTIFIER { $$=$1; _PARSE_DEBUG("prefix = IDENTIFIER");}
|
||||
|
||||
element2 : key_preds { $$=$1; clicon_debug(3,"element2 = key_preds"); }
|
||||
| leaf_list_pred { $$=$1; clicon_debug(3,"element2 = leaf_list_pred"); }
|
||||
| pos { $$=$1; clicon_debug(3,"element2 = key_preds"); }
|
||||
| { $$=NULL; clicon_debug(3,"element2 = "); }
|
||||
element2 : key_preds { $$=$1; _PARSE_DEBUG("element2 = key_preds"); }
|
||||
| leaf_list_pred { $$=$1; _PARSE_DEBUG("element2 = leaf_list_pred"); }
|
||||
| pos { $$=$1; _PARSE_DEBUG("element2 = key_preds"); }
|
||||
| { $$=NULL; _PARSE_DEBUG("element2 = "); }
|
||||
;
|
||||
|
||||
leaf_list_pred : LSQBR leaf_list_pred_expr RSQBR
|
||||
{ if (($$ = keyval_add(NULL, $2)) == NULL) YYABORT;
|
||||
clicon_debug(3,"leaf_list_pred = [ leaf_list_pred_expr ]"); }
|
||||
_PARSE_DEBUG("leaf_list_pred = [ leaf_list_pred_expr ]"); }
|
||||
;
|
||||
|
||||
leaf_list_pred_expr : DOT EQUAL qstring { $$ = keyval_set(".", $3); free($3);
|
||||
clicon_debug(3,"leaf_list_pred_expr = '.=' qstring"); }
|
||||
_PARSE_DEBUG("leaf_list_pred_expr = '.=' qstring"); }
|
||||
;
|
||||
|
||||
pos : LSQBR UINT RSQBR { $$ = keyval_pos($2); free($2);
|
||||
clicon_debug(3,"pos = [ UINT ]"); }
|
||||
_PARSE_DEBUG("pos = [ UINT ]"); }
|
||||
;
|
||||
|
||||
key_preds : key_preds key_pred { if (($$ = keyval_add($1, $2)) == NULL) YYABORT;
|
||||
clicon_debug(3,"key_preds = key_pred key_preds"); }
|
||||
_PARSE_DEBUG("key_preds = key_pred key_preds"); }
|
||||
| key_pred { if (($$ = keyval_add(NULL, $1)) == NULL) YYABORT;
|
||||
clicon_debug(3,"key_preds = key_pred");}
|
||||
_PARSE_DEBUG("key_preds = key_pred");}
|
||||
;
|
||||
|
||||
key_pred : LSQBR key_pred_expr RSQBR { $$ = $2;
|
||||
clicon_debug(3,"key_pred = [ key_pred_expr ]"); }
|
||||
_PARSE_DEBUG("key_pred = [ key_pred_expr ]"); }
|
||||
;
|
||||
|
||||
key_pred_expr : node_id_k EQUAL qstring { $$ = keyval_set($1, $3); free($1); free($3);
|
||||
clicon_debug(3,"key_pred_expr = node_id_k = qstring"); }
|
||||
_PARSE_DEBUG("key_pred_expr = node_id_k = qstring"); }
|
||||
;
|
||||
|
||||
node_id_k : IDENTIFIER { $$ = $1;
|
||||
clicon_debug(3,"node_id_k = IDENTIFIER %s", $1); }
|
||||
_PARSE_DEBUG("node_id_k = IDENTIFIER"); }
|
||||
| prefix COLON IDENTIFIER { $$ = $3; /* ignore prefix in key? */
|
||||
clicon_debug(3,"node_id_k = prefix %s : IDENTIFIER %s", $1, $3); free($1);}
|
||||
_PARSE_DEBUG("node_id_k = prefix : IDENTIFIER"); free($1);}
|
||||
;
|
||||
|
||||
qstring : DQUOTE STRING DQUOTE { $$=$2;
|
||||
clicon_debug(3,"qstring = \" string \""); }
|
||||
_PARSE_DEBUG("qstring = \" string \""); }
|
||||
| DQUOTE DQUOTE { $$=strdup("");
|
||||
clicon_debug(3,"qstring = \" \""); }
|
||||
_PARSE_DEBUG("qstring = \" \""); }
|
||||
| SQUOTE STRING SQUOTE { $$=$2;
|
||||
clicon_debug(3,"qstring = ' string '"); }
|
||||
_PARSE_DEBUG("qstring = ' string '"); }
|
||||
| SQUOTE SQUOTE { $$=strdup("");
|
||||
clicon_debug(3,"qstring = ''"); }
|
||||
_PARSE_DEBUG("qstring = ''"); }
|
||||
;
|
||||
|
||||
%%
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue