Skip to content

Commit e08b473

Browse files
cbdevnetcbdevnet
committedJan 5, 2020
Implement commandline config override (Fixes #26)
·
v0.6v0.4
1 parent f8ed6c2 commit e08b473

File tree

5 files changed

+314
-154
lines changed

5 files changed

+314
-154
lines changed
 

‎README.md

+7
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ The MIDImonster takes as it's first argument the name of an optional configurati
4848
to use (`monster.cfg` is used as default if none is specified). The configuration
4949
file syntax is explained in the next section.
5050

51+
The current MIDIMonster version can be queried by passing *-v* as command-line argument.
52+
5153
## Configuration
5254

5355
Each protocol supported by MIDIMonster is implemented by a *backend*, which takes
@@ -76,6 +78,11 @@ To make an instance available for mapping channels, it requires at least the
7678
`[<backend-name> <instance-name>]` configuration stanza. Most backends require
7779
additional configuration for their instances.
7880

81+
Backend and instance configuration options can also be overriden via command line
82+
arguments using the syntax `-b <backend>.<option>=<value>` for backend options
83+
and `-i <instance>.<option>=<value>` for instance options. These overrides
84+
are applied when the backend/instance is first mentioned in the configuration file.
85+
7986
### Channel mapping
8087

8188
The `[map]` section consists of lines of channel-to-channel assignments, reading like

‎config.c

+237-127
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ typedef enum {
2121

2222
static backend* current_backend = NULL;
2323
static instance* current_instance = NULL;
24+
static size_t noverrides = 0;
25+
static config_override* overrides = NULL;
2426

2527
#ifdef _WIN32
2628
#define GETLINE_BUFFER 4096
@@ -312,13 +314,179 @@ static int config_map(char* to_raw, char* from_raw){
312314
return rv;
313315
}
314316

317+
static int config_line(char* line){
318+
map_type mapping_type = map_rtl;
319+
char* separator = NULL;
320+
size_t u;
321+
322+
line = config_trim_line(line);
323+
if(*line == ';' || strlen(line) == 0){
324+
//skip comments
325+
return 0;
326+
}
327+
if(*line == '[' && line[strlen(line) - 1] == ']'){
328+
if(!strncmp(line, "[backend ", 9)){
329+
//backend configuration
330+
parser_state = backend_cfg;
331+
line[strlen(line) - 1] = 0;
332+
current_backend = backend_match(line + 9);
333+
334+
if(!current_backend){
335+
fprintf(stderr, "Cannot configure unknown backend %s\n", line + 9);
336+
return 1;
337+
}
338+
339+
//apply overrides
340+
for(u = 0; u < noverrides; u++){
341+
if(!overrides[u].handled && overrides[u].type == override_backend
342+
&& !strcmp(overrides[u].target, current_backend->name)){
343+
if(current_backend->conf(overrides[u].option, overrides[u].value)){
344+
fprintf(stderr, "Configuration override for %s failed for backend %s\n",
345+
overrides[u].option, current_backend->name);
346+
return 1;
347+
}
348+
overrides[u].handled = 1;
349+
}
350+
}
351+
}
352+
else if(!strcmp(line, "[map]")){
353+
//mapping configuration
354+
parser_state = map;
355+
}
356+
else{
357+
//backend instance configuration
358+
parser_state = instance_cfg;
359+
360+
//trim braces
361+
line[strlen(line) - 1] = 0;
362+
line++;
363+
364+
//find separating space and terminate
365+
for(separator = line; *separator && *separator != ' '; separator++){
366+
}
367+
if(!*separator){
368+
fprintf(stderr, "No instance name specified for backend %s\n", line);
369+
return 1;
370+
}
371+
*separator = 0;
372+
separator++;
373+
374+
current_backend = backend_match(line);
375+
if(!current_backend){
376+
fprintf(stderr, "No such backend %s\n", line);
377+
return 1;
378+
}
379+
380+
if(instance_match(separator)){
381+
fprintf(stderr, "Duplicate instance name %s\n", separator);
382+
return 1;
383+
}
384+
385+
//validate instance name
386+
if(strchr(separator, ' ') || strchr(separator, '.')){
387+
fprintf(stderr, "Invalid instance name %s\n", separator);
388+
return 1;
389+
}
390+
391+
current_instance = current_backend->create();
392+
if(!current_instance){
393+
fprintf(stderr, "Failed to instantiate backend %s\n", line);
394+
return 1;
395+
}
396+
397+
current_instance->name = strdup(separator);
398+
current_instance->backend = current_backend;
399+
fprintf(stderr, "Created %s instance %s\n", line, separator);
400+
401+
//apply overrides
402+
for(u = 0; u < noverrides; u++){
403+
if(!overrides[u].handled && overrides[u].type == override_instance
404+
&& !strcmp(overrides[u].target, current_instance->name)){
405+
if(current_backend->conf_instance(current_instance, overrides[u].option, overrides[u].value)){
406+
fprintf(stderr, "Configuration override for %s failed for instance %s\n",
407+
overrides[u].option, current_instance->name);
408+
return 1;
409+
}
410+
overrides[u].handled = 1;
411+
}
412+
}
413+
}
414+
}
415+
else if(parser_state == map){
416+
mapping_type = map_rtl;
417+
//find separator
418+
for(separator = line; *separator && *separator != '<' && *separator != '>'; separator++){
419+
}
420+
421+
switch(*separator){
422+
case '>':
423+
mapping_type = map_ltr;
424+
//fall through
425+
case '<': //default
426+
*separator = 0;
427+
separator++;
428+
break;
429+
case 0:
430+
default:
431+
fprintf(stderr, "Not a channel mapping: %s\n", line);
432+
return 1;
433+
}
434+
435+
if((mapping_type == map_ltr && *separator == '<')
436+
|| (mapping_type == map_rtl && *separator == '>')){
437+
mapping_type = map_bidir;
438+
separator++;
439+
}
440+
441+
line = config_trim_line(line);
442+
separator = config_trim_line(separator);
443+
444+
if(mapping_type == map_ltr || mapping_type == map_bidir){
445+
if(config_map(separator, line)){
446+
fprintf(stderr, "Failed to map channel %s to %s\n", line, separator);
447+
return 1;
448+
}
449+
}
450+
if(mapping_type == map_rtl || mapping_type == map_bidir){
451+
if(config_map(line, separator)){
452+
fprintf(stderr, "Failed to map channel %s to %s\n", separator, line);
453+
return 1;
454+
}
455+
}
456+
}
457+
else{
458+
//pass to parser
459+
//find separator
460+
separator = strchr(line, '=');
461+
if(!separator){
462+
fprintf(stderr, "Not an assignment: %s\n", line);
463+
return 1;
464+
}
465+
466+
*separator = 0;
467+
separator++;
468+
line = config_trim_line(line);
469+
separator = config_trim_line(separator);
470+
471+
if(parser_state == backend_cfg && current_backend->conf(line, separator)){
472+
fprintf(stderr, "Failed to configure backend %s\n", current_backend->name);
473+
return 1;
474+
}
475+
else if(parser_state == instance_cfg && current_backend->conf_instance(current_instance, line, separator)){
476+
fprintf(stderr, "Failed to configure instance %s\n", current_instance->name);
477+
return 1;
478+
}
479+
}
480+
481+
return 0;
482+
}
483+
315484
int config_read(char* cfg_filepath){
316485
int rv = 1;
317486
size_t line_alloc = 0;
318487
ssize_t status;
319-
map_type mapping_type = map_rtl;
320488
FILE* source = NULL;
321-
char* line_raw = NULL, *line, *separator;
489+
char* line_raw = NULL;
322490

323491
//create heap copy of file name because original might be in readonly memory
324492
char* source_dir = strdup(cfg_filepath), *source_file = NULL;
@@ -355,146 +523,88 @@ int config_read(char* cfg_filepath){
355523
}
356524

357525
for(status = getline(&line_raw, &line_alloc, source); status >= 0; status = getline(&line_raw, &line_alloc, source)){
358-
line = config_trim_line(line_raw);
359-
if(*line == ';' || strlen(line) == 0){
360-
//skip comments
361-
continue;
526+
if(config_line(line_raw)){
527+
goto bail;
362528
}
363-
if(*line == '[' && line[strlen(line) - 1] == ']'){
364-
if(!strncmp(line, "[backend ", 9)){
365-
//backend configuration
366-
parser_state = backend_cfg;
367-
line[strlen(line) - 1] = 0;
368-
current_backend = backend_match(line + 9);
369-
370-
if(!current_backend){
371-
fprintf(stderr, "Cannot configure unknown backend %s\n", line + 9);
372-
goto bail;
373-
}
374-
}
375-
else if(!strcmp(line, "[map]")){
376-
//mapping configuration
377-
parser_state = map;
378-
}
379-
else{
380-
//backend instance configuration
381-
parser_state = instance_cfg;
382-
383-
//trim braces
384-
line[strlen(line) - 1] = 0;
385-
line++;
386-
387-
//find separating space and terminate
388-
for(separator = line; *separator && *separator != ' '; separator++){
389-
}
390-
if(!*separator){
391-
fprintf(stderr, "No instance name specified for backend %s\n", line);
392-
goto bail;
393-
}
394-
*separator = 0;
395-
separator++;
529+
}
396530

397-
current_backend = backend_match(line);
398-
if(!current_backend){
399-
fprintf(stderr, "No such backend %s\n", line);
400-
goto bail;
401-
}
531+
//TODO check whether all overrides have been applied
402532

403-
if(instance_match(separator)){
404-
fprintf(stderr, "Duplicate instance name %s\n", separator);
405-
goto bail;
406-
}
533+
rv = 0;
534+
bail:
535+
free(source_dir);
536+
if(source){
537+
fclose(source);
538+
}
539+
free(line_raw);
540+
return rv;
541+
}
407542

408-
//validate instance name
409-
if(strchr(separator, ' ') || strchr(separator, '.')){
410-
fprintf(stderr, "Invalid instance name %s\n", separator);
411-
goto bail;
412-
}
543+
int config_add_override(override_type type, char* data_raw){
544+
int rv = 1;
545+
//heap a copy because the original data is probably not writable
546+
char* data = strdup(data_raw);
413547

414-
current_instance = current_backend->create();
415-
if(!current_instance){
416-
fprintf(stderr, "Failed to instantiate backend %s\n", line);
417-
goto bail;
418-
}
548+
if(!data){
549+
fprintf(stderr, "Failed to allocate memory\n");
550+
goto bail;
551+
}
419552

420-
current_instance->name = strdup(separator);
421-
current_instance->backend = current_backend;
422-
fprintf(stderr, "Created %s instance %s\n", line, separator);
423-
}
424-
}
425-
else if(parser_state == map){
426-
mapping_type = map_rtl;
427-
//find separator
428-
for(separator = line; *separator && *separator != '<' && *separator != '>'; separator++){
429-
}
553+
char* option = strchr(data, '.');
554+
char* value = strchr(data, '=');
430555

431-
switch(*separator){
432-
case '>':
433-
mapping_type = map_ltr;
434-
//fall through
435-
case '<': //default
436-
*separator = 0;
437-
separator++;
438-
break;
439-
case 0:
440-
default:
441-
fprintf(stderr, "Not a channel mapping: %s\n", line);
442-
goto bail;
443-
}
556+
if(!option || !value){
557+
fprintf(stderr, "Override %s is not a valid assignment\n", data_raw);
558+
goto bail;
559+
}
444560

445-
if((mapping_type == map_ltr && *separator == '<')
446-
|| (mapping_type == map_rtl && *separator == '>')){
447-
mapping_type = map_bidir;
448-
separator++;
449-
}
561+
//terminate strings
562+
*option = 0;
563+
option++;
450564

451-
line = config_trim_line(line);
452-
separator = config_trim_line(separator);
565+
*value = 0;
566+
value++;
453567

454-
if(mapping_type == map_ltr || mapping_type == map_bidir){
455-
if(config_map(separator, line)){
456-
fprintf(stderr, "Failed to map channel %s to %s\n", line, separator);
457-
goto bail;
458-
}
459-
}
460-
if(mapping_type == map_rtl || mapping_type == map_bidir){
461-
if(config_map(line, separator)){
462-
fprintf(stderr, "Failed to map channel %s to %s\n", separator, line);
463-
goto bail;
464-
}
465-
}
466-
}
467-
else{
468-
//pass to parser
469-
//find separator
470-
separator = strchr(line, '=');
471-
if(!separator){
472-
fprintf(stderr, "Not an assignment: %s\n", line);
473-
goto bail;
474-
}
568+
config_override new = {
569+
.type = type,
570+
.handled = 0,
571+
.target = strdup(config_trim_line(data)),
572+
.option = strdup(config_trim_line(option)),
573+
.value = strdup(config_trim_line(value))
574+
};
475575

476-
*separator = 0;
477-
separator++;
478-
line = config_trim_line(line);
479-
separator = config_trim_line(separator);
576+
if(!new.target || !new.option || !new.value){
577+
fprintf(stderr, "Failed to allocate memory\n");
578+
goto bail;
579+
}
480580

481-
if(parser_state == backend_cfg && current_backend->conf(line, separator)){
482-
fprintf(stderr, "Failed to configure backend %s\n", current_backend->name);
483-
goto bail;
484-
}
485-
else if(parser_state == instance_cfg && current_backend->conf_instance(current_instance, line, separator)){
486-
fprintf(stderr, "Failed to configure instance %s\n", current_instance->name);
487-
goto bail;
488-
}
489-
}
581+
overrides = realloc(overrides, (noverrides + 1) * sizeof(config_override));
582+
if(!overrides){
583+
noverrides = 0;
584+
fprintf(stderr, "Failed to allocate memory\n");
585+
goto bail;
490586
}
587+
overrides[noverrides] = new;
588+
noverrides++;
491589

492590
rv = 0;
493591
bail:
494-
free(source_dir);
495-
if(source){
496-
fclose(source);
497-
}
498-
free(line_raw);
592+
free(data);
499593
return rv;
500594
}
595+
596+
void config_free(){
597+
size_t u;
598+
599+
for(u = 0; u < noverrides; u++){
600+
free(overrides[u].target);
601+
free(overrides[u].option);
602+
free(overrides[u].value);
603+
}
604+
605+
noverrides = 0;
606+
free(overrides);
607+
overrides = NULL;
608+
609+
parser_state = none;
610+
}

‎config.h

+44
Original file line numberDiff line numberDiff line change
@@ -1 +1,45 @@
1+
/*
2+
* Channel specification glob
3+
*/
4+
typedef struct /*_mm_channel_glob*/ {
5+
size_t offset[2];
6+
union {
7+
void* impl;
8+
uint64_t u64[2];
9+
} limits;
10+
uint64_t values;
11+
} channel_glob;
12+
13+
/*
14+
* (Multi-)Channel specification
15+
*/
16+
typedef struct /*_mm_channel_spec*/ {
17+
char* spec;
18+
uint8_t internal;
19+
size_t channels;
20+
size_t globs;
21+
channel_glob* glob;
22+
} channel_spec;
23+
24+
/*
25+
* Command-line override types
26+
*/
27+
typedef enum {
28+
override_backend,
29+
override_instance
30+
} override_type;
31+
32+
/*
33+
* Command-line override data
34+
*/
35+
typedef struct /*_mm_config_override*/ {
36+
override_type type;
37+
uint8_t handled;
38+
char* target;
39+
char* option;
40+
char* value;
41+
} config_override;
42+
143
int config_read(char* file);
44+
int config_add_override(override_type type, char* data);
45+
void config_free();

‎midimonster.c

+26-3
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,30 @@ static int args_parse(int argc, char** argv, char** cfg_file){
274274
version();
275275
return 1;
276276
}
277-
278-
//if nothing else matches, it's probably the configuration file
279-
*cfg_file = argv[u];
277+
else if(!strcmp(argv[u], "-i")){
278+
if(!argv[u + 1]){
279+
fprintf(stderr, "Missing instance override specification\n");
280+
return 1;
281+
}
282+
if(config_add_override(override_instance, argv[u + 1])){
283+
return 1;
284+
}
285+
u++;
286+
}
287+
else if(!strcmp(argv[u], "-b")){
288+
if(!argv[u + 1]){
289+
fprintf(stderr, "Missing backend override specification\n");
290+
return 1;
291+
}
292+
if(config_add_override(override_backend, argv[u + 1])){
293+
return 1;
294+
}
295+
u++;
296+
}
297+
else{
298+
//if nothing else matches, it's probably the configuration file
299+
*cfg_file = argv[u];
300+
}
280301
}
281302

282303
return 0;
@@ -317,6 +338,7 @@ int main(int argc, char** argv){
317338
map_free();
318339
fds_free();
319340
plugins_close();
341+
config_free();
320342
return usage(argv[0]);
321343
}
322344

@@ -403,6 +425,7 @@ int main(int argc, char** argv){
403425
fds_free();
404426
event_free();
405427
plugins_close();
428+
config_free();
406429

407430
return rv;
408431
}

‎midimonster.h

-24
Original file line numberDiff line numberDiff line change
@@ -189,29 +189,6 @@ typedef struct _backend_instance {
189189
char* name;
190190
} instance;
191191

192-
/*
193-
* Channel specification glob
194-
*/
195-
typedef struct /*_mm_channel_glob*/ {
196-
size_t offset[2];
197-
union {
198-
void* impl;
199-
uint64_t u64[2];
200-
} limits;
201-
uint64_t values;
202-
} channel_glob;
203-
204-
/*
205-
* (Multi-)Channel specification
206-
*/
207-
typedef struct /*_mm_channel_spec*/ {
208-
char* spec;
209-
uint8_t internal;
210-
size_t channels;
211-
size_t globs;
212-
channel_glob* glob;
213-
} channel_spec;
214-
215192
/*
216193
* Instance channel structure
217194
* Backends may either manage their own channel registry
@@ -283,7 +260,6 @@ MM_API instance* mm_instance_find(char* backend, uint64_t ident);
283260
* function.
284261
*/
285262
MM_API channel* mm_channel(instance* i, uint64_t ident, uint8_t create);
286-
//TODO channel* mm_channel_find()
287263

288264
/*
289265
* Register (manage = 1) or unregister (manage = 0) a file descriptor

0 commit comments

Comments
 (0)
Please sign in to comment.