paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad memory management around device threading model

This commit is contained in:
Paul Dino Jones 2025-01-16 16:45:37 -05:00
parent f90b173e8c
commit 6145efd2a9
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/monocoque/devices/sound/usb_generic_shaker_pulse.c
View File

@ -109,6 +109,7 @@ int usb_generic_shaker_free(SoundDevice* sounddevice)
int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop, pa_context* context, const char* devname, int volume, int pan, int channels, const char* streamname) int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop, pa_context* context, const char* devname, int volume, int pan, int channels, const char* streamname)
{ {
pa_threaded_mainloop_lock(mainloop);
pa_stream *stream; pa_stream *stream;
// Create a playback stream // Create a playback stream
@ -181,10 +182,9 @@ int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* main
pa_threaded_mainloop_wait(mainloop); pa_threaded_mainloop_wait(mainloop);
} }
//pa_threaded_mainloop_unlock(mainloop);
// Uncork the stream so it will start playing // Uncork the stream so it will start playing
pa_stream_cork(stream, 0, stream_success_cb, mainloop); pa_stream_cork(stream, 0, stream_success_cb, mainloop);
pa_threaded_mainloop_unlock(mainloop);
sounddevice->stream = stream; sounddevice->stream = stream;
return 0; return 0;

36
src/monocoque/gameloop/gameloop.c
View File

@ -251,22 +251,22 @@ void looprun(MonocoqueSettings* ms, loop_data* f, SimData* simdata)
settingsfree(ds[i]); settingsfree(ds[i]);
} }
free(ds); free(ds);
doui = false;
int numdevices = f->numdevices; int numdevices = f->numdevices;
SimDevice* devices = f->simdevices; SimDevice* devices = f->simdevices;
f->device_timers = (malloc(uv_handle_size(UV_TIMER) * numdevices)); f->device_timers = (uv_timer_t*) (malloc(uv_handle_size(UV_TIMER) * numdevices));
f->device_batons = (malloc(sizeof(device_loop_data) * numdevices)); f->device_batons = (device_loop_data*) (malloc(sizeof(device_loop_data) * numdevices));
for (int x = 0; x < numdevices; x++) for (int x = 0; x < numdevices; x++)
{ {
if (devices[x].initialized == true && devices[x].type != 2) if (devices[x].initialized == true)
{ {
device_loop_data* dld = f->device_batons + (sizeof(device_loop_data) * x); device_loop_data* dld = &f->device_batons[x];
dld->simdevice = &devices[x]; dld->simdevice = &devices[x];
dld->simdata = simdata; dld->simdata = simdata;
uv_timer_t* dt = (f->device_timers + (uv_handle_size(UV_TIMER) * x)); uv_timer_t* dt = &f->device_timers[x];
uv_timer_init(uv_default_loop(), dt); uv_timer_init(uv_default_loop(), dt);
uv_handle_set_data((uv_handle_t*) dt, (void*) dld); uv_handle_set_data((uv_handle_t*) dt, (void*) dld);
int interval = 1000/devices[x].fps; int interval = 1000/devices[x].fps;
@ -274,19 +274,21 @@ void looprun(MonocoqueSettings* ms, loop_data* f, SimData* simdata)
slogi("starting device at %i fps (%i ms ticks)", devices[x].fps, interval); slogi("starting device at %i fps (%i ms ticks)", devices[x].fps, interval);
} }
} }
doui = false;
} }
else else
{ {
showstats(simdata); showstats(simdata);
SimDevice* devices = f->simdevices; //SimDevice* devices = f->simdevices;
int numdevices = f->numdevices; //int numdevices = f->numdevices;
for (int x = 0; x < numdevices; x++) //for (int x = 0; x < numdevices; x++)
{ //{
if (devices[x].initialized == true && devices[x].type == 2) // if (devices[x].initialized == true && devices[x].type == 2)
{ // {
devices[x].update(&devices[x], simdata); // devices[x].update(&devices[x], simdata);
} // }
} //}
} }
} }
@ -321,9 +323,9 @@ void shmdatamapcallback(uv_timer_t* handle)
for (int x = 0; x < numdevices; x++) for (int x = 0; x < numdevices; x++)
{ {
if (devices[x].initialized == true && devices[x].type != 2) if (devices[x].initialized == true)
{ {
uv_timer_t* dt = (uv_timer_t*) f->device_timers + (uv_handle_size(UV_TIMER) * x); uv_timer_t* dt = &f->device_timers[x];
slogt("attempting device timer stop and release"); slogt("attempting device timer stop and release");
slogt("timer active status %i", uv_is_active((uv_handle_t*) dt)); slogt("timer active status %i", uv_is_active((uv_handle_t*) dt));
uv_timer_stop(dt); uv_timer_stop(dt);