From patchwork Fri Nov 15 13:10:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 179501 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp12441664ilf; Fri, 15 Nov 2019 05:19:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwTyOi7zVfCdunC09R4aUGbMbKGNNSbrXag6WHMgKWOP964XGTOIkb1Ux9H8uRHwu0oM2zV X-Received: by 2002:a0c:b446:: with SMTP id e6mr13321640qvf.159.1573823961949; Fri, 15 Nov 2019 05:19:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573823961; cv=none; d=google.com; s=arc-20160816; b=SfZRQlo7gkW8fZMMwQsz5QH8qpJihcR4aYvJ3nrk3YhW/FOEdlyf69rHWoZF6dvUhr I0k5zKkek4hinP+G8aFiy47MoPQ9YtZ53XZnW2q2MbzOZPy2+HItBy3BMKA9AGnlYKpq NeH5CjZ6WR7t5u2j+X5jEF2YxJm5qZRFyjK4vsoYUvLFvAzSq62zROl6kUlQ7AtXSH71 r+FZgNTKDpm+MRPHz9Pgni8tSO0PgkwLI53CNpdNO1K1OUokekv1uIriMgOqCRNeMxjq m2gFEzVUmzzqp7PhVszqYROgQyeevo6LlxgjscYUHA7VXWxLnvJrPcxlowtlJQ4zBuPW atfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=l2vROXNnUFY1UYlqir6gW1pq2UjcxHQai6CiYsBYIgQ=; b=h/AKCguiVUNq8qhxTEsQl8czCtJoiV91cEQObSsxg1/zW0nccFBEsC1xaOBh7gGID5 8GArZYr63Hd27tVq6W8OTanE2jqZYasVzkFNsllIcnSO5XECmz2pfjaE7jXlapuo/qsW UUoZOZps1SIWnFrhvdFUY4ykaAj4KxiUx+n9RCm9GQSpnWK+z96kMH+cDit6wxC2sQaw pnGXOthwN4WWIWnUYFoClLmtxvyFRJCVSi0Pzj+CAQsLhKBbsFcDZNUilIPRCLnMD+Pj wycWtpdpkhya2UjNBs3ScqljUSRVTTaNOqLCOeyCfikTwZN9+3S3JI6jBBhmFd4NsNEz M/8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XhktTi7O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k18si5323753qkg.14.2019.11.15.05.19.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Nov 2019 05:19:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XhktTi7O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVbVR-000330-6I for patch@linaro.org; Fri, 15 Nov 2019 08:19:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49473) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVbO5-0004ZS-JH for qemu-devel@nongnu.org; Fri, 15 Nov 2019 08:11:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVbO4-0004RG-Ba for qemu-devel@nongnu.org; Fri, 15 Nov 2019 08:11:45 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:44255) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iVbO4-0004R0-5Y for qemu-devel@nongnu.org; Fri, 15 Nov 2019 08:11:44 -0500 Received: by mail-pl1-x642.google.com with SMTP id az9so4638036plb.11 for ; Fri, 15 Nov 2019 05:11:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l2vROXNnUFY1UYlqir6gW1pq2UjcxHQai6CiYsBYIgQ=; b=XhktTi7O5+7Mh00Z0888n3UAedn6Aa5bfPNd1m3szElA408i8Ykoyc5EOBxTZptH9U ogwOD4jWuWOG7EX5UYmI8eGmdGw+74fbo0X96xmoVj9zPhsLh3soZfTtZ8527EikYKAH hc9yEK+cZGYEvBAISOX6M7zfztJcYl8nDdXxMwcooZ9a2SdaR9oGlI+tzOalHUpZ1OTM jc0qQIL7o2e3CIITr0RghPuOuG1behMDb4pCVwIggls8zf+Q7ur+/gMcNgWSXa0Qy2I2 z5JPTEZKEuBlXatiT1NX22J67hHG4bEmpQnsQR3yCSh94tIeOcQOPpfuVx9YlGR5CZVI tFpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l2vROXNnUFY1UYlqir6gW1pq2UjcxHQai6CiYsBYIgQ=; b=CUap0RRcFLQrBh6EHUiP5abY63xXdStirVetUJaSI1bwuDXl1rT+SzG2J23TwHiwTP F9P/ur/4UnSQzuuLxES2S/ih+lLYB9EnfAAdGWBDKs9ImN8gNWeWr3eb1/q2mvpp3B3n 6/gMJyRYfkQaQmQP80ewAGN+HXP4u9IOY3m3kW2AtMVJKf2vSiRKOSKBO0GYPJ3MkRs+ i6jKB773HT5NvsASaUw8SCOYTnG74hnFje9+Mv08TDRdburGEFQXNakSufyg9dl9UB1k /bd2EOvGoMjUN0zCySf3mpr2tzp7bkDl2KCJd9Fv8JZvKazu6bhKTDPFjr32VUeO2I5l 3Z8Q== X-Gm-Message-State: APjAAAV6AqczT1RBmzDpBQiXGQfYoPPNfb5Q1d8+z2Ch41cpjncLuxGc e6+rIT/+lL4CWC/Gj4aJYEkOoV5WSOU= X-Received: by 2002:a17:90a:348c:: with SMTP id p12mr19372857pjb.105.1573823502875; Fri, 15 Nov 2019 05:11:42 -0800 (PST) Received: from Rfoley-MA01.usrd.futurewei.com ([12.111.81.71]) by smtp.gmail.com with ESMTPSA id w138sm12007249pfc.68.2019.11.15.05.11.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 05:11:42 -0800 (PST) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] Added tests for close and change of logfile. Date: Fri, 15 Nov 2019 08:10:40 -0500 Message-Id: <20191115131040.2834-7-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115131040.2834-1-robert.foley@linaro.org> References: <20191115131040.2834-1-robert.foley@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.puhov@linaro.org, alex.bennee@linaro.org, robert.foley@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" One test ensures that the logfile handle is still valid even if the logfile is changed during logging. The other test validates that the logfile handle remains valid under the logfile lock even if the logfile is closed. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée --- v1 - Changes for first round of code review comments. - Added in use of g_autofree, removed the g_free()s. - Added in use of logfile2 and changed sequence of asserts. --- tests/test-logging.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) -- 2.17.1 diff --git a/tests/test-logging.c b/tests/test-logging.c index a12585f70a..1e646f045d 100644 --- a/tests/test-logging.c +++ b/tests/test-logging.c @@ -108,6 +108,82 @@ static void test_parse_path(gconstpointer data) error_free_or_abort(&err); } +static void test_logfile_write(gconstpointer data) +{ + QemuLogFile *logfile; + QemuLogFile *logfile2; + gchar const *dir = data; + Error *err = NULL; + g_autofree gchar *file_path; + g_autofree gchar *file_path1; + FILE *orig_fd; + + /* + * Before starting test, set log flags, to ensure the file gets + * opened below with the call to qemu_set_log_filename(). + * In cases where a logging backend other than log is used, + * this is needed. + */ + qemu_set_log(CPU_LOG_TB_OUT_ASM); + file_path = g_build_filename(dir, "qemu_test_log_write0.log", NULL); + file_path1 = g_build_filename(dir, "qemu_test_log_write1.log", NULL); + + /* + * Test that even if an open file handle is changed, + * our handle remains valid due to RCU. + */ + qemu_set_log_filename(file_path, &err); + g_assert(!err); + rcu_read_lock(); + logfile = atomic_rcu_read(&qemu_logfile); + orig_fd = logfile->fd; + g_assert(logfile && logfile->fd); + fprintf(logfile->fd, "%s 1st write to file\n", __func__); + fflush(logfile->fd); + + /* Change the logfile and ensure that the handle is still valid. */ + qemu_set_log_filename(file_path1, &err); + g_assert(!err); + logfile2 = atomic_rcu_read(&qemu_logfile); + g_assert(logfile->fd == orig_fd); + g_assert(logfile2->fd != logfile->fd); + fprintf(logfile->fd, "%s 2nd write to file\n", __func__); + fflush(logfile->fd); + rcu_read_unlock(); +} + +static void test_logfile_lock(gconstpointer data) +{ + FILE *logfile; + gchar const *dir = data; + Error *err = NULL; + g_autofree gchar *file_path; + + file_path = g_build_filename(dir, "qemu_test_logfile_lock0.log", NULL); + + /* + * Test the use of the logfile lock, such + * that even if an open file handle is closed, + * our handle remains valid for use due to RCU. + */ + qemu_set_log_filename(file_path, &err); + logfile = qemu_log_lock(); + g_assert(logfile); + fprintf(logfile, "%s 1st write to file\n", __func__); + fflush(logfile); + + /* + * Initiate a close file and make sure our handle remains + * valid since we still have the logfile lock. + */ + qemu_log_close(); + fprintf(logfile, "%s 2nd write to file\n", __func__); + fflush(logfile); + qemu_log_unlock(logfile); + + g_assert(!err); +} + /* Remove a directory and all its entries (non-recursive). */ static void rmdir_full(gchar const *root) { @@ -134,6 +210,10 @@ int main(int argc, char **argv) g_test_add_func("/logging/parse_range", test_parse_range); g_test_add_data_func("/logging/parse_path", tmp_path, test_parse_path); + g_test_add_data_func("/logging/logfile_write_path", + tmp_path, test_logfile_write); + g_test_add_data_func("/logging/logfile_lock_path", + tmp_path, test_logfile_lock); rc = g_test_run();