From patchwork Tue Feb 20 07:42:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1901234 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=lists.linux.it header.i=@lists.linux.it header.a=rsa-sha256 header.s=picard header.b=R0zoeU9J; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=fj2 header.b=YA+4PoVq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBGl4Pylz23cw for ; Tue, 20 Feb 2024 18:43:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.linux.it; i=@lists.linux.it; q=dns/txt; s=picard; t=1708415005; h=to : date : message-id : in-reply-to : references : mime-version : subject : list-id : list-unsubscribe : list-archive : list-post : list-help : list-subscribe : from : reply-to : content-type : content-transfer-encoding : sender : from; bh=vIxMbpOWtd5i8lHwGVFqj+dSiGHe9xt46C2T/n/u4Ic=; b=R0zoeU9JNrP/VK5lDgSRhk76NyhGPUOexX53uw7bKr8wBJZ0AkY+8HjVfB9f7wtzUMDsO JurWoDdHETwBidIJSZ7N7VBxpFn1bCNWu1HNZV5SH6QnLh8Iv5SJYjAhB8yoqno+7H54yns pvhySRIz8OYiQYALFtPrhqqsUePDHu8= Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 739F43CDB85 for ; Tue, 20 Feb 2024 08:43:25 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 02EEB3CF163 for ; Tue, 20 Feb 2024 08:43:10 +0100 (CET) Authentication-Results: in-7.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=fujitsu.com (client-ip=139.138.36.225; helo=esa10.hc1455-7.c3s2.iphmx.com; envelope-from=xuyang2018.jy@fujitsu.com; receiver=lists.linux.it) Received: from esa10.hc1455-7.c3s2.iphmx.com (esa10.hc1455-7.c3s2.iphmx.com [139.138.36.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id A32C2200914 for ; Tue, 20 Feb 2024 08:43:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1708414989; x=1739950989; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G7zwVmiZgw+FwYq4VMuVMdFB74URbJ8cnDGf7wlANxw=; b=YA+4PoVqIMzmQkPklaxU/XWeeAMK58CWqsEl1xYM2XQRdqVT+qsUs6kG mdhIAISaxZBrkLRafJc+2Vca4+fH2bFtSNtUuRvxbCDOo7VUY+l0MAkKU melXUMZ7FDpckv1synukkd2pNiyaHbHxFqygiWVsF7kgS2Elg5Jt/DInX BJRfWEXMEIhaqxx5a7cKzkOoTqg6NOhGUadB3bUfLwID3seDWxEXeZxVR +iDZKN91LLMV4roE/czLxaWKk2m8Fz+3GF+WqeZEqNbIflRfUKvSImQEU R/ajiDS2JUAC0LmjWGq0sN00/q5gplndSHmOyDfZq1wUndG+KDWlFvLPn Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10989"; a="137512045" X-IronPort-AV: E=Sophos;i="6.06,172,1705330800"; d="scan'208";a="137512045" Received: from unknown (HELO oym-r2.gw.nic.fujitsu.com) ([210.162.30.90]) by esa10.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2024 16:43:07 +0900 Received: from oym-m2.gw.nic.fujitsu.com (oym-nat-oym-m2.gw.nic.fujitsu.com [192.168.87.59]) by oym-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id D59B8D9AE2 for ; Tue, 20 Feb 2024 16:43:04 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by oym-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id 1E934BF4A3 for ; Tue, 20 Feb 2024 16:43:04 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab3.gw.nic.fujitsu.com (Postfix) with ESMTP id 95BCF20097CE1 for ; Tue, 20 Feb 2024 16:43:03 +0900 (JST) Received: from rhel93GA.g08.fujitsu.local (unknown [10.167.221.71]) by edo.cn.fujitsu.com (Postfix) with ESMTP id 4A9D61A006B; Tue, 20 Feb 2024 15:43:03 +0800 (CST) To: ltp@lists.linux.it Date: Tue, 20 Feb 2024 02:42:13 -0500 Message-Id: <20240220074218.13487-2-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240220074218.13487-1-xuyang2018.jy@fujitsu.com> References: <20240220074218.13487-1-xuyang2018.jy@fujitsu.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-28202.005 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-28202.005 X-TMASE-Result: 10--8.247500-10.000000 X-TMASE-MatchedRID: wrMmQdWyhqi9TGmwrVcPSwXtykVcrvpNCZa9cSpBObnAuQ0xDMaXkH4q tYI9sRE/Vztt14qydotC2s0bIz7TOS0+EsApCrRRutvHF25zoU9MVCcj56k8hq25ZjP2hWgveWw Yle3v1YxzzWLzuR3HAoAy6p60ZV62yA7duzCw6dLdB/CxWTRRu25FeHtsUoHuzujsnLTlnseY/h hlFx6P0p8RG48oJjOaYabljj5MfqFoBmTSwRxjXg== X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-7.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v4 2/7] libltpswap: alter tst_count_swaps api X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Yang Xu via ltp From: "Yang Xu \\(Fujitsu\\)" Reply-To: Yang Xu Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Like we count the ipc resource total, we can also add a similar api for swapfiles, so we can use it for swapon03 case. Signed-off-by: Yang Xu Reviewed-by: Petr Vorel --- include/libswap.h | 5 +++++ libs/libltpswap/libswap.c | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/libswap.h b/include/libswap.h index 361d73175..76a3ed0c0 100644 --- a/include/libswap.h +++ b/include/libswap.h @@ -27,4 +27,9 @@ bool is_swap_supported(const char *filename); */ int tst_max_swapfiles(void); +/* + * Get the used swapfiles number + */ +int tst_count_swaps(void); + #endif /* __LIBSWAP_H__ */ diff --git a/libs/libltpswap/libswap.c b/libs/libltpswap/libswap.c index a404a4ada..1f9235f17 100644 --- a/libs/libltpswap/libswap.c +++ b/libs/libltpswap/libswap.c @@ -265,3 +265,30 @@ int tst_max_swapfiles(void) return max_swapfile - swp_migration_num - swp_hwpoison_num - swp_device_num - swp_pte_marker_num; } + +/* + * Get the used swapfiles number + */ +int tst_count_swaps(void) +{ + FILE *fp; + int used = -1; + char c; + + fp = fopen("/proc/swaps", "r"); + if (fp == NULL) { + return -1; + } + + while ((c = fgetc(fp)) != EOF) { + if (c == '\n') + used++; + } + + fclose(fp); + if (used < 0) { + tst_brk(TBROK, "can't read /proc/swaps to get used swapfiles resource total"); + } + + return used; +}