[netperf-dev] netperf4 commit notice r4 - in trunk: . src
src/missing
raj at netperf.org
raj at netperf.org
Tue Oct 25 14:31:15 PDT 2005
Author: raj
Date: 2005-10-25 14:31:11 -0700 (Tue, 25 Oct 2005)
New Revision: 4
Added:
trunk/autogen.sh
trunk/src/missing/get_expiration_time.c
Modified:
trunk/config.h.in
trunk/configure
trunk/configure.ac
trunk/src/Makefile.in
trunk/src/netperf.c
Log:
Add a replacement for get_expiration_time and pt autogen.sh into the repos.
Added: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2005-10-25 00:15:58 UTC (rev 3)
+++ trunk/autogen.sh 2005-10-25 21:31:11 UTC (rev 4)
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+aclocal -I src/missing/m4 \
+&& automake --add-missing \
+&& autoconf
Property changes on: trunk/autogen.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in 2005-10-25 00:15:58 UTC (rev 3)
+++ trunk/config.h.in 2005-10-25 21:31:11 UTC (rev 4)
@@ -42,6 +42,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
+/* Define to 1 if you have the `get_expiration_time' function. */
+#undef HAVE_GET_EXPIRATION_TIME
+
/* Define to one to include ICSC-EXS tests. */
#undef HAVE_ICSC_EXS
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-10-25 00:15:58 UTC (rev 3)
+++ trunk/configure 2005-10-25 21:31:11 UTC (rev 4)
@@ -23430,7 +23430,7 @@
#AC_CONFIG_SUBDIRS(src/missing)
-# does this platform need the replacement getaddrinfo
+# does this platform need the replacement getaddrinfo or other
@@ -23584,6 +23584,120 @@
fi
+for ac_func in get_expiration_time
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+if test "$ac_cv_func_get_expiration_time" != yes ; then
+ { echo "$as_me:$LINENO: Requesting replacement get_expiration_time" >&5
+echo "$as_me: Requesting replacement get_expiration_time" >&6;}
+ case $LIBOBJS in
+ "missing/get_expiration_time.$ac_objext" | \
+ *" missing/get_expiration_time.$ac_objext" | \
+ "missing/get_expiration_time.$ac_objext "* | \
+ *" missing/get_expiration_time.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS missing/get_expiration_time.$ac_objext" ;;
+esac
+
+fi
+
+
for ac_func in sendfile
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-10-25 00:15:58 UTC (rev 3)
+++ trunk/configure.ac 2005-10-25 21:31:11 UTC (rev 4)
@@ -71,7 +71,7 @@
#AC_CONFIG_SUBDIRS(src/missing)
-# does this platform need the replacement getaddrinfo
+# does this platform need the replacement getaddrinfo or other
AC_CHECK_FUNCS([getnameinfo getaddrinfo inet_ntop getopt_long])
# AC_REPLACE_FUNCS([getaddrinfo])
@@ -90,6 +90,12 @@
AC_LIBOBJ(missing/getopt1)
fi
+AC_CHECK_FUNCS([get_expiration_time])
+if test "$ac_cv_func_get_expiration_time" != yes ; then
+ AC_MSG_NOTICE([Requesting replacement get_expiration_time])
+ AC_LIBOBJ(missing/get_expiration_time)
+fi
+
AC_CHECK_FUNCS(sendfile)
AC_CHECK_FUNCS(mpctl processor_bind sched_setaffinity bind_to_cpu_id)
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2005-10-25 00:15:58 UTC (rev 3)
+++ trunk/src/Makefile.in 2005-10-25 21:31:11 UTC (rev 4)
@@ -199,7 +199,8 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/missing/getaddrinfo.Po \
+ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/missing/get_expiration_time.Po \
+ at AMDEP_TRUE@ $(DEPDIR)/missing/getaddrinfo.Po \
@AMDEP_TRUE@ $(DEPDIR)/missing/getopt.Po \
@AMDEP_TRUE@ $(DEPDIR)/missing/getopt1.Po \
@AMDEP_TRUE@ $(DEPDIR)/missing/inet_ntop.Po \
@@ -218,7 +219,8 @@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) \
$(netperf_SOURCES) $(netserver_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am missing/getaddrinfo.c \
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am \
+ missing/get_expiration_time.c missing/getaddrinfo.c \
missing/getopt.c missing/getopt1.c missing/inet_ntop.c
SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) $(netperf_SOURCES) $(netserver_SOURCES)
@@ -305,6 +307,7 @@
distclean-compile:
-rm -f *.tab.c
+ at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/get_expiration_time.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/getaddrinfo.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/getopt.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/getopt1.Po at am__quote@
Added: trunk/src/missing/get_expiration_time.c
===================================================================
--- trunk/src/missing/get_expiration_time.c 2005-10-25 00:15:58 UTC (rev 3)
+++ trunk/src/missing/get_expiration_time.c 2005-10-25 21:31:11 UTC (rev 4)
@@ -0,0 +1,17 @@
+/* a very crude replacement for the get_expiration_time routine that
+ can be found under HP-UX */
+
+#include <sys/time.h>
+#include <time.h>
+
+int get_expiration_time(struct timespec *delta,struct timespec *abstime )
+{
+ struct timeval now;
+ gettimeofday(&now,NULL);
+ abstime->tv_sec = now.tv_sec + delta->tv_sec;
+ abstime->tv_nsec = (now.tv_usec * 1000) + delta->tv_nsec;
+ while (delta->tv_nsec > 1000000000) {
+ abstime->tv_sec += 1;
+ delta->tv_nsec -= 1000000000;
+ }
+}
Modified: trunk/src/netperf.c
===================================================================
--- trunk/src/netperf.c 2005-10-25 00:15:58 UTC (rev 3)
+++ trunk/src/netperf.c 2005-10-25 21:31:11 UTC (rev 4)
@@ -783,7 +783,7 @@
}
pthread_mutex_lock(&h->hash_lock);
get_expiration_time(&delta_time,&abstime);
- rc = pthread_cond_timedwait(&h->condition, &h->hash_lock, & abstime);
+ rc = pthread_cond_timedwait(&h->condition, &h->hash_lock, &abstime);
if (debug) {
fprintf(where,
"resolve_dependency: pthread_cond_wait exited %d\n",rc);
More information about the netperf-dev
mailing list