Gentoo Archives: gentoo-commits

From: Alice Ferrazzi <alicef@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/tiobench/files/
Date: Sun, 26 Nov 2017 12:52:49
Message-Id: 1511700738.764b44334566a3ba3634b05b6617712469b9c254.alicef@gentoo
1 commit: 764b44334566a3ba3634b05b6617712469b9c254
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 26 10:35:08 2017 +0000
4 Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 26 12:52:18 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764b4433
7
8 app-benchmark/tiobench: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/6304
11
12 app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch | 12 ------------
13 .../files/0.3.3-column-description-fix.patch | 21 ---------------------
14 .../tiobench/files/0.3.3-glibc-2.16.patch | 21 ---------------------
15 3 files changed, 54 deletions(-)
16
17 diff --git a/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch b/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
18 deleted file mode 100644
19 index 9145ae47044..00000000000
20 --- a/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
21 +++ /dev/null
22 @@ -1,12 +0,0 @@
23 -diff -Nur tiobench-0.3.3.orig/Makefile tiobench-0.3.3/Makefile
24 ---- tiobench-0.3.3.orig/Makefile 2002-03-13 20:22:55.000000000 +0000
25 -+++ tiobench-0.3.3/Makefile 2006-09-16 17:07:21.181644608 +0000
26 -@@ -34,7 +34,7 @@
27 - $(CC) -c $(CFLAGS) $(DEFINES) tiotest.c -o tiotest.o
28 -
29 - $(EXE): tiotest.o crc32.o
30 -- $(LINK) -o $(EXE) tiotest.o crc32.o -lpthread
31 -+ $(LINK) -o $(EXE) $(LDFLAGS) tiotest.o crc32.o -lpthread
32 - @echo
33 - @echo "./tiobench.pl --help for usage options"
34 - @echo
35
36 diff --git a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
37 deleted file mode 100644
38 index b3ebb90b33e..00000000000
39 --- a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
40 +++ /dev/null
41 @@ -1,21 +0,0 @@
42 ---- tiobench.pl 2005-02-23 00:21:33.000000000 +0100
43 -+++ tiobench.pl 2005-03-15 18:11:19.000000000 +0100
44 -@@ -168,6 +168,8 @@
45 - $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'stime'} ) /
46 - $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'time'};
47 - $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpueff'} =
48 -+ ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'} == 0) ?
49 -+ '0' :
50 - ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'rate'} /
51 - ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'}/100));
52 - }
53 -@@ -196,6 +198,9 @@
54 - $report{'SEQ_WRITES'} = "Sequential Writes";
55 - $report{'RAND_WRITES'} = "Random Writes";
56 -
57 -+# The top is the same for all 4 reports
58 -+$^ = 'SEQ_READS_TOP';
59 -+
60 - foreach my $title ('SEQ_READS', 'RAND_READS', 'SEQ_WRITES', 'RAND_WRITES') {
61 - $-=0; $~="$title"; $^L=''; # reporting variables
62 - print "\n$report{$title}\n";
63
64 diff --git a/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch b/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
65 deleted file mode 100644
66 index fed845a51d6..00000000000
67 --- a/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
68 +++ /dev/null
69 @@ -1,21 +0,0 @@
70 -diff -Nur tiobench-0.3.3.orig/tiotest.c tiobench-0.3.3/tiotest.c
71 ---- tiobench-0.3.3.orig/tiotest.c 2001-03-05 02:34:00.000000000 +0000
72 -+++ tiobench-0.3.3/tiotest.c 2012-11-04 22:44:41.695677071 +0000
73 -@@ -31,7 +31,7 @@
74 - */
75 - ArgumentOptions args;
76 -
77 --static void * aligned_alloc(ssize_t size)
78 -+static void * tio_aligned_alloc(ssize_t size)
79 - {
80 - caddr_t a;
81 - a = mmap((caddr_t )0, size,
82 -@@ -281,7 +281,7 @@
83 - pthread_attr_setscope(&(d->threads[i].thread_attr),
84 - PTHREAD_SCOPE_SYSTEM);
85 -
86 -- d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize );
87 -+ d->threads[i].buffer = tio_aligned_alloc( d->threads[i].blockSize );
88 - if( d->threads[i].buffer == NULL )
89 - {
90 - perror("Error allocating memory");