From patchwork Fri Mar 17 22:34:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125244 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D385241EC5; Fri, 17 Mar 2023 23:35:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50ED343018; Fri, 17 Mar 2023 23:34:55 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 7FA1342FFC for ; Fri, 17 Mar 2023 23:34:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id C8E812057BEC; Fri, 17 Mar 2023 15:34:48 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C8E812057BEC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679092488; bh=I/q+WmM7gq5ainbAJ/uAVTa+nptKRgKvJUTv9GhDpLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hf6ki4D+5lsep/STf2NmNXsxpPxaPrQwTduorSEiHwPzwSWbvyz+QOF6RDm9C3Hd5 KohSbgpdKU8u3myBsCt1nH6/tJzo9U/L1TP1JeWCF5AbP59E2yVLc7HY8eNKk0p83Y HlpXMyONYBuTINbsYSa86d/5ShN/w1JN/bHk/A/g= From: Tyler Retzlaff To: dev@dpdk.org Cc: thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 4/6] net/iavf: use rte thread API Date: Fri, 17 Mar 2023 15:34:18 -0700 Message-Id: <1679092460-9930-5-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679092460-9930-1-git-send-email-roretzla@linux.microsoft.com> References: <1679092460-9930-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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;