[csw-devel] SF.net SVN: gar:[8969] csw/mgar/pkg
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Thu Mar 4 20:49:22 CET 2010
Revision: 8969
http://gar.svn.sourceforge.net/gar/?rev=8969&view=rev
Author: skayser
Date: 2010-03-04 19:49:22 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
httperf: initial commit
Added Paths:
-----------
csw/mgar/pkg/httperf/
csw/mgar/pkg/httperf/branches/
csw/mgar/pkg/httperf/tags/
csw/mgar/pkg/httperf/trunk/
csw/mgar/pkg/httperf/trunk/Makefile
csw/mgar/pkg/httperf/trunk/checksums
csw/mgar/pkg/httperf/trunk/files/
csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch
csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch
csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch
Property changes on: csw/mgar/pkg/httperf/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/httperf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/httperf/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/httperf/trunk/Makefile 2010-03-04 19:49:22 UTC (rev 8969)
@@ -0,0 +1,54 @@
+# TODO
+# ! Doesn't compile yet, getopt.h is unhappy about the inclusion of
+# unistd.h (from patch 0002-...)
+#
+# source='getopt.c' object='getopt.o' libtool=no \
+# DEPDIR=.deps depmode=none /bin/bash ../../depcomp \
+# /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I../.. -I/opt/csw/include -xO3 -xarch=386 -DHAVE_SSL -c getopt.c
+#"/usr/include/iso/stdio_iso.h", line 165: identifier redeclared: rename
+# current : function(pointer to char, pointer to char) returning int
+# previous: function(pointer to const char, pointer to const char) returning int : "/usr/include/unistd.h", line 382
+#"/usr/include/stdio.h", line 265: identifier redeclared: getopt
+# current : function(int, pointer to pointer to char, pointer to char) returning int
+# previous: function(int, pointer to const pointer to char, pointer to const char) returning int : "/usr/include/unistd.h", line 282
+#
+GARNAME = httperf
+GARVERSION = 0.9.0
+CATEGORIES = apps
+
+DESCRIPTION = A tool for measuring web server performance.
+define BLURB
+ Httperf is a tool for measuring web server performance. It provides a
+ flexible facility for generating various HTTP workloads and for
+ measuring server performance.
+
+ The focus of httperf is not on implementing one particular benchmark but
+ on providing a robust, high-performance tool that facilitates the
+ construction of both micro- and macro-level benchmarks. The three
+ distinguishing characteristics of httperf are its robustness, which
+ includes the ability to generate and sustain server overload, support
+ for the HTTP/1.1 and SSL protocols, and its extensibility to new
+ workload generators and performance measurements.
+endef
+
+VENDOR_URL = http://code.google.com/p/httperf/
+MASTER_SITES = $(GOOGLE_MIRROR)
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# Put source tree -I instructions first so that <event.h> is not picked
+# up from -I/opt/csw/lib
+PATCHFILES = 0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch
+# Avoid implicit declarations for getpid and some str* functions
+PATCHFILES += 0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch
+# Rewrite non-constant subscript in array declaration to make cc happy
+PATCHFILES += 0003-avoid-variably-modified-type-in-struct.patch
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+
+# Patch 0001 tweaks "Makefile.am"s so we then pull out the autoreconf hammer
+pre-configure-modulated:
+ autoreconf -fi $(WORKSRC)
+ @$(MAKECOOKIE)
Added: csw/mgar/pkg/httperf/trunk/checksums
===================================================================
--- csw/mgar/pkg/httperf/trunk/checksums (rev 0)
+++ csw/mgar/pkg/httperf/trunk/checksums 2010-03-04 19:49:22 UTC (rev 8969)
@@ -0,0 +1,4 @@
+b5e6a0c732e428134783b6ec6e06c577 0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch
+4e9453cdd9a71c843b2e4dd561073f6c 0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch
+858eeb97b1106d2d4dbd2c171040866e 0003-avoid-variably-modified-type-in-struct.patch
+2968c36b9ecf3d98fc1f2c1c9c0d9341 httperf-0.9.0.tar.gz
Added: csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch
===================================================================
--- csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch (rev 0)
+++ csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch 2010-03-04 19:49:22 UTC (rev 8969)
@@ -0,0 +1,49 @@
+From 032fdb655f2c9096920c925577396fb71b9d7a78 Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Thu, 4 Mar 2010 19:37:27 +0100
+Subject: [PATCH 1/3] Move cpp includes from AM_CFLAGS to AM_CPPFLAGS
+
+---
+ src/Makefile.am | 2 +-
+ src/gen/Makefile.am | 2 +-
+ src/stat/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6685b4d..a91540d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ SUBDIRS = gen lib stat
+
+ # what flags you want to pass to the C compiler & linker
+-AM_CFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat
++AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat
+
+ bin_PROGRAMS = httperf idleconn
+ httperf_SOURCES = httperf.c httperf.h object.c object.h call.c call.h conn.c \
+diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am
+index 740f27e..75dff29 100644
+--- a/src/gen/Makefile.am
++++ b/src/gen/Makefile.am
+@@ -1,5 +1,5 @@
+ # what flags you want to pass to the C compiler & linker
+-AM_CFLAGS = -I$(srcdir)/..
++AM_CPPFLAGS = -I$(srcdir)/..
+ AM_LDFLAGS =
+
+ noinst_LIBRARIES = libgen.a
+diff --git a/src/stat/Makefile.am b/src/stat/Makefile.am
+index 08498aa..d98f3cb 100644
+--- a/src/stat/Makefile.am
++++ b/src/stat/Makefile.am
+@@ -1,5 +1,5 @@
+ # what flags you want to pass to the C compiler & linker
+-AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gen
++AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gen
+
+ noinst_LIBRARIES = libstat.a
+ libstat_a_SOURCES = basic.c sess_stat.c print_reply.c stats.h
+--
+1.6.6
+
Added: csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch
===================================================================
--- csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch (rev 0)
+++ csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch 2010-03-04 19:49:22 UTC (rev 8969)
@@ -0,0 +1,44 @@
+From 49711d5440c1c4711f2f8f1f52a0bcec1a901ad4 Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Thu, 4 Mar 2010 20:06:33 +0100
+Subject: [PATCH 2/3] getopt.c: include header files for getpid and strlen,strcmp,strncmp
+
+---
+ configure.ac | 1 +
+ src/lib/getopt.c | 8 ++++++++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2ef6369..811c0ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,6 +51,7 @@ AC_C_CONST
+ AC_TYPE_SIZE_T
+ AC_TYPE_SSIZE_T
+ AC_HEADER_TIME
++AC_HEADER_STDC
+ AC_CHECK_TYPE(u_char, unsigned char)
+ AC_CHECK_TYPE(u_short, unsigned short)
+ AC_CHECK_TYPE(u_int, unsigned int)
+diff --git a/src/lib/getopt.c b/src/lib/getopt.c
+index 1b386c0..4a7d279 100644
+--- a/src/lib/getopt.c
++++ b/src/lib/getopt.c
+@@ -32,6 +32,14 @@ Cambridge, MA 02139, USA. */
+
+ #include "config.h"
+
++#ifdef HAVE_STRING_H
++# include <string.h>
++#endif
++
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ #ifndef HAVE_GETOPT_LONG
+
+ #if !defined (__STDC__) || !__STDC__
+--
+1.6.6
+
Added: csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch
===================================================================
--- csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch (rev 0)
+++ csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch 2010-03-04 19:49:22 UTC (rev 8969)
@@ -0,0 +1,36 @@
+From 21ad56ee66fc00014fdc7c53ddd26c4d556c7867 Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Thu, 4 Mar 2010 20:33:33 +0100
+Subject: [PATCH 3/3] avoid variably modified type in struct
+
+This rewrites the floating point operation (i.e. non integer constant)
+for the array length of conn_lifetime_hist to an integer constant.
+Otherwise cc is unhappy.
+
+ "basic.c", line 97: warning: can not declare variably modified type at file scope
+ "basic.c", line 97: warning: member can not have variably modified type: conn_lifetime_hist
+
+For some background details see:
+Sun Studio C - Is this warning valid? Is it suppressable?
+http://forums.sun.com/thread.jspa?threadID=5412459
+---
+ src/stat/basic.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/stat/basic.c b/src/stat/basic.c
+index e5c4b77..be57bc3 100644
+--- a/src/stat/basic.c
++++ b/src/stat/basic.c
+@@ -50,7 +50,8 @@
+ times. */
+ #define MAX_LIFETIME 100.0 /* max. conn. lifetime in seconds */
+ #define BIN_WIDTH 1e-3
+-#define NUM_BINS ((u_int) (MAX_LIFETIME / BIN_WIDTH))
++/*#define NUM_BINS ((u_int) (MAX_LIFETIME / BIN_WIDTH)) */
++#define NUM_BINS 100000
+
+ static struct
+ {
+--
+1.6.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list