From patchwork Tue Nov 12 15:01:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 179208 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp8235081ilf; Tue, 12 Nov 2019 07:02:55 -0800 (PST) X-Google-Smtp-Source: APXvYqxQSZxzZ3pWD2Z5v9rgvHYa68LcloQMcHlom0MBW8DN7X+7kml0BuzzCKfDLZOGrFt55KA5 X-Received: by 2002:ac8:2476:: with SMTP id d51mr32509982qtd.378.1573570975569; Tue, 12 Nov 2019 07:02:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573570975; cv=none; d=google.com; s=arc-20160816; b=BNFf96TQV1KdRmHKz+CmkDcYVfsJZCaUI6pbOkcHcUFc/lqsJlL+tNTYcWjRrI/bWm XK8EgJb/jmIjd+dKkO2nrJ7xVRgcEn5uEQJ2syl3zMq4TDGccaendc2IYxxebICGCTbt Df0nl7hjRbRxDxzhdGTXhUqBRgX8QCkmsofWJar7RTS/1tMNGrQLNrvxOYyyn9GwgMtN T5Ul1qnm7eQ1upLT88qqFJQC5QIHkwLDFyaemVUqX1AZKwERGSpcu9+gXVA1HO767RaJ hQ9qkVj2PtWzjMDHdVkSKQ8Kn8ki2w3W9fYGyAEXN6UvoQCrCBRSuCoI1vNtGUh9idxu tgag== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=rb+rwwDtLFyVaqPrueQVfE7R//yL4u5e6ReAZf9CRts=; b=BWHjlMpKrTNKkMnKyvRDnKpYTLO7S+poSxoIyPC18JH+mVks+fMqO8X4iz/WxwjiX5 uSN5gPYRcXLIWjyCriUAnkb5pwkyr8C1ASjC26653cG+LUecbj5eHckROUo4mEeWIM0g 10XKVEzL/frC9Dx8YCc/d2JQ85jSqXMjqB2lvDPc0R2xgHih3aZYxUi70XutAM+iJ9Ur GAr2aorinf/B3jZEriLHPGSOHLifRwArsehb+q9b9XnkOx6Ux6+DfNUVMYMwraikE+tJ BOGL0c6Wh9CEFSLB3nMEL322Jjndh95Srx7gThQL+stcDMb+Tgdptun0y7VM5CFivt+Z y8kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=shS4+Yob; 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 p7si11048677qtp.377.2019.11.12.07.02.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Nov 2019 07:02:55 -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=shS4+Yob; 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]:36080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXh0-00061f-HT for patch@linaro.org; Tue, 12 Nov 2019 10:02:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38067) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXgf-0005yX-90 for qemu-devel@nongnu.org; Tue, 12 Nov 2019 10:02:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUXgd-0002LY-Up for qemu-devel@nongnu.org; Tue, 12 Nov 2019 10:02:33 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:46070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUXgc-0002KC-Nj for qemu-devel@nongnu.org; Tue, 12 Nov 2019 10:02:31 -0500 Received: by mail-pf1-x444.google.com with SMTP id z4so13498415pfn.12 for ; Tue, 12 Nov 2019 07:02:30 -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; bh=rb+rwwDtLFyVaqPrueQVfE7R//yL4u5e6ReAZf9CRts=; b=shS4+Yob2T10+TBH7EpS7n8xqgnny/KicLtIVo3u0KVgTP+P5xXtOj+6gRDtuDMIFf ACWEUdU0IM+aBHHWg25ALdGaaXkY6vMSTs4ijVPnrTl1u17lJVRjVz0PQbuF0ukKmSmQ HD5Z7ZIeVQI+gmGFcqRIElYsX+RNESVfTKAxtGWV1UgVyoMEi7l/HMdjyLu14IoD9I/K 1U56f4D6PXsnkdwNF1dINYP4+cONHwIYnaCiFGCCr6Bzw/kT3hZ70gbNH9BG2BZuldS3 W8EQLjMwbbYkQL7iKcqgRA4EXyyC9h4ROgLHoBtDJQ0CZ06k1Uxqtx4cTkT2VJFKKQc8 wxbg== 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; bh=rb+rwwDtLFyVaqPrueQVfE7R//yL4u5e6ReAZf9CRts=; b=ehGYMNxF9R5xqYonLAQL5n2fA5Y8u5nQbVFKHK1/HmvbOHVhH/cs2QeLfHQNgPyhFB CrCiPKERTNZGBaGnLfrF7ly4jHEiVDZx6vBbTY6kE36w3TwdFvQ3Ej3vP4dmJp1PD3Dg dF4GVdZTm+Z2hsYoYdzHuKak3DNatV3FRB0kOMr/2UfdDRGQHLujgxlSTNC4eEBEpw/Q cqKmup9rd5kaNmxaWsZiE5EFUJw5v/91yE0NxMJCVF+SXtuUlMnU7MSgrjV5vzCTEhLy STfEhScEoZp+uxIpAWtjh1wMXl1HPx+NKpceoJNuBeTVyW7frhLWCk5uR0T/Bc1Ptt6O StEA== X-Gm-Message-State: APjAAAXOYVP4SmN8Y8KFmgUhFz+Ziw2Jrjg7WB8KLHre+rXFMJZn1dpX N/wCqdhkwH9JxtEw9anQjTSFfSs4BH0= X-Received: by 2002:a65:5885:: with SMTP id d5mr34710063pgu.278.1573570949400; Tue, 12 Nov 2019 07:02:29 -0800 (PST) Received: from Rfoley-MA01.usrd.futurewei.com ([12.111.81.71]) by smtp.gmail.com with ESMTPSA id a3sm8235511pfo.71.2019.11.12.07.02.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 07:02:28 -0800 (PST) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v1 4/5] Added tests for close and change of logfile. Date: Tue, 12 Nov 2019 10:01:04 -0500 Message-Id: <20191112150105.2498-5-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191112150105.2498-1-robert.foley@linaro.org> References: <20191112150105.2498-1-robert.foley@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 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 -- 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 Reviewed-by: Alex Bennée 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();