Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46A9BC3ABC9 for ; Fri, 16 May 2025 16:06:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F2A1310EB21; Fri, 16 May 2025 16:06:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="NhKhbwcL"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6956910EB20 for ; Fri, 16 May 2025 16:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747411597; x=1778947597; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y1P4GDY1F9w600Xhx1kCzE1tvdjxAjPuNGWC8t/4auQ=; b=NhKhbwcLLxC+qyEJ9sEDIWZ0BTZEQfRmdJrtkdXcoMLJu6AgMpaOpbXV 59j40fs0S/F6ow6AjDwrNGIClvmnh++ErqCW2TKCTkMe6LFjOMBklwK71 QsWGu7geRnUKI6NFAeKbKynKDb2h3nSbu4bBq88AcuB+qBd4YagGl9NQt 7EYxE0HmcWIKD36DXHWvEqr2ZRsObljJ5pca5ESWPJNfXDza3lUrmgMea wMuGAdRRKY1ti45ktRZqYDPOYzZyCiR44lwoHGPmzGo/bq0l8zRCrmBn7 F0tBjtW4zzy3+dN+Ubs9V16LKl5NN9NxWbwxpXtZfoLp3LehM2nZ9r/xe Q==; X-CSE-ConnectionGUID: Kulb3ImRQEemuxKawm65rg== X-CSE-MsgGUID: yYhpDmAATDOm2lpR77fPyw== X-IronPort-AV: E=McAfee;i="6700,10204,11435"; a="66941143" X-IronPort-AV: E=Sophos;i="6.15,294,1739865600"; d="scan'208";a="66941143" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2025 09:06:37 -0700 X-CSE-ConnectionGUID: pa/srvopSImmDD9Dl+QV8A== X-CSE-MsgGUID: Lyyl8WzSTZCd4B2tdXq+rQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,294,1739865600"; d="scan'208";a="169772584" Received: from unknown (HELO d368ed45d7ae.iind.intel.com) ([10.66.234.123]) by fmviesa001.fm.intel.com with ESMTP; 16 May 2025 09:06:34 -0700 From: Jeevaka Prabu Badrappan To: igt-dev@lists.freedesktop.org Cc: zbigniew.kempczynski@intel.com, kamil.konieczny@intel.com, markyacoub@google.com, seanpaul@google.com, carlos.santa@intel.com, sapna1.singh@intel.com, Jeevaka Prabu Badrappan Subject: [PATCH i-g-t v6 08/14] lib/xe/xe_spin: Avoid pthread_cancel use by introducing an exit flag Date: Fri, 16 May 2025 16:05:45 +0000 Message-ID: <20250516160551.58760-9-jeevaka.badrappan@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250516160551.58760-1-jeevaka.badrappan@intel.com> References: <20250516160551.58760-1-jeevaka.badrappan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Android build fails due to pthread_cancel unavailability. Replace pthread_cancel with thread exit based on an exit flag. Signed-off-by: Jeevaka Prabu Badrappan --- lib/xe/xe_spin.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/xe/xe_spin.c b/lib/xe/xe_spin.c index a92903b6b..23f1dfbfd 100644 --- a/lib/xe/xe_spin.c +++ b/lib/xe/xe_spin.c @@ -7,6 +7,7 @@ */ #include +#include #include "drmtest.h" #include "igt.h" @@ -264,7 +265,16 @@ void xe_spin_free(int fd, struct igt_spin *spin) igt_assert(spin->driver == INTEL_DRIVER_XE); if (spin->timerfd >= 0) { +#ifdef ANDROID + struct itimerspec its; + + memset(&its, 0, sizeof(its)); + its.it_value.tv_sec = 0; + its.it_value.tv_nsec = 1; + timerfd_settime(spin->timerfd, 0, &its, NULL); +#else pthread_cancel(spin->timer_thread); +#endif igt_assert(pthread_join(spin->timer_thread, NULL) == 0); close(spin->timerfd); } -- 2.49.0