| 1 |
commit: 7c25464ace1616c53d5c3f8f528c35453d8ff46e |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 8 02:44:25 2021 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 8 02:44:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c25464a |
| 7 |
|
| 8 |
sys-block/blktrace: cleanup 1.2.0 |
| 9 |
|
| 10 |
Reference: https://bugs.gentoo.org/655146 |
| 11 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-block/blktrace/Manifest | 1 - |
| 14 |
sys-block/blktrace/blktrace-1.2.0.ebuild | 53 ------------- |
| 15 |
.../blktrace/files/blktrace-1.2.0-ldflags.patch | 89 ---------------------- |
| 16 |
.../blktrace-1.2.0-overlapping-io-stats.patch | 68 ----------------- |
| 17 |
.../files/blktrace-1.2.0-parallel-build.patch | 71 ----------------- |
| 18 |
5 files changed, 282 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest |
| 21 |
index 15d068dc51f..0d52fe09a16 100644 |
| 22 |
--- a/sys-block/blktrace/Manifest |
| 23 |
+++ b/sys-block/blktrace/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86 |
| 26 |
DIST blktrace-1.3.0.tar.bz2 396669 BLAKE2B ab340b27421ec423c8e5bd9fd719f97e06c30366ce95560adea644d10737f41d2c2f16e4c6503b65ef8fedeec7d997de6f47f0d3f2542c5065fe7846f8d18966 SHA512 4cc3d8e0d77e934bd70f447e1bb462400d3c9982460802f093d260e3cb69a66c6f61a63a05af55b84c35c5bdf18027e571d55cebea8c89d0be6d00c7ca9b9174 |
| 27 |
|
| 28 |
diff --git a/sys-block/blktrace/blktrace-1.2.0.ebuild b/sys-block/blktrace/blktrace-1.2.0.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index ee5ebdfdceb..00000000000 |
| 31 |
--- a/sys-block/blktrace/blktrace-1.2.0.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,53 +0,0 @@ |
| 34 |
-# Copyright 1999-2020 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI="6" |
| 38 |
- |
| 39 |
-inherit toolchain-funcs flag-o-matic linux-info |
| 40 |
- |
| 41 |
-MY_PN="blktrace" |
| 42 |
-MY_P="${MY_PN}-${PV}" |
| 43 |
- |
| 44 |
-DESCRIPTION="show detailed info about what is happening on a block device io queue" |
| 45 |
-HOMEPAGE="https://git.kernel.dk/cgit/blktrace/" |
| 46 |
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" |
| 47 |
- |
| 48 |
-LICENSE="GPL-2" |
| 49 |
-SLOT="0" |
| 50 |
-KEYWORDS="amd64 ~arm ppc x86" |
| 51 |
-IUSE="doc" |
| 52 |
- |
| 53 |
-RDEPEND="dev-libs/libaio" |
| 54 |
-# This is a Linux specific app! |
| 55 |
-DEPEND="${RDEPEND} |
| 56 |
- sys-kernel/linux-headers |
| 57 |
- doc? ( |
| 58 |
- virtual/latex-base |
| 59 |
- >=app-text/texlive-core-2014 |
| 60 |
- ) |
| 61 |
-" |
| 62 |
-S="${WORKDIR}/${MY_P}" |
| 63 |
- |
| 64 |
-CONFIG_CHECK="~BLK_DEV_IO_TRACE" |
| 65 |
-WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" |
| 66 |
- |
| 67 |
-PATCHES=( |
| 68 |
- "${FILESDIR}"/${P}-overlapping-io-stats.patch |
| 69 |
- "${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741 |
| 70 |
- "${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741 |
| 71 |
-) |
| 72 |
- |
| 73 |
-src_compile() { |
| 74 |
- append-cppflags -DLVM_REMAP_WORKAROUND -W -I"${S}" |
| 75 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" |
| 76 |
- if use doc; then |
| 77 |
- export VARTEXFONTS="${T}/fonts" |
| 78 |
- emake docs |
| 79 |
- fi |
| 80 |
-} |
| 81 |
- |
| 82 |
-src_install() { |
| 83 |
- emake install CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" |
| 84 |
- einstalldocs |
| 85 |
- use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf |
| 86 |
-} |
| 87 |
|
| 88 |
diff --git a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch b/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch |
| 89 |
deleted file mode 100644 |
| 90 |
index b8e2aebfff4..00000000000 |
| 91 |
--- a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch |
| 92 |
+++ /dev/null |
| 93 |
@@ -1,89 +0,0 @@ |
| 94 |
-http://git.kernel.dk/?p=blktrace.git;a=commit;h=d1398e339585f6750f7158c50c98861b68dddc8b |
| 95 |
- |
| 96 |
-From 6d8c3d7a10f62b26514a56b25a3744c5f35219a6 Mon Sep 17 00:00:00 2001 |
| 97 |
-From: "Robin H. Johnson" <robbat2@g.o> |
| 98 |
-Date: Tue, 23 Jan 2018 17:40:48 -0500 |
| 99 |
-Subject: [PATCH] respect LDFLAGS when linking programs |
| 100 |
- |
| 101 |
---- |
| 102 |
- Makefile | 10 +++++----- |
| 103 |
- btreplay/Makefile | 4 ++-- |
| 104 |
- btt/Makefile | 2 +- |
| 105 |
- iowatcher/Makefile | 2 +- |
| 106 |
- 4 files changed, 9 insertions(+), 9 deletions(-) |
| 107 |
- |
| 108 |
-diff --git a/Makefile b/Makefile |
| 109 |
-index fdbded02ee0a..68de59183a73 100644 |
| 110 |
---- a/Makefile |
| 111 |
-+++ b/Makefile |
| 112 |
-@@ -26,19 +26,19 @@ btreplay/btreplay: |
| 113 |
- $(CC) -o $*.o -c $(ALL_CFLAGS) $< |
| 114 |
- |
| 115 |
- blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o |
| 116 |
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 117 |
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 118 |
- |
| 119 |
- blktrace: blktrace.o act_mask.o |
| 120 |
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 121 |
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 122 |
- |
| 123 |
- verify_blkparse: verify_blkparse.o |
| 124 |
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 125 |
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 126 |
- |
| 127 |
- blkrawverify: blkrawverify.o |
| 128 |
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 129 |
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 130 |
- |
| 131 |
- blkiomon: blkiomon.o rbtree.o |
| 132 |
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt |
| 133 |
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt |
| 134 |
- |
| 135 |
- $(PROGS): | depend |
| 136 |
- |
| 137 |
-diff --git a/btreplay/Makefile b/btreplay/Makefile |
| 138 |
-index 2998182401e7..f574a2976ec1 100644 |
| 139 |
---- a/btreplay/Makefile |
| 140 |
-+++ b/btreplay/Makefile |
| 141 |
-@@ -32,10 +32,10 @@ clean: docsclean |
| 142 |
- $(CC) $(CFLAGS) -c -o $*.o $< |
| 143 |
- |
| 144 |
- btrecord: btrecord.o |
| 145 |
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) |
| 146 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 147 |
- |
| 148 |
- btreplay: btreplay.o |
| 149 |
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 150 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 151 |
- |
| 152 |
- depend: |
| 153 |
- @$(CC) -MM $(CFLAGS) *.c 1> .depend |
| 154 |
-diff --git a/btt/Makefile b/btt/Makefile |
| 155 |
-index df7a3de6b3fb..32075573954c 100644 |
| 156 |
---- a/btt/Makefile |
| 157 |
-+++ b/btt/Makefile |
| 158 |
-@@ -38,7 +38,7 @@ clean: docsclean |
| 159 |
- $(CC) $(CFLAGS) -c -o $*.o $< |
| 160 |
- |
| 161 |
- btt: $(OBJS) |
| 162 |
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 163 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 164 |
- |
| 165 |
- ifneq ($(wildcard .depend),) |
| 166 |
- include .depend |
| 167 |
-diff --git a/iowatcher/Makefile b/iowatcher/Makefile |
| 168 |
-index e013556f3ae1..a224a0848cc8 100644 |
| 169 |
---- a/iowatcher/Makefile |
| 170 |
-+++ b/iowatcher/Makefile |
| 171 |
-@@ -19,7 +19,7 @@ all: $(ALL) |
| 172 |
- $(CC) -o $*.o -c $(ALL_CFLAGS) $< |
| 173 |
- |
| 174 |
- iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o |
| 175 |
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt |
| 176 |
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm -lrt |
| 177 |
- |
| 178 |
- depend: |
| 179 |
- @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend |
| 180 |
--- |
| 181 |
-2.15.1 |
| 182 |
- |
| 183 |
|
| 184 |
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 |
| 185 |
deleted file mode 100644 |
| 186 |
index 11c495efbc0..00000000000 |
| 187 |
--- a/sys-block/blktrace/files/blktrace-1.2.0-overlapping-io-stats.patch |
| 188 |
+++ /dev/null |
| 189 |
@@ -1,68 +0,0 @@ |
| 190 |
-http://git.kernel.dk/?p=blktrace.git;a=commit;h=8fc451c6b0b9a7db7c376ea6865c35321e561f00 |
| 191 |
- |
| 192 |
-From 8fc451c6b0b9a7db7c376ea6865c35321e561f00 Mon Sep 17 00:00:00 2001 |
| 193 |
-From: Gwendal Grignou <gwendal@××××××××.org> |
| 194 |
-Date: Fri, 18 Aug 2017 15:00:22 -0700 |
| 195 |
-Subject: [PATCH] btt: Fix overlapping IO stats. |
| 196 |
- |
| 197 |
-Keep scanning the tree for overlapping IO otherwise Q2G and process |
| 198 |
-traces will be incorrect. |
| 199 |
- |
| 200 |
-Let assume we have 2 IOs: |
| 201 |
- |
| 202 |
-A A+a |
| 203 |
-|---------------------------------------| |
| 204 |
- B B+b |
| 205 |
- |-----------------| |
| 206 |
- |
| 207 |
-In the red/black tree we have: |
| 208 |
- |
| 209 |
- o -> [A,A+a] |
| 210 |
- / \ |
| 211 |
- left right |
| 212 |
- / \ |
| 213 |
- [...]o o -> [B, B+b] |
| 214 |
- |
| 215 |
-In the current code, if we would not be able to find [B+b] in the tree: |
| 216 |
-B is greater than A, so we won't go left |
| 217 |
-B+b is smaller than A+a, so we are not going right either. |
| 218 |
- |
| 219 |
-When we have a [X, X+x] IO to look for: |
| 220 |
-We need to check for right when either: |
| 221 |
- X+x >= A+a (for merged IO) |
| 222 |
-and |
| 223 |
- X > A (for overlapping IO) |
| 224 |
- |
| 225 |
-TEST=Check with a trace with overlapping IO: Q2C and Q2G are expected. |
| 226 |
- |
| 227 |
-Signed-off-by: Gwendal Grignou <gwendal@××××××××.org> |
| 228 |
-Signed-off-by: Jens Axboe <axboe@××××××.dk> |
| 229 |
---- |
| 230 |
- btt/dip_rb.c | 4 ++-- |
| 231 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 232 |
- |
| 233 |
-diff --git a/btt/dip_rb.c b/btt/dip_rb.c |
| 234 |
-index 2aa7ffcc763b..6efef6c03b8f 100644 |
| 235 |
---- a/btt/dip_rb.c |
| 236 |
-+++ b/btt/dip_rb.c |
| 237 |
-@@ -57,7 +57,7 @@ struct io *rb_find_sec(struct rb_root *root, __u64 sec) |
| 238 |
- __iop = rb_entry(n, struct io, rb_node); |
| 239 |
- if (sec < BIT_START(__iop)) |
| 240 |
- n = n->rb_left; |
| 241 |
-- else if (sec >= BIT_END(__iop)) |
| 242 |
-+ else if (sec > BIT_START(__iop)) |
| 243 |
- n = n->rb_right; |
| 244 |
- else |
| 245 |
- return __iop; |
| 246 |
-@@ -82,7 +82,7 @@ void rb_foreach(struct rb_node *n, struct io *iop, |
| 247 |
- } |
| 248 |
- if (iop_s < this_s) |
| 249 |
- rb_foreach(n->rb_left, iop, fnc, head); |
| 250 |
-- if (this_e < iop_e) |
| 251 |
-+ if ((this_e < iop_e) || (this_s < iop_s)) |
| 252 |
- rb_foreach(n->rb_right, iop, fnc, head); |
| 253 |
- } |
| 254 |
- } |
| 255 |
--- |
| 256 |
-2.15.1 |
| 257 |
- |
| 258 |
|
| 259 |
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 |
| 260 |
deleted file mode 100644 |
| 261 |
index 129f04107fa..00000000000 |
| 262 |
--- a/sys-block/blktrace/files/blktrace-1.2.0-parallel-build.patch |
| 263 |
+++ /dev/null |
| 264 |
@@ -1,71 +0,0 @@ |
| 265 |
-http://git.kernel.dk/?p=blktrace.git;a=commit;h=519fd9a5d08d85f3d9cb4192d624fe8351e40232 |
| 266 |
- |
| 267 |
-From 4569544261be495bdec0574d7729c85a62dabad7 Mon Sep 17 00:00:00 2001 |
| 268 |
-From: "Robin H. Johnson" <robbat2@g.o> |
| 269 |
-Date: Thu, 3 Feb 2011 03:07:06 +0000 |
| 270 |
-Subject: [PATCH] fix parallel build failures |
| 271 |
- |
| 272 |
-When building in parallel, the btreplay/btrecord and btreplay/btreplay |
| 273 |
-targets cause make to kick off two jobs for `make -C btreplay` and they |
| 274 |
-sometimes end up clobbering each other. We could fix this by making one |
| 275 |
-a dependency of the other, but it's a bit cleaner to refactor things to |
| 276 |
-be based on subdirs. This way changes in subdirs also get noticed: |
| 277 |
- $ touch btreplay/*.[ch] |
| 278 |
- $ make |
| 279 |
- <btreplay is now correctly updated> |
| 280 |
- |
| 281 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 282 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
| 283 |
---- |
| 284 |
- Makefile | 24 ++++++++++-------------- |
| 285 |
- 1 file changed, 10 insertions(+), 14 deletions(-) |
| 286 |
- |
| 287 |
-diff --git a/Makefile b/Makefile |
| 288 |
-index 68de59183a73..5917814d0344 100644 |
| 289 |
---- a/Makefile |
| 290 |
-+++ b/Makefile |
| 291 |
-@@ -4,23 +4,19 @@ ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 |
| 292 |
- PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon |
| 293 |
- LIBS = -lpthread |
| 294 |
- SCRIPTS = btrace |
| 295 |
-+SUBDIRS = btreplay btt iowatcher |
| 296 |
- |
| 297 |
--ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ |
| 298 |
-+ALL = $(PROGS) $(SCRIPTS) |
| 299 |
-+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \ |
| 300 |
- btt/bno_plot.py iowatcher/iowatcher |
| 301 |
- |
| 302 |
--all: $(ALL) |
| 303 |
-+all: $(ALL) $(SUBDIRS) |
| 304 |
- |
| 305 |
--btt/btt: |
| 306 |
-- $(MAKE) -C btt |
| 307 |
-- |
| 308 |
--iowatcher/iowatcher: |
| 309 |
-- $(MAKE) -C iowatcher |
| 310 |
-- |
| 311 |
--btreplay/btrecord: |
| 312 |
-- $(MAKE) -C btreplay |
| 313 |
-- |
| 314 |
--btreplay/btreplay: |
| 315 |
-- $(MAKE) -C btreplay |
| 316 |
-+# We always descend into subdirs because they contain their own dependency |
| 317 |
-+# information which we don't track in this top level Makefile. |
| 318 |
-+$(SUBDIRS): |
| 319 |
-+ $(MAKE) -C $@ |
| 320 |
-+.PHONY: $(SUBDIRS) |
| 321 |
- |
| 322 |
- %.o: %.c |
| 323 |
- $(CC) -o $*.o -c $(ALL_CFLAGS) $< |
| 324 |
-@@ -85,7 +81,7 @@ install: all |
| 325 |
- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) |
| 326 |
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 |
| 327 |
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8 |
| 328 |
-- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir) |
| 329 |
-+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir) |
| 330 |
- $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1 |
| 331 |
- $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8 |
| 332 |
- |
| 333 |
--- |
| 334 |
-2.15.1 |
| 335 |
- |
Archives