From patchwork Fri Mar 1 06:27:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Gao X-Patchwork-Id: 1906549 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=m6EyHg5E; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=f/ggDBBV; 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 4TmJ6X3v0xz23fC for ; Fri, 1 Mar 2024 17:27:31 +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=1709274447; h=to : date : message-id : 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=raGUMCE14pvhVG2ATJ5Ds4oXPhnO7akgf8zSt7y2z14=; b=m6EyHg5Epg4mz5zKc6qp1SeU7cPPaoaAw7Lt7go61S4fFXeI2oNCAbSGrY9rm2tOcVsIK Chpx9TlskLflJKVKmdpkKYo7eZqvL7UF9Cpw85MJFZ0iKKtJpvB1L9gjEaLvm8+b5icSMqt rhrx8sPZ8WZW3MMYYenXzNl2SXQwHpA= Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id D92183CECF4 for ; Fri, 1 Mar 2024 07:27:27 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (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 BE05E3CECF2 for ; Fri, 1 Mar 2024 07:27:24 +0100 (CET) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 03640100CD1D for ; Fri, 1 Mar 2024 07:27:23 +0100 (CET) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-412c227c80bso7624785e9.1 for ; Thu, 29 Feb 2024 22:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1709274443; x=1709879243; darn=lists.linux.it; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sbGMS+pTExGwVRCc3Ghj+3vF04CotY8wVBMN1cYm8QQ=; b=f/ggDBBVsZNmuRa4e2Wxo2R9qXSpWHHmbO9UyrOeDNk01HRHvCW9D/6s5uWd3BIV+A MEmZRy5lLx59RCdAhIRKmPA5id90adLM576JfP6S3o7bwIqK/L3CZcRYrIJovszcQT6s 5CJYEJQdpB9kvs4v0ticqbrCmjEVQewOelvmyoyLaiBk2mhPmTwLeg7efWK+iLu+/GFU 244Xiuh1oydSrgKGxsNBD6SashDQnhtlcPxoGb9Q4sGSYPDVa2SWf4tLyE00WPXqtCX3 yqu4AaSjKBx1fybTEj8Jlo6r1GAHlVuiRB8ImPCAMZtSSRQl/ApLMJp+6MStM1Rdw4aI E5hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709274443; x=1709879243; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sbGMS+pTExGwVRCc3Ghj+3vF04CotY8wVBMN1cYm8QQ=; b=WhRlsq41DtZvtVNN1UR+Q9U3hq8EotMX+ibLxQbM94ppXskCYxYGM0qME5Z4Ae40e+ WiNLTlvbuX1hlpCTK2qLM1LwtkDMRuH7NMXK4o2zgSXhqanBwJhuItIKgp0Dp0g5xqSC 9IQo2N4DFEffSjzCL/pC8YY1+Z44G5LvOTvN42JqhJOH5qmt6Z/BkOODKF6C256remvJ uVljtyK7QfCb6JLa2lZdp0opHKu5IAGRAQPFSPWKe8SGB0FFdlCwSbCxQbfGJAonATpK qiNZMC2dTsfs3JvQIjtZjYaHSzHPZrrtqWsRDSFZB/Q7Rptl7GyPNjA69Osj26MZY/Sw l4hw== X-Gm-Message-State: AOJu0YxNS1c2+4VPR1iNmqr2GfcdkZps3nv5BxUTVXbetTB66r+9pJzr Xli7q48BJlze7QYQaK96bwnhOrLf7rklo6YB/YXTk5+dkbf5cD0Hfczud0VRUUPrsDFg5vXUY2w = X-Google-Smtp-Source: AGHT+IEic6SV1WANMwsAZ8OdhfM9aDbzgBmhu+aT3EmM1ZPWtudnEwVTSl67l8xrDo9TnyQqrH4xYA== X-Received: by 2002:a05:600c:4e92:b0:412:c827:7a09 with SMTP id f18-20020a05600c4e9200b00412c8277a09mr409908wmq.11.1709274442683; Thu, 29 Feb 2024 22:27:22 -0800 (PST) Received: from localhost ([81.95.8.245]) by smtp.gmail.com with ESMTPSA id ay29-20020a05600c1e1d00b00412bb8101bbsm4333623wmb.43.2024.02.29.22.27.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 22:27:22 -0800 (PST) To: ltp@lists.linux.it Date: Fri, 1 Mar 2024 01:27:16 -0500 Message-Id: <20240301062716.3023-1-wegao@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,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-4.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v1] libswap.c: Improve caculate swap dev number 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: Wei Gao via ltp From: Wei Gao Reply-To: Wei Gao Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" I encounter a dead loop on following code in our test on ppc64 machine: while ((c = fgetc(fp)) != EOF) I think "/proc/swaps" is not normal file and can not get EOF in some situation, so i use fgets a line and caculate swap dev number. Signed-off-by: Wei Gao --- libs/libltpswap/libswap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/libltpswap/libswap.c b/libs/libltpswap/libswap.c index c8cbb8ea1..6924066b7 100644 --- a/libs/libltpswap/libswap.c +++ b/libs/libltpswap/libswap.c @@ -13,6 +13,7 @@ #define TST_NO_DEFAULT_MAIN #define DEFAULT_MAX_SWAPFILE 32 +#define MAX_LINE_LEN 256 #include "tst_test.h" #include "libswap.h" @@ -274,16 +275,17 @@ int tst_max_swapfiles(void) int tst_count_swaps(void) { FILE *fp; - int used = -1; - char c; + int used = 0; fp = SAFE_FOPEN("/proc/swaps", "r"); if (fp == NULL) return -1; - while ((c = fgetc(fp)) != EOF) { - if (c == '\n') + char line[MAX_LINE_LEN]; + while (fgets(line, MAX_LINE_LEN, fp) != NULL) { + if (strstr(line, "/dev/") != NULL) { used++; + } } SAFE_FCLOSE(fp);