From patchwork Sun Sep 23 19:24:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 186270 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B27872C0091 for ; Mon, 24 Sep 2012 05:24:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753922Ab2IWTYm (ORCPT ); Sun, 23 Sep 2012 15:24:42 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:59473 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753529Ab2IWTYl (ORCPT ); Sun, 23 Sep 2012 15:24:41 -0400 Received: by lbbgj3 with SMTP id gj3so5850906lbb.19 for ; Sun, 23 Sep 2012 12:24:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=cBYTtuMwXWru0wTEx6sODFy9ggfTCAPJf6nDJgNgAB0=; b=gsEa3YDHdOdUwGhVHNAYGxeb79186YstsTwNCWN4TOWReTN1RlFsNIDew/2d/31QJ4 3UX5kfppiyUqHgnk2eQexeht4BBh7lDTVA7ClRfpjxNM2fPtY2Uu5hOD6Ewp4KSSkd73 i7XKxKJBErPvKDqX/MQpM5Z9yY6QJWpScJ5LBDGxxROEFU7dBultdcjLv6n0eGSlgJR/ MDeL0cGGnWyJjP6Pv6v223tTATbttKWRBdK/LmmcmMNThsOIcUFSOFOyXaqJ1ny324K5 lNEBcD2mPNCxqXNiYnbBkgR+YAnzUZ17YaB+yojhQTO41OyA/dCX63tUZFP9UGmletab U2zg== Received: by 10.112.102.68 with SMTP id fm4mr3641281lbb.19.1348428279818; Sun, 23 Sep 2012 12:24:39 -0700 (PDT) Received: from smtp.gmail.com (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id go3sm2084330lab.11.2012.09.23.12.24.38 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Sep 2012 12:24:39 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: xfs@oss.sgi.com, hch@lst.de, Dmitry Monakhov Subject: [PATCH 1/6] xfstest: add fio git submodule Date: Sun, 23 Sep 2012 23:24:31 +0400 Message-Id: <1348428276-13161-1-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org FIO is very flexible io generator, i would call it IO swiss knife. Currently we have tonnes of hardcoded application which reproduces some predefined scenario. This approach has obvious dissadvantages 1) Lack of flexability: once written it is hard to modify it in future 2) Code base is large, many routines written again and again At the same time add new fio based tast is just add simle INI file. This greatly simplify code review. I do beleve that some day we will replace most of hardcoded io binaries with fio. Signed-off-by: Dmitry Monakhov --- .gitmodules | 3 +++ common.config | 3 +++ src/Makefile | 8 +++++--- src/aio-dio-regress/Makefile | 4 ++-- src/fio | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 160000 src/fio diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f0481ea --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/fio"] + path = src/fio + url = git://git.kernel.dk/fio.git diff --git a/common.config b/common.config index 7bed1c5..25cddb4 100644 --- a/common.config +++ b/common.config @@ -138,6 +138,9 @@ export DF_PROG="`set_prog_path df`" [ "$DF_PROG" = "" ] && _fatal "df not found" [ "$HOSTOS" = "Linux" ] && export DF_PROG="$DF_PROG -T" +export FIO_PROG="`set_prog_path $PWD/src/fio/fio`" +[ "$FIO_PROG" = "" ] && _fatal "fio not found" + export XFS_LOGPRINT_PROG="`set_prog_path xfs_logprint`" export XFS_REPAIR_PROG="`set_prog_path xfs_repair`" export XFS_CHECK_PROG="`set_prog_path xfs_check`" diff --git a/src/Makefile b/src/Makefile index 67250ee..255bdd4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,16 +52,18 @@ LLDLIBS += $(LIBGDBM) endif ifeq ($(HAVE_AIO), true) -SUBDIRS += aio-dio-regress +SUBDIRS += aio-dio-regress \ + fio + endif CFILES = $(TARGETS:=.c) LDIRT = $(TARGETS) -default: depend $(TARGETS) $(SUBDIRS) +default: .depend $(TARGETS) $(SUBDIRS) -depend: .dep +.depend: .dep include $(BUILDRULES) diff --git a/src/aio-dio-regress/Makefile b/src/aio-dio-regress/Makefile index 79dd55d..fcead9a 100644 --- a/src/aio-dio-regress/Makefile +++ b/src/aio-dio-regress/Makefile @@ -8,9 +8,9 @@ LDIRT = $(TARGETS) LLDLIBS = -laio -lpthread -default: depend $(TARGETS) +default: .depend $(TARGETS) -depend: .dep +.depend: .dep include $(BUILDRULES) diff --git a/src/fio b/src/fio new file mode 160000 index 0000000..e12d280 --- /dev/null +++ b/src/fio @@ -0,0 +1 @@ +Subproject commit e12d2800f811cb64d376cfdaed9a1257f3fa9c99