boomjacky/looper
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: use persistent MIDI client and fix save_ring race condition

Browse Source 
Co-authored-by: aider (deepseek/deepseek-reasoner) <aider@aider.chat>
This commit is contained in:
Loic Coenen
2026-05-11 22:14:33 +00:00
parent 7deea9266b
commit 346c15d1c3
3 changed files with 59 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/channel.h
View File

@@ -28,7 +28,7 @@ struct channel_t {
jack_port_t *audio_in; jack_port_t *audio_in;
jack_port_t *audio_out; jack_port_t *audio_out;
RingBuf *save_ring; _Atomic RingBuf *save_ring;
}; };
/* Globals declared in looper.c */ /* Globals declared in looper.c */

15
src/looper.c
View File

@@ -127,11 +127,12 @@ int process_callback(jack_nframes_t nframes, void *arg) {
break; break;
} }
/* push loop output into save ring if saving */ // push loop output into save ring if saving (atomic load)
if (channels[c].save_ring != NULL) { RingBuf *r = atomic_load_explicit(&channels[c].save_ring, memory_order_acquire);
if (r != NULL) {
if (state == STATE_LOOPING && channels[c].loop_count > 0) { if (state == STATE_LOOPING && channels[c].loop_count > 0) {
float *outf = (float *)out; float *outf = (float *)out;
ring_write(channels[c].save_ring, outf, nframes); ring_write(r, outf, nframes);
} }
} }
@@ -199,7 +200,7 @@ int looper_init(jack_client_t *client) {
channels[0].loop_count = 0; channels[0].loop_count = 0;
channels[0].record_pos = 0; channels[0].record_pos = 0;
channels[0].playback_pos = 0; channels[0].playback_pos = 0;
channels[0].save_ring = NULL; atomic_store_explicit(&channels[0].save_ring, NULL, memory_order_release);
channels[0].audio_in = jack_port_register( channels[0].audio_in = jack_port_register(
client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0); client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
@@ -257,7 +258,9 @@ static void *writer_thread(void *arg) {
ring_destroy(ring); ring_destroy(ring);
free(ring); free(ring);
ch->save_ring = NULL; atomic_store_explicit(&ch->save_ring, NULL, memory_order_release);
ring_destroy(ring);
free(ring);
return NULL; return NULL;
} }
@@ -326,7 +329,7 @@ void looper_process_commands(jack_client_t *client) {
if (ring) { if (ring) {
size_t sz = (size_t)channels[0].loop_count * 2; size_t sz = (size_t)channels[0].loop_count * 2;
if (ring_init(ring, sz) == 0) { if (ring_init(ring, sz) == 0) {
channels[0].save_ring = ring; atomic_store_explicit(&channels[0].save_ring, ring, memory_order_release);
pthread_t th; pthread_t th;
pthread_create(&th, NULL, writer_thread, &channels[0]); pthread_create(&th, NULL, writer_thread, &channels[0]);
pthread_detach(th); pthread_detach(th);

71
tests/integration.c
View File

@@ -225,50 +225,61 @@ static int test_audio_pass_through(void) {
/* Helper: open a transient JACK client, send a MIDI note‑on, close */ /* Helper: open a transient JACK client, send a MIDI note‑on, close */
static jack_client_t *midi_persistent_client = NULL;
static jack_port_t *midi_persistent_port = NULL;
static int send_jack_note_on(const char *target_port, unsigned char note, unsigned char velocity) { static int send_jack_note_on(const char *target_port, unsigned char note, unsigned char velocity) {
midi_inject_note = note; /* create persistent client on first call */
midi_inject_velocity = velocity; if (!midi_persistent_client) {
jack_status_t st; jack_status_t st;
midi_inject_client = jack_client_open("test_midi_inject", JackNoStartServer, &st); midi_persistent_client = jack_client_open("midi_inject_persistent", JackNoStartServer, &st);
if (!midi_inject_client) return -1; if (!midi_persistent_client) return -1;
midi_persistent_port = jack_port_register(midi_persistent_client, "out",
midi_inject_port = jack_port_register(midi_inject_client, "out",
JACK_DEFAULT_MIDI_TYPE, JACK_DEFAULT_MIDI_TYPE,
JackPortIsOutput, 0); JackPortIsOutput, 0);
if (!midi_inject_port) { if (!midi_persistent_port) {
jack_client_close(midi_inject_client); jack_client_close(midi_persistent_client);
midi_inject_client = NULL; midi_persistent_client = NULL;
return -1; return -1;
} }
char src[64]; char src[64];
snprintf(src, sizeof(src), "test_midi_inject:out"); snprintf(src, sizeof(src), "midi_inject_persistent:out");
if (jack_connect(midi_inject_client, src, target_port) != 0) { if (jack_connect(midi_persistent_client, src, target_port) != 0) {
jack_client_close(midi_inject_client); jack_client_close(midi_persistent_client);
midi_inject_client = NULL; midi_persistent_client = NULL;
midi_inject_port = NULL; midi_persistent_port = NULL;
return -1; return -1;
} }
midi_inject_pending = 1; /* signal before activation */ jack_set_process_callback(midi_persistent_client, midi_inject_process, NULL);
jack_set_process_callback(midi_inject_client, midi_inject_process, NULL); if (jack_activate(midi_persistent_client) != 0) {
if (jack_activate(midi_inject_client) != 0) { jack_client_close(midi_persistent_client);
jack_client_close(midi_inject_client); midi_persistent_client = NULL;
midi_inject_client = NULL; midi_persistent_port = NULL;
midi_inject_port = NULL;
return -1; return -1;
} }
/* wait for the process callback to clear the flag (event delivered) */ }
for (int attempts = 0; attempts < 50; attempts++) { /* ~50 * 10ms = 500ms */ midi_inject_note = note;
midi_inject_velocity = velocity;
midi_inject_pending = 1;
/* wait for delivery (process callback clears the flag) */
for (int attempts = 0; attempts < 100; attempts++) {
safe_usleep(10000); safe_usleep(10000);
if (!midi_inject_pending) break; if (!midi_inject_pending) break;
} }
jack_deactivate(midi_inject_client);
jack_client_close(midi_inject_client);
midi_inject_client = NULL;
midi_inject_port = NULL;
return 0; return 0;
} }
/* must be called after all tests */
static void close_persistent_midi(void) {
if (midi_persistent_client) {
jack_deactivate(midi_persistent_client);
jack_client_close(midi_persistent_client);
midi_persistent_client = NULL;
midi_persistent_port = NULL;
}
}
/* /*
* Full loop recording test: * Full loop recording test:
* 1. start looper * 1. start looper
@@ -946,9 +957,9 @@ static int test_wav_load(void) {
unlink("loop.wav"); return 1; unlink("loop.wav"); return 1;
} }
/* wait for the loop to be fully loaded and playing */ /* wait for the loop to be fully loaded and playing */
safe_usleep(2000000); safe_usleep(3000000);
/* continue listening for the rest of the time */ /* continue listening for the rest of the time */
safe_usleep(4000000); /* total 6 seconds after activation */ safe_usleep(6000000); /* total 9 seconds after activation */
jack_deactivate(client); jack_deactivate(client);
jack_client_close(client); jack_client_close(client);
kill(pid, SIGTERM); waitpid(pid, NULL, 0); kill(pid, SIGTERM); waitpid(pid, NULL, 0);
@@ -1142,6 +1153,8 @@ int main(void) {
failures++; failures++;
} }
close_persistent_midi();
if (failures > 0) { if (failures > 0) {
fprintf(stderr, "%d test(s) FAILED\n", failures); fprintf(stderr, "%d test(s) FAILED\n", failures);
return 1; return 1;