aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-10-28 18:23:41 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-10-28 18:23:41 +0000
commit4ec9db8e186675793f4d2a71cbeaf70882d65efa (patch)
tree92a40c9bed3d8e17593053c6a430eae784514f2d
parentrender worker context: allocate, and let worker threads free (diff)
term: no need to stack-allocate an array of worker contexts
-rw-r--r--terminal.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/terminal.c b/terminal.c
index 5c9c7b37..9aadd549 100644
--- a/terminal.c
+++ b/terminal.c
@@ -219,7 +219,6 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
int delay_upper_fd = -1;
struct terminal *term = NULL;
- struct render_worker_context *worker_context[conf->render_worker_count];
if ((ptmx = posix_openpt(O_RDWR | O_NOCTTY)) == -1) {
LOG_ERRNO("failed to open PTY");
@@ -341,12 +340,16 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
mtx_init(&term->render.workers.lock, mtx_plain);
cnd_init(&term->render.workers.cond);
- term->render.workers.threads = calloc(term->render.workers.count, sizeof(term->render.workers.threads[0]));
+ term->render.workers.threads = calloc(
+ term->render.workers.count, sizeof(term->render.workers.threads[0]));
+
for (size_t i = 0; i < term->render.workers.count; i++) {
- worker_context[i] = malloc(sizeof(*worker_context[i]));
- worker_context[i]->term = term;
- worker_context[i]->my_id = 1 + i;
- thrd_create(&term->render.workers.threads[i], &render_worker_thread, worker_context[i]);
+ struct render_worker_context *ctx = malloc(sizeof(*ctx));
+ *ctx = (struct render_worker_context) {
+ .term = term,
+ .my_id = 1 + i,
+ };
+ thrd_create(&term->render.workers.threads[i], &render_worker_thread, ctx);
}
font_list_t font_names = tll_init();