db: add set("link:scope", ...) syntax

and dbLinkScopeDefault() private accessor New DB syntax is: set '(' STR ( ',' STR )* ')'
mdavidsaver · Nov 25, 2023 · 979491e · 979491e
1 parent 20dc6ae
commit 979491e
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 0 deletions.
diff --git a/modules/database/src/ioc/db/dbLink.c b/modules/database/src/ioc/db/dbLink.c
@@ -115,6 +115,11 @@ long dbInitLink(struct link *plink, short dbfType)
 
     srcMask = plink->value.pv_link.pvlMask & pvlOptSrcMask;
 
+    if(srcMask == pvlOptSrcAuto) {
+        /* apply default from set("link:scope", ...) */
+        srcMask = plink->flags & pvlOptSrcMask;
+    }
+
     if((srcMask == pvlOptSrcInt) && dbChannelTest(plink->value.pv_link.pvname)) {
         DBENTRY closest;
         epicsPrintf("%s.%s " ERL_ERROR ": Unable to create INT link to \"" ANSI_BOLD("%s") "\".\n",

diff --git a/modules/database/src/ioc/dbStatic/dbLex.l b/modules/database/src/ioc/dbStatic/dbLex.l
@@ -79,6 +79,7 @@ static int yyreset(void)
 "registrar"     return(tokenREGISTRAR);
 "function"      return(tokenFUNCTION);
 "variable"      return(tokenVARIABLE);
+"set"           return(tokenSET);
 
 {bareword}+ { /* unquoted string or number */
     yylval.Str = dbmfStrdup((char *) yytext);

diff --git a/modules/database/src/ioc/dbStatic/dbLexRoutines.c b/modules/database/src/ioc/dbStatic/dbLexRoutines.c
@@ -107,6 +107,7 @@ typedef struct inputFile{
     const char  *filename;
     FILE        *fp;
     int         line_num;
+    unsigned linkDefLoc;
 }inputFile;
 static ELLLIST inputFileList = ELLLIST_INIT;
 
@@ -1292,6 +1293,61 @@ static void dbAlias(char *name, char *alias)
     dbFinishEntry(pdbEntry);
 }
 
+static void warnSetUnknown(const char *name)
+{
+    static ELLLIST warned;
+    ELLNODE *cur;
+    tempListNode *node;
+    size_t namelen = strlen(name);
+
+    for(cur = ellFirst(&warned); cur; cur = ellNext(cur)) {
+        node = CONTAINER(cur, tempListNode, node);
+        if(strcmp((char*)node->item, name)==0)
+            return; /* omit duplicate warning */
+    }
+
+    epicsPrintf(ERL_WARNING " Unknown name in set(\"%s\", ...)\n", name);
+
+    if(!!(node = malloc(sizeof(*node) + namelen + 1))) {
+        node->item = &node[1];
+        strcpy((char*)node->item, name);
+        ellAdd(&warned, &node->node);
+    }
+}
+
+static void dbSet(const char *name)
+{
+    if(strcmp(name, "link:scope")==0) {
+        char* val = popFirstTemp();
+
+        if(!val || strcmp(val, "AUTO")==0 || strcmp(val, "EXT")==0) {
+            pinputFileNow->linkDefLoc = pvlOptSrcExt;
+
+        } else if(strcmp(val, "INT")==0) {
+            pinputFileNow->linkDefLoc = pvlOptSrcInt;
+
+        } else {
+            epicsPrintf(ERL_WARNING " Invalid value in set(\"%s\", \"%s\")\n", name, val);
+        }
+        dbmfFree(val);
+
+    } else {
+        warnSetUnknown(name);
+    }
+
+    /* clean up unused arguments */
+    while(ellCount(&tempList))
+        dbmfFree(popFirstTemp());
+}
+
+unsigned dbLinkScopeDefault(void)
+{
+    int ret = pvlOptSrcExt;
+    if(pinputFileNow && pinputFileNow->linkDefLoc)
+        ret = pinputFileNow->linkDefLoc;
+    return ret;
+}
+
 static void dbRecordBody(void)
 {
     DBENTRY *pdbentry;

diff --git a/modules/database/src/ioc/dbStatic/dbStaticLib.c b/modules/database/src/ioc/dbStatic/dbStaticLib.c
@@ -2745,6 +2745,8 @@ long dbPutString(DBENTRY *pdbentry,const char *pstring)
                 free(plink->text);
                 plink->text = epicsStrDup(pstring);
                 dbFreeLinkInfo(&link_info);
+                /* capture default link scope */
+                plink->flags |= dbLinkScopeDefault();
             } else {
                 /* assignment after init (eg. autosave restore) */
                 struct dbCommon *prec = pdbentry->precnode->precord;

diff --git a/modules/database/src/ioc/dbStatic/dbStaticPvt.h b/modules/database/src/ioc/dbStatic/dbStaticPvt.h
@@ -125,6 +125,8 @@ void dbPvdFreeMem(DBBASE *pdbbase);
 DBCORE_API
 char** dbCompleteRecord(const char *word);
 
+unsigned dbLinkScopeDefault(void);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/modules/database/src/ioc/dbStatic/dbYacc.y b/modules/database/src/ioc/dbStatic/dbYacc.y
@@ -28,6 +28,7 @@ static int yyAbort = 0;
 %token tokenFIELD tokenINFO tokenREGISTRAR
 %token tokenDEVICE tokenDRIVER tokenLINK tokenBREAKTABLE
 %token tokenRECORD tokenGRECORD tokenVARIABLE tokenFUNCTION
+%token tokenSET
 %token <Str> tokenSTRING tokenCDEFS
 
 %token jsonNULL jsonTRUE jsonFALSE
@@ -60,6 +61,7 @@ database_item:  include
     |   tokenRECORD record_head record_body
     |   tokenGRECORD grecord_head record_body
     |   alias
+    |   set
     ;
 
 include:    tokenINCLUDE tokenSTRING
@@ -278,6 +280,25 @@ alias: tokenALIAS '(' tokenSTRING ',' tokenSTRING ')'
     dbAlias($3,$5); dbmfFree($3); dbmfFree($5);
 };
 
+set: tokenSET '(' tokenSTRING set_args ')'
+{
+    if(dbStaticDebug>2) printf("set(%s\n",$3);
+    dbSet($3); dbmfFree($3);
+    /* dbSet() empties tempList */
+};
+
+set_args:
+{
+    if (ellCount(&tempList))
+        yyerrorAbort("dbSet: tempList not empty");
+}
+    | set_args ',' tokenSTRING
+{
+    if(dbStaticDebug>2) printf("  %s,\n",$3);
+    allocTemp($3); /* takes ownership of $3 */
+}
+    ;
+
 json_object: '{' '}'
 {
     $$ = dbmfStrdup("{}");

diff --git a/modules/database/src/ioc/dbStatic/link.h b/modules/database/src/ioc/dbStatic/link.h
@@ -76,6 +76,7 @@ DBCORE_API extern maplinkType pamaplinkType[];
 /* DBLINK Flag bits */
 #define DBLINK_FLAG_INITIALIZED    1 /* dbInitLink() called */
 #define DBLINK_FLAG_TSELisTIME     2 /* Use TSEL to get timeStamp */
+/* pvlOptSrc* bits also used to indicate default from file parsing. */
 
 struct macro_link {
     char *macroStr;