summaryrefslogtreecommitdiff
path: root/src/modules/flui2d
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-04-01 17:47:19 -0700
committerVito Caputo <vcaputo@pengaru.com>2022-04-01 17:59:03 -0700
commit6b8790a22c38e0d5419eb5a4dac5e30f684ae473 (patch)
tree444ac5369c34a705cd302862928ccad237d68bfe /src/modules/flui2d
parent78c275b094b63e01a5f7bc71af80fe787911bbf4 (diff)
modules/*: instantiate and use setups
Now modules allocate and return an opaque setup pointer in res_setup when they implement a setup method. Defaults are utilized when ${module}_create_context() receives a NULL setup. The default setup used in this case should match the defaults/preferred values emitted by the module's setup method. But performing setup should always be optional, so a NULL setup provided to create_context() is to be expected. No cleanup of these setup instances is currently performed, so it's a small memory leak for now. Since these are opaque and may contain nested references to other allocations, simply using free() somewhere in the frontend is insufficient. There will probably need to be something like a til_module_t.setup_free() method added in the future which modules may assign libc's free() to when appropriate, or their own more elaborate version. Lifecycle for the settings is very simple; the setup method returns an instance, the caller is expected to free it when no longer needed (once free is implemented). The create_context consumer of a given setup must make its own copy of the settings if necessary, and may not keep a reference - it must assume the setup will be freed immediately after create_context() returns. This enables the ability to reuse a setup instance across multiple create_context() calls if desired, one can imagine something like running the same module with the same settings multiple times across multiple displays for instance. If the module has significant entropy the output will differ despite being configured identically... With this commit one may change settings for any of the modules *while* the modules are actively rendering a given context, and the settings should *not* be visible. They should only affect the context they're supplied to.
Diffstat (limited to 'src/modules/flui2d')
-rw-r--r--src/modules/flui2d/flui2d.c51
1 files changed, 37 insertions, 14 deletions
diff --git a/src/modules/flui2d/flui2d.c b/src/modules/flui2d/flui2d.c
index cf6024b..d5b3b72 100644
--- a/src/modules/flui2d/flui2d.c
+++ b/src/modules/flui2d/flui2d.c
@@ -27,10 +27,6 @@
#define IX(i, j) ((i) + (ROOT + 2) * (j))
#define SWAP(x0, x) {float *tmp = x0; x0 = x; x = tmp;}
-static float flui2d_viscosity = DEFAULT_VISCOSITY;
-static float flui2d_diffusion = DEFAULT_DIFFUSION;
-static float flui2d_decay = DEFAULT_DECAY;
-
typedef struct flui2d_t {
float u[SIZE], v[SIZE], u_prev[SIZE], v_prev[SIZE];
float dens[SIZE], dens_prev[SIZE];
@@ -184,18 +180,33 @@ typedef struct flui2d_context_t {
float xf, yf;
} flui2d_context_t;
+typedef struct flui2d_setup_t {
+ float viscosity;
+ float diffusion;
+ float decay;
+} flui2d_setup_t;
+
+static flui2d_setup_t flui2d_default_setup = {
+ .viscosity = DEFAULT_VISCOSITY,
+ .diffusion = DEFAULT_DIFFUSION,
+ .decay = DEFAULT_DECAY,
+};
+
static void * flui2d_create_context(unsigned ticks, unsigned num_cpus, void *setup)
{
flui2d_context_t *ctxt;
+ if (!setup)
+ setup = &flui2d_default_setup;
+
ctxt = calloc(1, sizeof(flui2d_context_t));
if (!ctxt)
return NULL;
- ctxt->fluid.visc = flui2d_viscosity;
- ctxt->fluid.diff = flui2d_diffusion;
- ctxt->fluid.decay = flui2d_decay;
+ ctxt->fluid.visc = ((flui2d_setup_t *)setup)->viscosity;
+ ctxt->fluid.diff = ((flui2d_setup_t *)setup)->diffusion;
+ ctxt->fluid.decay = ((flui2d_setup_t *)setup)->decay;
return ctxt;
}
@@ -354,14 +365,26 @@ static int flui2d_setup(const til_settings_t *settings, til_setting_t **res_sett
if (r)
return r;
- /* TODO: return -EINVAL on parse errors? */
- sscanf(viscosity, "%f", &flui2d_viscosity);
- sscanf(diffusion, "%f", &flui2d_diffusion);
- sscanf(decay, "%f", &flui2d_decay);
+ if (res_setup) {
+ flui2d_setup_t *setup;
- /* prevent overflow in case an explicit out of range setting is supplied */
- if (flui2d_decay > 1.f || flui2d_decay < 0.f)
- return -EINVAL;
+ setup = calloc(1, sizeof(*setup));
+ if (!setup)
+ return -ENOMEM;
+
+ /* TODO: return -EINVAL on parse errors? */
+ sscanf(viscosity, "%f", &setup->viscosity);
+ sscanf(diffusion, "%f", &setup->diffusion);
+ sscanf(decay, "%f", &setup->decay);
+
+ /* prevent overflow in case an explicit out of range setting is supplied */
+ if (setup->decay > 1.f || setup->decay < 0.f) {
+ free(setup);
+ return -EINVAL;
+ }
+
+ *res_setup = setup;
+ }
return 0;
}
© All Rights Reserved