async,main: make re_thread_async itself thread safe

baresip · Jan 11, 2023 · 755ea46 · 755ea46
1 parent a1e31bf
commit 755ea46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/async/async.c b/src/async/async.c
@@ -225,10 +225,13 @@ int re_async(struct re_async *async, re_async_work_h *workh, re_async_h *cb,
 	if (unlikely(!async))
 		return EINVAL;
 
+	mtx_lock(&async->mtx);
 	if (unlikely(list_isempty(&async->freel))) {
 		async_work = mem_zalloc(sizeof(struct async_work), NULL);
-		if (!async_work)
-			return ENOMEM;
+		if (!async_work) {
+			err = ENOMEM;
+			goto out;
+		}
 	}
 	else {
 		async_work = list_head(&async->freel)->data;
@@ -239,9 +242,10 @@ int re_async(struct re_async *async, re_async_work_h *workh, re_async_h *cb,
 	async_work->cb	  = cb;
 	async_work->arg	  = arg;
 
-	mtx_lock(&async->mtx);
 	list_append(&async->workl, &async_work->le, async_work);
 	cnd_signal(&async->wait);
+
+out:
 	mtx_unlock(&async->mtx);
 
 	return err;

diff --git a/src/main/main.c b/src/main/main.c
@@ -1540,11 +1540,5 @@ int re_thread_async(re_async_work_h *work, re_async_h *cb, void *arg)
 			return err;
 	}
 
-#ifndef RELEASE
-	err = re_thread_check();
-	if (err)
-		return err;
-#endif
-
 	return re_async(re->async, work, cb, arg);
 }