From 871bc1568f94ee4026fd64df062572b91d45d462 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sat, 4 Jan 2020 18:39:04 +0100
Subject: Add input_channel call to Lua backend

---
 midimonster.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'midimonster.h')

diff --git a/midimonster.h b/midimonster.h
index 5844bb9..c5a6cf5 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -7,7 +7,7 @@
 
 /* Core version unless set by the build process */
 #ifndef MIDIMONSTER_VERSION
-	#define MIDIMONSTER_VERSION "v0.3-dist"
+	#define MIDIMONSTER_VERSION "v0.4-dist"
 #endif
 
 /* Set backend name if unset */
-- 
cgit v1.2.3


From e08b473d0eeb467ad358ba5314157753b4f37c18 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 5 Jan 2020 23:26:04 +0100
Subject: Implement commandline config override (Fixes #26)

---
 README.md     |   7 ++
 config.c      | 364 ++++++++++++++++++++++++++++++++++++++--------------------
 config.h      |  44 +++++++
 midimonster.c |  29 ++++-
 midimonster.h |  24 ----
 5 files changed, 314 insertions(+), 154 deletions(-)

(limited to 'midimonster.h')

diff --git a/README.md b/README.md
index e955d53..2496dfa 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,8 @@ The MIDImonster takes as it's first argument the name of an optional configurati
 to use (`monster.cfg` is used as default if none is specified). The configuration
 file syntax is explained in the next section.
 
+The current MIDIMonster version can be queried by passing *-v* as command-line argument.
+
 ## Configuration
 
 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
 `[<backend-name> <instance-name>]` configuration stanza. Most backends require
 additional configuration for their instances.
 
+Backend and instance configuration options can also be overriden via command line
+arguments using the syntax `-b <backend>.<option>=<value>` for backend options
+and `-i <instance>.<option>=<value>` for instance options. These overrides
+are applied when the backend/instance is first mentioned in the configuration file.
+
 ### Channel mapping
 
 The `[map]` section consists of lines of channel-to-channel assignments, reading like
diff --git a/config.c b/config.c
index c7e2f7e..d2b65d4 100644
--- a/config.c
+++ b/config.c
@@ -21,6 +21,8 @@ typedef enum {
 
 static backend* current_backend = NULL;
 static instance* current_instance = NULL;
+static size_t noverrides = 0;
+static config_override* overrides = NULL;
 
 #ifdef _WIN32
 #define GETLINE_BUFFER 4096
@@ -312,13 +314,179 @@ done:
 	return rv;
 }
 
+static int config_line(char* line){
+	map_type mapping_type = map_rtl;
+	char* separator = NULL;
+	size_t u;
+
+	line = config_trim_line(line);
+	if(*line == ';' || strlen(line) == 0){
+		//skip comments
+		return 0;
+	}
+	if(*line == '[' && line[strlen(line) - 1] == ']'){
+		if(!strncmp(line, "[backend ", 9)){
+			//backend configuration
+			parser_state = backend_cfg;
+			line[strlen(line) - 1] = 0;
+			current_backend = backend_match(line + 9);
+
+			if(!current_backend){
+				fprintf(stderr, "Cannot configure unknown backend %s\n", line + 9);
+				return 1;
+			}
+
+			//apply overrides
+			for(u = 0; u < noverrides; u++){
+				if(!overrides[u].handled && overrides[u].type == override_backend
+					       && !strcmp(overrides[u].target, current_backend->name)){
+					if(current_backend->conf(overrides[u].option, overrides[u].value)){
+						fprintf(stderr, "Configuration override for %s failed for backend %s\n",
+								overrides[u].option, current_backend->name);
+						return 1;
+					}
+					overrides[u].handled = 1;
+				}
+			}
+		}
+		else if(!strcmp(line, "[map]")){
+			//mapping configuration
+			parser_state = map;
+		}
+		else{
+			//backend instance configuration
+			parser_state = instance_cfg;
+			
+			//trim braces
+			line[strlen(line) - 1] = 0;
+			line++;
+
+			//find separating space and terminate
+			for(separator = line; *separator && *separator != ' '; separator++){
+			}
+			if(!*separator){
+				fprintf(stderr, "No instance name specified for backend %s\n", line);
+				return 1;
+			}
+			*separator = 0;
+			separator++;
+
+			current_backend = backend_match(line);
+			if(!current_backend){
+				fprintf(stderr, "No such backend %s\n", line);
+				return 1;
+			}
+
+			if(instance_match(separator)){
+				fprintf(stderr, "Duplicate instance name %s\n", separator);
+				return 1;
+			}
+
+			//validate instance name
+			if(strchr(separator, ' ') || strchr(separator, '.')){
+				fprintf(stderr, "Invalid instance name %s\n", separator);
+				return 1;
+			}
+
+			current_instance = current_backend->create();
+			if(!current_instance){
+				fprintf(stderr, "Failed to instantiate backend %s\n", line);
+				return 1;
+			}
+
+			current_instance->name = strdup(separator);
+			current_instance->backend = current_backend;
+			fprintf(stderr, "Created %s instance %s\n", line, separator);
+
+			//apply overrides
+			for(u = 0; u < noverrides; u++){
+				if(!overrides[u].handled && overrides[u].type == override_instance
+					       && !strcmp(overrides[u].target, current_instance->name)){
+					if(current_backend->conf_instance(current_instance, overrides[u].option, overrides[u].value)){
+						fprintf(stderr, "Configuration override for %s failed for instance %s\n",
+								overrides[u].option, current_instance->name);
+						return 1;
+					}
+					overrides[u].handled = 1;
+				}
+			}
+		}
+	}
+	else if(parser_state == map){
+		mapping_type = map_rtl;
+		//find separator
+		for(separator = line; *separator && *separator != '<' && *separator != '>'; separator++){
+		}
+
+		switch(*separator){
+			case '>':
+				mapping_type = map_ltr;
+				//fall through
+			case '<': //default
+				*separator = 0;
+				separator++;
+				break;
+			case 0:
+			default:
+				fprintf(stderr, "Not a channel mapping: %s\n", line);
+				return 1;
+		}
+
+		if((mapping_type == map_ltr && *separator == '<')
+				|| (mapping_type == map_rtl && *separator == '>')){
+			mapping_type = map_bidir;
+			separator++;
+		}
+
+		line = config_trim_line(line);
+		separator = config_trim_line(separator);
+
+		if(mapping_type == map_ltr || mapping_type == map_bidir){
+			if(config_map(separator, line)){
+				fprintf(stderr, "Failed to map channel %s to %s\n", line, separator);
+				return 1;
+			}
+		}
+		if(mapping_type == map_rtl || mapping_type == map_bidir){
+			if(config_map(line, separator)){
+				fprintf(stderr, "Failed to map channel %s to %s\n", separator, line);
+				return 1;
+			}
+		}
+	}
+	else{
+		//pass to parser
+		//find separator
+		separator = strchr(line, '=');
+		if(!separator){
+			fprintf(stderr, "Not an assignment: %s\n", line);
+			return 1;
+		}
+
+		*separator = 0;
+		separator++;
+		line = config_trim_line(line);
+		separator = config_trim_line(separator);
+
+		if(parser_state == backend_cfg && current_backend->conf(line, separator)){
+			fprintf(stderr, "Failed to configure backend %s\n", current_backend->name);
+			return 1;
+		}
+		else if(parser_state == instance_cfg && current_backend->conf_instance(current_instance, line, separator)){
+			fprintf(stderr, "Failed to configure instance %s\n", current_instance->name);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
 int config_read(char* cfg_filepath){
 	int rv = 1;
 	size_t line_alloc = 0;
 	ssize_t status;
-	map_type mapping_type = map_rtl;
 	FILE* source = NULL;
-	char* line_raw = NULL, *line, *separator;
+	char* line_raw = NULL;
 
 	//create heap copy of file name because original might be in readonly memory
 	char* source_dir = strdup(cfg_filepath), *source_file = NULL;
@@ -355,146 +523,88 @@ int config_read(char* cfg_filepath){
 	}
 
 	for(status = getline(&line_raw, &line_alloc, source); status >= 0; status = getline(&line_raw, &line_alloc, source)){
-		line = config_trim_line(line_raw);
-		if(*line == ';' || strlen(line) == 0){
-			//skip comments
-			continue;
+		if(config_line(line_raw)){
+			goto bail;
 		}
-		if(*line == '[' && line[strlen(line) - 1] == ']'){
-			if(!strncmp(line, "[backend ", 9)){
-				//backend configuration
-				parser_state = backend_cfg;
-				line[strlen(line) - 1] = 0;
-				current_backend = backend_match(line + 9);
-
-				if(!current_backend){
-					fprintf(stderr, "Cannot configure unknown backend %s\n", line + 9);
-					goto bail;
-				}
-			}
-			else if(!strcmp(line, "[map]")){
-				//mapping configuration
-				parser_state = map;
-			}
-			else{
-				//backend instance configuration
-				parser_state = instance_cfg;
-				
-				//trim braces
-				line[strlen(line) - 1] = 0;
-				line++;
-
-				//find separating space and terminate
-				for(separator = line; *separator && *separator != ' '; separator++){
-				}
-				if(!*separator){
-					fprintf(stderr, "No instance name specified for backend %s\n", line);
-					goto bail;
-				}
-				*separator = 0;
-				separator++;
+	}
 
-				current_backend = backend_match(line);
-				if(!current_backend){
-					fprintf(stderr, "No such backend %s\n", line);
-					goto bail;
-				}
+	//TODO check whether all overrides have been applied
 
-				if(instance_match(separator)){
-					fprintf(stderr, "Duplicate instance name %s\n", separator);
-					goto bail;
-				}
+	rv = 0;
+bail:
+	free(source_dir);
+	if(source){
+		fclose(source);
+	}
+	free(line_raw);
+	return rv;
+}
 
-				//validate instance name
-				if(strchr(separator, ' ') || strchr(separator, '.')){
-					fprintf(stderr, "Invalid instance name %s\n", separator);
-					goto bail;
-				}
+int config_add_override(override_type type, char* data_raw){
+	int rv = 1;
+	//heap a copy because the original data is probably not writable
+	char* data = strdup(data_raw);
 
-				current_instance = current_backend->create();
-				if(!current_instance){
-					fprintf(stderr, "Failed to instantiate backend %s\n", line);
-					goto bail;
-				}
+	if(!data){
+		fprintf(stderr, "Failed to allocate memory\n");
+		goto bail;
+	}
 
-				current_instance->name = strdup(separator);
-				current_instance->backend = current_backend;
-				fprintf(stderr, "Created %s instance %s\n", line, separator);
-			}
-		}
-		else if(parser_state == map){
-			mapping_type = map_rtl;
-			//find separator
-			for(separator = line; *separator && *separator != '<' && *separator != '>'; separator++){
-			}
+	char* option = strchr(data, '.');
+	char* value = strchr(data, '=');
 
-			switch(*separator){
-				case '>':
-					mapping_type = map_ltr;
-					//fall through
-				case '<': //default
-					*separator = 0;
-					separator++;
-					break;
-				case 0:
-				default:
-					fprintf(stderr, "Not a channel mapping: %s\n", line);
-					goto bail;
-			}
+	if(!option || !value){
+		fprintf(stderr, "Override %s is not a valid assignment\n", data_raw);
+		goto bail;
+	}
 
-			if((mapping_type == map_ltr && *separator == '<')
-					|| (mapping_type == map_rtl && *separator == '>')){
-				mapping_type = map_bidir;
-				separator++;
-			}
+	//terminate strings
+	*option = 0;
+	option++;
 
-			line = config_trim_line(line);
-			separator = config_trim_line(separator);
+	*value = 0;
+	value++;
 
-			if(mapping_type == map_ltr || mapping_type == map_bidir){
-				if(config_map(separator, line)){
-					fprintf(stderr, "Failed to map channel %s to %s\n", line, separator);
-					goto bail;
-				}
-			}
-			if(mapping_type == map_rtl || mapping_type == map_bidir){
-				if(config_map(line, separator)){
-					fprintf(stderr, "Failed to map channel %s to %s\n", separator, line);
-					goto bail;
-				}
-			}
-		}
-		else{
-			//pass to parser
-			//find separator
-			separator = strchr(line, '=');
-			if(!separator){
-				fprintf(stderr, "Not an assignment: %s\n", line);
-				goto bail;
-			}
+	config_override new = {
+		.type = type,
+		.handled = 0,
+		.target = strdup(config_trim_line(data)),
+		.option = strdup(config_trim_line(option)),
+		.value = strdup(config_trim_line(value))
+	};
 
-			*separator = 0;
-			separator++;
-			line = config_trim_line(line);
-			separator = config_trim_line(separator);
+	if(!new.target || !new.option || !new.value){
+		fprintf(stderr, "Failed to allocate memory\n");
+		goto bail;
+	}
 
-			if(parser_state == backend_cfg && current_backend->conf(line, separator)){
-				fprintf(stderr, "Failed to configure backend %s\n", current_backend->name);
-				goto bail;
-			}
-			else if(parser_state == instance_cfg && current_backend->conf_instance(current_instance, line, separator)){
-				fprintf(stderr, "Failed to configure instance %s\n", current_instance->name);
-				goto bail;
-			}
-		}
+	overrides = realloc(overrides, (noverrides + 1) * sizeof(config_override));
+	if(!overrides){
+		noverrides = 0;
+		fprintf(stderr, "Failed to allocate memory\n");
+		goto bail;
 	}
+	overrides[noverrides] = new;
+	noverrides++;
 
 	rv = 0;
 bail:
-	free(source_dir);
-	if(source){
-		fclose(source);
-	}
-	free(line_raw);
+	free(data);
 	return rv;
 }
+
+void config_free(){
+	size_t u;
+
+	for(u = 0; u < noverrides; u++){
+		free(overrides[u].target);
+		free(overrides[u].option);
+		free(overrides[u].value);
+	}
+
+	noverrides = 0;
+	free(overrides);
+	overrides = NULL;
+
+	parser_state = none;
+}
diff --git a/config.h b/config.h
index 7cc2a42..d15aed2 100644
--- a/config.h
+++ b/config.h
@@ -1 +1,45 @@
+/*
+ * Channel specification glob
+ */
+typedef struct /*_mm_channel_glob*/ {
+	size_t offset[2];
+	union {
+		void* impl;
+		uint64_t u64[2];
+	} limits;
+	uint64_t values;
+} channel_glob;
+
+/*
+ * (Multi-)Channel specification
+ */
+typedef struct /*_mm_channel_spec*/ {
+	char* spec;
+	uint8_t internal;
+	size_t channels;
+	size_t globs;
+	channel_glob* glob;
+} channel_spec;
+
+/*
+ * Command-line override types
+ */
+typedef enum {
+	override_backend,
+	override_instance
+} override_type;
+
+/*
+ * Command-line override data
+ */
+typedef struct /*_mm_config_override*/ {
+	override_type type;
+	uint8_t handled;
+	char* target;
+	char* option;
+	char* value;
+} config_override;
+
 int config_read(char* file);
+int config_add_override(override_type type, char* data);
+void config_free();
diff --git a/midimonster.c b/midimonster.c
index 2ec165b..583601e 100644
--- a/midimonster.c
+++ b/midimonster.c
@@ -274,9 +274,30 @@ static int args_parse(int argc, char** argv, char** cfg_file){
 			version();
 			return 1;
 		}
-
-		//if nothing else matches, it's probably the configuration file
-		*cfg_file = argv[u];
+		else if(!strcmp(argv[u], "-i")){
+			if(!argv[u + 1]){
+				fprintf(stderr, "Missing instance override specification\n");
+				return 1;
+			}
+			if(config_add_override(override_instance, argv[u + 1])){
+				return 1;
+			}
+			u++;
+		}
+		else if(!strcmp(argv[u], "-b")){
+			if(!argv[u + 1]){
+				fprintf(stderr, "Missing backend override specification\n");
+				return 1;
+			}
+			if(config_add_override(override_backend, argv[u + 1])){
+				return 1;
+			}
+			u++;
+		}
+		else{
+			//if nothing else matches, it's probably the configuration file
+			*cfg_file = argv[u];
+		}
 	}
 
 	return 0;
@@ -317,6 +338,7 @@ int main(int argc, char** argv){
 		map_free();
 		fds_free();
 		plugins_close();
+		config_free();
 		return usage(argv[0]);
 	}
 	
@@ -403,6 +425,7 @@ bail:
 	fds_free();
 	event_free();
 	plugins_close();
+	config_free();
 
 	return rv;
 }
diff --git a/midimonster.h b/midimonster.h
index c5a6cf5..d6f04e7 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -189,29 +189,6 @@ typedef struct _backend_instance {
 	char* name;
 } instance;
 
-/*
- * Channel specification glob
- */
-typedef struct /*_mm_channel_glob*/ {
-	size_t offset[2];
-	union {
-		void* impl;
-		uint64_t u64[2];
-	} limits;
-	uint64_t values;
-} channel_glob;
-
-/*
- * (Multi-)Channel specification
- */
-typedef struct /*_mm_channel_spec*/ {
-	char* spec;
-	uint8_t internal;
-	size_t channels;
-	size_t globs;
-	channel_glob* glob;
-} channel_spec;
-
 /* 
  * Instance channel structure
  * Backends may either manage their own channel registry
@@ -283,7 +260,6 @@ MM_API instance* mm_instance_find(char* backend, uint64_t ident);
  * function.
  */
 MM_API channel* mm_channel(instance* i, uint64_t ident, uint8_t create);
-//TODO channel* mm_channel_find()
 
 /*
  * Register (manage = 1) or unregister (manage = 0) a file descriptor
-- 
cgit v1.2.3


From 78b21a9ac3f975f35ec7b61108531e1495eb91c0 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 12 Jan 2020 17:34:14 +0100
Subject: Rework instance creation

---
 README.md           |  6 +++---
 backend.c           |  6 +++---
 backend.h           |  2 +-
 backends/artnet.c   | 14 ++++----------
 backends/artnet.h   |  2 +-
 backends/evdev.c    | 13 ++++---------
 backends/evdev.h    |  2 +-
 backends/jack.c     | 12 +++---------
 backends/jack.h     |  2 +-
 backends/loopback.c | 15 +++++----------
 backends/loopback.h |  2 +-
 backends/lua.c      | 13 ++++---------
 backends/lua.h      |  2 +-
 backends/maweb.c    | 13 ++++---------
 backends/maweb.h    |  2 +-
 backends/midi.c     | 11 +++--------
 backends/midi.h     |  2 +-
 backends/ola.cpp    | 16 +++++-----------
 backends/ola.h      |  2 +-
 backends/osc.c      | 11 +++--------
 backends/osc.h      |  2 +-
 backends/sacn.c     | 11 +++--------
 backends/sacn.h     |  2 +-
 backends/winmidi.c  | 15 +++++----------
 backends/winmidi.h  |  2 +-
 config.c            | 14 +++++++++-----
 midimonster.c       |  2 +-
 midimonster.h       | 21 ++++-----------------
 28 files changed, 75 insertions(+), 142 deletions(-)

(limited to 'midimonster.h')

diff --git a/README.md b/README.md
index b9be3cf..725390f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # The MIDIMonster
 
-Named for its scary math, the MIDIMonster is a universal translation
-tool between multi-channel absolute-value-based control and/or bus protocols.
+Named for its scary math, the MIDIMonster is a universal control and translation
+tool for multi-channel absolute-value-based control and/or bus protocols.
 
 Currently, the MIDIMonster supports the following protocols:
 
@@ -18,7 +18,7 @@ Currently, the MIDIMonster supports the following protocols:
 
 with additional flexibility provided by a [Lua scripting environment](backends/lua.md).
 
-The MIDIMonster allows the user to translate any channel on one protocol into channel(s)
+With these features, the MIDIMonster allows the user to translate any channel on one protocol into channel(s)
 on any other (or the same) supported protocol, for example to:
 
 * Translate MIDI Control Changes into Notes ([Example configuration](configs/unifest-17.cfg))
diff --git a/backend.c b/backend.c
index a2b120f..e9c3829 100644
--- a/backend.c
+++ b/backend.c
@@ -54,7 +54,7 @@ int backends_notify(size_t nev, channel** c, channel_value* v){
 			if(c[p]->instance == instances[u]){
 				xval = v[n];
 				xchnl = c[n];
-				
+
 				v[n] = v[p];
 				c[n] = c[p];
 
@@ -105,7 +105,7 @@ MM_API channel* mm_channel(instance* inst, uint64_t ident, uint8_t create){
 	return channels[nchannels++];
 }
 
-MM_API instance* mm_instance(){
+instance* mm_instance(){
 	instance** new_inst = realloc(instances, (ninstances + 1) * sizeof(instance*));
 	if(!new_inst){
 		//TODO free
@@ -274,7 +274,7 @@ int backends_start(){
 		if(p == ninstances){
 			continue;
 		}
-		
+
 		//fetch list of instances
 		if(mm_backend_instances(backends[u].name, &n, &inst)){
 			fprintf(stderr, "Failed to fetch instance list for initialization of backend %s\n", backends[u].name);
diff --git a/backend.h b/backend.h
index 6573e17..de9b5dc 100644
--- a/backend.h
+++ b/backend.h
@@ -10,10 +10,10 @@ int backends_start();
 int backends_stop();
 void instances_free();
 void channels_free();
+instance* mm_instance();
 
 /* Backend API */
 MM_API channel* mm_channel(instance* inst, uint64_t ident, uint8_t create);
-MM_API instance* mm_instance();
 MM_API instance* mm_instance_find(char* name, uint64_t ident);
 MM_API int mm_backend_instances(char* name, size_t* ninst, instance*** inst);
 MM_API int mm_backend_register(backend b);
diff --git a/backends/artnet.c b/backends/artnet.c
index 0bd1a32..ed426b0 100644
--- a/backends/artnet.c
+++ b/backends/artnet.c
@@ -94,23 +94,17 @@ static int artnet_configure(char* option, char* value){
 	return 1;
 }
 
-static instance* artnet_instance(){
-	artnet_instance_data* data = NULL;
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
-	data = calloc(1, sizeof(artnet_instance_data));
+static int artnet_instance(instance* inst){
+	artnet_instance_data* data = calloc(1, sizeof(artnet_instance_data));
 	if(!data){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
 	data->net = default_net;
 
 	inst->impl = data;
-	return inst;
+	return 0;
 }
 
 static int artnet_configure_instance(instance* inst, char* option, char* value){
diff --git a/backends/artnet.h b/backends/artnet.h
index 59bd53f..1efdee6 100644
--- a/backends/artnet.h
+++ b/backends/artnet.h
@@ -6,7 +6,7 @@
 MM_PLUGIN_API int init();
 static int artnet_configure(char* option, char* value);
 static int artnet_configure_instance(instance* instance, char* option, char* value);
-static instance* artnet_instance();
+static int artnet_instance(instance* inst);
 static channel* artnet_channel(instance* instance, char* spec, uint8_t flags);
 static int artnet_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int artnet_handle(size_t num, managed_fd* fds);
diff --git a/backends/evdev.c b/backends/evdev.c
index 4725ef7..af5ec74 100644
--- a/backends/evdev.c
+++ b/backends/evdev.c
@@ -63,16 +63,11 @@ static int evdev_configure(char* option, char* value) {
 	return 1;
 }
 
-static instance* evdev_instance(){
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
+static int evdev_instance(instance* inst){
 	evdev_instance_data* data = calloc(1, sizeof(evdev_instance_data));
 	if(!data){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
 	data->input_fd = -1;
@@ -81,12 +76,12 @@ static instance* evdev_instance(){
 	if(!data->output_proto){
 		LOG("Failed to initialize libevdev output prototype device");
 		free(data);
-		return NULL;
+		return 1;
 	}
 #endif
 
 	inst->impl = data;
-	return inst;
+	return 0;
 }
 
 static int evdev_attach(instance* inst, evdev_instance_data* data, char* node){
diff --git a/backends/evdev.h b/backends/evdev.h
index 0c877fc..e896d2d 100644
--- a/backends/evdev.h
+++ b/backends/evdev.h
@@ -11,7 +11,7 @@
 MM_PLUGIN_API int init();
 static int evdev_configure(char* option, char* value);
 static int evdev_configure_instance(instance* instance, char* option, char* value);
-static instance* evdev_instance();
+static int evdev_instance(instance* inst);
 static channel* evdev_channel(instance* instance, char* spec, uint8_t flags);
 static int evdev_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int evdev_handle(size_t num, managed_fd* fds);
diff --git a/backends/jack.c b/backends/jack.c
index d7f68c4..c862096 100644
--- a/backends/jack.c
+++ b/backends/jack.c
@@ -334,19 +334,13 @@ static int mmjack_configure_instance(instance* inst, char* option, char* value){
 	return 0;
 }
 
-static instance* mmjack_instance(){
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
+static int mmjack_instance(instance* inst){
 	inst->impl = calloc(1, sizeof(mmjack_instance_data));
 	if(!inst->impl){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
-
-	return inst;
+	return 0;
 }
 
 static int mmjack_parse_midispec(mmjack_channel_ident* ident, char* spec){
diff --git a/backends/jack.h b/backends/jack.h
index 66c66db..03ce052 100644
--- a/backends/jack.h
+++ b/backends/jack.h
@@ -5,7 +5,7 @@
 MM_PLUGIN_API int init();
 static int mmjack_configure(char* option, char* value);
 static int mmjack_configure_instance(instance* inst, char* option, char* value);
-static instance* mmjack_instance();
+static int mmjack_instance(instance* inst);
 static channel* mmjack_channel(instance* inst, char* spec, uint8_t flags);
 static int mmjack_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int mmjack_handle(size_t num, managed_fd* fds);
diff --git a/backends/loopback.c b/backends/loopback.c
index 085d1df..eaecdb4 100644
--- a/backends/loopback.c
+++ b/backends/loopback.c
@@ -34,19 +34,14 @@ static int loopback_configure_instance(instance* inst, char* option, char* value
 	return 0;
 }
 
-static instance* loopback_instance(){
-	instance* i = mm_instance();
-	if(!i){
-		return NULL;
-	}
-
-	i->impl = calloc(1, sizeof(loopback_instance_data));
-	if(!i->impl){
+static int loopback_instance(instance* inst){
+	inst->impl = calloc(1, sizeof(loopback_instance_data));
+	if(!inst->impl){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
-	return i;
+	return 0;
 }
 
 static channel* loopback_channel(instance* inst, char* spec, uint8_t flags){
diff --git a/backends/loopback.h b/backends/loopback.h
index c508d72..cfb2e19 100644
--- a/backends/loopback.h
+++ b/backends/loopback.h
@@ -3,7 +3,7 @@
 MM_PLUGIN_API int init();
 static int loopback_configure(char* option, char* value);
 static int loopback_configure_instance(instance* inst, char* option, char* value);
-static instance* loopback_instance();
+static int loopback_instance(instance* inst);
 static channel* loopback_channel(instance* inst, char* spec, uint8_t flags);
 static int loopback_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int loopback_handle(size_t num, managed_fd* fds);
diff --git a/backends/lua.c b/backends/lua.c
index 510fc72..7d20fb1 100644
--- a/backends/lua.c
+++ b/backends/lua.c
@@ -304,16 +304,11 @@ static int lua_configure_instance(instance* inst, char* option, char* value){
 	return 1;
 }
 
-static instance* lua_instance(){
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
+static int lua_instance(instance* inst){
 	lua_instance_data* data = calloc(1, sizeof(lua_instance_data));
 	if(!data){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
 	//load the interpreter
@@ -321,7 +316,7 @@ static instance* lua_instance(){
 	if(!data->interpreter){
 		LOG("Failed to initialize interpreter");
 		free(data);
-		return NULL;
+		return 1;
 	}
 	luaL_openlibs(data->interpreter);
 
@@ -338,7 +333,7 @@ static instance* lua_instance(){
 	lua_settable(data->interpreter, LUA_REGISTRYINDEX);
 
 	inst->impl = data;
-	return inst;
+	return 0;
 }
 
 static channel* lua_channel(instance* inst, char* spec, uint8_t flags){
diff --git a/backends/lua.h b/backends/lua.h
index 75f03c4..ebe2046 100644
--- a/backends/lua.h
+++ b/backends/lua.h
@@ -12,7 +12,7 @@
 MM_PLUGIN_API int init();
 static int lua_configure(char* option, char* value);
 static int lua_configure_instance(instance* inst, char* option, char* value);
-static instance* lua_instance();
+static int lua_instance(instance* inst);
 static channel* lua_channel(instance* inst, char* spec, uint8_t flags);
 static int lua_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int lua_handle(size_t num, managed_fd* fds);
diff --git a/backends/maweb.c b/backends/maweb.c
index f81ab46..6a006bd 100644
--- a/backends/maweb.c
+++ b/backends/maweb.c
@@ -205,16 +205,11 @@ static int maweb_configure_instance(instance* inst, char* option, char* value){
 	return 1;
 }
 
-static instance* maweb_instance(){
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
+static int maweb_instance(instance* inst){
 	maweb_instance_data* data = calloc(1, sizeof(maweb_instance_data));
 	if(!data){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
 	data->fd = -1;
@@ -222,12 +217,12 @@ static instance* maweb_instance(){
 	if(!data->buffer){
 		LOG("Failed to allocate memory");
 		free(data);
-		return NULL;
+		return 1;
 	}
 	data->allocated = MAWEB_RECV_CHUNK;
 
 	inst->impl = data;
-	return inst;
+	return 0;
 }
 
 static channel* maweb_channel(instance* inst, char* spec, uint8_t flags){
diff --git a/backends/maweb.h b/backends/maweb.h
index 50b777a..80835d9 100644
--- a/backends/maweb.h
+++ b/backends/maweb.h
@@ -3,7 +3,7 @@
 MM_PLUGIN_API int init();
 static int maweb_configure(char* option, char* value);
 static int maweb_configure_instance(instance* inst, char* option, char* value);
-static instance* maweb_instance();
+static int maweb_instance(instance* inst);
 static channel* maweb_channel(instance* inst, char* spec, uint8_t flags);
 static int maweb_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int maweb_handle(size_t num, managed_fd* fds);
diff --git a/backends/midi.c b/backends/midi.c
index 11d759d..f73ebb4 100644
--- a/backends/midi.c
+++ b/backends/midi.c
@@ -69,19 +69,14 @@ static int midi_configure(char* option, char* value){
 	return 1;
 }
 
-static instance* midi_instance(){
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
+static int midi_instance(instance* inst){
 	inst->impl = calloc(1, sizeof(midi_instance_data));
 	if(!inst->impl){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
-	return inst;
+	return 0;
 }
 
 static int midi_configure_instance(instance* inst, char* option, char* value){
diff --git a/backends/midi.h b/backends/midi.h
index 66a02bc..dcee010 100644
--- a/backends/midi.h
+++ b/backends/midi.h
@@ -3,7 +3,7 @@
 MM_PLUGIN_API int init();
 static int midi_configure(char* option, char* value);
 static int midi_configure_instance(instance* instance, char* option, char* value);
-static instance* midi_instance();
+static int midi_instance(instance* inst);
 static channel* midi_channel(instance* instance, char* spec, uint8_t flags);
 static int midi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int midi_handle(size_t num, managed_fd* fds);
diff --git a/backends/ola.cpp b/backends/ola.cpp
index 09d68c9..106dbd5 100644
--- a/backends/ola.cpp
+++ b/backends/ola.cpp
@@ -40,21 +40,15 @@ static int ola_configure(char* option, char* value){
 	return 1;
 }
 
-static instance* ola_instance(){
-	ola_instance_data* data = NULL;
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
-	data = (ola_instance_data*)calloc(1, sizeof(ola_instance_data));
+static int ola_instance(instance* inst){
+	ola_instance_data* data = (ola_instance_data*) calloc(1, sizeof(ola_instance_data));
 	if(!data){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
 	inst->impl = data;
-	return inst;
+	return 0;
 }
 
 static int ola_configure_instance(instance* inst, char* option, char* value){
@@ -188,7 +182,7 @@ static void ola_data_receive(unsigned int universe, const ola::DmxBuffer& ola_dm
 			else{
 				chan = mm_channel(inst, p, 0);
 			}
-			
+
 			if(!chan){
 				LOGPF("Active channel %" PRIsize_t " on %s not known to core", p, inst->name);
 				return;
diff --git a/backends/ola.h b/backends/ola.h
index 083e971..68244ec 100644
--- a/backends/ola.h
+++ b/backends/ola.h
@@ -7,7 +7,7 @@ extern "C" {
 	MM_PLUGIN_API int init();
 	static int ola_configure(char* option, char* value);
 	static int ola_configure_instance(instance* instance, char* option, char* value);
-	static instance* ola_instance();
+	static int ola_instance(instance* inst);
 	static channel* ola_channel(instance* instance, char* spec, uint8_t flags);
 	static int ola_set(instance* inst, size_t num, channel** c, channel_value* v);
 	static int ola_handle(size_t num, managed_fd* fds);
diff --git a/backends/osc.c b/backends/osc.c
index 7b9a5a5..754c290 100644
--- a/backends/osc.c
+++ b/backends/osc.c
@@ -562,21 +562,16 @@ static int osc_configure_instance(instance* inst, char* option, char* value){
 	return 1;
 }
 
-static instance* osc_instance(){
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
+static int osc_instance(instance* inst){
 	osc_instance_data* data = calloc(1, sizeof(osc_instance_data));
 	if(!data){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
 	data->fd = -1;
 	inst->impl = data;
-	return inst;
+	return 0;
 }
 
 static channel* osc_map_channel(instance* inst, char* spec, uint8_t flags){
diff --git a/backends/osc.h b/backends/osc.h
index f8ff3ff..ec75e3f 100644
--- a/backends/osc.h
+++ b/backends/osc.h
@@ -10,7 +10,7 @@
 MM_PLUGIN_API int init();
 static int osc_configure(char* option, char* value);
 static int osc_configure_instance(instance* inst, char* option, char* value);
-static instance* osc_instance();
+static int osc_instance(instance* inst);
 static channel* osc_map_channel(instance* inst, char* spec, uint8_t flags);
 static int osc_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int osc_handle(size_t num, managed_fd* fds);
diff --git a/backends/sacn.c b/backends/sacn.c
index ff2b61e..5096123 100644
--- a/backends/sacn.c
+++ b/backends/sacn.c
@@ -195,19 +195,14 @@ static int sacn_configure_instance(instance* inst, char* option, char* value){
 	return 1;
 }
 
-static instance* sacn_instance(){
-	instance* inst = mm_instance();
-	if(!inst){
-		return NULL;
-	}
-
+static int sacn_instance(instance* inst){
 	inst->impl = calloc(1, sizeof(sacn_instance_data));
 	if(!inst->impl){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
-	return inst;
+	return 0;
 }
 
 static channel* sacn_channel(instance* inst, char* spec, uint8_t flags){
diff --git a/backends/sacn.h b/backends/sacn.h
index c8d11e9..ac59441 100644
--- a/backends/sacn.h
+++ b/backends/sacn.h
@@ -3,7 +3,7 @@
 MM_PLUGIN_API int init();
 static int sacn_configure(char* option, char* value);
 static int sacn_configure_instance(instance* instance, char* option, char* value);
-static instance* sacn_instance();
+static int sacn_instance(instance* inst);
 static channel* sacn_channel(instance* instance, char* spec, uint8_t flags);
 static int sacn_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int sacn_handle(size_t num, managed_fd* fds);
diff --git a/backends/winmidi.c b/backends/winmidi.c
index c2aee2f..ad9b02d 100644
--- a/backends/winmidi.c
+++ b/backends/winmidi.c
@@ -95,19 +95,14 @@ static int winmidi_configure_instance(instance* inst, char* option, char* value)
 	return 1;
 }
 
-static instance* winmidi_instance(){
-	instance* i = mm_instance();
-	if(!i){
-		return NULL;
-	}
-
-	i->impl = calloc(1, sizeof(winmidi_instance_data));
-	if(!i->impl){
+static int winmidi_instance(instance* inst){
+	inst->impl = calloc(1, sizeof(winmidi_instance_data));
+	if(!inst->impl){
 		LOG("Failed to allocate memory");
-		return NULL;
+		return 1;
 	}
 
-	return i;
+	return 0;
 }
 
 static channel* winmidi_channel(instance* inst, char* spec, uint8_t flags){
diff --git a/backends/winmidi.h b/backends/winmidi.h
index 81e7439..4c740ea 100644
--- a/backends/winmidi.h
+++ b/backends/winmidi.h
@@ -3,7 +3,7 @@
 MM_PLUGIN_API int init();
 static int winmidi_configure(char* option, char* value);
 static int winmidi_configure_instance(instance* inst, char* option, char* value);
-static instance* winmidi_instance();
+static int winmidi_instance(instance* inst);
 static channel* winmidi_channel(instance* inst, char* spec, uint8_t flags);
 static int winmidi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int winmidi_handle(size_t num, managed_fd* fds);
diff --git a/config.c b/config.c
index d2b65d4..920e161 100644
--- a/config.c
+++ b/config.c
@@ -279,7 +279,7 @@ static int config_map(char* to_raw, char* from_raw){
 			|| config_glob_scan(instance_from, &spec_from)){
 		goto done;
 	}
-	
+
 	if((spec_to.channels != spec_from.channels && spec_from.channels != 1 && spec_to.channels != 1)
 			|| spec_to.channels == 0
 			|| spec_from.channels == 0){
@@ -298,7 +298,7 @@ static int config_map(char* to_raw, char* from_raw){
 	for(n = 0; !rv && n < max(spec_from.channels, spec_to.channels); n++){
 		channel_from = config_glob_resolve(instance_from, &spec_from, min(n, spec_from.channels), mmchannel_input);
 		channel_to = config_glob_resolve(instance_to, &spec_to, min(n, spec_to.channels), mmchannel_output);
-		
+
 		if(!channel_from || !channel_to){
 			rv = 1;
 			goto done;
@@ -356,7 +356,7 @@ static int config_line(char* line){
 		else{
 			//backend instance configuration
 			parser_state = instance_cfg;
-			
+
 			//trim braces
 			line[strlen(line) - 1] = 0;
 			line++;
@@ -388,9 +388,13 @@ static int config_line(char* line){
 				return 1;
 			}
 
-			current_instance = current_backend->create();
+			current_instance = mm_instance();
 			if(!current_instance){
-				fprintf(stderr, "Failed to instantiate backend %s\n", line);
+				return 1;
+			}
+
+			if(current_backend->create(current_instance)){
+				fprintf(stderr, "Failed to create %s instance %s\n", line, separator);
 				return 1;
 			}
 
diff --git a/midimonster.c b/midimonster.c
index 583601e..b6f7758 100644
--- a/midimonster.c
+++ b/midimonster.c
@@ -341,7 +341,7 @@ int main(int argc, char** argv){
 		config_free();
 		return usage(argv[0]);
 	}
-	
+
 	//load an initial timestamp
 	update_timestamp();
 
diff --git a/midimonster.h b/midimonster.h
index d6f04e7..bb1eb24 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -93,8 +93,9 @@ struct _managed_fd;
  * 		Parse backend-global configuration options from the user-supplied
  * 		configuration file. Returning a non-zero value fails config parsing.
  * 	* mmbackend_instance
- * 		Allocate space for a backend instance. Returning NULL signals an out-of-memory
- * 		condition and terminates the program.
+ * 		Allocate the backend-specific data parts of the supplied instance
+ * 		structure. Returning non-zero signals an error condition and
+ * 		terminates the program.
  * 	* mmbackend_configure_instance
  * 		Parse instance configuration from the user-supplied configuration
  * 		file. Returning a non-zero value fails config parsing.
@@ -135,7 +136,7 @@ struct _managed_fd;
  *		Return value is currently ignored.
  */
 typedef int (*mmbackend_handle_event)(struct _backend_instance* inst, size_t channels, struct _backend_channel** c, struct _channel_value* v);
-typedef struct _backend_instance* (*mmbackend_create_instance)();
+typedef int (*mmbackend_create_instance)(struct _backend_instance* inst);
 typedef struct _backend_channel* (*mmbackend_parse_channel)(struct _backend_instance* instance, char* spec, uint8_t flags);
 typedef void (*mmbackend_free_channel)(struct _backend_channel* c);
 typedef int (*mmbackend_configure)(char* option, char* value);
@@ -222,20 +223,6 @@ typedef struct /*_mm_channel_mapping*/ {
  */
 MM_API int mm_backend_register(backend b);
 
-/*
- * Provides a pointer to a newly (zero-)allocated instance.
- * All instance pointers need to be allocated via this API
- * in order to be assignable from the configuration parser.
- * This API should be called from the mmbackend_create_instance
- * call of your backend.
- *
- * Instances returned from this call are freed by midimonster.
- * The contents of the impl members should be freed in the
- * mmbackend_shutdown procedure of the backend, eg. by querying
- * all instances for the backend.
- */
-MM_API instance* mm_instance();
-
 /*
  * Finds an instance matching the specified backend and identifier.
  * Since setting an identifier for an instance is optional,
-- 
cgit v1.2.3


From 8c32598449895e506b4d0eab71be0abf219a62da Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 13 Jan 2020 22:49:33 +0100
Subject: Hide core-internal structures

---
 midimonster.c | 7 +++++++
 midimonster.h | 9 +--------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'midimonster.h')

diff --git a/midimonster.c b/midimonster.c
index b6f7758..d9a99d9 100644
--- a/midimonster.c
+++ b/midimonster.c
@@ -14,6 +14,7 @@
 #include "backend.h"
 #include "plugin.h"
 
+/* Core-internal structures */
 typedef struct /*_event_collection*/ {
 	size_t alloc;
 	size_t n;
@@ -21,6 +22,12 @@ typedef struct /*_event_collection*/ {
 	channel_value* value;
 } event_collection;
 
+typedef struct /*_mm_channel_mapping*/ {
+	channel* from;
+	size_t destinations;
+	channel** to;
+} channel_mapping;
+
 static size_t mappings = 0;
 static channel_mapping* map = NULL;
 static size_t fds = 0;
diff --git a/midimonster.h b/midimonster.h
index bb1eb24..2c29956 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -202,7 +202,7 @@ typedef struct _backend_channel {
 } channel;
 
 /*
- * File descriptor management structure
+ * File descriptor structure passed for backend handling
  * Register for the core event loop using mm_manage_fd()
  */
 typedef struct _managed_fd {
@@ -211,13 +211,6 @@ typedef struct _managed_fd {
 	void* impl;
 } managed_fd;
 
-/* Internal channel mapping structure - Core use only */
-typedef struct /*_mm_channel_mapping*/ {
-	channel* from;
-	size_t destinations;
-	channel** to;
-} channel_mapping;
-
 /*
  * Register a new backend.
  */
-- 
cgit v1.2.3


From 4ebcda3a1b0d90c44e91a5dfe455ad59fe694cbe Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 9 Mar 2020 21:31:54 +0100
Subject: Update README and example config

---
 README.md              | 9 +++++++--
 configs/osc-artnet.cfg | 2 +-
 midimonster.h          | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'midimonster.h')

diff --git a/README.md b/README.md
index 2a71b3a..aeaeb2a 100644
--- a/README.md
+++ b/README.md
@@ -172,6 +172,10 @@ chmod +x ./installer.sh
 ./installer.sh
 ```
 
+The installer can also be used for automating installations by specifying additional
+command line arguments. To see a list of valid arguments, run the installer with the
+`--help` argument.
+
 The installer script can also update MIDIMonster to the latest version automatically,
 using a configuration file generated during the installation.
 To do so, run `midimonster-updater` as root on your system after using the installer.
@@ -187,8 +191,9 @@ dpkg -i <file>.deb
 ### Building from source
 
 To build the MIDIMonster directly from the sources, you'll need some libraries that provide
-support for the protocols to translate. When building from source, you can also to exclude
-backends (for example, if you don't need them or don't want to install their prerequisites).
+support for the protocols to translate. When building from source, you can also choose to
+exclude backends (for example, if you don't need them or don't want to install their
+prerequisites).
 
 * `libasound2-dev` (for the ALSA MIDI backend)
 * `libevdev-dev` (for the evdev backend)
diff --git a/configs/osc-artnet.cfg b/configs/osc-artnet.cfg
index ab1d767..35b2111 100644
--- a/configs/osc-artnet.cfg
+++ b/configs/osc-artnet.cfg
@@ -5,7 +5,7 @@
 bind = 0.0.0.0
 
 [osc touch]
-bind = * 8000
+bind = 0.0.0.0 8000
 dest = learn@8001
 
 [artnet out]
diff --git a/midimonster.h b/midimonster.h
index 2c29956..bad83c7 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -7,7 +7,7 @@
 
 /* Core version unless set by the build process */
 #ifndef MIDIMONSTER_VERSION
-	#define MIDIMONSTER_VERSION "v0.4-dist"
+	#define MIDIMONSTER_VERSION "v0.5-dist"
 #endif
 
 /* Set backend name if unset */
-- 
cgit v1.2.3


From abb1ffd367f4046d77ac62b0b017b407997bc43b Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Wed, 11 Mar 2020 21:53:14 +0100
Subject: Add codesmell statistics to CI

---
 .travis-ci.sh | 34 +++++++++++++++++++++++++++++++---
 .travis.yml   | 12 ++++++++++--
 midimonster.h |  6 ++++--
 3 files changed, 45 insertions(+), 7 deletions(-)

(limited to 'midimonster.h')

diff --git a/.travis-ci.sh b/.travis-ci.sh
index e9e3df3..763e558 100644
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -21,7 +21,7 @@ if [ "$TASK" = "spellcheck" ]; then
 	fi
 
 	# Run codespell to find some more
-	cs_results=$(codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" $spellcheck_files 2>&1)
+	cs_results=$(codespell --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" $spellcheck_files 2>&1)
 	cs_errors=$(wc -l <<< "$cs_results")
 	if [ "$cs_errors" -ne 0 ]; then
 		printf "Codespell found %s errors:\n\n" "$cs_errors"
@@ -31,12 +31,40 @@ if [ "$TASK" = "spellcheck" ]; then
 		printf "Codespell reports no errors\n"
 	fi
 	exit "$result"
-elif [ "$TASK" = 'sanitize' ]; then
+elif [ "$TASK" = "codesmell" ]; then
+	result=0
+
+	if [ -z "$(which lizard)" ]; then
+		printf "Installing lizard...\n"
+		pip3 install lizard
+	fi
+
+	# Run shellcheck for all shell scripts
+	printf "Running shellcheck...\n"
+	shell_files="$(find . -type f -iname \*.sh)"
+	xargs shellcheck -Cnever -s bash <<< "$shell_files"
+	if [ "$?" -ne "0" ]; then
+		result=1
+	fi
+
+	# Run cloc for some stats
+	printf "Code statistics:\n\n"
+	cloc ./
+
+	# Run lizard for the project
+	printf "Running lizard for code complexity analysis\n"
+	lizard ./
+	if [ "$?" -ne "0" ]; then
+		result=1
+	fi
+
+	exit "$result"
+elif [ "$TASK" = "sanitize" ]; then
 	# Run sanitized compile
 	travis_fold start "make_sanitize"
 	make sanitize;
 	travis_fold end "make_sanitize"
-elif [ "$TASK" = 'windows' ]; then
+elif [ "$TASK" = "windows" ]; then
 	travis_fold start "make_windows"
 	make windows;
 	make -C backends lua.dll
diff --git a/.travis.yml b/.travis.yml
index 48b4b71..a5de2f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_script:
  - export -f travis_fold
 
 script:
- - "bash -ex .travis-ci.sh"
+ - "bash .travis-ci.sh"
 
 addons:
   apt:
@@ -35,6 +35,8 @@ addons:
      - *core_build
      - mingw-w64
     packages: &linters
+     - python3
+     - python3-pip
      - lintian
      - codespell
      - shellcheck
@@ -92,7 +94,6 @@ jobs:
       compiler: clang
       env:
       - TASK='sanitize'
-  allow_failures:
     - os: linux
       dist: bionic
       env: TASK='codesmell'
@@ -107,6 +108,13 @@ jobs:
         apt:
           packages:
            - *linters
+  allow_failures:
+    - os: linux
+      dist: bionic
+      env: TASK='codesmell'
+    - os: linux
+      dist: bionic
+      env: TASK='spellcheck'
 
 env:
   global:
diff --git a/midimonster.h b/midimonster.h
index bad83c7..dc0e255 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -234,10 +234,12 @@ MM_API instance* mm_instance_find(char* backend, uint64_t ident);
  * matching `ident`, a pointer to it is returned.
  * This API is just a convenience function. The array of channels is
  * only used for mapping internally, creating and managing your own
- * channel store is possible.
+ * channel store is possible. When returning pointers from a
+ * backend-local channel store, the returned pointers must stay
+ * valid over the lifetime of the instance.
  * For each channel with a non-NULL `impl` field registered using
  * this function, the backend will receive a call to its channel_free
- * function.
+ * function (if it exists).
  */
 MM_API channel* mm_channel(instance* i, uint64_t ident, uint8_t create);
 
-- 
cgit v1.2.3


From 846a49199ba011a00e4814bacac524a6fe9b299a Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 16 Mar 2020 22:19:27 +0100
Subject: Hash-index event routing table

---
 installer.sh  |  87 +++++++++++++----------------------
 midimonster.c | 142 +++++++++++++++++++++++++++++++---------------------------
 midimonster.h |   2 +
 3 files changed, 109 insertions(+), 122 deletions(-)

(limited to 'midimonster.h')

diff --git a/installer.sh b/installer.sh
index 56021c4..111c783 100755
--- a/installer.sh
+++ b/installer.sh
@@ -26,13 +26,13 @@ latest_version="$(curl --silent "https://api.github.com/repos/cbdevnet/midimonst
 # make invocation arguments
 makeargs="all"
 
-normal=$(tput sgr0)
-dim=$(tput dim)
-bold=$(tput bold)
-uline=$(tput smul)
-c_red=$(tput setaf 1)
-c_green=$(tput setaf 2)
-c_mag=$(tput setaf 5)
+normal="$(tput sgr0)"
+dim="$(tput dim)"
+bold="$(tput bold)"
+uline="$(tput smul)"
+c_red="$(tput setaf 1)"
+c_green="$(tput setaf 2)"
+c_mag="$(tput setaf 5)"
 
 DEFAULT_PREFIX="/usr"
 DEFAULT_PLUGINPATH="/lib/midimonster"
@@ -49,7 +49,7 @@ assign_defaults(){
 
 ARGS(){
 	for i in "$@"; do
-		case $i in
+		case "$i" in
 			--prefix=*)
 				VAR_PREFIX="${i#*=}"
 			;;
@@ -71,37 +71,28 @@ ARGS(){
 			-fu|--forceupdate)
 				UPDATER_FORCE="1"
 			;;
-			-supd|--selfupdate)
-				NIGHTLY=""
-				self_update
-				rmdir "$tmp_path"
+			--install-updater)
+				NIGHTLY=1 prepare_repo
+				install_script
 				exit 0
 			;;
-			-insup|--installupdater)
-				NIGHTLY=""
-				install_updater
-				rmdir "$tmp_path"
-				exit 0
-			;;
-			-insdep|--installdeps)
+			--install-dependencies)
 				install_dependencies
-				rmdir "$tmp_path"
 				exit 0
 			;;
 			-h|--help|*)
 				assign_defaults
 				printf "${bold}Usage:${normal} ${0} ${c_green}[OPTIONS]${normal}"
-				printf "\n\t${c_green} --prefix${normal} ${c_red}<path>${normal}\tSet the installation prefix\t\t${c_mag}Default:${normal} ${dim}%s${normal}" "$VAR_PREFIX"
-				printf "\n\t${c_green} --plugins${normal} ${c_red}<path>${normal}\tSet the plugin install path\t\t${c_mag}Default:${normal} ${dim}%s${normal}" "$VAR_PLUGINS"
-				printf "\n\t${c_green} --defcfg${normal} ${c_red}<path>${normal}\tSet the default configuration path\t${c_mag}Default:${normal} ${dim}%s${normal}" "$VAR_DEFAULT_CFG"
-				printf "\n\t${c_green} --examples${normal} ${c_red}<path>${normal}\tSet the path for example configurations\t${c_mag}Default:${normal} ${dim}%s${normal}\n" "$VAR_EXAMPLE_CFGS"
-				printf "\n\t${c_green}  --dev${normal}\t\t\tInstall nightly version"
-				printf "\n ${c_green}-d,\t  --default${normal}\t\tUse default values to install"
-				printf "\n ${c_green}-fu,\t  --forceupdate${normal}\t\tForce the updater to update without a version check"
-				printf "\n ${c_green}-supd,\t  --selfupdate${normal}\t\tUpdates this script to the newest version"
-				printf "\n ${c_green}-insup,  --installupdater${normal}\tInstall the updater (Run with midimonster-updater)"
-				printf "\n ${c_green}-insdep, --installdeps${normal}\t\tInstall dependencies and exit"
-				printf "\n ${c_green}-h,\t  --help${normal}\t\tShow this message and exit"
+				printf "\n\t${c_green}--prefix${normal} ${c_red}<path>${normal}\t\tSet the installation prefix\t\t${c_mag}Default:${normal} ${dim}%s${normal}" "$VAR_PREFIX"
+				printf "\n\t${c_green}--plugins${normal} ${c_red}<path>${normal}\tSet the plugin install path\t\t${c_mag}Default:${normal} ${dim}%s${normal}" "$VAR_PLUGINS"
+				printf "\n\t${c_green}--defcfg${normal} ${c_red}<path>${normal}\t\tSet the default configuration path\t${c_mag}Default:${normal} ${dim}%s${normal}" "$VAR_DEFAULT_CFG"
+				printf "\n\t${c_green}--examples${normal} ${c_red}<path>${normal}\tSet the path for example configurations\t${c_mag}Default:${normal} ${dim}%s${normal}\n" "$VAR_EXAMPLE_CFGS"
+				printf "\n\t${c_green}--dev${normal}\t\t\t\tInstall nightly version"
+				printf "\n\t${c_green}-d, --default${normal}\t\t\tUse default values to install"
+				printf "\n\t${c_green}-fu, --forceupdate${normal}\t\tForce the updater to update without a version check"
+				printf "\n\t${c_green}--install-updater${normal}\t\tInstall the updater (Run with midimonster-updater)"
+				printf "\n\t${c_green}--install-dependencies${normal}\t\tInstall dependencies and exit"
+				printf "\n\t${c_green}-h, --help${normal}\t\t\tShow this message and exit"
 				printf "\n\t${uline}${bold}${c_mag}Each argument can be overwritten by another, the last one is used!${normal}\n"
 				rmdir "$tmp_path"
 				exit 1
@@ -116,7 +107,7 @@ install_dependencies(){
 	for dependency in ${deps[@]}; do
 		if [ "$(dpkg-query -W -f='${Status}' "$dependency" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; then
 			printf "Installing %s\n" "$dependency"
-			apt-get install $dependency
+			apt-get install "$dependency"
 		else
 			printf "%s already installed!\n" "$dependency"
 		fi
@@ -181,7 +172,7 @@ prepare_repo(){
 		printf "Finding latest stable version...\n"
 		last_tag=$(git describe --abbrev=0)
 		printf "Checking out %s...\n" "$last_tag"
-		git checkout -f -q $last_tag
+		git checkout -f -q "$last_tag"
 	fi
 }
 
@@ -207,30 +198,14 @@ save_config(){
 	printf "VAR_PREFIX=%s\nVAR_PLUGINS=%s\nVAR_DEFAULT_CFG=%s\nVAR_DESTDIR=%s\nVAR_EXAMPLE_CFGS=%s\n" "$VAR_PREFIX" "$VAR_PLUGINS" "$VAR_DEFAULT_CFG" "$VAR_DESTDIR" "$VAR_EXAMPLE_CFGS" > "$updater_dir/updater.conf"
 }
 
-# Updates this script either from the downloaded sources or the remote repository.
-self_update(){
+# Updates this script using the one from the checked out repo (containing the requested version)
+install_script(){
 	mkdir -p "$updater_dir"
-	if [ "$NIGHTLY" = "1" ]; then
-		cp -u "$tmp_path/installer.sh" "$0"
-	elif [ "$NIGHTLY" != "1" ]; then
-		wget https://raw.githubusercontent.com/cbdevnet/midimonster/master/installer.sh -O "$0"
-	fi
-	chmod +x "$0"
-}
-
-install_updater(){
-	mkdir -p "$updater_dir"
-	if [ "$NIGHTLY" = "1" ]; then
-		printf "Copying updater to %s/updater.sh\n" "$updater_dir"
-		cp -u "$tmp_path/installer.sh" "$updater_dir/updater.sh"
-	else
-		printf "Downloading updater to %s/updater.sh\n" "$updater_dir"
-		wget https://raw.githubusercontent.com/cbdevnet/midimonster/master/installer.sh -O "$updater_dir/updater.sh"
-	fi
+	printf "Copying updater to %s/updater.sh\n" "$updater_dir"
+	cp "$tmp_path/installer.sh" "$updater_dir/updater.sh"
 	chmod +x "$updater_dir/updater.sh"
 	printf "Creating symlink /usr/bin/midimonster-updater\n"
 	ln -s "$updater_dir/updater.sh" "/usr/bin/midimonster-updater"
-	printf "Done.\n"
 }
 
 error_handler(){
@@ -238,7 +213,7 @@ error_handler(){
 	exit 1
 }
 
-cleanup() {
+cleanup(){
 	if [ -d "$tmp_path" ]; then
 		printf "Cleaning up temporary files...\n"
 		rm -rf "$tmp_path"
@@ -288,7 +263,7 @@ if [ -f "$updater_dir/updater.conf" ] || [ "$UPDATER_FORCE" = "1" ]; then
 
 	# Run updater steps
 	prepare_repo
-	install_updater
+	install_script
 	save_config
 	build
 else
@@ -296,7 +271,7 @@ else
 	install_dependencies
 	prepare_repo
 	ask_questions
-	install_updater
+	install_script
 	save_config
 	build
 fi
diff --git a/midimonster.c b/midimonster.c
index 8e217e7..afb6a2b 100644
--- a/midimonster.c
+++ b/midimonster.c
@@ -29,25 +29,34 @@ typedef struct /*_mm_channel_mapping*/ {
 	channel** to;
 } channel_mapping;
 
-static size_t mappings = 0;
-static channel_mapping* map = NULL;
+static struct {
+	//routing_hash is set up for 256 buckets
+	size_t entries[256];
+	channel_mapping* map[256];
+
+	event_collection pool[2];
+	event_collection* events;
+} routing = {
+	.events = routing.pool
+};
+
 static size_t fds = 0;
 static managed_fd* fd = NULL;
 static volatile sig_atomic_t fd_set_dirty = 1;
 static uint64_t global_timestamp = 0;
 
-static event_collection event_pool[2] = {
-	{0},
-	{0}
-};
-static event_collection* primary = event_pool;
-
 volatile static sig_atomic_t shutdown_requested = 0;
 
 static void signal_handler(int signum){
 	shutdown_requested = 1;
 }
 
+static size_t routing_hash(channel* key){
+	uint64_t repr = (uint64_t) key;
+	//return 8bit hash for 256 buckets, not ideal but it works
+	return (repr ^ (repr >> 8) ^ (repr >> 16) ^ (repr >> 24) ^ (repr >> 32)) & 0xFF;
+}
+
 MM_API uint64_t mm_timestamp(){
 	return global_timestamp;
 }
@@ -67,53 +76,66 @@ static void update_timestamp(){
 }
 
 int mm_map_channel(channel* from, channel* to){
-	size_t u, m;
+	size_t u, m, bucket = routing_hash(from);
+
 	//find existing source mapping
-	for(u = 0; u < mappings; u++){
-		if(map[u].from == from){
+	for(u = 0; u < routing.entries[bucket]; u++){
+		if(routing.map[bucket][u].from == from){
 			break;
 		}
 	}
 
 	//create new entry
-	if(u == mappings){
-		map = realloc(map, (mappings + 1) * sizeof(channel_mapping));
-		if(!map){
+	if(u == routing.entries[bucket]){
+		routing.map[bucket] = realloc(routing.map[bucket], (routing.entries[bucket] + 1) * sizeof(channel_mapping));
+		if(!routing.map[bucket]){
+			routing.entries[bucket] = 0;
 			fprintf(stderr, "Failed to allocate memory\n");
 			return 1;
 		}
-		memset(map + mappings, 0, sizeof(channel_mapping));
-		mappings++;
-		map[u].from = from;
+
+		memset(routing.map[bucket] + routing.entries[bucket], 0, sizeof(channel_mapping));
+		routing.entries[bucket]++;
+		routing.map[bucket][u].from = from;
 	}
 
 	//check whether the target is already mapped
-	for(m = 0; m < map[u].destinations; m++){
-		if(map[u].to[m] == to){
+	for(m = 0; m < routing.map[bucket][u].destinations; m++){
+		if(routing.map[bucket][u].to[m] == to){
 			return 0;
 		}
 	}
 
-	map[u].to = realloc(map[u].to, (map[u].destinations + 1) * sizeof(channel*));
-	if(!map[u].to){
+	//add a mapping target
+	routing.map[bucket][u].to = realloc(routing.map[bucket][u].to, (routing.map[bucket][u].destinations + 1) * sizeof(channel*));
+	if(!routing.map[bucket][u].to){
 		fprintf(stderr, "Failed to allocate memory\n");
-		map[u].destinations = 0;
+		routing.map[bucket][u].destinations = 0;
 		return 1;
 	}
 
-	map[u].to[map[u].destinations] = to;
-	map[u].destinations++;
+	routing.map[bucket][u].to[routing.map[bucket][u].destinations] = to;
+	routing.map[bucket][u].destinations++;
 	return 0;
 }
 
-static void map_free(){
-	size_t u;
-	for(u = 0; u < mappings; u++){
-		free(map[u].to);
+static void routing_cleanup(){
+	size_t u, n;
+
+	for(u = 0; u < sizeof(routing.map) / sizeof(routing.map[0]); u++){
+		for(n = 0; n < routing.entries[u]; n++){
+			free(routing.map[u][n].to);
+		}
+		free(routing.map[u]);
+		routing.map[u] = NULL;
+		routing.entries[u] = 0;
+	}
+
+	for(u = 0; u < sizeof(routing.pool) / sizeof(routing.pool[0]); u++){
+		free(routing.pool[u].channel);
+		free(routing.pool[u].value);
+		routing.pool[u].alloc = 0;
 	}
-	free(map);
-	mappings = 0;
-	map = NULL;
 }
 
 MM_API int mm_manage_fd(int new_fd, char* back, int manage, void* impl){
@@ -170,7 +192,6 @@ MM_API int mm_manage_fd(int new_fd, char* back, int manage, void* impl){
 static void fds_free(){
 	size_t u;
 	for(u = 0; u < fds; u++){
-		//TODO free impl
 		if(fd[u].fd >= 0){
 			close(fd[u].fd);
 			fd[u].fd = -1;
@@ -182,56 +203,46 @@ static void fds_free(){
 }
 
 MM_API int mm_channel_event(channel* c, channel_value v){
-	size_t u, p;
+	size_t u, p, bucket = routing_hash(c);
 
 	//find mapped channels
-	for(u = 0; u < mappings; u++){
-		if(map[u].from == c){
+	for(u = 0; u < routing.entries[bucket]; u++){
+		if(routing.map[bucket][u].from == c){
 			break;
 		}
 	}
 
-	if(u == mappings){
+	if(u == routing.entries[bucket]){
 		//target-only channel
 		return 0;
 	}
 
 	//resize event structures to fit additional events
-	if(primary->n + map[u].destinations >= primary->alloc){
-		primary->channel = realloc(primary->channel, (primary->alloc + map[u].destinations) * sizeof(channel*));
-		primary->value = realloc(primary->value, (primary->alloc + map[u].destinations) * sizeof(channel_value));
+	if(routing.events->n + routing.map[bucket][u].destinations >= routing.events->alloc){
+		routing.events->channel = realloc(routing.events->channel, (routing.events->alloc + routing.map[bucket][u].destinations) * sizeof(channel*));
+		routing.events->value = realloc(routing.events->value, (routing.events->alloc + routing.map[bucket][u].destinations) * sizeof(channel_value));
 
-		if(!primary->channel || !primary->value){
+		if(!routing.events->channel || !routing.events->value){
 			fprintf(stderr, "Failed to allocate memory\n");
-			primary->alloc = 0;
-			primary->n = 0;
+			routing.events->alloc = 0;
+			routing.events->n = 0;
 			return 1;
 		}
 
-		primary->alloc += map[u].destinations;
+		routing.events->alloc += routing.map[bucket][u].destinations;
 	}
 
 	//enqueue channel events
 	//FIXME this might lead to one channel being mentioned multiple times in an apply call
-	for(p = 0; p < map[u].destinations; p++){
-		primary->channel[primary->n + p] = map[u].to[p];
-		primary->value[primary->n + p] = v;
+	memcpy(routing.events->channel + routing.events->n, routing.map[bucket][u].to, routing.map[bucket][u].destinations * sizeof(channel*));
+	for(p = 0; p < routing.map[bucket][u].destinations; p++){
+		routing.events->value[routing.events->n + p] = v;
 	}
 
-	primary->n += map[u].destinations;
+	routing.events->n += routing.map[bucket][u].destinations;
 	return 0;
 }
 
-static void event_free(){
-	size_t u;
-
-	for(u = 0; u < sizeof(event_pool) / sizeof(event_collection); u++){
-		free(event_pool[u].channel);
-		free(event_pool[u].value);
-		event_pool[u].alloc = 0;
-	}
-}
-
 static void version(){
 	printf("MIDIMonster %s\n", MIDIMONSTER_VERSION);
 }
@@ -336,13 +347,13 @@ static int core_process(size_t nfds, managed_fd* signaled_fds){
 		return 1;
 	}
 
-	while(primary->n){
+	while(routing.events->n){
 		//swap primary and secondary event collectors
-		DBGPF("Swapping event collectors, %lu events in primary\n", primary->n);
-		for(u = 0; u < sizeof(event_pool) / sizeof(event_collection); u++){
-			if(primary != event_pool + u){
-				secondary = primary;
-				primary = event_pool + u;
+		DBGPF("Swapping event collectors, %lu events in primary\n", routing.events->n);
+		for(u = 0; u < sizeof(routing.pool) / sizeof(routing.pool[0]); u++){
+			if(routing.events != routing.pool + u){
+				secondary = routing.events;
+				routing.events = routing.pool + u;
 				break;
 			}
 		}
@@ -466,7 +477,7 @@ int main(int argc, char** argv){
 	if(config_read(cfg_file)){
 		fprintf(stderr, "Failed to read configuration file %s\n", cfg_file);
 		backends_stop();
-		map_free();
+		routing_cleanup();
 		fds_free();
 		plugins_close();
 		config_free();
@@ -495,9 +506,8 @@ int main(int argc, char** argv){
 bail:
 	//free all data
 	backends_stop();
-	map_free();
+	routing_cleanup();
 	fds_free();
-	event_free();
 	plugins_close();
 	config_free();
 	platform_shutdown();
diff --git a/midimonster.h b/midimonster.h
index dc0e255..61467c1 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -247,6 +247,8 @@ MM_API channel* mm_channel(instance* i, uint64_t ident, uint8_t create);
  * Register (manage = 1) or unregister (manage = 0) a file descriptor
  * to be selected on. The backend will be notified when the descriptor
  * becomes ready to read via its registered mmbackend_process_fd call.
+ * The `impl` argument will be provided within the corresponding
+ * managed_fd structure upon callback.
  */
 MM_API int mm_manage_fd(int fd, char* backend, int manage, void* impl);
 
-- 
cgit v1.2.3


From 5cc2ea308632c335f347d7a1002123c7152fd851 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sat, 21 Mar 2020 02:01:43 +0100
Subject: Refactor global channel store

---
 backend.c     | 81 +++++++++++++++++++++++++++++++++++------------------------
 midimonster.h | 54 +++++++++++++++++++--------------------
 2 files changed, 74 insertions(+), 61 deletions(-)

(limited to 'midimonster.h')

diff --git a/backend.c b/backend.c
index 9e7989e..003980f 100644
--- a/backend.c
+++ b/backend.c
@@ -16,9 +16,21 @@ static struct {
 	.n = 0
 };
 
-//TODO move channel store into registry
-static size_t nchannels = 0;
-static channel** channels = NULL;
+//the global channel store was converted from a naive list to a hashmap of lists for performance reasons
+static struct {
+	//channelstore hash is set up for 256 buckets
+	size_t n[256];
+	channel** entry[256];
+} channels = {
+	.n = {
+		0
+	}
+};
+
+static size_t channelstore_hash(instance* inst, uint64_t ident){
+	uint64_t repr = ((uint64_t) inst) ^ ident;
+	return (repr ^ (repr >> 8) ^ (repr >> 16) ^ (repr >> 24) ^ (repr >> 32)) & 0xFF;
+}
 
 int backends_handle(size_t nfds, managed_fd* fds){
 	size_t u, p, n;
@@ -81,11 +93,12 @@ int backends_notify(size_t nev, channel** c, channel_value* v){
 }
 
 MM_API channel* mm_channel(instance* inst, uint64_t ident, uint8_t create){
-	size_t u;
-	for(u = 0; u < nchannels; u++){
-		if(channels[u]->instance == inst && channels[u]->ident == ident){
-			DBGPF("Requested channel %" PRIu64 " on instance %s already exists, reusing\n", ident, inst->name);
-			return channels[u];
+	size_t u, bucket = channelstore_hash(inst, ident);
+	for(u = 0; u < channels.n[bucket]; u++){
+		if(channels.entry[bucket][u]->instance == inst
+				&& channels.entry[bucket][u]->ident == ident){
+			DBGPF("Requested channel %" PRIu64 " on instance %s already exists, reusing (%" PRIsize_t " search steps)\n", ident, inst->name, u);
+			return channels.entry[bucket][u];
 		}
 	}
 
@@ -94,24 +107,23 @@ MM_API channel* mm_channel(instance* inst, uint64_t ident, uint8_t create){
 		return NULL;
 	}
 
-	DBGPF("Creating previously unknown channel %" PRIu64 " on instance %s\n", ident, inst->name);
-	channel** new_chan = realloc(channels, (nchannels + 1) * sizeof(channel*));
-	if(!new_chan){
+	DBGPF("Creating previously unknown channel %" PRIu64 " on instance %s, bucket %" PRIsize_t "\n", ident, inst->name, bucket);
+	channels.entry[bucket] = realloc(channels.entry[bucket], (channels.n[bucket] + 1) * sizeof(channel*));
+	if(!channels.entry[bucket]){
 		fprintf(stderr, "Failed to allocate memory\n");
-		nchannels = 0;
+		channels.n[bucket] = 0;
 		return NULL;
 	}
 
-	channels = new_chan;
-	channels[nchannels] = calloc(1, sizeof(channel));
-	if(!channels[nchannels]){
+	channels.entry[bucket][channels.n[bucket]] = calloc(1, sizeof(channel));
+	if(!channels.entry[bucket][channels.n[bucket]]){
 		fprintf(stderr, "Failed to allocate memory\n");
 		return NULL;
 	}
 
-	channels[nchannels]->instance = inst;
-	channels[nchannels]->ident = ident;
-	return channels[nchannels++];
+	channels.entry[bucket][channels.n[bucket]]->instance = inst;
+	channels.entry[bucket][channels.n[bucket]]->ident = ident;
+	return channels.entry[bucket][(channels.n[bucket]++)];
 }
 
 instance* mm_instance(backend* b){
@@ -191,21 +203,6 @@ MM_API int mm_backend_instances(char* name, size_t* ninst, instance*** inst){
 	return 1;
 }
 
-void channels_free(){
-	size_t u;
-	for(u = 0; u < nchannels; u++){
-		DBGPF("Destroying channel %" PRIu64 " on instance %s\n", channels[u]->ident, channels[u]->instance->name);
-		if(channels[u]->impl && channels[u]->instance->backend->channel_free){
-			channels[u]->instance->backend->channel_free(channels[u]);
-		}
-		free(channels[u]);
-		channels[u] = NULL;
-	}
-	free(channels);
-	nchannels = 0;
-}
-
-
 backend* backend_match(char* name){
 	size_t u;
 	for(u = 0; u < registry.n; u++){
@@ -306,6 +303,24 @@ int backends_start(){
 	return rv;
 }
 
+static void channels_free(){
+	size_t u, p;
+	for(u = 0; u < sizeof(channels.n) / sizeof(channels.n[0]); u++){
+		DBGPF("Cleaning up channel registry bucket %" PRIsize_t " with %" PRIsize_t " channels", u, channels.n[u]);
+		for(p = 0; p < channels.n[u]; p++){
+			DBGPF("Destroying channel %" PRIu64 " on instance %s\n", channels.entry[u][p]->ident, channels.entry[u][p]->instance->name);
+			//call the channel_free function if the backend supports it
+			if(channels.entry[u][p]->impl && channels.entry[u][p]->instance->backend->channel_free){
+				channels.entry[u][p]->instance->backend->channel_free(channels.entry[u][p]);
+			}
+			free(channels.entry[u][p]);
+		}
+		free(channels.entry[u]);
+		channels.entry[u] = NULL;
+		channels.n[u] = 0;
+	}
+}
+
 int backends_stop(){
 	size_t u, n;
 	instance** inst = NULL;
diff --git a/midimonster.h b/midimonster.h
index 61467c1..75eb30a 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -192,8 +192,8 @@ typedef struct _backend_instance {
 
 /* 
  * Instance channel structure
- * Backends may either manage their own channel registry
- * or use the memory returned by mm_channel()
+ * Backends may either manage their own channel registry or use the global
+ * channel store via the mm_channel() API
  */
 typedef struct _backend_channel {
 	instance* instance;
@@ -218,25 +218,24 @@ MM_API int mm_backend_register(backend b);
 
 /*
  * Finds an instance matching the specified backend and identifier.
- * Since setting an identifier for an instance is optional,
- * this may not work depending on the backend.
- * Instance identifiers may for example be set in the backends
- * mmbackend_start call.
+ * Since setting an identifier for an instance is optional, this may not work
+ * depending on the backend. Instance identifiers may for example be set in the
+ * backends mmbackend_start call.
  */
 MM_API instance* mm_instance_find(char* backend, uint64_t ident);
 
 /*
- * Provides a pointer to a channel structure, pre-filled with
- * the provided instance reference and identifier.
- * The `create` parameter is a boolean flag indicating whether
- * a channel matching the `ident` parameter should be created if
- * none exists. If the instance already registered a channel
- * matching `ident`, a pointer to it is returned.
- * This API is just a convenience function. The array of channels is
- * only used for mapping internally, creating and managing your own
- * channel store is possible. When returning pointers from a
- * backend-local channel store, the returned pointers must stay
- * valid over the lifetime of the instance.
+ * Provides a pointer to a channel structure, pre-filled with the provided
+ * instance reference and identifier.
+ * The `create` parameter is a boolean flag indicating whether a channel
+ * matching the `ident` parameter should be created in the global channel store
+ * if none exists yet. If the instance already registered a channel matching
+ * `ident`, a pointer to the existing channel is returned.
+ * This API is just a convenience function. Creating and managing a
+ * backend-internal channel store is possible (and encouraged for performance
+ * reasons). When returning pointers from a backend-local channel store, the
+ * returned pointers must stay valid over the lifetime of the instance and
+ * provide valid `instance` members, as they are used for callbacks.
  * For each channel with a non-NULL `impl` field registered using
  * this function, the backend will receive a call to its channel_free
  * function (if it exists).
@@ -244,17 +243,16 @@ MM_API instance* mm_instance_find(char* backend, uint64_t ident);
 MM_API channel* mm_channel(instance* i, uint64_t ident, uint8_t create);
 
 /*
- * Register (manage = 1) or unregister (manage = 0) a file descriptor
- * to be selected on. The backend will be notified when the descriptor
- * becomes ready to read via its registered mmbackend_process_fd call.
- * The `impl` argument will be provided within the corresponding
- * managed_fd structure upon callback.
+ * Register (manage = 1) or unregister (manage = 0) a file descriptor to be
+ * selected on. The backend will be notified when the descriptor becomes ready
+ * to read via its registered mmbackend_process_fd call. The `impl` argument
+ * will be provided within the corresponding managed_fd structure upon callback.
  */
 MM_API int mm_manage_fd(int fd, char* backend, int manage, void* impl);
 
 /*
- * Notifies the core of a channel event. Called by backends to
- * inject events gathered from their backing implementation.
+ * Notifies the core of a channel event. Called by backends to inject events
+ * gathered from their backing implementation.
  */
 MM_API int mm_channel_event(channel* c, channel_value v);
 
@@ -266,14 +264,14 @@ MM_API int mm_backend_instances(char* backend, size_t* n, instance*** i);
 
 /*
  * Query an internal timestamp, which is updated every core iteration.
- * This timestamp should not be used as a performance counter, but can be
- * used for timeouting. Resolution is milliseconds.
+ * This timestamp should not be used as a performance counter, but can be used
+ * for timeouting. Resolution is milliseconds.
  */
 MM_API uint64_t mm_timestamp();
 
 /*
- * Create a channel-to-channel mapping. This API should not
- * be used by backends. It is only exported for core modules.
+ * Create a channel-to-channel mapping. This API should not be used by backends.
+ * It is only exported for core modules.
  */
 int mm_map_channel(channel* from, channel* to);
 #endif
-- 
cgit v1.2.3