M lv2lint/lv2lint.h => lv2lint/lv2lint.h +31 -10
@@ 9,17 9,15 @@
#include <unistd.h> // isatty
#include <string.h>
#include <stdlib.h>
-#include <setjmp.h>
#include <stdatomic.h>
#include <lv2lint/lv2lint_shm.h>
-
-#ifdef ENABLE_PTRACE_TESTS
-# include <lv2lint/lv2lint_syscall.h>
-#endif
+#include <lv2lint/lv2lint_syscall.h>
#include <lilv/lilv.h>
+#include <varchunk/varchunk.h>
+
#include <lv2/worker/worker.h>
#include <lv2/state/state.h>
#include <lv2/options/options.h>
@@ 63,8 61,6 @@ typedef enum _ansi_color_t {
} ansi_color_t;
extern const char *colors [2][ANSI_COLOR_MAX];
-extern jmp_buf jump_env;
-extern atomic_bool jump_flag;
typedef union _port_t port_t;
typedef union _var_t var_t;
@@ 73,8 69,12 @@ typedef struct _urid_t urid_t;
typedef struct _app_t app_t;
typedef struct _test_t test_t;
typedef struct _ret_t ret_t;
+typedef struct _dst_t dst_t;
typedef struct _res_t res_t;
typedef const ret_t *(*test_cb_t)(app_t *app);
+typedef int (*wrap_t)(app_t *app, void *data);
+typedef int (*parent_t)(app_t *, pid_t);
+typedef int (*child_t)(void *);
typedef enum _lint_t {
LINT_NONE = 0,
@@ 102,13 102,18 @@ struct _ret_t {
const char *dsc;
};
+struct _dst_t {
+ int idx;
+ void *body;
+};
+
struct _res_t {
const ret_t *ret;
char *urn;
bool is_whitelisted;
};
-#define PORT_NSAMPLES 32
+#define PORT_NSAMPLES 32 //FIXME
union _port_t {
float wav [PORT_NSAMPLES];
@@ 626,10 631,23 @@ struct _app_t {
struct {
unsigned connect_port;
unsigned run;
+ unsigned work_response;
} forbidden;
-#ifdef ENABLE_PTRACE_TESTS
+ struct {
+ int instantiate;
+ int connect_port;
+ int activate;
+ int run;
+ int deactivate;
+ int cleanup;
+ int ui_instantiate;
+ int ui_cleanup;
+ int work;
+ int work_response;
+ } status;
+ varchunk_t *to_worker;
+ varchunk_t *from_worker;
bool syscall [SYSCALL_MAX];
-#endif
LilvNode *nodes [STAT_URID_MAX];
};
@@ 717,4 735,7 @@ uri_to_id(LV2_URI_Map_Callback_Data instance, const char *_map, const char *uri)
void
lv2lint_append_to(char **dst, const char *src);
+int
+lv2lint_wrap(app_t *app, wrap_t wrap, void *data);
+
#endif
M meson.build => meson.build +12 -6
@@ 20,6 20,7 @@ if cpu_family in match
endif
mapper_lv2 = subproject('mapper.lv2')
+varchunk = subproject('varchunk')
online_tests = get_option('online-tests')
elf_tests = get_option('elf-tests')
@@ 50,8 51,9 @@ curl_dep = dependency('libcurl', required: online_tests)
elf_dep = dependency('libelf', required: elf_tests)
x11_dep = dependency('x11', version : '>=1.6.0', required : x11_tests)
mapper_lv2_dep = mapper_lv2.get_variable('mapper')
+varchunk_dep = varchunk.get_variable('varchunk')
-deps = [m_dep, rt_dep, dl_dep, lv2_dep, lilv_dep, curl_dep, elf_dep, x11_dep, mapper_lv2_dep]
+deps = [m_dep, rt_dep, dl_dep, lv2_dep, lilv_dep, curl_dep, elf_dep, x11_dep, mapper_lv2_dep, varchunk_dep]
lib_deps = [rt_dep, dl_dep]
@@ 82,12 84,16 @@ srcs = [
join_paths('src', 'lv2lint_shm.c')
]
-if cc.has_member('struct ptrace_syscall_info', 'op',
- prefix : '#include <linux/ptrace.h>')
- add_project_arguments('-DENABLE_PTRACE_TESTS', language : 'c')
+if cc.has_function('clone', args : '-D_GNU_SOURCE', prefix : '#include <sched.h>')
+ add_project_arguments('-DENABLE_WRAP_TESTS', language : 'c')
- srcs += join_paths('src', 'lv2lint_syscall.c')
- srcs += join_paths('src', 'lv2lint_syscall_' + cpu_family + '.c')
+ if cc.has_member('struct ptrace_syscall_info', 'op',
+ prefix : '#include <linux/ptrace.h>')
+ add_project_arguments('-DENABLE_PTRACE_TESTS', language : 'c')
+
+ srcs += join_paths('src', 'lv2lint_syscall.c')
+ srcs += join_paths('src', 'lv2lint_syscall_' + cpu_family + '.c')
+ endif
endif
lib_srcs = [
M meson_options.txt => meson_options.txt +1 -1
@@ 4,4 4,4 @@
option('online-tests', type : 'feature', value : 'disabled')
option('elf-tests', type : 'feature', value : 'disabled')
option('x11-tests', type : 'feature', value : 'disabled')
-option('version', type : 'string', value : '0.1.25')
+option('version', type : 'string', value : '0.1.33')
M src/lv2lint.c => src/lv2lint.c +312 -95
@@ 16,8 16,10 @@
#endif
#include <sys/wait.h>
#include <sys/ptrace.h>
+#include <sys/mman.h>
#include <linux/ptrace.h>
#include <inttypes.h>
+#include <sched.h>
#include <lv2lint/lv2lint.h>
@@ 49,6 51,14 @@
#include <mapper.lv2/mapper.h>
+#define STACK_SIZE (1024 * 1024)
+
+typedef struct _wrap_data_t {
+ app_t *app;
+ wrap_t wrap;
+ void *data;
+} wrap_data_t;
+
const char *colors [2][ANSI_COLOR_MAX] = {
{
[ANSI_COLOR_BOLD] = "",
@@ 522,18 532,6 @@ static const char *stat_uris [STAT_URID_MAX] = {
#undef ITM
-jmp_buf jump_env;
-atomic_bool jump_flag = ATOMIC_VAR_INIT(false);
-
-static void
-_sig(int signal __attribute__((unused)))
-{
- if(atomic_load(&jump_flag))
- {
- longjmp(jump_env, 1);
- }
-}
-
static void
_map_uris(app_t *app)
{
@@ 569,41 567,87 @@ _free_urids(app_t *app)
}
static LV2_Worker_Status
-_respond(LV2_Worker_Respond_Handle instance, uint32_t size, const void *data)
+_sched(LV2_Worker_Schedule_Handle instance, uint32_t size, const void *data)
{
app_t *app = instance;
- void *plughandle = lilv_instance_get_handle(app->instance);
+ void *tar;
- if(app->work_iface && app->work_iface->work_response)
+ if( (tar = varchunk_write_request(app->to_worker, size)) )
{
- return app->work_iface->work_response(plughandle, size, data);
+ memcpy(tar, data, size);
+
+ varchunk_write_advance(app->to_worker, size);
+ return LV2_WORKER_SUCCESS;
}
- return LV2_WORKER_ERR_UNKNOWN;
+ return LV2_WORKER_ERR_NO_SPACE;
}
static LV2_Worker_Status
-_sched(LV2_Worker_Schedule_Handle instance, uint32_t size, const void *data)
+_respond(LV2_Worker_Respond_Handle instance, uint32_t size, const void *data)
{
app_t *app = instance;
+ void *tar;
+
+ if( (tar = varchunk_write_request(app->from_worker, size)) )
+ {
+ memcpy(tar, data, size);
+
+ varchunk_write_advance(app->from_worker, size);
+ return LV2_WORKER_SUCCESS;
+ }
+
+ return LV2_WORKER_ERR_NO_SPACE;
+}
+
+static int
+_wrap_work(app_t *app, void *_data __attribute__((unused)))
+{
+ LV2_Worker_Status status = LV2_WORKER_SUCCESS;
void *plughandle = lilv_instance_get_handle(app->instance);
+ const void *data;
+ size_t size;
+
+ while( (data = varchunk_read_request(app->to_worker, &size)) )
+ {
+ if(app->work_iface && app->work_iface->work)
+ {
+ status |= app->work_iface->work(plughandle, _respond, app, size, data);
+ }
+
+ varchunk_read_advance(app->to_worker);
+ }
+ return status;
+}
+
+static int
+_wrap_work_response(app_t *app, void *_data __attribute__((unused)))
+{
LV2_Worker_Status status = LV2_WORKER_SUCCESS;
+ void *plughandle = lilv_instance_get_handle(app->instance);
+ const void *data;
+ size_t size;
- shm_pause(app->shm);
+ shm_enable(app->shm);
- if(app->work_iface && app->work_iface->work)
+ while( (data = varchunk_read_request(app->from_worker, &size)) )
{
- status |= app->work_iface->work(plughandle, _respond, app, size, data);
- }
+ if(app->work_iface && app->work_iface->work_response)
+ {
+ status |= app->work_iface->work_response(plughandle, size, data);
+ }
- shm_resume(app->shm);
+ varchunk_read_advance(app->from_worker);
+ }
if(app->work_iface && app->work_iface->end_run)
{
status |= app->work_iface->end_run(plughandle);
}
+ app->forbidden.work_response = shm_disable(app->shm);
+
return status;
}
@@ 1346,41 1390,12 @@ _free_whitelist_libs(app_t *app)
}
#endif
-static void
-_trace_internal(app_t *app)
-{
- const size_t nports = lilv_plugin_get_num_ports(app->plugin);
- const size_t ports_sz = sizeof(port_t) * nports;
- port_t *ports = alloca(ports_sz);
- memset(ports, 0x0, ports_sz);
- shm_enable(app->shm);
- for(size_t p = 0; p < nports; p++)
- {
- const LilvPort *port = lilv_plugin_get_port_by_index(app->plugin, p);
-
- port_t *tar = &ports[p];
- tar->seq.atom.type = ATOM__Sequence;
- if(lilv_port_is_a(app->plugin, port, NODE(app, CORE__InputPort)))
- {
- tar->seq.atom.size = sizeof(tar->seq.body);
- }
- else if(lilv_port_is_a(app->plugin, port, NODE(app, CORE__OutputPort)))
- {
- tar->seq.atom.size = sizeof(tar);
- }
- lilv_instance_connect_port(app->instance, p, tar);
- }
- app->forbidden.connect_port = shm_disable(app->shm);
-
- shm_enable(app->shm);
- lilv_instance_run(app->instance, PORT_NSAMPLES);
- app->forbidden.run = shm_disable(app->shm);
-}
-
#ifdef ENABLE_PTRACE_TESTS
-static void
-_trace_child(app_t *app)
+static int
+_trace_child(void *data)
{
+ wrap_data_t *wd = data;
+
const pid_t pid = getpid();
if(ptrace(PTRACE_TRACEME, 0, NULL, NULL) < 0)
@@ 1391,9 1406,7 @@ _trace_child(app_t *app)
kill(pid, SIGSTOP);
- _trace_internal(app);
-
- _exit(0);
+ return wd->wrap(wd->app, wd->data);
}
static void
@@ 1506,21 1519,10 @@ _trace_parent(app_t *app, pid_t kid)
_show_info(app, &info);
} break;
- case SIGABRT:
- // fall-through
- case SIGSEGV:
- {
- kill(kid, SIGKILL);
- } break;
-
- case SIGCHLD:
- {
- // ignore
- } break;
-
default:
{
fprintf(stderr, "unexpected stop signal: 0x%x\n", WSTOPSIG(status));
+ kill(kid, SIGKILL);
} break;
}
@@ 1529,33 1531,204 @@ _trace_parent(app_t *app, pid_t kid)
return 0;
}
+#endif
+
+#ifdef ENABLE_WRAP_TESTS
+static int
+_wrap_child(void *data)
+{
+ wrap_data_t *wd = data;
+
+ return wd->wrap(wd->app, wd->data);
+}
static int
-_trace(app_t *app)
+_wrap_parent(app_t *app __attribute__((unused)), pid_t kid)
{
- const pid_t kid = fork();
+ int status;
- switch(kid)
+ while(true)
{
- case -1:
+ pid_t rc = waitpid(kid, &status, 0);
+
+ if(rc != kid)
+ {
+ fprintf(stderr, "cannot happen\n");
+ return 1;
+ }
+
+ if(WIFEXITED(status))
{
- fprintf(stderr, "[%s] fork failed: %s\n", __func__, strerror(errno));
- } return 1;
- case 0: // child
+ // kid is no more
+ if(WEXITSTATUS(status) == 0)
+ {
+ break;
+ }
+
+ fprintf(stderr, "failed exit\n");
+ return 1;
+ }
+
+ if(WIFSIGNALED(status))
{
- _trace_child(app);
- } break;
- default: // parent
+ // kid is no more
+ fprintf(stderr, "signaled\n");
+ return 1;
+ }
+
+ if(!WIFSTOPPED(status))
{
- _trace_parent(app, kid);
- } break;
+ // cannot happen
+ fprintf(stderr, "stop cannot happen\n");
+ return 1;
+ }
+
+ fprintf(stderr, "unexpected stop signal: 0x%x\n", WSTOPSIG(status));
+ return 1;
}
return 0;
}
+
+static int
+_wrap(app_t *app, wrap_t wrap, void *data, child_t child, parent_t parent)
+{
+ wrap_data_t wd = {
+ .app = app,
+ .wrap = wrap,
+ .data = data
+ };
+
+ char *stack = mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
+
+ if(stack == MAP_FAILED)
+ {
+ return 1;
+ }
+
+ char *stack_top = stack + STACK_SIZE;
+ const pid_t kid = clone(child, stack_top,
+ //CLONE_FILES | CLONE_FS | CLONE_IO | CLONE_VM | SIGCHLD, &wd);
+ CLONE_VM | SIGCHLD, &wd);
+
+ if(kid == -1)
+ {
+ fprintf(stderr, "[%s] clone failed: %s\n", __func__, strerror(errno));
+ return 1;
+ }
+
+ return parent(app, kid);
+}
#endif
int
+lv2lint_wrap(app_t *app, wrap_t wrap, void *data)
+{
+#ifdef ENABLE_WRAP_TESTS
+ return _wrap(app, wrap, data, _wrap_child, _wrap_parent);
+#else
+ return wrap(app, data);
+#endif
+}
+
+static int
+_trace(app_t *app, wrap_t wrap, void *data)
+{
+#ifdef ENABLE_PTRACE_TESTS
+ return _wrap(app, wrap, data, _trace_child, _trace_parent);
+#else
+ return wrap(app, data);
+#endif
+}
+
+static int
+_wrap_instantiate(app_t *app, void *data)
+{
+ const float param_sample_rate = 48000.f;
+ const LV2_Feature **features = data;
+
+ app->instance = lilv_plugin_instantiate(app->plugin, param_sample_rate, features);
+
+ return 0;
+}
+
+static int
+_wrap_activate(app_t *app, void *data __attribute__((unused)))
+{
+ if(!app->instance)
+ {
+ return 1;
+ }
+
+ lilv_instance_activate(app->instance);
+
+ return 0;
+}
+
+static int
+_wrap_deactivate(app_t *app, void *data __attribute__((unused)))
+{
+ if(!app->instance)
+ {
+ return 1;
+ }
+
+ lilv_instance_deactivate(app->instance);
+
+ return 0;
+}
+
+static int
+_wrap_free(app_t *app, void *data __attribute__((unused)))
+{
+ if(!app->instance)
+ {
+ return 1;
+ }
+
+ lilv_instance_free(app->instance);
+
+ return 0;
+}
+
+static int
+_wrap_connect_port(app_t *app, void *data)
+{
+ dst_t *dst = data;
+
+ if(!app->instance)
+ {
+ return 1;
+ }
+
+ shm_enable(app->shm);
+
+ lilv_instance_connect_port(app->instance, dst->idx, dst->body);
+
+ app->forbidden.connect_port |= shm_disable(app->shm);
+
+ return 0;
+}
+
+static int
+_wrap_run(app_t *app, void *data __attribute__((unused)))
+{
+ if(!app->instance)
+ {
+ return 1;
+ }
+
+ shm_enable(app->shm);
+
+ lilv_instance_run(app->instance, PORT_NSAMPLES);
+
+ app->forbidden.run = shm_disable(app->shm);
+
+ return 0;
+}
+
+int
main(int argc, char **argv)
{
static app_t app;
@@ 1747,12 1920,11 @@ main(int argc, char **argv)
_header(argv);
}
- signal(SIGSEGV, _sig);
- signal(SIGABRT, _sig);
-
app.shm = shm_attach();
if(!app.shm)
+ {
return -1;
+ }
#ifdef ENABLE_ONLINE_TESTS
app.curl = curl_easy_init();
@@ 1768,6 1940,14 @@ main(int argc, char **argv)
if(!mapper)
return -1;
+ app.to_worker = varchunk_new(0x10000, true);
+ if(!app.to_worker)
+ return -1;
+
+ app.from_worker = varchunk_new(0x10000, true);
+ if(!app.from_worker)
+ return -1;
+
_map_uris(&app);
lilv_world_load_all(app.world);
_load_include_dirs(&app);
@@ 2131,7 2311,7 @@ main(int argc, char **argv)
lilv_node_as_uri(lilv_plugin_get_uri(app.plugin)),
colors[app.atty][ANSI_COLOR_RESET]);
- app.instance = lilv_plugin_instantiate(app.plugin, param_sample_rate, features);
+ app.status.instantiate = lv2lint_wrap(&app, _wrap_instantiate, (void *)features);
app.descriptor = app.instance
? lilv_instance_get_descriptor(app.instance)
: NULL;
@@ 2154,6 2334,7 @@ main(int argc, char **argv)
LilvState *state = lilv_state_new_from_world(app.world, app.map, pset);
if(state)
{
+ //FIXME wrap or trace
lilv_state_restore(state, app.instance, _state_set_value, &app,
LV2_STATE_IS_POD | LV2_STATE_IS_PORTABLE, NULL); //FIXME features
@@ 2163,16 2344,50 @@ main(int argc, char **argv)
lilv_world_unload_resource(app.world, pset);
}
- lilv_instance_activate(app.instance);
+ memset(app.syscall, 0, sizeof(bool)*SYSCALL_MAX); //FIXME
-#ifdef ENABLE_PTRACE_TESTS
- memset(app.syscall, 0, sizeof(bool)*SYSCALL_MAX);
- _trace(&app);
-#endif
+ const size_t nports = lilv_plugin_get_num_ports(app.plugin);
+ const size_t ports_sz = sizeof(port_t) * nports;
+ port_t *ports = alloca(ports_sz);
+ memset(ports, 0x0, ports_sz);
+
+ app.status.connect_port = 0;
+ app.forbidden.connect_port = 0;
+
+ for(size_t p = 0; p < nports; p++)
+ {
+ const LilvPort *port = lilv_plugin_get_port_by_index(app.plugin, p);
+
+ port_t *tar = &ports[p];
+ tar->seq.atom.type = ATOM__Sequence;
+ if(lilv_port_is_a(app.plugin, port, NODE(&app, CORE__InputPort)))
+ {
+ tar->seq.atom.size = sizeof(tar->seq.body);
+ }
+ else if(lilv_port_is_a(app.plugin, port, NODE(&app, CORE__OutputPort)))
+ {
+ tar->seq.atom.size = sizeof(*tar);
+ }
+
+ dst_t dst = {
+ .idx = p,
+ .body = tar
+ };
+
+ app.status.connect_port += _trace(&app, _wrap_connect_port, &dst);
+ }
+
+ app.status.activate = lv2lint_wrap(&app, _wrap_activate, NULL);
+
+ app.status.work = lv2lint_wrap(&app, _wrap_work, NULL);
+ app.status.work_response = _trace(&app, _wrap_work_response, NULL);
+
+ app.status.run = _trace(&app, _wrap_run, NULL);
- _trace_internal(&app);
+ app.status.work += lv2lint_wrap(&app, _wrap_work, NULL);
+ app.status.work_response += _trace(&app, _wrap_work_response, NULL);
- lilv_instance_deactivate(app.instance);
+ app.status.deactivate = lv2lint_wrap(&app, _wrap_deactivate, NULL);
}
if(!test_plugin(&app))
@@ 2260,7 2475,7 @@ main(int argc, char **argv)
if(app.instance)
{
- lilv_instance_free(app.instance);
+ app.status.cleanup = lv2lint_wrap(&app, _wrap_free, NULL);
app.instance = NULL;
app.descriptor = NULL;
app.work_iface = NULL;
@@ 2297,6 2512,8 @@ main(int argc, char **argv)
_free_whitelist_symbols(&app);
_free_whitelist_libs(&app);
#endif
+ varchunk_free(app.to_worker);
+ varchunk_free(app.from_worker);
mapper_free(mapper);
shm_detach();
M src/lv2lint_plugin.c => src/lv2lint_plugin.c +124 -5
@@ 125,18 125,28 @@ _serialize_mask(char **symbols, unsigned mask)
}
static const ret_t *
-_test_port_connection(app_t *app)
+_test_connect_port(app_t *app)
{
- static const ret_t ret_nonrt= {
+ static const ret_t ret_nonrt = {
.lnt = LINT_FAIL,
.msg = "non-realtime function called: %s",
.uri = LV2_CORE__hardRTCapable,
.dsc = "Time waits for nothing."
+ },
+ ret_crash = {
+ .lnt = LINT_FAIL,
+ .msg = "crashed",
+ .uri = LV2_CORE__Plugin,
+ .dsc = "Well - fix your plugin."
};
const ret_t *ret = NULL;
- if(app->instance && app->forbidden.connect_port)
+ if(app->status.connect_port)
+ {
+ ret = &ret_crash;
+ }
+ else if(app->instance && app->forbidden.connect_port)
{
char *symbols = NULL;
@@ 157,11 167,21 @@ _test_run(app_t *app)
.msg = "non-realtime function called: %s",
.uri = LV2_CORE__hardRTCapable,
.dsc = "Time waits for nothing."
+ },
+ ret_crash = {
+ .lnt = LINT_FAIL,
+ .msg = "crashed",
+ .uri = LV2_CORE__Plugin,
+ .dsc = "Well - fix your plugin."
};
const ret_t *ret = NULL;
- if(app->instance && app->forbidden.run)
+ if(app->status.run)
+ {
+ ret = &ret_crash;
+ }
+ else if(app->instance && app->forbidden.run)
{
char *symbols = NULL;
@@ 174,6 194,101 @@ _test_run(app_t *app)
return ret;
}
+static const ret_t *
+_test_work(app_t *app)
+{
+ static const ret_t ret_crash = {
+ .lnt = LINT_FAIL,
+ .msg = "crashed",
+ .uri = LV2_CORE__Plugin,
+ .dsc = "Well - fix your plugin."
+ };
+
+ const ret_t *ret = NULL;
+
+ if(app->status.work)
+ {
+ ret = &ret_crash;
+ }
+
+ return ret;
+}
+
+static const ret_t *
+_test_work_response(app_t *app)
+{
+ static const ret_t ret_nonrt= {
+ .lnt = LINT_FAIL,
+ .msg = "non-realtime function called: %s",
+ .uri = LV2_CORE__hardRTCapable,
+ .dsc = "Time waits for nothing."
+ },
+ ret_crash = {
+ .lnt = LINT_FAIL,
+ .msg = "crashed",
+ .uri = LV2_CORE__Plugin,
+ .dsc = "Well - fix your plugin."
+ };
+
+ const ret_t *ret = NULL;
+
+ if(app->status.work_response)
+ {
+ ret = &ret_crash;
+ }
+ else if(app->instance && app->forbidden.work_response)
+ {
+ char *symbols = NULL;
+
+ _serialize_mask(&symbols, app->forbidden.work_response);
+
+ *app->urn = symbols;
+ ret = &ret_nonrt;
+ }
+
+ return ret;
+}
+
+static const ret_t *
+_test_activate(app_t *app)
+{
+ static const ret_t ret_crash = {
+ .lnt = LINT_FAIL,
+ .msg = "crashed",
+ .uri = LV2_CORE__Plugin,
+ .dsc = "Well - fix your plugin."
+ };
+
+ const ret_t *ret = NULL;
+
+ if(app->status.activate)
+ {
+ ret = &ret_crash;
+ }
+
+ return ret;
+}
+
+static const ret_t *
+_test_deactivate(app_t *app)
+{
+ static const ret_t ret_crash = {
+ .lnt = LINT_FAIL,
+ .msg = "crashed",
+ .uri = LV2_CORE__Plugin,
+ .dsc = "Well - fix your plugin."
+ };
+
+ const ret_t *ret = NULL;
+
+ if(app->status.deactivate)
+ {
+ ret = &ret_crash;
+ }
+
+ return ret;
+}
+
#ifdef ENABLE_PTRACE_TESTS
static const ret_t *
_test_syscall(app_t *app)
@@ 1736,8 1851,12 @@ _test_patch(app_t *app)
static const test_t tests [] = {
{"Plugin LV2_PATH", _test_lv2_path},
{"Plugin Instantiation", _test_instantiation},
- {"Plugin Port Connection", _test_port_connection},
+ {"Plugin Connect Port", _test_connect_port},
{"Plugin Run", _test_run},
+ {"Plugin Work", _test_work},
+ {"Plugin Work Response", _test_work_response},
+ {"Plugin Activate", _test_activate},
+ {"Plugin Deactivate", _test_deactivate},
#ifdef ENABLE_PTRACE_TESTS
{"Plugin Syscall", _test_syscall},
#endif
M src/lv2lint_x11.c => src/lv2lint_x11.c +99 -43
@@ 89,11 89,21 @@ _test_ui_instantiation(app_t *app)
.msg = "failed to instantiate",
.uri = LV2_UI__X11UI,
.dsc = "You likely have forgotten to list all lv2:requiredFeatures."
+ },
+ ret_crash = {
+ .lnt = LINT_FAIL,
+ .msg = "crashed",
+ .uri = LV2_CORE__Plugin,
+ .dsc = "Well - fix your plugin."
};
const ret_t *ret = NULL;
- if(!app->ui_instance)
+ if(app->status.ui_instantiate)
+ {
+ ret = &ret_crash;
+ }
+ else if(!app->ui_instance)
{
ret = &ret_instantiation;
}
@@ 121,6 131,8 @@ _test_ui_widget(app_t *app)
return ret;
}
+static Display *_display; //FIXME
+
static const ret_t *
_test_ui_hints(app_t *app)
{
@@ 149,12 161,9 @@ _test_ui_hints(app_t *app)
memset(&hints, 0x1, sizeof(hints));
long supplied = 0;
- Display *display = XOpenDisplay(NULL); // FIXME reuse existing one
- if(display && app->ui_widget)
+ if(_display && app->ui_widget)
{
- XGetWMNormalHints(display, app->ui_widget, &hints, &supplied);
-
- XCloseDisplay(display);
+ XGetWMNormalHints(_display, app->ui_widget, &hints, &supplied);
}
if(supplied & PAspect)
@@ 188,6 197,64 @@ _test_ui_hints(app_t *app)
return ret;
}
+static int
+_wrap_instantiate(app_t *app, void *data)
+{
+ const LV2_Feature **features = data;
+
+ if(!app->ui_descriptor)
+ {
+ return 1;
+ }
+
+ if(!app->ui_descriptor->instantiate)
+ {
+ return 1;
+ }
+
+ const LilvNode *ui_bundle_uri = lilv_ui_get_bundle_uri(app->ui);
+ char *ui_plugin_bundle_path = lilv_file_uri_parse(lilv_node_as_string(ui_bundle_uri), NULL);
+
+ if(!ui_plugin_bundle_path)
+ {
+ return 1;
+ }
+
+ char path [PATH_MAX];
+ snprintf(path, sizeof(path), "%s", ui_plugin_bundle_path);
+
+ lilv_free(ui_plugin_bundle_path);
+
+ app->ui_instance = app->ui_descriptor->instantiate(app->ui_descriptor,
+ app->plugin_uri, path, _write_function, app,
+ (void *)&app->ui_widget, features);
+
+ return 0;
+}
+
+static int
+_wrap_cleanup(app_t *app, void *data __attribute__((unused)))
+{
+ if(!app->ui_instance)
+ {
+ return 1;
+ }
+
+ if(!app->ui_descriptor)
+ {
+ return 1;
+ }
+
+ if(!app->ui_descriptor->cleanup)
+ {
+ return 1;
+ }
+
+ app->ui_descriptor->cleanup(app->ui_instance);
+
+ return 0;
+}
+
static const test_t tests [] = {
{"UI Instantiation", _test_ui_instantiation},
{"UI Widget", _test_ui_widget},
@@ 199,6 266,14 @@ static const unsigned tests_n = sizeof(tests) / sizeof(test_t);
void
test_x11(app_t *app, bool *flag)
{
+ static bool xinit = true;
+
+ if(xinit)
+ {
+ XInitThreads();
+ xinit = false;
+ }
+
char *DISPLAY = getenv("DISPLAY");
if(!DISPLAY || !strlen(DISPLAY))
{
@@ 213,17 288,15 @@ test_x11(app_t *app, bool *flag)
}
memset(rets, 0x0, tests_n * sizeof(res_t));
- Display *display = NULL;
- Window win = 0;
-
- display = XOpenDisplay(NULL);
+ Display *display = XOpenDisplay(NULL);
if(!display)
{
goto jump;
}
+ _display = display;
const int black = BlackPixel(display, DefaultScreen(display));
- win = XCreateSimpleWindow(display, DefaultRootWindow(display), 0, 0,
+ Window win = XCreateSimpleWindow(display, DefaultRootWindow(display), 0, 0,
600, 600, 0, black, black);
if(!win)
{
@@ 330,7 403,7 @@ test_x11(app_t *app, bool *flag)
};
const LV2_Feature feat_instance_access = {
.URI = LV2_INSTANCE_ACCESS_URI,
- .data = lilv_instance_get_handle(app->instance)
+ .data = app->instance ? lilv_instance_get_handle(app->instance) : NULL
};
const LV2_Feature feat_data_access = {
.URI = LV2_DATA_ACCESS_URI,
@@ 459,29 532,14 @@ test_x11(app_t *app, bool *flag)
}
#undef MAX_OPTS
- const LilvNode *ui_bundle_uri = lilv_ui_get_bundle_uri(app->ui);
- char *ui_plugin_bundle_path = lilv_file_uri_parse(lilv_node_as_string(ui_bundle_uri), NULL);
- if(ui_plugin_bundle_path)
- {
- if(app->ui_descriptor && app->ui_descriptor->instantiate)
- {
- atomic_store(&jump_flag, true);
- if(setjmp(jump_env) == 0)
- {
- app->ui_instance = app->ui_descriptor->instantiate(app->ui_descriptor,
- app->plugin_uri, ui_plugin_bundle_path, _write_function, app,
- (void *)&app->ui_widget, features);
- }
- else
- {
- app->ui_instance = NULL;
- }
- atomic_store(&jump_flag, false);
- }
-
- lilv_free(ui_plugin_bundle_path);
- }
+ // FIXME
+#if 0
+ app->status.ui_instantiate = lv2lint_wrap(app, _wrap_instantiate, (void *)features);
+#else
+ app->status.ui_instantiate = _wrap_instantiate(app, (void *)features);
+#endif
+ // FIXME
#if 0
if(app->ui_instance && app->ui_idle_iface && app->ui_idle_iface->idle)
{
@@ 505,15 563,12 @@ test_x11(app_t *app, bool *flag)
}
}
- if(app->ui_instance)
- {
- if(app->ui_descriptor && app->ui_descriptor->cleanup)
- {
- app->ui_descriptor->cleanup(app->ui_instance);
- }
-
- app->ui_instance = NULL;
- }
+ // FIXME
+#if 0
+ app->status.ui_cleanup = lv2lint_wrap(app, _wrap_cleanup, NULL);
+#else
+ app->status.ui_cleanup = _wrap_cleanup(app, NULL);
+#endif
if(app->ui_widget)
{
@@ 558,5 613,6 @@ jump:
XCloseDisplay(display);
display = NULL;
+ _display = NULL;
}
}
A subprojects/varchunk/.gitignore => subprojects/varchunk/.gitignore +5 -0
@@ 0,0 1,5 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+tags
+*.taghl
A subprojects/varchunk/.gitlab-ci.yml => subprojects/varchunk/.gitlab-ci.yml +5 -0
@@ 0,0 1,5 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+ - local: 'gitlab-ci/generic.yml'
A subprojects/varchunk/LICENSES/Artistic-2.0.txt => subprojects/varchunk/LICENSES/Artistic-2.0.txt +85 -0
@@ 0,0 1,85 @@
+The Artistic License 2.0
+
+Copyright (c) 2000-2006, The Perl Foundation.
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+This license establishes the terms under which a given free software Package may be copied, modified, distributed, and/or redistributed. The intent is that the Copyright Holder maintains some artistic control over the development of that Package while still keeping the Package available as open source and free software.
+
+You are always permitted to make arrangements wholly outside of this license directly with the Copyright Holder of a given Package. If the terms of this license do not permit the full use that you propose to make of the Package, you should contact the Copyright Holder and seek a different licensing arrangement.
+
+Definitions
+
+ "Copyright Holder" means the individual(s) or organization(s) named in the copyright notice for the entire Package.
+
+ "Contributor" means any party that has contributed code or other material to the Package, in accordance with the Copyright Holder's procedures.
+
+ "You" and "your" means any person who would like to copy, distribute, or modify the Package.
+
+ "Package" means the collection of files distributed by the Copyright Holder, and derivatives of that collection and/or of those files. A given Package may consist of either the Standard Version, or a Modified Version.
+
+ "Distribute" means providing a copy of the Package or making it accessible to anyone else, or in the case of a company or organization, to others outside of your company or organization.
+
+ "Distributor Fee" means any fee that you charge for Distributing this Package or providing support for this Package to another party. It does not mean licensing fees.
+
+ "Standard Version" refers to the Package if it has not been modified, or has been modified only in ways explicitly requested by the Copyright Holder.
+
+ "Modified Version" means the Package, if it has been changed, and such changes were not explicitly requested by the Copyright Holder.
+
+ "Original License" means this Artistic License as Distributed with the Standard Version of the Package, in its current version or as it may be modified by The Perl Foundation in the future.
+
+ "Source" form means the source code, documentation source, and configuration files for the Package.
+
+ "Compiled" form means the compiled bytecode, object code, binary, or any other form resulting from mechanical transformation or translation of the Source form.
+
+Permission for Use and Modification Without Distribution
+
+(1) You are permitted to use the Standard Version and create and use Modified Versions for any purpose without restriction, provided that you do not Distribute the Modified Version.
+
+Permissions for Redistribution of the Standard Version
+
+(2) You may Distribute verbatim copies of the Source form of the Standard Version of this Package in any medium without restriction, either gratis or for a Distributor Fee, provided that you duplicate all of the original copyright notices and associated disclaimers. At your discretion, such verbatim copies may or may not include a Compiled form of the Package.
+
+(3) You may apply any bug fixes, portability changes, and other modifications made available from the Copyright Holder. The resulting Package will still be considered the Standard Version, and as such will be subject to the Original License.
+
+Distribution of Modified Versions of the Package as Source
+
+(4) You may Distribute your Modified Version as Source (either gratis or for a Distributor Fee, and with or without a Compiled form of the Modified Version) provided that you clearly document how it differs from the Standard Version, including, but not limited to, documenting any non-standard features, executables, or modules, and provided that you do at least ONE of the following:
+
+ (a) make the Modified Version available to the Copyright Holder of the Standard Version, under the Original License, so that the Copyright Holder may include your modifications in the Standard Version.
+ (b) ensure that installation of your Modified Version does not prevent the user installing or running the Standard Version. In addition, the Modified Version must bear a name that is different from the name of the Standard Version.
+ (c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified Version available to others under
+
+ (i) the Original License or
+ (ii) a license that permits the licensee to freely copy, modify and redistribute the Modified Version using the same licensing terms that apply to the copy that the licensee received, and requires that the Source form of the Modified Version, and of any works derived from it, be made freely available in that license fees are prohibited but Distributor Fees are allowed.
+
+Distribution of Compiled Forms of the Standard Version or Modified Versions without the Source
+
+(5) You may Distribute Compiled forms of the Standard Version without the Source, provided that you include complete instructions on how to get the Source of the Standard Version. Such instructions must be valid at the time of your distribution. If these instructions, at any time while you are carrying out such distribution, become invalid, you must provide new instructions on demand or cease further distribution. If you provide valid instructions or cease distribution within thirty days after you become aware that the instructions are invalid, then you do not forfeit any of your rights under this license.
+
+(6) You may Distribute a Modified Version in Compiled form without the Source, provided that you comply with Section 4 with respect to the Source of the Modified Version.
+
+Aggregating or Linking the Package
+
+(7) You may aggregate the Package (either the Standard Version or Modified Version) with other packages and Distribute the resulting aggregation provided that you do not charge a licensing fee for the Package. Distributor Fees are permitted, and licensing fees for other components in the aggregation are permitted. The terms of this license apply to the use and Distribution of the Standard or Modified Versions as included in the aggregation.
+
+(8) You are permitted to link Modified and Standard Versions with other works, to embed the Package in a larger work of your own, or to build stand-alone binary or bytecode versions of applications that include the Package, and Distribute the result without restriction, provided the result does not expose a direct interface to the Package.
+
+Items That are Not Considered Part of a Modified Version
+
+(9) Works (including, but not limited to, modules and scripts) that merely extend or make use of the Package, do not, by themselves, cause the Package to be a Modified Version. In addition, such works are not considered parts of the Package itself, and are not subject to the terms of this license.
+
+General Provisions
+
+(10) Any use, modification, and distribution of the Standard or Modified Versions is governed by this Artistic License. By using, modifying or distributing the Package, you accept this license. Do not use, modify, or distribute the Package, if you do not accept this license.
+
+(11) If your Modified Version has been derived from a Modified Version made by someone other than you, you are nevertheless required to ensure that your Modified Version complies with the requirements of this license.
+
+(12) This license does not grant you the right to use any trademark, service mark, tradename, or logo of the Copyright Holder.
+
+(13) This license includes the non-exclusive, worldwide, free-of-charge patent license to make, have made, use, offer to sell, sell, import and otherwise transfer the Package with respect to any patent claims licensable by the Copyright Holder that are necessarily infringed by the Package. If you institute patent litigation (including a cross-claim or counterclaim) against any party alleging that the Package constitutes direct or contributory patent infringement, then this Artistic License to you shall terminate on the date that such litigation is filed.
+
+(14) Disclaimer of Warranty:
+THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
A subprojects/varchunk/LICENSES/CC0-1.0.txt => subprojects/varchunk/LICENSES/CC0-1.0.txt +121 -0
@@ 0,0 1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
A subprojects/varchunk/README.md => subprojects/varchunk/README.md +110 -0
@@ 0,0 1,110 @@
+<!--
+ -- (SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+ -- (SPDX-License-Identifier: CC0-1.0
+ -->
+# Varchunk
+
+## Ringbuffer optimized for realtime event handling
+
+### Properties
+
+* Is realtime-safe
+* Is lock-free
+* Supports variably sized chunks
+* Supports contiguous memory chunks
+* Supports zero copy operation
+* Uses a simplistic API
+
+### Build Status
+
+[](https://gitlab.com/OpenMusicKontrollers/varchunk/commits/master)
+
+### Build / test
+
+ git clone https://git.open-music-kontrollers.ch/lad/varchunk
+ cd varchunk
+ meson build
+ cd build
+ ninja -j4
+ ninja test
+
+### Dependencies
+
+#### Optional
+
+* [REUSE](https://git.fsfe.org/reuse/tool) (tool for compliance with the REUSE recommendations)
+
+### Usage
+
+ #include <pthread.h>
+ #include <varchunk.h>
+
+ static void *
+ producer_main(void *arg)
+ {
+ varchunk_t *varchunk = arg;
+ void *ptr;
+ const size_t towrite = sizeof(uint32_t);
+ uint32_t counter = 0;
+
+ while(counter <= 1000000)
+ {
+ if( (ptr = varchunk_write_request(varchunk, towrite)) )
+ {
+ // write 'towrite' bytes to 'ptr'
+ *(uint32_t *)ptr = counter++;
+ varchunk_write_advance(varchunk, towrite);
+ }
+ }
+
+ return NULL;
+ }
+
+ static void *
+ consumer_main(void *arg)
+ {
+ varchunk_t *varchunk = arg;
+ const void *ptr;
+ size_t toread;
+
+ while(1)
+ {
+ if( (ptr = varchunk_read_request(varchunk, &toread)) )
+ {
+ // read 'toread' bytes from 'ptr'
+ if(*(uint32_t *)ptr >= 1000000)
+ break;
+ varchunk_read_advance(varchunk);
+ }
+ }
+
+ return NULL;
+ }
+
+ int
+ main(int argc, char **argv)
+ {
+ if(!varchunk_is_lock_free())
+ return -1;
+
+ pthread_t producer;
+ pthread_t consumer;
+ varchunk_t *varchunk = varchunk_new(8192, true);
+ if(!varchunk)
+ return -1;
+
+ pthread_create(&consumer, NULL, consumer_main, varchunk);
+ pthread_create(&producer, NULL, producer_main, varchunk);
+
+ pthread_join(producer, NULL);
+ pthread_join(consumer, NULL);
+
+ varchunk_free(varchunk);
+
+ return 0;
+ }
+
+### License
+
+SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+SPDX-License-Identifier: Artistic-2.0
A subprojects/varchunk/gitlab-ci/LICENSES/CC0-1.0.txt => subprojects/varchunk/gitlab-ci/LICENSES/CC0-1.0.txt +29 -0
@@ 0,0 1,29 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+ 1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+ i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+ iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+ vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+ 2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+ 3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+ 4. Limitations and Disclaimers.
+ a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
A subprojects/varchunk/gitlab-ci/generic.yml => subprojects/varchunk/gitlab-ci/generic.yml +123 -0
@@ 0,0 1,123 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+stages:
+ - prepare
+ - build
+ - deploy
+
+variables:
+ PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
+ BUILD_OPTS: ""
+
+vars:
+ stage: prepare
+ script:
+ - echo "VERSION=$( grep version meson_options.txt | cut -d\' -f6 )" > vars.env
+ artifacts:
+ reports:
+ dotenv: vars.env
+
+.native_template: &native_definition
+ stage: build
+ script:
+ - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-${VERSION}/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} build
+ - ninja -C build
+ - ninja -C build test
+ - meson test -C build --wrap="valgrind --leak-check=full --error-exitcode=1"
+ - ninja -C build install
+
+ - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-${VERSION}/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} -Db_sanitize=address sanitize
+ - ninja -C sanitize
+ - ninja -C sanitize test
+
+ - scan-build --status-bugs meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-${VERSION}/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} scanbuild
+ - scan-build --status-bugs ninja -C scanbuild
+ - scan-build --status-bugs ninja -C scanbuild test
+ artifacts:
+ name: "${CI_PROJECT_NAME}-${VERSION}-${CI_BUILD_NAME}"
+ paths:
+ - "${CI_PROJECT_NAME}-${VERSION}/${CI_BUILD_NAME}/"
+
+.cross_template: &cross_definition
+ stage: build
+ script:
+ - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-${VERSION}/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} build
+ - ninja -C build
+ - ninja -C build test
+ - ninja -C build install
+ artifacts:
+ name: "${CI_PROJECT_NAME}-${VERSION}-${CI_BUILD_NAME}"
+ paths:
+ - "${CI_PROJECT_NAME}-${VERSION}/${CI_BUILD_NAME}/"
+
+# build
+.universal_linux_template_stretch: &universal_linux_definition_stretch
+ image: ventosus/universal-linux-gnu:stretch
+ <<: *cross_definition
+
+.universal_linux_template_buster: &universal_linux_definition_buster
+ image: ventosus/universal-linux-gnu:buster
+ <<: *native_definition
+
+.universal_linux_template_bullseye: &universal_linux_definition_bullseye
+ image: ventosus/universal-linux-gnu:bullseye
+ <<: *native_definition
+
+.arm_linux_template_stretch: &arm_linux_definition_stretch
+ image: ventosus/arm-linux-gnueabihf:stretch
+ <<: *cross_definition
+
+.arm_linux_template_buster: &arm_linux_definition_buster
+ image: ventosus/arm-linux-gnueabihf:buster
+ <<: *cross_definition
+
+.arm_linux_template_bullseye: &arm_linux_definition_bullseye
+ image: ventosus/arm-linux-gnueabihf:bullseye
+ <<: *cross_definition
+
+# build
+x86_64-linux-gnu-stretch:
+ <<: *universal_linux_definition_stretch
+
+x86_64-linux-gnu-buster:
+ <<: *universal_linux_definition_buster
+
+x86_64-linux-gnu-bullseye:
+ <<: *universal_linux_definition_bullseye
+
+i686-linux-gnu-stretch:
+ <<: *universal_linux_definition_stretch
+
+i686-linux-gnu-buster:
+ <<: *universal_linux_definition_buster
+
+i686-linux-gnu-bullseye:
+ <<: *universal_linux_definition_bullseye
+
+arm-linux-gnueabihf-stretch:
+ <<: *arm_linux_definition_stretch
+
+arm-linux-gnueabihf-buster:
+ <<: *arm_linux_definition_buster
+
+arm-linux-gnueabihf-bullseye:
+ <<: *arm_linux_definition_bullseye
+
+aarch64-linux-gnu-stretch:
+ <<: *arm_linux_definition_stretch
+
+aarch64-linux-gnu-buster:
+ <<: *arm_linux_definition_buster
+
+aarch64-linux-gnu-bullseye:
+ <<: *arm_linux_definition_bullseye
+
+pack:
+ stage: deploy
+ script:
+ - echo 'packing up'
+ artifacts:
+ name: "${CI_PROJECT_NAME}-${VERSION}"
+ paths:
+ - "${CI_PROJECT_NAME}-${VERSION}/"
A subprojects/varchunk/meson.build => subprojects/varchunk/meson.build +57 -0
@@ 0,0 1,57 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+project('varchunk', 'c', default_options : [
+ 'buildtype=release',
+ 'warning_level=3',
+ 'werror=false',
+ 'b_lto=true',
+ 'c_std=c11'])
+
+reuse = find_program('reuse', required : false)
+
+add_project_arguments('-D_GNU_SOURCE', language : 'c')
+
+cc = meson.get_compiler('c')
+
+thread_dep = dependency('threads')
+
+lib_deps = []
+
+lib_incs = []
+lib_incs += include_directories('')
+
+lib_srcs = []
+lib_srcs += join_paths('src', 'varchunk.c')
+
+if host_machine.system() == 'linux'
+ rt_dep = cc.find_library('rt')
+ lib_deps += rt_dep
+endif
+
+varchunk = declare_dependency(
+ include_directories : lib_incs,
+ dependencies : lib_deps,
+ sources : lib_srcs)
+
+test_deps = []
+test_deps += varchunk
+test_deps += thread_dep
+
+test_srcs = []
+test_srcs += join_paths('test', 'test.c')
+
+test_varchunk = executable('Test', test_srcs,
+ dependencies : test_deps,
+ install : false)
+
+test('Test', test_varchunk,
+ args : ['100000'],
+ timeout : 360) # seconds
+
+if reuse.found()
+ test('REUSE', reuse, args : [
+ '--root', meson.current_source_dir(),
+ 'lint'
+ ])
+endif
A subprojects/varchunk/meson_options.txt => subprojects/varchunk/meson_options.txt +4 -0
@@ 0,0 1,4 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+option('version', type : 'string', value : '0.1.113')
A subprojects/varchunk/src/varchunk.c => subprojects/varchunk/src/varchunk.c +295 -0
@@ 0,0 1,295 @@
+/*
+ * SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+ * SPDX-License-Identifier: Artistic-2.0
+ */
+
+#include <assert.h>
+
+#if !defined(_WIN32)
+# include <sys/mman.h> // mlock
+#endif
+
+#include <varchunk/varchunk.h>
+
+#define VARCHUNK_PAD(SIZE) ( ( (size_t)(SIZE) + 7U ) & ( ~7U ) )
+
+bool
+varchunk_is_lock_free(void)
+{
+ varchunk_t varchunk;
+
+ return atomic_is_lock_free(&varchunk.head)
+ && atomic_is_lock_free(&varchunk.tail);
+}
+
+size_t
+varchunk_body_size(size_t minimum)
+{
+ size_t size = 1;
+ while(size < minimum)
+ size <<= 1; // assure size to be a power of 2
+ return size;
+}
+
+void
+varchunk_init(varchunk_t *varchunk, size_t body_size, bool release_and_acquire)
+{
+ varchunk->acquire = release_and_acquire
+ ? memory_order_acquire
+ : memory_order_relaxed;
+ varchunk->release = release_and_acquire
+ ? memory_order_release
+ : memory_order_relaxed;
+
+ atomic_init(&varchunk->head, 0);
+ atomic_init(&varchunk->tail, 0);
+
+ varchunk->size = body_size;
+ varchunk->mask = varchunk->size - 1;
+}
+
+varchunk_t *
+varchunk_new(size_t minimum, bool release_and_acquire)
+{
+ varchunk_t *varchunk = NULL;
+
+ const size_t body_size = varchunk_body_size(minimum);
+ const size_t total_size = sizeof(varchunk_t) + body_size;
+
+#if defined(_WIN32)
+ varchunk = _aligned_malloc(total_size, sizeof(varchunk_elmnt_t));
+#else
+ posix_memalign((void **)&varchunk, sizeof(varchunk_elmnt_t), total_size);
+ mlock(varchunk, total_size); // prevent memory from being flushed to disk
+#endif
+
+ if(varchunk)
+ varchunk_init(varchunk, body_size, release_and_acquire);
+
+ return varchunk;
+}
+
+void
+varchunk_free(varchunk_t *varchunk)
+{
+ if(varchunk)
+ {
+#if !defined(_WIN32)
+ munlock(varchunk->buf, varchunk->size);
+#endif
+ free(varchunk);
+ }
+}
+
+static inline void
+_varchunk_write_advance_raw(varchunk_t *varchunk, size_t head, size_t written)
+{
+ // only producer is allowed to advance write head
+ const size_t new_head = (head + written) & varchunk->mask;
+ atomic_store_explicit(&varchunk->head, new_head, varchunk->release);
+}
+
+void *
+varchunk_write_request_max(varchunk_t *varchunk, size_t minimum, size_t *maximum)
+{
+ assert(varchunk);
+
+ size_t space; // size of writable buffer
+ size_t end; // virtual end of writable buffer
+ const size_t head = atomic_load_explicit(&varchunk->head, memory_order_relaxed); // read head
+ const size_t tail = atomic_load_explicit(&varchunk->tail, varchunk->acquire); // read tail (consumer modifies it any time)
+ const size_t padded = 2*sizeof(varchunk_elmnt_t) + VARCHUNK_PAD(minimum);
+
+ // calculate writable space
+ if(head > tail)
+ space = ((tail - head + varchunk->size) & varchunk->mask) - 1;
+ else if(head < tail)
+ space = (tail - head) - 1;
+ else // head == tail
+ space = varchunk->size - 1;
+ end = head + space;
+
+ if(end > varchunk->size) // available region wraps over at end of buffer
+ {
+ // get first part of available buffer
+ uint8_t *buf1 = varchunk->buf + head;
+ const size_t len1 = varchunk->size - head;
+
+ if(len1 < padded) // not enough space left on first part of buffer
+ {
+ // get second part of available buffer
+ uint8_t *buf2 = varchunk->buf;
+ const size_t len2 = end & varchunk->mask;
+
+ if(len2 < padded) // not enough space left on second buffer, either
+ {
+ varchunk->rsvd = 0;
+ varchunk->gapd = 0;
+ if(maximum)
+ *maximum = varchunk->rsvd;
+ return NULL;
+ }
+ else // enough space left on second buffer, use it!
+ {
+ varchunk->rsvd = len2;
+ varchunk->gapd = len1;
+ if(maximum)
+ *maximum = varchunk->rsvd;
+ return buf2 + sizeof(varchunk_elmnt_t);
+ }
+ }
+ else // enough space left on first part of buffer, use it!
+ {
+ varchunk->rsvd = len1;
+ varchunk->gapd = 0;
+ if(maximum)
+ *maximum = varchunk->rsvd;
+ return buf1 + sizeof(varchunk_elmnt_t);
+ }
+ }
+ else // available region is contiguous
+ {
+ uint8_t *buf = varchunk->buf + head;
+
+ if(space < padded) // no space left on contiguous buffer
+ {
+ varchunk->rsvd = 0;
+ varchunk->gapd = 0;
+ if(maximum)
+ *maximum = varchunk->rsvd;
+ return NULL;
+ }
+ else // enough space left on contiguous buffer, use it!
+ {
+ varchunk->rsvd = space;
+ varchunk->gapd = 0;
+ if(maximum)
+ *maximum = varchunk->rsvd;
+ return buf + sizeof(varchunk_elmnt_t);
+ }
+ }
+}
+
+void *
+varchunk_write_request(varchunk_t *varchunk, size_t minimum)
+{
+ return varchunk_write_request_max(varchunk, minimum, NULL);
+}
+
+void
+varchunk_write_advance(varchunk_t *varchunk, size_t written)
+{
+ assert(varchunk);
+ // fail miserably if stupid programmer tries to write more than rsvd
+ assert(written <= varchunk->rsvd);
+
+ // write elmnt header at head
+ const size_t head = atomic_load_explicit(&varchunk->head, memory_order_relaxed);
+ if(varchunk->gapd > 0)
+ {
+ // fill end of first buffer with gap
+ varchunk_elmnt_t *elmnt = (varchunk_elmnt_t *)(varchunk->buf + head);
+ elmnt->size = varchunk->gapd - sizeof(varchunk_elmnt_t);
+ elmnt->gap = 1;
+
+ // fill written element header
+ elmnt = (void *)varchunk->buf;
+ elmnt->size = written;
+ elmnt->gap = 0;
+ }
+ else // varchunk->gapd == 0
+ {
+ // fill written element header
+ varchunk_elmnt_t *elmnt = (varchunk_elmnt_t *)(varchunk->buf + head);
+ elmnt->size = written;
+ elmnt->gap = 0;
+ }
+
+ // advance write head
+ _varchunk_write_advance_raw(varchunk, head,
+ varchunk->gapd + sizeof(varchunk_elmnt_t) + VARCHUNK_PAD(written));
+}
+
+static inline void
+_varchunk_read_advance_raw(varchunk_t *varchunk, size_t tail, size_t read)
+{
+ // only consumer is allowed to advance read tail
+ const size_t new_tail = (tail + read) & varchunk->mask;
+ atomic_store_explicit(&varchunk->tail, new_tail, varchunk->release);
+}
+
+const void *
+varchunk_read_request(varchunk_t *varchunk, size_t *toread)
+{
+ assert(varchunk);
+ size_t space; // size of available buffer
+ const size_t tail = atomic_load_explicit(&varchunk->tail, memory_order_relaxed); // read tail
+ const size_t head = atomic_load_explicit(&varchunk->head, varchunk->acquire); // read head (producer modifies it any time)
+
+ // calculate readable space
+ if(head > tail)
+ space = head - tail;
+ else
+ space = (head - tail + varchunk->size) & varchunk->mask;
+
+ if(space > 0) // there may be chunks available for reading
+ {
+ const size_t end = tail + space; // virtual end of available buffer
+
+ if(end > varchunk->size) // available buffer wraps around at end
+ {
+ // first part of available buffer
+ const uint8_t *buf1 = varchunk->buf + tail;
+ const size_t len1 = varchunk->size - tail;
+ const varchunk_elmnt_t *elmnt = (const varchunk_elmnt_t *)buf1;
+
+ if(elmnt->gap) // gap elmnt?
+ {
+ // skip gap
+ _varchunk_read_advance_raw(varchunk, tail, len1);
+
+ // second part of available buffer
+ const uint8_t *buf2 = varchunk->buf;
+ // there will always be at least on element after a gap
+ elmnt = (const varchunk_elmnt_t *)buf2;
+
+ *toread = elmnt->size;
+ return buf2 + sizeof(varchunk_elmnt_t);
+ }
+ else // valid chunk, use it!
+ {
+ *toread = elmnt->size;
+ return buf1 + sizeof(varchunk_elmnt_t);
+ }
+ }
+ else // available buffer is contiguous
+ {
+ // get buffer
+ const uint8_t *buf = varchunk->buf + tail;
+ const varchunk_elmnt_t *elmnt = (const varchunk_elmnt_t *)buf;
+
+ *toread = elmnt->size;
+ return buf + sizeof(varchunk_elmnt_t);
+ }
+ }
+ else // no chunks available aka empty buffer
+ {
+ *toread = 0;
+ return NULL;
+ }
+}
+
+void
+varchunk_read_advance(varchunk_t *varchunk)
+{
+ assert(varchunk);
+ // get elmnt header from tail (for size)
+ const size_t tail = atomic_load_explicit(&varchunk->tail, memory_order_relaxed);
+ const varchunk_elmnt_t *elmnt = (const varchunk_elmnt_t *)(varchunk->buf + tail);
+
+ // advance read tail
+ _varchunk_read_advance_raw(varchunk, tail,
+ sizeof(varchunk_elmnt_t) + VARCHUNK_PAD(elmnt->size));
+}
+
+#undef VARCHUNK_PAD
A subprojects/varchunk/test/test.c => subprojects/varchunk/test/test.c +242 -0
@@ 0,0 1,242 @@
+/*
+ * SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+ * SPDX-License-Identifier: Artistic-2.0
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <assert.h>
+
+#include <varchunk/varchunk.h>
+
+#if !defined(_WIN32)
+# include <sys/mman.h>
+# include <sys/stat.h>
+# include <fcntl.h>
+# include <string.h>
+# define VARCHUNK_USE_SHARED_MEM
+
+static const struct timespec req = {
+ .tv_sec = 0,
+ .tv_nsec = 1
+};
+#endif
+
+static uint64_t iterations = 10000000;
+#define THRESHOLD (RAND_MAX / 256)
+#define PAD(SIZE) ( ( (size_t)(SIZE) + 7U ) & ( ~7U ) )
+
+static void *
+producer_main(void *arg)
+{
+ varchunk_t *varchunk = arg;
+ uint8_t *ptr;
+ const uint8_t *end;
+ size_t written;
+ uint64_t cnt = 0;
+
+ while(cnt < iterations)
+ {
+#if !defined(_WIN32)
+ if(rand() < THRESHOLD)
+ {
+ nanosleep(&req, NULL);
+ }
+#endif
+
+ written = PAD(rand() * 1024.f / RAND_MAX);
+
+ size_t maximum;
+ if( (ptr = varchunk_write_request_max(varchunk, written, &maximum)) )
+ {
+ assert(maximum >= written);
+ end = ptr + written;
+ for(uint8_t *src=ptr; src<end; src+=sizeof(uint64_t))
+ {
+ *(uint64_t *)src = cnt;
+ assert(*(uint64_t *)src == cnt);
+ }
+ varchunk_write_advance(varchunk, written);
+ cnt++;
+ }
+ else
+ {
+ // buffer full
+ }
+ }
+
+ return NULL;
+}
+
+static void *
+consumer_main(void *arg)
+{
+ varchunk_t *varchunk = arg;
+ const uint8_t *ptr;
+ const uint8_t *end;
+ size_t toread;
+ uint64_t cnt = 0;
+
+ while(cnt < iterations)
+ {
+#if !defined(_WIN32)
+ if(rand() < THRESHOLD)
+ {
+ nanosleep(&req, NULL);
+ }
+#endif
+
+ if( (ptr = varchunk_read_request(varchunk, &toread)) )
+ {
+ end = ptr + toread;
+ for(const uint8_t *src=ptr; src<end; src+=sizeof(uint64_t))
+ {
+ assert(*(const uint64_t *)src == cnt);
+ }
+ varchunk_read_advance(varchunk);
+ cnt++;
+ }
+ else
+ {
+ // buffer empty
+ }
+ }
+
+ return NULL;
+}
+
+static void
+test_threaded()
+{
+ pthread_t producer;
+ pthread_t consumer;
+ varchunk_t *varchunk = varchunk_new(8192, true);
+ assert(varchunk);
+
+ pthread_create(&consumer, NULL, consumer_main, varchunk);
+ pthread_create(&producer, NULL, producer_main, varchunk);
+
+ pthread_join(producer, NULL);
+ pthread_join(consumer, NULL);
+
+ varchunk_free(varchunk);
+}
+
+#if defined(VARCHUNK_USE_SHARED_MEM)
+typedef struct _varchunk_shm_t varchunk_shm_t;
+
+struct _varchunk_shm_t {
+ char *name;
+ int fd;
+ varchunk_t *varchunk;
+};
+
+static int
+varchunk_shm_init(varchunk_shm_t *varchunk_shm, const char *name, size_t minimum, bool release_and_acquire)
+{
+ const size_t body_size = varchunk_body_size(minimum);
+ const size_t total_size = sizeof(varchunk_t) + body_size;
+
+ varchunk_shm->name = strdup(name);
+ if(!varchunk_shm->name)
+ {
+ return -1;
+ }
+
+ bool is_first = true;
+ varchunk_shm->fd = shm_open(varchunk_shm->name, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+ if(varchunk_shm->fd == -1)
+ {
+ is_first = false;
+ varchunk_shm->fd = shm_open(varchunk_shm->name, O_RDWR , S_IRUSR | S_IWUSR);
+ }
+ if(varchunk_shm->fd == -1)
+ {
+ free(varchunk_shm->name);
+ return -1;
+ }
+
+ if( (ftruncate(varchunk_shm->fd, total_size) == -1)
+ || ((varchunk_shm->varchunk = mmap(NULL, total_size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, varchunk_shm->fd, 0)) == MAP_FAILED) )
+ {
+ shm_unlink(varchunk_shm->name);
+ close(varchunk_shm->fd);
+ free(varchunk_shm->name);
+ return -1;
+ }
+
+ if(is_first)
+ {
+ varchunk_init(varchunk_shm->varchunk, body_size, release_and_acquire);
+ }
+
+ return 0;
+}
+
+static void
+varchunk_shm_deinit(varchunk_shm_t *varchunk_shm)
+{
+ const size_t total_size = sizeof(varchunk_t) + varchunk_shm->varchunk->size;
+
+ munmap(varchunk_shm->varchunk, total_size);
+ shm_unlink(varchunk_shm->name);
+ close(varchunk_shm->fd);
+ free(varchunk_shm->name);
+}
+
+static void
+test_shared()
+{
+ const char *name = "/varchunk_shm_test";
+ pid_t pid = fork();
+
+ assert(pid != -1);
+
+ if(pid == 0) // child
+ {
+ varchunk_shm_t varchunk_shm;
+ assert(varchunk_shm_init(&varchunk_shm, name, 8192, true) == 0);
+
+ consumer_main(varchunk_shm.varchunk);
+
+ varchunk_shm_deinit(&varchunk_shm);
+ }
+ else // parent
+ {
+ varchunk_shm_t varchunk_shm;
+ assert(varchunk_shm_init(&varchunk_shm, name, 8192, true) == 0);
+
+ producer_main(varchunk_shm.varchunk);
+
+ varchunk_shm_deinit(&varchunk_shm);
+ }
+}
+#endif
+
+int
+main(int argc, char **argv)
+{
+#if !defined(_WIN32)
+ const int seed = time(NULL);
+ srand(seed);
+#endif
+
+ if(argc >= 2)
+ {
+ iterations = atoi(argv[1]);
+ }
+
+ assert(varchunk_is_lock_free());
+
+ test_threaded();
+
+#if defined(VARCHUNK_USE_SHARED_MEM)
+ test_shared();
+#endif
+
+ return 0;
+}
A subprojects/varchunk/varchunk/varchunk.h => subprojects/varchunk/varchunk/varchunk.h +79 -0
@@ 0,0 1,79 @@
+/*
+ * SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+ * SPDX-License-Identifier: Artistic-2.0
+ */
+
+#ifndef _VARCHUNK_H
+#define _VARCHUNK_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+
+/*****************************************************************************
+ * API START
+ *****************************************************************************/
+
+typedef struct _varchunk_elmnt_t varchunk_elmnt_t;
+typedef struct _varchunk_t varchunk_t;
+
+struct _varchunk_elmnt_t {
+ uint32_t size;
+ uint32_t gap;
+};
+
+struct _varchunk_t {
+ size_t size;
+ size_t mask;
+ size_t rsvd;
+ size_t gapd;
+
+ memory_order acquire;
+ memory_order release;
+
+ atomic_size_t head;
+ atomic_size_t tail;
+
+ uint8_t buf [] __attribute__((aligned(sizeof(varchunk_elmnt_t))));
+};
+
+bool
+varchunk_is_lock_free(void);
+
+size_t
+varchunk_body_size(size_t minimum);
+
+varchunk_t *
+varchunk_new(size_t minimum, bool release_and_acquire);
+
+void
+varchunk_free(varchunk_t *varchunk);
+
+void
+varchunk_init(varchunk_t *varchunk, size_t body_size, bool release_and_acquire);
+
+void *
+varchunk_write_request_max(varchunk_t *varchunk, size_t minimum, size_t *maximum);
+
+void *
+varchunk_write_request(varchunk_t *varchunk, size_t minimum);
+
+void
+varchunk_write_advance(varchunk_t *varchunk, size_t written);
+
+const void *
+varchunk_read_request(varchunk_t *varchunk, size_t *toread);
+
+void
+varchunk_read_advance(varchunk_t *varchunk);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //_VARCHUNK_H