mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-20 05:33:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

thrd_create(): handle errors correctly

Browse source 
* Detect thrd_create() failures in all places where we instantiate
  threads
* Log error correctl; thrd_create() does not return an errno value
This commit is contained in:
Daniel Eklöf 2020-05-03 12:25:04 +02:00
parent dd3f43d65c
commit 7525fa20c2
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

44
terminal.c
View file

@ -497,9 +497,10 @@ initialize_render_workers(struct terminal *term)
int ret = thrd_create( int ret = thrd_create(
&term->render.workers.threads[i], &render_worker_thread, ctx); &term->render.workers.threads[i], &render_worker_thread, ctx);
if (ret != 0) { if (ret != 0) {
LOG_ERRNO_P("failed to create render worker thread", ret);
LOG_ERR("failed to create render worker thread: %s (%d)",
thrd_err_as_string(ret), ret);
term->render.workers.threads[i] = 0; term->render.workers.threads[i] = 0;
return false; return false;
} }
@ -660,15 +661,24 @@ load_fonts_from_conf(const struct terminal *term, const struct config *conf,
{count, names, attrs3, &fonts[3]}, {count, names, attrs3, &fonts[3]},
}; };
thrd_t tids[4]; thrd_t tids[4] = {};
for (size_t i = 0; i < 4; i++) for (size_t i = 0; i < 4; i++) {
thrd_create(&tids[i], &font_loader_thread, &data[i]); int ret = thrd_create(&tids[i], &font_loader_thread, &data[i]);
if (ret != 0) {
LOG_ERR("failed to create font loader thread: %s (%d)",
thrd_err_as_string(ret), ret);
break;
}
}
bool success = true; bool success = true;
for (size_t i = 0; i < 4; i++) { for (size_t i = 0; i < 4; i++) {
int ret; if (tids[i] != 0) {
thrd_join(tids[i], &ret); int ret;
success = success && ret; thrd_join(tids[i], &ret);
success = success && ret;
} else
success = false;
} }
if (!success) { if (!success) {
@ -1352,12 +1362,20 @@ term_font_size_adjust(struct terminal *term, double amount)
{term->fonts[3], amount}, {term->fonts[3], amount},
}; };
thrd_t tids[4]; thrd_t tids[4] = {};
for (size_t i = 0; i < 4; i++) for (size_t i = 0; i < 4; i++) {
thrd_create(&tids[i], &font_size_adjust_thread, &data[i]); int ret = thrd_create(&tids[i], &font_size_adjust_thread, &data[i]);
if (ret != 0) {
LOG_ERR("failed to create font adjustmen thread: %s (%d)",
thrd_err_as_string(ret), ret);
break;
}
}
for (size_t i = 0; i < 4; i++) for (size_t i = 0; i < 4; i++) {
thrd_join(tids[i], NULL); if (tids[i] != 0)
thrd_join(tids[i], NULL);
}
if (data[0].font_out == NULL || data[1].font_out == NULL || if (data[0].font_out == NULL || data[1].font_out == NULL ||
data[2].font_out == NULL || data[3].font_out == NULL) data[2].font_out == NULL || data[3].font_out == NULL)