diff options
author | Vito Caputo <vcaputo@pengaru.com> | 2023-01-19 21:00:40 -0800 |
---|---|---|
committer | Vito Caputo <vcaputo@pengaru.com> | 2023-01-20 00:20:15 -0800 |
commit | 5e647dee95763d8f628bdc771a32c5d33c51d78a (patch) | |
tree | 399fcda4edda0a9c5017aff784b09c80110804f9 /src/modules/swarm | |
parent | 729ea9c0f2d6a9caa27f17c05e0c26560a8f07e1 (diff) |
til: pass module to .context_create()/til_module_context_new()
Let's make it so til_module_context_t as returned from
til_module_context_new() can immediately be freed via
til_module_context_free().
Previously it was only after the context propagated out to
til_module_context_create() that it could be freed that way, as
that was where the module member was being assigned.
With this change, and wiring up the module pointer into
til_module_t.create_context() as well for convenient providing to
til_module_context_new(), til_module_t.create_context() error
paths can easily cleanup via `return til_module_context_free()`
But this does require the til_module_t.destroy_context() be able
to safely handle partially constructed contexts, since the
mid-create failure freeing won't necessarily have all the members
initialized. There will probably be some NULL derefs to fix up,
but at least the contexts are zero-initialized @ new.
Diffstat (limited to 'src/modules/swarm')
-rw-r--r-- | src/modules/swarm/swarm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/swarm/swarm.c b/src/modules/swarm/swarm.c index 5a58210..e1b9640 100644 --- a/src/modules/swarm/swarm.c +++ b/src/modules/swarm/swarm.c @@ -181,14 +181,14 @@ static inline uint32_t color_to_uint32(v3f_t color) { } -static til_module_context_t * swarm_create_context(til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, char *path, til_setup_t *setup) +static til_module_context_t * swarm_create_context(const til_module_t *module, til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, char *path, til_setup_t *setup) { swarm_context_t *ctxt; if (!setup) setup = &swarm_default_setup.til_setup; - ctxt = til_module_context_new(stream, sizeof(swarm_context_t) + sizeof(*(ctxt->boids)) * SWARM_SIZE, seed, ticks, n_cpus, path); + ctxt = til_module_context_new(module, sizeof(swarm_context_t) + sizeof(*(ctxt->boids)) * SWARM_SIZE, stream, seed, ticks, n_cpus, path); if (!ctxt) return NULL; |