* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/tiobench/files/
@ 2017-11-26 12:52 Alice Ferrazzi
0 siblings, 0 replies; 2+ messages in thread
From: Alice Ferrazzi @ 2017-11-26 12:52 UTC (permalink / raw
To: gentoo-commits
commit: 764b44334566a3ba3634b05b6617712469b9c254
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov 26 10:35:08 2017 +0000
Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 12:52:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764b4433
app-benchmark/tiobench: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/6304
app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch | 12 ------------
.../files/0.3.3-column-description-fix.patch | 21 ---------------------
.../tiobench/files/0.3.3-glibc-2.16.patch | 21 ---------------------
3 files changed, 54 deletions(-)
diff --git a/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch b/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
deleted file mode 100644
index 9145ae47044..00000000000
--- a/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur tiobench-0.3.3.orig/Makefile tiobench-0.3.3/Makefile
---- tiobench-0.3.3.orig/Makefile 2002-03-13 20:22:55.000000000 +0000
-+++ tiobench-0.3.3/Makefile 2006-09-16 17:07:21.181644608 +0000
-@@ -34,7 +34,7 @@
- $(CC) -c $(CFLAGS) $(DEFINES) tiotest.c -o tiotest.o
-
- $(EXE): tiotest.o crc32.o
-- $(LINK) -o $(EXE) tiotest.o crc32.o -lpthread
-+ $(LINK) -o $(EXE) $(LDFLAGS) tiotest.o crc32.o -lpthread
- @echo
- @echo "./tiobench.pl --help for usage options"
- @echo
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
deleted file mode 100644
index b3ebb90b33e..00000000000
--- a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tiobench.pl 2005-02-23 00:21:33.000000000 +0100
-+++ tiobench.pl 2005-03-15 18:11:19.000000000 +0100
-@@ -168,6 +168,8 @@
- $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'stime'} ) /
- $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'time'};
- $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpueff'} =
-+ ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'} == 0) ?
-+ '0' :
- ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'rate'} /
- ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'}/100));
- }
-@@ -196,6 +198,9 @@
- $report{'SEQ_WRITES'} = "Sequential Writes";
- $report{'RAND_WRITES'} = "Random Writes";
-
-+# The top is the same for all 4 reports
-+$^ = 'SEQ_READS_TOP';
-+
- foreach my $title ('SEQ_READS', 'RAND_READS', 'SEQ_WRITES', 'RAND_WRITES') {
- $-=0; $~="$title"; $^L=''; # reporting variables
- print "\n$report{$title}\n";
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
deleted file mode 100644
index fed845a51d6..00000000000
--- a/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur tiobench-0.3.3.orig/tiotest.c tiobench-0.3.3/tiotest.c
---- tiobench-0.3.3.orig/tiotest.c 2001-03-05 02:34:00.000000000 +0000
-+++ tiobench-0.3.3/tiotest.c 2012-11-04 22:44:41.695677071 +0000
-@@ -31,7 +31,7 @@
- */
- ArgumentOptions args;
-
--static void * aligned_alloc(ssize_t size)
-+static void * tio_aligned_alloc(ssize_t size)
- {
- caddr_t a;
- a = mmap((caddr_t )0, size,
-@@ -281,7 +281,7 @@
- pthread_attr_setscope(&(d->threads[i].thread_attr),
- PTHREAD_SCOPE_SYSTEM);
-
-- d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize );
-+ d->threads[i].buffer = tio_aligned_alloc( d->threads[i].blockSize );
- if( d->threads[i].buffer == NULL )
- {
- perror("Error allocating memory");
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/tiobench/files/
@ 2022-08-17 7:05 Alice Ferrazzi
0 siblings, 0 replies; 2+ messages in thread
From: Alice Ferrazzi @ 2022-08-17 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 27c8f8ab4c78612bf69f985cbe922747d0775110
Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 07:04:36 2022 +0000
Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 07:04:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c8f8ab
app-benchmarks/tiobench/files: Remove 0.4.2 remaint files
Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org>
.../files/tiobench-0.4.2-fix-perl-shebang.patch | 51 ----------------------
.../tiobench/files/tiobench-0.4.2-gcc5.patch | 48 --------------------
2 files changed, 99 deletions(-)
diff --git a/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch b/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch
deleted file mode 100644
index 900472d80dd2..000000000000
--- a/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Fix perl shebangs, in order to be maximally compatible with Gentoo Prefix.
-Rationale: https://blogs.gentoo.org/mgorny/2016/02/08/a-quick-note-on-portable-shebangs/
-
---- a/scripts/makeimages.pl
-+++ b/scripts/makeimages.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-
- # Author: James Manning <jmm@users.sf.net>
- # This software may be used and distributed according to the terms of
-@@ -8,6 +8,7 @@
- # Perl wrapper for calling tiobench.pl and displaying results
- # graphically using gnuplot
-
-+use warnings;
- use strict;
-
- my $args = join(" ",@ARGV);
---- a/scripts/tiosum.pl
-+++ b/scripts/tiosum.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- # Author: Randy Hron <rwhron (at) earthlink dot net>
- # This software may be used and distributed according to the terms of
- # the GNU General Public License, http://www.gnu.org/copyleft/gpl.html
-@@ -6,6 +6,7 @@
- # Summarize output of tiobench2.pl for multiple kernels/runs.
- # Assumes logfiles created with:
- # ./tiobench2.pl > tiobench-`uname -r` 2> tiobench-`uname -r`.err
-+use warnings;
- use strict;
- $|++;
-
---- a/tiobench.pl
-+++ b/tiobench.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-
- # Author: James Manning <jmm at users.sf.net>
- # Author: Randy Hron <rwhron at earthlink dot net>
-@@ -9,6 +9,7 @@
- # Perl wrapper for calling the tiotest executable multiple times
- # with varying sets of parameters as instructed
-
-+use warnings;
- use strict;
- use Getopt::Long;
-
diff --git a/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch b/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch
deleted file mode 100644
index e1bf89b87ec3..000000000000
--- a/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/crc32.c b/crc32.c
-index bae7384..a22fc5d 100644
---- a/crc32.c
-+++ b/crc32.c
-@@ -72,10 +72,9 @@ static const unsigned long crctab[256] = {
- 0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
- };
-
--inline
--unsigned long crc32( const void* buffer,
-- unsigned long length,
-- unsigned long crc)
-+unsigned long crc32(const void* buffer,
-+ unsigned long length,
-+ unsigned long crc)
- {
- const unsigned char* cp = (const unsigned char*)buffer;
-
-diff --git a/crc32.h b/crc32.h
-index 62b3433..cb9b96f 100644
---- a/crc32.h
-+++ b/crc32.h
-@@ -18,9 +18,8 @@
- #ifndef CRC32_H
- #define CRC32_H
-
--inline
--unsigned long crc32( const void* const buffer,
-- unsigned long length,
-- unsigned long crc);
-+unsigned long crc32(const void* const buffer,
-+ unsigned long length,
-+ unsigned long crc);
-
- #endif
-diff --git a/tiotest.c b/tiotest.c
-index c23ceb4..bb73fcb 100644
---- a/tiotest.c
-+++ b/tiotest.c
-@@ -1392,7 +1392,7 @@ static int do_mmap_read_operation(void *loc, ThreadData *d)
-
- if(crc != d->bufferCrc)
- {
-- fprintf(stderr, "Thread(%lu) mmap consistency check failed at 0x%x\n", d->myNumber, (unsigned int)loc);
-+ fprintf(stderr, "Thread(%lu) mmap consistency check failed at 0x%p\n", d->myNumber, loc);
- return -1;
- }
- }
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-17 7:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-17 7:05 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/tiobench/files/ Alice Ferrazzi
-- strict thread matches above, loose matches on Subject: below --
2017-11-26 12:52 Alice Ferrazzi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox