Index: GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 53c53 < make -C $$d $@ || exit $$?; \ --- > $(MAKE) -C $$d $@ || exit $$?; \ 55c55 < done --- > done 70c70 < make -C $$d $@ || exit $$?; \ --- > $(MAKE) -C $$d $@ || exit $$?; \ 72c72 < done --- > done Index: configure.in =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/configure.in,v retrieving revision 1.1.1.1 diff -r1.1.1.1 configure.in 32a33,36 > > #Clear away the excess OSF version information. > build_os=`echo $build_os | sed '[s/osf.*/osf/]'` > target_os=`echo $build_os | sed '[s/osf.*/osf/]'` 42a47,49 > elif test $target_os = osf > then > : 53c60 < . VERSION.pcp --- > . ./VERSION.pcp 63c70,74 < package_builder=`id -u -n`@`hostname -f` --- > if test $target_os = osf; then > package_builder=`id -u -n`@`hostname ` > else > package_builder=`id -u -n`@`hostname -f` > fi 159a171,188 > dnl Tru64 needs crT to truncate the archive names, which Linux use "f" > if test $target_os = osf > then > arflags=crT > else > arflags=crf > fi > AC_SUBST(arflags) > > > dnl Tru64 needs this for "pmie" which does tricks with "nans" and requires IEEE compliant math. > if test $target_os = osf > then > ieee_math_flag=-mieee > fi > AC_SUBST(ieee_math_flag) > > 302c331 < ps ${pcp_ps_all_flags} 2>&1 | grep '[ ]1[ ].*[ /]init' >/dev/null && pcp_ps_all_flags=${pcp_ps_all_flags}w --- > ps ${pcp_ps_all_flags}w 2>&1 | grep '[ ]1[ ].*[ /]init' >/dev/null && pcp_ps_all_flags=${pcp_ps_all_flags}w 304a334 > 320c350 < AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/time.h syslog.h unistd.h sched.h termios.h dlfcn.h ieeefp.h endian.h sys/endian.h pthread.h) --- > AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/time.h syslog.h unistd.h sched.h termios.h dlfcn.h ieeefp.h endian.h sys/endian.h pthread.h inttypes.h float.h) 334c364 < AC_CHECK_FUNCS(getcwd gethostname gettimeofday mktime putenv select socket strdup strerror strtod strtol uname waitpid atexit brk sbrk __clone sproc tcgetattr signal hstrerror isnanf isnand shl_load sginap usleep oserror setoserror sighold sigrelse prctl regex regcmp regexec regcomp) --- > AC_CHECK_FUNCS(getcwd gethostname gettimeofday mktime putenv select socket strdup strerror strtod strtol strtoll uname waitpid atexit brk sbrk __clone sproc memalign tcgetattr signal hstrerror isnanf isnand shl_load sginap usleep oserror setoserror sighold sigrelse prctl regex regcmp regexec regcomp) 339a370 > 341c372 < AC_CHECK_TYPE(__uint32_t, u_int32_t) --- > AC_CHECK_TYPE(__uint32_t, uint32_t) 344c375 < AC_CHECK_TYPE(uint_t, u_int32_t) --- > AC_CHECK_TYPE(uint_t, uint32_t) 595a627,629 > dnl check if dlopen et al are resolved without linking in a library > AC_TRY_LINK_FUNC(dlopen, AC_DEFINE(HAVE_DLFCN)) > 597a632 > 601a637,644 > dnl check if nanosleep needs -lrt to work > AC_CHECK_LIB(rt, nanosleep, lib_for_nanosleep=-lrt; AC_DEFINE(HAVE_NANOSLEEP)) > AC_SUBST(lib_for_nanosleep) > > dnl check if isnanf needs -lm to work > AC_CHECK_LIB(m, isnanf, lib_for_isnanf=-lm; AC_DEFINE(HAVE_ISNANF)) > AC_SUBST(lib_for_isnanf) > 699a743,745 > then > pcp_binadm_dir=$pcp_share_dir/bin > elif test $target_os = osf Index: src/dbpmda/src/pmda.c =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/dbpmda/src/pmda.c,v retrieving revision 1.1.1.1 diff -r1.1.1.1 pmda.c 48a49,52 > #if defined(HAVE_FLOAT_H) > #include > #endif > Index: src/include/builddefs.in =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/include/builddefs.in,v retrieving revision 1.1.1.1 diff -r1.1.1.1 builddefs.in 57c57,58 < PACKAGE_BUILDER = $(shell echo `id -un`@`hostname -f`) --- > #PACKAGE_BUILDER = $(shell echo `id -un`@`hostname -f`) > PACKAGE_BUILDER = $(shell echo `id -un`@`hostname `) 75a77,80 > ARFLAGS= @arflags@ > > IEEE_MATH_FLAG= @ieee_math_flag@ > 126a132,133 > LIB_FOR_NANOSLEEP = @lib_for_nanosleep@ > LIB_FOR_ISNANF = @lib_for_isnanf@ Index: src/include/buildrules =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/include/buildrules,v retrieving revision 1.1.1.1 diff -r1.1.1.1 buildrules 54c54 < $(AR) crf $(STATICLIBTARGET) $? --- > $(AR) $(ARFLAGS) $(STATICLIBTARGET) $? Index: src/include/pcp.env =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/include/pcp.env,v retrieving revision 1.1.1.1 diff -r1.1.1.1 pcp.env 78a79,81 > # All ps's except Tru64.... It has the form: HH:MM:SS.TT. > # The sed scripts have been updated to cope with this. --PGE > # 84c87 < | sed -n \ --- > | sed -n \ 88c91 < -e 's/^[^ ]* //' \ --- > -e 's/^[^ ]* //' \ 90c93,95 < -e "/[0-9]:[0-9][0-9] *$1 /s/ .*//p" --- > -e "/[0-9]:[0-9][0-9] *$1 /s/ .*//p" \ > -e "/[0-9]:[0-9][0-9].[0-9][0-9] *[^ ]*\/$1 /s/ .*//p" \ > -e "/[0-9]:[0-9][0-9].[0-9][0-9] *$1 /s/ .*//p" Index: src/include/platform_defs.h.in =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/include/platform_defs.h.in,v retrieving revision 1.1.1.1 diff -r1.1.1.1 platform_defs.h.in 120a121,122 > #undef HAVE_INTTYPES_H > #undef HAVE_FLOAT_H 145a148 > #undef HAVE_STRTOLL 209a213,217 > /* This defines uint32_t and int32_t for Tru64 */ > #if defined(HAVE_INTTYPES_H) > #include > #endif > 234a243,253 > /* If we don't have a strtoll function, but we have 64 bit longs, > * strtol is the equivalent of strtoll. > */ > > #ifdef HAVE_64BIT_LONG > #ifndef HAVE_STRTOLL > #define strtoll strtol > #define strtoull strtoul > #endif > #endif > 237a257,260 > #endif > > #ifndef HAVE_MEMALIGN > #define memalign(x,y) malloc(y) Index: src/include/trace_dev.h =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/include/trace_dev.h,v retrieving revision 1.1.1.1 diff -r1.1.1.1 trace_dev.h 72a73 > #ifdef USE_SGI_INT32 73a75,77 > #else > typedef uint __pmTracePDU; > #endif Index: src/libpcp/src/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/libpcp/src/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 50a51,52 > LLDLIBS = $(LIB_FOR_ISNANF) > 91c93 < cd $(@D); make $(@F) --- > cd $(@D); $(MAKE) $(@F) Index: src/pmcd/pmdaproc.sh =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmcd/pmdaproc.sh,v retrieving revision 1.1.1.1 diff -r1.1.1.1 pmdaproc.sh 178a179,198 > # This function will send signal $1 kill all processors that are named $2 > # Linux has a nice utility (killall) that will do this. It has to be simulated > # on Tru64. > > __killall() > { > > if [ $PCP_PLATFORM = "osf" ] > then > _get_pids_by_name $2 >$tmp.kill > if [ -s $tmp.kill ] > then > kill $1 `cat $tmp.kill` > fi > else > killall $1 $2 >/dev/null 2>&1 > fi > > } > 276c296 < killall -HUP pmcd >/dev/null 2>&1 --- > __killall -HUP pmcd 350c370 < killall -HUP pmcd >/dev/null 2>&1 --- > __killall -HUP pmcd 802c822 < killall -HUP pmcd --- > __killall -HUP pmcd 842c862 < killall -HUP pmcd --- > __killall -HUP pmcd 933c953 < if make install --- > if gmake install 978c998 < killall -HUP pmcd --- > __killall -HUP pmcd 1007c1027 < make clobber >/dev/null --- > gmake clobber >/dev/null Index: src/pmcd/rc_pcp =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmcd/rc_pcp,v retrieving revision 1.1.1.1 diff -r1.1.1.1 rc_pcp 87a88,108 > # This function will send signal $1 kill all processors that are named $2 > # Linux has a nice utility (killall) that will do this. It has to be simulated > # on Tru64. > > __killall() > { > > if [ $PCP_PLATFORM = "osf" ] > then > _get_pids_by_name $2 >$tmp.kill > if [ -s $tmp.kill ] > then > kill $1 `cat $tmp.kill` > fi > else > killall $1 $2 >/dev/null 2>&1 > fi > > } > > 339,340c360,361 < Warning: PMCD control file "$PCP_PMCDCONF_PATH" is missing, cannot identify PMDAs < to be terminated.' --- > Warning: PMCD control file "$PCP_PMCDCONF_PATH" is missing, cannot identify PMDAs > to be terminated.' 353c374 < killall -TERM `basename $pmda` >/dev/null 2>&1 & --- > __killall -TERM `basename $pmda` 365c386 < killall -KILL `basename $pmda` >/dev/null 2>&1 & --- > __killall -KILL `basename $pmda` 378c399 < killall -TERM pmcd >/dev/null 2>&1 --- > __killall -TERM pmcd 406c427 < killall -KILL pmcd >/dev/null 2>&1 --- > __killall -KILL pmcd 427,428c448,449 < < while getopts v c --- > > while getopts v c 481a503 > PMCD_CTL=on Index: src/pmdas/pmcd/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/pmcd/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 27,28c27,28 < @if ! grep -q $(CONF_LINE) ../pmcd.conf ; then \ < echo $(CONF_LINE) >> ../pmcd.conf ; \ --- > @if grep -q $(CONF_LINE) ../pmcd.conf ; then true;\ > else echo $(CONF_LINE) >> ../pmcd.conf ; \ Index: src/pmdas/pmcd/src/pmcd.c =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/pmcd/src/pmcd.c,v retrieving revision 1.1.1.1 diff -r1.1.1.1 pmcd.c 1000a1001,1004 > /* I'm not sure what this should be... --PGE */ > #elif defined(__osf__) > #if defined(__alpha) > "coff"; 1002a1007,1008 > #endif > Index: src/pmdas/roomtemp/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/roomtemp/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 16c16 < LLDLIBS = -lmlan -lpcp -lpcp_pmda --- > LLDLIBS = $(LIB_FOR_NANOSLEEP) -lmlan -lpcp -lpcp_pmda 55a56 > rm -f pcp Index: src/pmdas/simple/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/simple/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 76a77 > rm -f pcp Index: src/pmdas/trace/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/trace/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 26c26 < LLDLIBS = -lpcp_trace --- > LLDLIBS = $(PTHREAD_LIB) -lpcp_trace Index: src/pmdas/trace/pmtrace.c =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/trace/pmtrace.c,v retrieving revision 1.1.1.1 diff -r1.1.1.1 pmtrace.c 33c33 < #ident "$Id: pmtrace.c,v 1.1.1.1 2001/08/01 13:33:02 ezolt Exp $" --- > #ident "$Id: pmtrace.c,v 1.1.1.1 2001/08/01 13:33:01 ezolt Exp $" Index: src/pmdas/trivial/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/trivial/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 76a77 > rm -f pcp Index: src/pmdas/weblog/pmda.c =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmdas/weblog/pmda.c,v retrieving revision 1.1.1.1 diff -r1.1.1.1 pmda.c 59a60,62 > #ifndef CLONE_VM > #define CLONE_VM 0x00000100 > #endif Index: src/pmie/src/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmie/src/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 46c46 < show.c match_inst.c syslog.c --- > show.c match_inst.c syslog.c 60a61,62 > > LCFLAGS = $(IEEE_MATH_FLAG) Index: src/pmns/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmns/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 47c47 < STDPMIDS= stdpmid.irix stdpmid.linux stdpmid.add-on stdpmid.local \ --- > STDPMIDS= stdpmid.irix stdpmid.linux stdpmid.osf stdpmid.add-on stdpmid.local \ 52c52 < --- > Index: src/pmstat/GNUmakefile =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmstat/GNUmakefile,v retrieving revision 1.1.1.1 diff -r1.1.1.1 GNUmakefile 45c45 < LLDLIBS = -lpcp --- > LLDLIBS = -lpcp $(LIB_FOR_NANOSLEEP) Index: src/pmstore/pmstore.c =================================================================== RCS file: /usr/users/ezolt/cvs/repository/pcp/src/pmstore/pmstore.c,v retrieving revision 1.1.1.1 diff -r1.1.1.1 pmstore.c 38a39,42 > #if defined(HAVE_FLOAT_H) > #include > #endif >