* [gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/, sys-block/blktrace/files/
@ 2021-04-30 19:03 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-04-30 19:03 UTC (permalink / raw
To: gentoo-commits
commit: fb3c9df94135a48093d66f2e3a7b44578743e105
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 10:57:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 19:02:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3c9df9
sys-block/blktrace: Drop 1.1.0 and 1.1.0-r1, EAPI5--
Both overshadowed by stable 1.2.0, likely no reason to keep those.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-block/blktrace/Manifest | 1 -
sys-block/blktrace/blktrace-1.1.0-r1.ebuild | 49 ----------
sys-block/blktrace/blktrace-1.1.0.ebuild | 48 ----------
.../blktrace-1.1.0-ldflags-parallel-make.patch | 105 ---------------------
4 files changed, 203 deletions(-)
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 4dc678b6a05..5f5984d3f9b 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,2 +1 @@
-DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355
DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
diff --git a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild b/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
deleted file mode 100644
index 29c03c431b2..00000000000
--- a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic linux-info
-
-MY_PN="blktrace"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue"
-HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libaio"
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
- doc? (
- virtual/latex-base
- >=app-text/texlive-core-2014
- )
-"
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="~BLK_DEV_IO_TRACE"
-WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch )
-
-src_compile() {
- append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
- if use doc; then
- export VARTEXFONTS="${T}/fonts"
- emake docs
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
- einstalldocs
- use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
-}
diff --git a/sys-block/blktrace/blktrace-1.1.0.ebuild b/sys-block/blktrace/blktrace-1.1.0.ebuild
deleted file mode 100644
index dd119541f90..00000000000
--- a/sys-block/blktrace/blktrace-1.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs flag-o-matic linux-info
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue"
-HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
- doc? (
- virtual/latex-base
- >=app-text/texlive-core-2014
- )
- dev-libs/libaio"
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="~BLK_DEV_IO_TRACE"
-WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch
-}
-
-src_compile() {
- append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
- if use doc; then
- export VARTEXFONTS="${T}/fonts"
- emake docs
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
- dodoc README
- use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
-}
diff --git a/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch b/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch
deleted file mode 100644
index f26799238fe..00000000000
--- a/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- blktrace-1.1.0/btreplay/Makefile
-+++ blktrace-1.1.0/btreplay/Makefile
-@@ -32,10 +32,10 @@
- $(CC) $(CFLAGS) -c -o $*.o $<
-
- btrecord: btrecord.o
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- btreplay: btreplay.o
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- depend:
- @$(CC) -MM $(CFLAGS) *.c 1> .depend
---- blktrace-1.1.0/btt/Makefile
-+++ blktrace-1.1.0/btt/Makefile
-@@ -38,7 +38,7 @@
- $(CC) $(CFLAGS) -c -o $*.o $<
-
- btt: $(OBJS)
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- ifneq ($(wildcard .depend),)
- include .depend
---- blktrace-1.1.0/iowatcher/Makefile
-+++ blktrace-1.1.0/iowatcher/Makefile
-@@ -19,7 +19,7 @@
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
-
- iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm
-
- depend:
- @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
---- blktrace-1.1.0/Makefile
-+++ blktrace-1.1.0/Makefile
-@@ -4,41 +4,35 @@
- PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
- LIBS = -lpthread
- SCRIPTS = btrace
-+SUBDIRS = btreplay btt iowatcher
-
--ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \
-+ALL = $(PROGS) $(SCRIPTS)
-+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
- btt/bno_plot.py iowatcher/iowatcher
-
--all: $(ALL)
-+all: $(ALL) $(SUBDIRS)
-+.PHONY: $(SUBDIRS)
-
--btt/btt:
-- $(MAKE) -C btt
--
--iowatcher/iowatcher:
-- $(MAKE) -C iowatcher
--
--btreplay/btrecord:
-- $(MAKE) -C btreplay
--
--btreplay/btreplay:
-- $(MAKE) -C btreplay
-+$(SUBDIRS): $(PROGS)
-+ $(MAKE) -C $@
-
- %.o: %.c
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
-
- blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blktrace: blktrace.o act_mask.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- verify_blkparse: verify_blkparse.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blkrawverify: blkrawverify.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blkiomon: blkiomon.o rbtree.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
-
- $(PROGS): | depend
-
-@@ -84,9 +78,10 @@
- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
-- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
- $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8
-+ $(INSTALL) -m 644 iowatcher/*.1 $(DESTDIR)$(mandir)/man1
-
- ifneq ($(wildcard .depend),)
- include .depend
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/, sys-block/blktrace/files/
@ 2021-07-08 2:44 Robin H. Johnson
0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson @ 2021-07-08 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 7c25464ace1616c53d5c3f8f528c35453d8ff46e
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 8 02:44:25 2021 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 8 02:44:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c25464a
sys-block/blktrace: cleanup 1.2.0
Reference: https://bugs.gentoo.org/655146
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-block/blktrace/Manifest | 1 -
sys-block/blktrace/blktrace-1.2.0.ebuild | 53 -------------
.../blktrace/files/blktrace-1.2.0-ldflags.patch | 89 ----------------------
.../blktrace-1.2.0-overlapping-io-stats.patch | 68 -----------------
.../files/blktrace-1.2.0-parallel-build.patch | 71 -----------------
5 files changed, 282 deletions(-)
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 15d068dc51f..0d52fe09a16 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,2 +1 @@
-DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
DIST blktrace-1.3.0.tar.bz2 396669 BLAKE2B ab340b27421ec423c8e5bd9fd719f97e06c30366ce95560adea644d10737f41d2c2f16e4c6503b65ef8fedeec7d997de6f47f0d3f2542c5065fe7846f8d18966 SHA512 4cc3d8e0d77e934bd70f447e1bb462400d3c9982460802f093d260e3cb69a66c6f61a63a05af55b84c35c5bdf18027e571d55cebea8c89d0be6d00c7ca9b9174
diff --git a/sys-block/blktrace/blktrace-1.2.0.ebuild b/sys-block/blktrace/blktrace-1.2.0.ebuild
deleted file mode 100644
index ee5ebdfdceb..00000000000
--- a/sys-block/blktrace/blktrace-1.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic linux-info
-
-MY_PN="blktrace"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="show detailed info about what is happening on a block device io queue"
-HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libaio"
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
- doc? (
- virtual/latex-base
- >=app-text/texlive-core-2014
- )
-"
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="~BLK_DEV_IO_TRACE"
-WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
-
-PATCHES=(
- "${FILESDIR}"/${P}-overlapping-io-stats.patch
- "${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741
- "${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741
-)
-
-src_compile() {
- append-cppflags -DLVM_REMAP_WORKAROUND -W -I"${S}"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
- if use doc; then
- export VARTEXFONTS="${T}/fonts"
- emake docs
- fi
-}
-
-src_install() {
- emake install CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
- einstalldocs
- use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
-}
diff --git a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch b/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
deleted file mode 100644
index b8e2aebfff4..00000000000
--- a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-http://git.kernel.dk/?p=blktrace.git;a=commit;h=d1398e339585f6750f7158c50c98861b68dddc8b
-
-From 6d8c3d7a10f62b26514a56b25a3744c5f35219a6 Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Tue, 23 Jan 2018 17:40:48 -0500
-Subject: [PATCH] respect LDFLAGS when linking programs
-
----
- Makefile | 10 +++++-----
- btreplay/Makefile | 4 ++--
- btt/Makefile | 2 +-
- iowatcher/Makefile | 2 +-
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index fdbded02ee0a..68de59183a73 100644
---- a/Makefile
-+++ b/Makefile
-@@ -26,19 +26,19 @@ btreplay/btreplay:
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
-
- blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blktrace: blktrace.o act_mask.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- verify_blkparse: verify_blkparse.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blkrawverify: blkrawverify.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blkiomon: blkiomon.o rbtree.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
-
- $(PROGS): | depend
-
-diff --git a/btreplay/Makefile b/btreplay/Makefile
-index 2998182401e7..f574a2976ec1 100644
---- a/btreplay/Makefile
-+++ b/btreplay/Makefile
-@@ -32,10 +32,10 @@ clean: docsclean
- $(CC) $(CFLAGS) -c -o $*.o $<
-
- btrecord: btrecord.o
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- btreplay: btreplay.o
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- depend:
- @$(CC) -MM $(CFLAGS) *.c 1> .depend
-diff --git a/btt/Makefile b/btt/Makefile
-index df7a3de6b3fb..32075573954c 100644
---- a/btt/Makefile
-+++ b/btt/Makefile
-@@ -38,7 +38,7 @@ clean: docsclean
- $(CC) $(CFLAGS) -c -o $*.o $<
-
- btt: $(OBJS)
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- ifneq ($(wildcard .depend),)
- include .depend
-diff --git a/iowatcher/Makefile b/iowatcher/Makefile
-index e013556f3ae1..a224a0848cc8 100644
---- a/iowatcher/Makefile
-+++ b/iowatcher/Makefile
-@@ -19,7 +19,7 @@ all: $(ALL)
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
-
- iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm -lrt
-
- depend:
- @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
---
-2.15.1
-
diff --git a/sys-block/blktrace/files/blktrace-1.2.0-overlapping-io-stats.patch b/sys-block/blktrace/files/blktrace-1.2.0-overlapping-io-stats.patch
deleted file mode 100644
index 11c495efbc0..00000000000
--- a/sys-block/blktrace/files/blktrace-1.2.0-overlapping-io-stats.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-http://git.kernel.dk/?p=blktrace.git;a=commit;h=8fc451c6b0b9a7db7c376ea6865c35321e561f00
-
-From 8fc451c6b0b9a7db7c376ea6865c35321e561f00 Mon Sep 17 00:00:00 2001
-From: Gwendal Grignou <gwendal@chromium.org>
-Date: Fri, 18 Aug 2017 15:00:22 -0700
-Subject: [PATCH] btt: Fix overlapping IO stats.
-
-Keep scanning the tree for overlapping IO otherwise Q2G and process
-traces will be incorrect.
-
-Let assume we have 2 IOs:
-
-A A+a
-|---------------------------------------|
- B B+b
- |-----------------|
-
-In the red/black tree we have:
-
- o -> [A,A+a]
- / \
- left right
- / \
- [...]o o -> [B, B+b]
-
-In the current code, if we would not be able to find [B+b] in the tree:
-B is greater than A, so we won't go left
-B+b is smaller than A+a, so we are not going right either.
-
-When we have a [X, X+x] IO to look for:
-We need to check for right when either:
- X+x >= A+a (for merged IO)
-and
- X > A (for overlapping IO)
-
-TEST=Check with a trace with overlapping IO: Q2C and Q2G are expected.
-
-Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- btt/dip_rb.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/btt/dip_rb.c b/btt/dip_rb.c
-index 2aa7ffcc763b..6efef6c03b8f 100644
---- a/btt/dip_rb.c
-+++ b/btt/dip_rb.c
-@@ -57,7 +57,7 @@ struct io *rb_find_sec(struct rb_root *root, __u64 sec)
- __iop = rb_entry(n, struct io, rb_node);
- if (sec < BIT_START(__iop))
- n = n->rb_left;
-- else if (sec >= BIT_END(__iop))
-+ else if (sec > BIT_START(__iop))
- n = n->rb_right;
- else
- return __iop;
-@@ -82,7 +82,7 @@ void rb_foreach(struct rb_node *n, struct io *iop,
- }
- if (iop_s < this_s)
- rb_foreach(n->rb_left, iop, fnc, head);
-- if (this_e < iop_e)
-+ if ((this_e < iop_e) || (this_s < iop_s))
- rb_foreach(n->rb_right, iop, fnc, head);
- }
- }
---
-2.15.1
-
diff --git a/sys-block/blktrace/files/blktrace-1.2.0-parallel-build.patch b/sys-block/blktrace/files/blktrace-1.2.0-parallel-build.patch
deleted file mode 100644
index 129f04107fa..00000000000
--- a/sys-block/blktrace/files/blktrace-1.2.0-parallel-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-http://git.kernel.dk/?p=blktrace.git;a=commit;h=519fd9a5d08d85f3d9cb4192d624fe8351e40232
-
-From 4569544261be495bdec0574d7729c85a62dabad7 Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Thu, 3 Feb 2011 03:07:06 +0000
-Subject: [PATCH] fix parallel build failures
-
-When building in parallel, the btreplay/btrecord and btreplay/btreplay
-targets cause make to kick off two jobs for `make -C btreplay` and they
-sometimes end up clobbering each other. We could fix this by making one
-a dependency of the other, but it's a bit cleaner to refactor things to
-be based on subdirs. This way changes in subdirs also get noticed:
- $ touch btreplay/*.[ch]
- $ make
- <btreplay is now correctly updated>
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 24 ++++++++++--------------
- 1 file changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 68de59183a73..5917814d0344 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,23 +4,19 @@ ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
- LIBS = -lpthread
- SCRIPTS = btrace
-+SUBDIRS = btreplay btt iowatcher
-
--ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \
-+ALL = $(PROGS) $(SCRIPTS)
-+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
- btt/bno_plot.py iowatcher/iowatcher
-
--all: $(ALL)
-+all: $(ALL) $(SUBDIRS)
-
--btt/btt:
-- $(MAKE) -C btt
--
--iowatcher/iowatcher:
-- $(MAKE) -C iowatcher
--
--btreplay/btrecord:
-- $(MAKE) -C btreplay
--
--btreplay/btreplay:
-- $(MAKE) -C btreplay
-+# We always descend into subdirs because they contain their own dependency
-+# information which we don't track in this top level Makefile.
-+$(SUBDIRS):
-+ $(MAKE) -C $@
-+.PHONY: $(SUBDIRS)
-
- %.o: %.c
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
-@@ -85,7 +81,7 @@ install: all
- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
-- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
- $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8
-
---
-2.15.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-08 2:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-30 19:03 [gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/, sys-block/blktrace/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-07-08 2:44 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox