Skip to contentSkip to conversation

pull request #2 for benchmark recipes

PATCH Superseded Noor, Ahsan 2 participants 6 messages Aug 30, 2011

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover pull request #2 for benchmark recipes

From: Noor Ahsan <[email protected]>

The following changes since commit eeb0e7ce1e3cf7be787eae20a6ed4e15faa55e35:
Noor Ahsan (1):
tiobench: Add version 0.3.3 (initial recipe)

are available in the git repository at:

git://github.com/Noor-Ahsan/meta-oe master
https://github.com/Noor-Ahsan/meta-oe/tree/master

Noor Ahsan (3):
bonnie++: Add version 1.03c (initial recipe)
netperf: Add version 2.4.4 (initial recipe)
iozone3: Add version 263 (initial recipe)

 meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb |   30 ++++++
 .../bonnie/files/gcc-4.3-fixes.patch               |   19 ++++
 .../iozone3/iozone3/copyright.txt                  |   62 +++++++++++
 .../iozone3/iozone3/fileop-arm.patch               |   32 ++++++
 meta-oe/recipes-benchmark/iozone3/iozone3_263.bb   |  111 ++++++++++++++++++++
 .../recipes-benchmark/netperf/files/cpu_set.patch  |   27 +++++
 meta-oe/recipes-benchmark/netperf/files/init       |   51 +++++++++
 .../recipes-benchmark/netperf/files/vfork.patch    |   29 +++++
 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb |   53 +++++++++
 9 files changed, 414 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb
 create mode 100644 meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch
 create mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3/copyright.txt
 create mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch
 create mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3_263.bb
 create mode 100644 meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
 create mode 100644 meta-oe/recipes-benchmark/netperf/files/init
 create mode 100755 meta-oe/recipes-benchmark/netperf/files/vfork.patch
 create mode 100644 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
#1 lore raw

PATCH 1/3 bonnie++: Add version 1.03c (initial recipe)

From: Noor Ahsan <[email protected]>

* Imported from oe.dev commit id 44985d56bc556786812a0a02d6219afd31a7381d.
* Merge .bb and .inc file.

---
 meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb |   30 ++++++++++++++++++++
 .../bonnie/files/gcc-4.3-fixes.patch               |   19 ++++++++++++
 2 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb
 create mode 100644 meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch
meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb new file +30 -0
new file mode 100644
index 0000000..2067307
@@ -0,0 +1,30 @@
+DESCRIPTION = "Tests large file IO and creation/deletion of small files."
+HOMEPAGE = "http://www.coker.com.au/bonnie++/"
+LICENSE = "GPL v2"
+LIC_FILES_CHKSUM = "file://copyright.txt;md5=cd4dde95a6b9d122f0a9150ae9cc3ee0"
+
+SRC_URI = "http://www.coker.com.au/bonnie++/bonnie++-${PV}.tgz \
+           file://gcc-4.3-fixes.patch \
+           "
+SRC_URI[md5sum] = "77a1ba78f37bdd7f024b67e1e36ad151"
+SRC_URI[sha256sum] = "c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26"
+
+SCRIPTS = "bon_csv2html bon_csv2txt"
+EXES = "bonnie++ zcav"
+
+inherit autotools
+
+do_install () {
+        install -d ${D}/bin
+        install -d ${D}/sbin
+        install -m 0755 ${EXES} ${D}/sbin
+        install -m 0755 ${SCRIPTS} ${D}/bin
+}
+
+PACKAGES += "bonnie-scripts"
+
+FILES_${PN} = "/sbin"
+FILES_bonnie-scripts="/bin"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch new file +19 -0
new file mode 100644
index 0000000..67f1b74
@@ -0,0 +1,19 @@
+Includes string.h to one of the source file.
+
+Upstream-Status: Inappropriate [not author.]
+---
+ zcav.cpp |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: bonnie++-1.03a/zcav.cpp
+===================================================================
+--- bonnie++-1.03a.orig/zcav.cpp
++++ bonnie++-1.03a/zcav.cpp
+@@ -15,6 +15,7 @@ using namespace std;
+ #else
+ #include <vector.h>
+ #endif
++#include <string.h>
+ 
+ // Read the specified number of megabytes of data from the fd and return the
+ // amount of time elapsed in seconds.
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [meta-oe][PATCH 1/3] bonnie++: Add version 1.03c (initial recipe)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 30-08-11 12:58, Noor, Ahsan schreef:

Quoted 9 lines

From: Noor Ahsan <[email protected]>

* Imported from oe.dev commit id 44985d56bc556786812a0a02d6219afd31a7381d. * Merge .bb and .inc file.

meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb create mode 100644 meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch

meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb new file mode 100644 index 0000000..2067307 --- /dev/null +++ b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Tests large file IO and renamed from meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb +0 -0

creation/deletion of small files." +HOMEPAGE = "http://www.coker.com.au/bonnie++/" +LICENSE = "GPL v2"

without spaces please

Quoted 2 lines

+LIC_FILES_CHKSUM = "file://copyright.txt;md5=cd4dde95a6b9d122f0a9150ae9cc3ee0" + +SRC_URI = "http://www.coker.com.au/bonnie++/bonnie++-${PV}.tgz \ + file://gcc-4.3-fixes.patch \ + " +SRC_URI[md5sum] = "77a1ba78f37bdd7f024b67e1e36ad151" +SRC_URI[sha256sum] =
"c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26" + +SCRIPTS = "bon_csv2html bon_csv2txt" +EXES = "bonnie++ zcav"

And move those 2 below the inherit line please.

Quoted 2 lines

+ +inherit autotools + +do_install () { + install -d ${D}/bin + install -d ${D}/sbin + install -m 0755 ${EXES} ${D}/sbin + install -m 0755 ${SCRIPTS} ${D}/bin +} + +PACKAGES += "bonnie-scripts" + +FILES_${PN} = "/sbin" +FILES_bonnie-scripts="/bin" + +TARGET_CC_ARCH
+= "${LDFLAGS}"

and move this one above do_install please. The general idea is to group them by usage and TARGET_CC_ARCH is a configure/compile thing.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOXM5GMkyGM64RGpERAsl1AKClQMALBYl1u1e67wpOM9+Sp3L1rgCeN/tw jieEZYOfqBAgQFkgDaqmfko=
=mlKS
-----END PGP SIGNATURE-----

#3 lore raw

Re: [meta-oe][PATCH 1/3] bonnie++: Add version 1.03c (initial recipe)

Quoted 3 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf

Of

Quoted 12 lines

Koen Kooi
Sent: Tuesday, August 30, 2011 4:49 PM
To: [email protected]
Subject: Re: [oe] [meta-oe][PATCH 1/3] bonnie++: Add version 1.03c (initial recipe)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 30-08-11 12:58, Noor, Ahsan schreef:

Quoted 2 lines

From: Noor Ahsan <[email protected]>

Quoted 9 lines
Quoted 1 line

* Imported from oe.dev commit id

44985d56bc556786812a0a02d6219afd31a7381d. * Merge .bb and .inc file.

Quoted 2 lines

oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb | 30
++++++++++++++++++++ .../bonnie/files/gcc-4.3-fixes.patch
| 19 ++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-)
create mode 100644

Quoted 1 line

meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb create mode

100644

Quoted 22 lines

meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03c.bb new file mode 100644 index 0000000..2067307 --- /dev/null +++ b/meta-oe/recipes- benchmark/bonnie/bonnie++_1.03c.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Tests large file IO and

Quoted 1 line

creation/deletion of small files." +HOMEPAGE =

"http://www.coker.com.au/bonnie++/" +LICENSE = "GPL v2"

without spaces please

Quoted 1 line

+LIC_FILES_CHKSUM =

"file://copyright.txt;md5=cd4dde95a6b9d122f0a9150ae9cc3ee0" + +SRC_URI = "http://www.coker.com.au/bonnie++/bonnie++-${PV}.tgz \ +
file://gcc-4.3-fixes.patch \ + " +SRC_URI[md5sum] =
"77a1ba78f37bdd7f024b67e1e36ad151" +SRC_URI[sha256sum] =

Quoted 1 line

"c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26" +

+SCRIPTS = "bon_csv2html bon_csv2txt" +EXES = "bonnie++ zcav"

And move those 2 below the inherit line please.

Quoted 8 lines
Quoted 1 line

+ +inherit autotools + +do_install () { + install -d ${D}/bin

+ install -d ${D}/sbin + install -m 0755 ${EXES}
${D}/sbin + install -m 0755 ${SCRIPTS} ${D}/bin +} + +PACKAGES
+= "bonnie-scripts" + +FILES_${PN} = "/sbin" +FILES_bonnie- scripts="/bin" + +TARGET_CC_ARCH

Quoted 1 line

+= "${LDFLAGS}"

and move this one above do_install please. The general idea is to

group

Quoted 6 lines

them by usage and TARGET_CC_ARCH is a configure/compile thing.

regards,

Koen

Hi,

The recipe is verified on oe-styliz.py script and the formatting is done by that script. Your recommendations are conflicting with oe-stylize. Kindly update oe-stylize according to your recommendation so that it give output according to your expectations.

Thanks.

Regards,
Noor

#4 lore raw

PATCH 2/3 netperf: Add version 2.4.4 (initial recipe)

In reply to Noor, Ahsan

From: Noor Ahsan <[email protected]>

* Import from oe.dev commit id c03c179bb19249b86c9ba0c6ea88701689ed2f3e.
* Add do_configure_prepend function which make sure the paths in the example script match up where stuff is placed after build.

---
 .../recipes-benchmark/netperf/files/cpu_set.patch  |   27 ++++++++++
 meta-oe/recipes-benchmark/netperf/files/init       |   51 +++++++++++++++++++
 .../recipes-benchmark/netperf/files/vfork.patch    |   29 +++++++++++
 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb |   53 ++++++++++++++++++++
 4 files changed, 160 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
 create mode 100644 meta-oe/recipes-benchmark/netperf/files/init
 create mode 100755 meta-oe/recipes-benchmark/netperf/files/vfork.patch
 create mode 100644 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
meta-oe/recipes-benchmark/netperf/files/cpu_set.patch new file +27 -0
new file mode 100644
index 0000000..5d7e149
@@ -0,0 +1,27 @@
+Define some macroes under the definition of CPU_SETSIZE.
+
+Upstream-Status: Inappropriate [not author]
+Index: netperf-2.4.4/src/netlib.c
+===================================================================
+--- netperf-2.4.4.orig/src/netlib.c	2007-10-17 23:16:02.000000000 +0200
++++ netperf-2.4.4/src/netlib.c	2008-12-03 17:56:32.000000000 +0100
+@@ -1988,10 +1988,15 @@
+      fall-back on what we had before, which is to use just the size of
+      an unsigned long. raj 2006-09-14 */
+ 
+-#if defined(__CPU_SETSIZE)
+-#define NETPERF_CPU_SETSIZE __CPU_SETSIZE
+-#define NETPERF_CPU_SET(cpu, cpusetp)  __CPU_SET(cpu, cpusetp)
+-#define NETPERF_CPU_ZERO(cpusetp)      __CPU_ZERO (cpusetp)
++#if defined(CPU_SETSIZE)
++#define NETPERF_CPU_SETSIZE CPU_SETSIZE
++#define NETPERF_CPU_SET(cpu, cpusetp)  CPU_SET(cpu, cpusetp)
++#define NETPERF_CPU_ZERO(cpusetp)      CPU_ZERO (cpusetp)
++  typedef cpu_set_t netperf_cpu_set_t;
++#elif defined(__CPU_SETSIZE)
++#define NETPERF_CPU_SETSIZE __CPU_SETSIZE
++#define NETPERF_CPU_SET(cpu, cpusetp)  __CPU_SET (cpu, cpusetp)
++#define NETPERF_CPU_ZERO(cpusetp)      __CPU_ZERO (cpusetp)
+   typedef cpu_set_t netperf_cpu_set_t;
+ #else
+ #define NETPERF_CPU_SETSIZE sizeof(unsigned long)
meta-oe/recipes-benchmark/netperf/files/init new file +51 -0

51 lines not on this page · raw message

meta-oe/recipes-benchmark/netperf/files/vfork.patch new file +29 -0
new file mode 100755
index 0000000..1702f55
@@ -0,0 +1,29 @@
+Falls back from fork to vfork if HAVE_FORK is not defined.
+
+Upstream-Status: Inappropriate [not author]
+--- netperf-2.4.4/src/netserver.c	2007-10-17 17:09:12.000000000 -0400
++++ netperf-2.4.4.new/src/netserver.c	2011-01-23 12:26:39.000000000 -0500
+@@ -567,7 +567,11 @@
+   fflush (stdin);
+   fflush (stdout);
+   fflush (stderr);
++#if defined(HAVE_FORK)
+   switch (fork())
++#else
++  switch (vfork())
++#endif
+     {
+     case -1:  	
+       perror("netperf server error");
+@@ -712,7 +716,11 @@
+ #else
+       signal(SIGCLD, SIG_IGN);
+ 	  
++#if defined(HAVE_FORK)
+ 	  switch (fork())
++#else
++	  switch (vfork())
++#endif
+ 	    {
+ 	    case -1:
+ 	      /* something went wrong */
meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb new file +53 -0

53 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 3/3 iozone3: Add version 263 (initial recipe)

In reply to Noor, Ahsan

From: Noor Ahsan <[email protected]>

* Import from oe.dev commit id b55dcd636a162541a4cdcace8c106869fbb9465b.
* Bring LIC_FILES_CHKSUM from iozone.c file.

---
 .../iozone3/iozone3/copyright.txt                  |   62 +++++++++++
 .../iozone3/iozone3/fileop-arm.patch               |   32 ++++++
 meta-oe/recipes-benchmark/iozone3/iozone3_263.bb   |  111 ++++++++++++++++++++
 3 files changed, 205 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3/copyright.txt
 create mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch
 create mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3_263.bb
meta-oe/recipes-benchmark/iozone3/iozone3/copyright.txt new file +62 -0
new file mode 100644
index 0000000..3468fa9
@@ -0,0 +1,62 @@
+LICENSE:
+
+ Copyright 1991, 1992, 1994, 1998, 1999, 2002   William D. Norcott
+
+ License to freely use and distribute this software is hereby granted 
+ by the author, subject to the condition that this copyright notice 
+ remains intact.  The author retains the exclusive right to publish 
+ derivative works based on this work, including, but not limited to
+ revised versions of this work.
+
+
+
+Below is author reply to question about distributing iozone3 in
+OpenEmbedded:
+
+========================================================================
+
+Marcin,
+
+        Re-distribution is permitted as long as the copyright is
+    maintained and the source code is not changed. I do not
+    see a problem with your mods to enable fileop for Linux-arm,
+    as these mods have been returned to the Iozone folks,
+    and they have been accepted for inclusion in the next
+    release :-)
+
+Thank you for your contribution,
+Don Capps
+
+----- Original Message ----- 
+From: "Marcin Juszkiewicz" <[email protected]>
+To: "Don Capps" <[email protected]>; "William D. Norcott" 
+<[email protected]>
+Sent: Sunday, October 29, 2006 4:55 PM
+Subject: iozone3 263 patch for arm and License question
+
+
+> Morning
+>
+> I want to include iozone3 in OpenEmbedded [1] metadata to give it for
+> other developers. Currently OE is used to build few distributions for
+> misc platforms: ARM, SH3, SH4, x86, PowerPC and different types of
+> machines (PDA, settopbox, devboards, desktops, thin clients, routers).
+>
+> According to your distribution of derivations is forbidden. Packaging
+> iozone3 in OpenEmbedded will not involve any source code changes. But
+> when I was building it for ARM I discovered that fileop binary was not
+> built - so I created patch for it (attached). Not yet tested it on target
+> device.
+>
+> Thus, I seek your written permission via e-mail to distribute a package of
+> the unmodified source code and also a package of the pre-compiled binary.
+> Your copyright statement will be included in the package.
+>
+>
+> 1. http://www.openembedded.org/
+>
+> Regards
+> -- 
+> JID: hrw-jabber.org
+> OpenEmbedded developer/consultant
+
meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch new file +32 -0
new file mode 100644
index 0000000..c71bfee
@@ -0,0 +1,32 @@
+Modify makefile to compile fileop.c file for ARM architecture.
+
+Upstream-Status: Inappropriate [not author]
+Index: current/makefile
+===================================================================
+--- current.orig/makefile	2006-10-14 21:42:36.000000000 +0200
++++ current/makefile	2006-10-14 21:40:02.000000000 +0200
+@@ -190,9 +190,10 @@
+ #
+ # GNU 'C' compiler Linux build with threads, largefiles, async I/O
+ #
+-linux-arm:	iozone_linux-arm.o  libbif.o libasync.o
++linux-arm:	iozone_linux-arm.o  libbif.o libasync.o fileop_linux-arm.o
+ 	$(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \
+ 		-lrt -lpthread -o iozone
++	$(CC)  -O3 -Dlinux fileop_linux-arm.o -o fileop
+ 
+ #
+ # GNU 'C' compiler Linux build with threads, largefiles, async I/O 
+@@ -725,6 +726,12 @@
+ 	@echo ""
+ 	$(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux-AMD64.o
+ 
++fileop_linux-arm.o:	fileop.c
++	@echo ""
++	@echo "Building fileop for Linux-arm"
++	@echo ""
++	$(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux-arm.o
++
+ fileop_windows.o: fileop.c
+ 	@echo ""
+ 	@echo "Building fileop for Windows"
meta-oe/recipes-benchmark/iozone3/iozone3_263.bb new file +111 -0

111 lines not on this page · raw message

Signature · 1 line
1.7.0.4