From patchwork Thu Dec 19 10:49:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 182097 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp327062iln; Thu, 19 Dec 2019 03:07:28 -0800 (PST) X-Google-Smtp-Source: APXvYqx+SBIkpGVf3CGwGvLFPXG6pp5I91dmI/7STREbSRanMemx4MXs3HDrgyHtGPkQije6WtDZ X-Received: by 2002:ac8:3467:: with SMTP id v36mr6348225qtb.255.1576753648447; Thu, 19 Dec 2019 03:07:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576753648; cv=none; d=google.com; s=arc-20160816; b=cCHASiE3Lp+H+HqXZF3RXJj70qXxZNDXXC8f7RcGaHQjyP44UwWut1juMbOoXF/9qP ajiWr+gIuHL1z59OtCYjqHeFhSGT9iRL2X0VS8oC0r0illVl36N1dwgZKlkqka/rxpc/ ENP+7Mh2fF3TTk6vuLpAipRq4JtSJ77nzJMXZ2oHzy2cFmOzUMVPk+ysECyrgjE6MuuD e/s3rUVGHIzgEGv9eKjy2RxrJSpmAXvNUeH0mCwcqHWM9D3oxVFqNJARJwyHywcHlQOO BSsF8r+N3YqFpgLOqy0BNR5ZTHkvNSLC8aNtUHNjS/X2qE+Lzro3nnM8hhhlEaEoyj+7 lMeQ== 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=G90giGYO7nxhno/z+r32FbzYuyDm/iXKiuSb+w5/6TE=; b=ov2uHNjchnZAC8BCThYsXtj0mk1RHT5hLg9IiBIbIzBsMkSdDaf2e+6leJFD5zpmhA skW5rLf40v6aR9GUZAKV9kCLrCTOMaEieE5nmMlyUJMw6uCM/4HgExQVmU8c8rSlASS+ VFzn2zB6sRddcYDw4/MeOeSTaTEGKwfRiZ98SgSFQ3VL5MyTTDLtd/kbiMrWiVAxcoGp JjlzV2i7aspsED5di9Dc1ghCUrpCCnq6YHNDB6Nyyi0lK2+g55D3GE1sg4gx3PYYG7mD pvQI24ANi7LghS1u0IQk6ZZtsxtmnn65nPfK/3nqKeF9mDWWdQNQzslFRd+xC5ypi4NN g0sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ult61Fm2; 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 v7si3233126qka.328.2019.12.19.03.07.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Dec 2019 03:07:28 -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=Ult61Fm2; 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]:39172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihteR-0006EN-KO for patch@linaro.org; Thu, 19 Dec 2019 06:07:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56983) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtWd-0003oB-6a for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:59:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihtWb-0000tP-AS for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:59:22 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:33213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihtWb-0000nx-0z for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:59:21 -0500 Received: by mail-wm1-x32e.google.com with SMTP id d139so6769579wmd.0 for ; Thu, 19 Dec 2019 02:59:20 -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=G90giGYO7nxhno/z+r32FbzYuyDm/iXKiuSb+w5/6TE=; b=Ult61Fm21X6ymHJREtKIA8UBETAmW2Icw7I366D2pGafyp1LJxA/R0HwNdoVb11Bb5 zP4tECh/PmgT+hTPCbBsELje9aUI8Z+ul4SztgJ7o7Vb866u9oYhBZ4VmzlwIiWhdQtR P5PuBTNIyIYl/+bxUOwilqMGVSD9VGSanjhFxZoQlYaJMGSv/NXHaZsf0c29wZKUEPSl /mu5xZ/j135Ktw/2uH3Oxj0Jki+jyEt7HTvHbSZJKTXMnc3qXebniGE/VCFg9IqTnlov 2TdoxvfCI4CayAOMoeTK5EjTPhxnkmNMEIo5uwdQtpqLvgU0Yo+FM9NJZZH90agUjCS3 cQLQ== 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=G90giGYO7nxhno/z+r32FbzYuyDm/iXKiuSb+w5/6TE=; b=WIjWJT9YgqqaCjopCTGYPXTK0MPFajcpQhdxc2oT8qPiWXCK6Ij2nesa2IPUrbdsV3 6mm0kfbzxND9LhABZA4Ur43IhDZVqmaPYEEtmYqvzZUXRCwoF0hFutCLJ+AJqwcoImfl sd9So5cSLS3WGPZzYI86YepmpUgKN+33neJ5BuH3o9U0HArRWqF09bKhn2im7rk2tA+U oAwyqHog+2e98mofChVp/5LB3Mgh2XydS4z+6vfTRoOZsZyjEc7cPwUPa+XsbxUG72eh c9p9cs+uyPIOXwCJUSGRnYiJ/xo6oGl7OhTvhgEqX5KCnTYV+VbRmOrfdn50lkCwnd9B W9Yw== X-Gm-Message-State: APjAAAVCXzHfuUCes/nLQHZSP1nETZJ9OJK5OqBKkZwKCudSQPiBX1ts 7UF4AvejxB4B593GaEJHwjSZDQ== X-Received: by 2002:a05:600c:248:: with SMTP id 8mr9583046wmj.175.1576753159844; Thu, 19 Dec 2019 02:59:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g7sm6091077wrq.21.2019.12.19.02.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 02:59:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0725F1FFA3; Thu, 19 Dec 2019 10:49:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 16/25] Added tests for close and change of logfile. Date: Thu, 19 Dec 2019 10:49:25 +0000 Message-Id: <20191219104934.866-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219104934.866-1-alex.bennee@linaro.org> References: <20191219104934.866-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley 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 Signed-off-by: Alex Bennée Message-Id: <20191118211528.3221-7-robert.foley@linaro.org> -- 2.20.1 diff --git a/tests/test-logging.c b/tests/test-logging.c index a12585f70af..1e646f045dc 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();