From 9f9f9eaa096e6be8c1613014868e919d6991b188 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sun, 24 Apr 2022 19:24:47 -0700 Subject: *: s/void */til_setup_t */ This brings something resembling an actual type to the private objects returrned in *res_setup. Internally libtil/rototiller wants this to be a til_setup_t, and it's up to the private users of what's returned in *res_setup to embed this appropriately and either use container_of() or casting when simply embedded at the start to go between til_setup_t and their private containing struct. Everywhere *res_setup was previously allocated using calloc() is now using til_setup_new() with a free_func, which til_setup_new() will initialize appropriately. There's still some remaining work to do with the supplied free_func in some modules, where free() isn't quite appropriate. Setup freeing isn't actually being performed yet, but this sets the foundation for that to happen in a subsequent commit that cleans up the setup leaks. Many modules use a static default setup for when no setup has been provided. In those cases, the free_func would be NULL, which til_setup_new() refuses to do. When setup freeing actually starts happening, it'll simply skip freeing when til_setup_t.free_func is NULL. --- src/til.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/til.h') diff --git a/src/til.h b/src/til.h index 572f408..42cbcf2 100644 --- a/src/til.h +++ b/src/til.h @@ -2,6 +2,7 @@ #define _TIL_H #include "til_fb.h" +#include "til_setup.h" /* til_fragmenter produces fragments from an input fragment, num being the desired fragment for the current call. * return value of 1 means a fragment has been produced, 0 means num is beyond the end of fragments. */ @@ -12,12 +13,12 @@ typedef struct til_setting_desc_t til_setting_desc_t; typedef struct til_knob_t til_knob_t; typedef struct til_module_t { - void * (*create_context)(unsigned ticks, unsigned n_cpus, void *setup); + void * (*create_context)(unsigned ticks, unsigned n_cpus, til_setup_t *setup); void (*destroy_context)(void *context); void (*prepare_frame)(void *context, unsigned ticks, unsigned n_cpus, til_fb_fragment_t *fragment, til_fragmenter_t *res_fragmenter); void (*render_fragment)(void *context, unsigned ticks, unsigned cpu, til_fb_fragment_t *fragment); void (*finish_frame)(void *context, unsigned ticks, til_fb_fragment_t *fragment); - int (*setup)(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, void **res_setup); + int (*setup)(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup); size_t (*knobs)(void *context, til_knob_t **res_knobs); char *name; char *description; @@ -30,9 +31,9 @@ void til_shutdown(void); 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); void til_module_render(const til_module_t *module, void *context, unsigned ticks, til_fb_fragment_t *fragment); -int til_module_create_context(const til_module_t *module, unsigned ticks, void *setup, void **res_context); +int til_module_create_context(const til_module_t *module, unsigned ticks, til_setup_t *setup, void **res_context); void * til_module_destroy_context(const til_module_t *module, void *context); -int til_module_setup(til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, void **res_setup); -int til_module_randomize_setup(const til_module_t *module, void **res_setup, char **res_arg); +int til_module_setup(til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup); +int til_module_randomize_setup(const til_module_t *module, til_setup_t **res_setup, char **res_arg); #endif -- cgit v1.2.1