diff options
| -rw-r--r-- | src/til.c | 35 | ||||
| -rw-r--r-- | src/til.h | 1 |
2 files changed, 26 insertions, 10 deletions
@@ -266,31 +266,46 @@ void til_module_render(til_module_context_t *context, til_stream_t *stream, unsi * the purpose of explicitly constraining rendering parallelization to less than n_threads, * if n_cpus is specified > n_threads it won't increase n_threads... */ -int til_module_create_context(const til_module_t *module, til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, til_setup_t *setup, til_module_context_t **res_context) +int til_module_create_contexts(const til_module_t *module, til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, til_setup_t *setup, size_t n_contexts, til_module_context_t **res_contexts) { - til_module_context_t *context; assert(module); assert(setup); /* we *always* want a setup, even if the module has no setup() method - for the path */ - assert(res_context); + assert(n_contexts > 0); + assert(res_contexts); if (!n_cpus) n_cpus = til_threads_num_threads(til_threads); - if (!module->create_context) - context = til_module_context_new(module, sizeof(til_module_context_t), stream, seed, ticks, n_cpus, setup); - else - context = module->create_context(module, stream, seed, ticks, n_cpus, setup); + for (size_t i = 0; i < n_contexts; i++) { + til_module_context_t *context; + + if (!module->create_context) + context = til_module_context_new(module, sizeof(til_module_context_t), stream, seed, ticks, n_cpus, setup); + else + context = module->create_context(module, stream, seed, ticks, n_cpus, setup); + + if (!context) { + for (size_t j = 0; j < i; j++) + res_contexts[j] = til_module_context_free(res_contexts[j]); - if (!context) - return -ENOMEM; + return -ENOMEM; + } - *res_context = context; + res_contexts[i] = context; + } return 0; } +/* convenience single-context wrapper around til_module_create_contexts(), as most callers need just one. */ +int til_module_create_context(const til_module_t *module, til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, til_setup_t *setup, til_module_context_t **res_context) +{ + return til_module_create_contexts(module, stream, seed, ticks, n_cpus, setup, 1, res_context); +} + + /* select module if not yet selected, then setup the module. */ int til_module_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup) { @@ -44,6 +44,7 @@ const til_module_t * til_lookup_module(const char *name); void til_get_modules(const til_module_t ***res_modules, size_t *res_n_modules); char * til_get_module_names(unsigned flags_excluded, const char **exclusions); void til_module_render(til_module_context_t *context, til_stream_t *stream, unsigned ticks, til_fb_fragment_t **fragment_ptr); +int til_module_create_contexts(const til_module_t *module, til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, til_setup_t *setup, size_t n_contexts, til_module_context_t **res_contexts); int til_module_create_context(const til_module_t *module, til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, til_setup_t *setup, til_module_context_t **res_context); til_module_context_t * til_module_destroy_context(til_module_context_t *context, til_stream_t *stream); int til_module_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup); |