Update driver to use rte thread API where available instead of pthread as a prerequisite to removing pthread stubs on Windows.
Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com> --- drivers/net/iavf/iavf_vchnl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 9adaadb..7a2be22 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -42,7 +42,7 @@ struct iavf_event_element { struct iavf_event_handler { uint32_t ndev; - pthread_t tid; + rte_thread_t tid; int fd[2]; pthread_mutex_t lock; TAILQ_HEAD(event_list, iavf_event_element) pending; @@ -59,7 +59,7 @@ struct iavf_event_handler { (var) = (tvar)) #endif -static void * +static uint32_t iavf_dev_event_handle(void *param __rte_unused) { struct iavf_event_handler *handler = &event_handler; @@ -84,7 +84,7 @@ struct iavf_event_handler { } } - return NULL; + return 0; } static void @@ -135,7 +135,7 @@ struct iavf_event_handler { TAILQ_INIT(&handler->pending); pthread_mutex_init(&handler->lock, NULL); - if (rte_ctrl_thread_create(&handler->tid, "iavf-event-thread", + if (rte_thread_create_control(&handler->tid, "iavf-event-thread", NULL, iavf_dev_event_handle, NULL)) { __atomic_sub_fetch(&handler->ndev, 1, __ATOMIC_RELAXED); return -1; @@ -152,14 +152,14 @@ struct iavf_event_handler { if (__atomic_sub_fetch(&handler->ndev, 1, __ATOMIC_RELAXED) != 0) return; - int unused = pthread_cancel(handler->tid); + int unused = pthread_cancel((pthread_t)handler->tid.opaque_id); RTE_SET_USED(unused); close(handler->fd[0]); close(handler->fd[1]); handler->fd[0] = -1; handler->fd[1] = -1; - pthread_join(handler->tid, NULL); + rte_thread_join(handler->tid, NULL); pthread_mutex_destroy(&handler->lock); struct iavf_event_element *pos, *save_next; -- 1.8.3.1