Module Name: src
Committed By: christos
Date: Sun Oct 13 21:32:07 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctfmerge.c
Log Message:
make worker thread prototype match the pthread_create signature.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.16 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.17
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.16 Mon May 28 17:05:06 2018
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Sun Oct 13 17:32:07 2019
@@ -528,9 +528,10 @@ worker_runphase2(workqueue_t *wq)
/*
* Main loop for worker threads.
*/
-static void
-worker_thread(workqueue_t *wq)
+static void *
+worker_thread(void *v)
{
+ workqueue_t *wq = v;
worker_runphase1(wq);
debug(2, "0x%jx: entering first barrier\n",
@@ -559,6 +560,7 @@ worker_thread(workqueue_t *wq)
(uintmax_t)(uintptr_t)pthread_self());
worker_runphase2(wq);
+ return NULL;
}
/*
@@ -728,8 +730,7 @@ start_threads(workqueue_t *wq)
pthread_sigmask(SIG_BLOCK, &sets, NULL);
for (i = 0; i < wq->wq_nthreads; i++) {
- pthread_create(&wq->wq_thread[i], NULL,
- (void *(*)(void *))worker_thread, wq);
+ pthread_create(&wq->wq_thread[i], NULL, worker_thread, wq);
}
#ifdef illumos
