changed addReccasterEnvVars to linked list implementation #117
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -74,7 +74,6 @@ static void casthook(initHookState state) | |
| void addReccasterEnvVars(caster_t* self, int argc, char **argv) | ||
| { | ||
| size_t i, j; | ||
|
|
||
| argv++; argc--; /* skip function arg */ | ||
| if(argc < 1) { | ||
|
|
@@ -95,91 +94,54 @@ void addReccasterEnvVars(caster_t* self, int argc, char **argv) | |
| epicsMutexUnlock(self->lock); | ||
| return; | ||
| } | ||
|
|
||
| int found_dup; | ||
| /* sanitize input - check for dups and empty args */ | ||
| for(i=0; i < argc; i++) { | ||
|
There was a problem hiding this comment. Lots of duplication in this loop and in the one for exclude patterns, just a thought... |
||
| if(argv[i][0] == '\0') { | ||
| errlogSevPrintf(errlogMinor, "Arg is empty for addReccasterEnvVars\n"); | ||
| continue; | ||
| } | ||
| found_dup = 0; | ||
| /* check if dup in self->default_envs */ | ||
| for(j = 0; default_envs[j]; j++) { | ||
| if(strcmp(argv[i], default_envs[j]) == 0) { | ||
| found_dup = 1; | ||
| break; | ||
| } | ||
| } | ||
| if(found_dup) { | ||
| errlogSevPrintf(errlogMinor, "Env var %s is already in env list sent by reccaster by default\n", argv[i]); | ||
| continue; | ||
| } | ||
| /* check if dup in self->extra_envs */ | ||
| ELLNODE *cur = ellFirst(&self->extra_envs); | ||
| while (cur != NULL) { | ||
| string_list_t *temp = (string_list_t *)cur; | ||
| if (strcmp(argv[i], temp->item_str) == 0) { | ||
| found_dup = 1; | ||
| break; | ||
| } | ||
| cur = ellNext(cur); | ||
| } | ||
| if(found_dup) { | ||
| errlogSevPrintf(errlogMinor, "Env var %s is already in extra_envs list\n", argv[i]); | ||
| continue; | ||
| } | ||
| string_list_t *new_list = malloc(sizeof(string_list_t)); | ||
| if (new_list == NULL) { | ||
| errlogSevPrintf(errlogMajor, "Error in addReccasterEnvVars - malloc error for creating linked list node"); | ||
| break; | ||
| } | ||
| new_list->item_str = strdup(argv[i]); | ||
|
Comment on lines
+131
to
+136
There was a problem hiding this comment. fyi. These two allocations could be combined into one. For example: https://github.com/epics-base/epics-base/blob/e4fbd83c93a68a1d9cb863ff341735388d246347/modules/libcom/src/iocsh/afterIocRunning.c#L62-L65 const size_t cmd_len = strlen(cmd) + 1;
struct cmditem *const item = mallocMustSucceed(sizeof(struct cmditem) + cmd_len, "afterIocRunning");
item->cmd = (char *)(item + 1);
memcpy(item->cmd, cmd, cmd_len);Also, iteration could be done in a more compact fashion: https://github.com/epics-base/epics-base/blob/e4fbd83c93a68a1d9cb863ff341735388d246347/modules/libcom/src/iocsh/initHooks.c#L64-L65 for(cur = ellFirst(&functionList); cur; cur = ellNext(cur)) {
const initHookLink *fn = CONTAINER(cur, initHookLink, node); |
||
| if (new_list->item_str == NULL) { | ||
| errlogSevPrintf(errlogMajor, "Error in addReccasterEnvVars - strdup error for copying %s to new->item_str from addReccasterEnvVars\n", argv[i]); | ||
| free(new_list); /* frees if strdup fails */ | ||
| break; | ||
| } | ||
| ellAdd(&self->extra_envs, &new_list->node); | ||
| } | ||
| epicsMutexUnlock(self->lock); | ||
| } | ||
|
|
||
| static const iocshArg addReccasterEnvVarsArg0 = { "environmentVar", iocshArgArgv }; | ||
|
|
@@ -200,6 +162,74 @@ static void addReccasterEnvVarsCallFunc(const iocshArgBuf *args) | |
| addReccasterEnvVars(&thecaster, args[0].aval.ac, args[0].aval.av); | ||
| } | ||
|
|
||
| void addReccasterExcludePattern(caster_t* self, int argc, char **argv) { | ||
| size_t i; | ||
| argv++; argc--; /* skip function arg */ | ||
| if (argc < 1) { | ||
| errlogSevPrintf(errlogMinor, "At least one argument expected for addReccasterExcludePattern\n"); | ||
| return; | ||
| } | ||
| epicsMutexMustLock(self->lock); | ||
| if (self->shutdown) { | ||
| /* shutdown in progress, silent no-op */ | ||
| epicsMutexUnlock(self->lock); | ||
| return; | ||
| } | ||
| /* error if called after iocInit() */ | ||
| if (self->current != casterStateInit) { | ||
| errlogSevPrintf(errlogMinor, "addReccasterExcludePattern called after iocInit() when reccaster might already be connected. Not supported\n"); | ||
| epicsMutexUnlock(self->lock); | ||
| return; | ||
| } | ||
|
|
||
| for (i = 0; i < argc; i++) { | ||
| if (argv[i][0] == '\0') { | ||
| errlogSevPrintf(errlogMinor, "Arg is empty for addReccasterExcludePattern\n"); | ||
| continue; | ||
| } | ||
| /* check duplicates */ | ||
| int dup = 0; | ||
| ELLNODE *cur = ellFirst(&self->exclude_patterns); | ||
| while (cur != NULL) { | ||
| string_list_t *temp = (string_list_t *)cur; | ||
| if (strcmp(argv[i], temp->item_str) == 0) { | ||
| dup = 1; | ||
| break; | ||
| } | ||
| cur = ellNext(cur); | ||
| } | ||
| if (dup) { | ||
| errlogSevPrintf(errlogMinor, "Duplicate pattern %s in addReccasterExcludePattern\n", argv[i]); | ||
| continue; | ||
| } | ||
| string_list_t *new_list = malloc(sizeof(string_list_t)); | ||
| if (new_list == NULL) { | ||
| errlogSevPrintf(errlogMajor, "Error in addReccasterExcludePattern - malloc error for creating linked list node"); | ||
| break; | ||
| } | ||
| new_list->item_str = strdup(argv[i]); | ||
| if (new_list->item_str == NULL) { | ||
| errlogSevPrintf(errlogMajor, "Error in addReccasterExcludePattern - strdup error for copying %s to new->item_str from addReccasterExcludePattern\n", argv[i]); | ||
| free(new_list); /* frees if strdup fails */ | ||
| break; | ||
| } | ||
| ellAdd(&self->exclude_patterns, &new_list->node); | ||
| } | ||
| epicsMutexUnlock(self->lock); | ||
| } | ||
|
|
||
| static const iocshArg addReccasterExcludePatternArg0 = { "excludePattern", iocshArgArgv }; | ||
| static const iocshArg * const addReccasterExcludePatternArgs[] = { &addReccasterExcludePatternArg0 }; | ||
| static const iocshFuncDef addReccasterExcludePatternFuncDef = { | ||
| "addReccasterExcludePattern", | ||
| 1, | ||
| addReccasterExcludePatternArgs | ||
| }; | ||
|
|
||
| static void addReccasterExcludePatternCallFunc(const iocshArgBuf *args) { | ||
| addReccasterExcludePattern(&thecaster, args[0].aval.ac, args[0].aval.av); | ||
| } | ||
|
|
||
| static void reccasterRegistrar(void) | ||
| { | ||
| osiSockAttach(); | ||
|
|
@@ -210,6 +240,7 @@ static void reccasterRegistrar(void) | |
| thepriv.laststate=casterStateInit; | ||
| strcpy(thepriv.lastmsg, "Initializing"); | ||
| iocshRegister(&addReccasterEnvVarsFuncDef,addReccasterEnvVarsCallFunc); | ||
| iocshRegister(&addReccasterExcludePatternFuncDef,addReccasterExcludePatternCallFunc); | ||
| } | ||
|
|
||
| static long init_record(void* prec) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need this lock/unlock?