[PVFS2-CVS]
commit by slang in pvfs2: ChangeLog Makefile.in configure.in
pvfs2-config.h.in
CVS commit program
cvs at parl.clemson.edu
Fri Nov 11 17:18:51 EST 2005
Update of /projects/cvsroot/pvfs2
In directory parlweb:/tmp/cvs-serv2348
Modified Files:
Tag: slang-sio-branch
ChangeLog Makefile.in configure.in pvfs2-config.h.in
Log Message:
fixes to small io stuff to get test-zero-fill working again. Also committing updates from HEAD to make things easier for merge.
Index: ChangeLog
===================================================================
RCS file: /projects/cvsroot/pvfs2/ChangeLog,v
diff -p -u -r1.180 -r1.180.2.1
--- ChangeLog 3 Nov 2005 21:23:28 -0000 1.180
+++ ChangeLog 11 Nov 2005 22:18:51 -0000 1.180.2.1
@@ -2,12 +2,31 @@
PVFS2 Release ChangeLog
-----------------------
-pvfs2-1.3.1pre1
+pvfs2-1.3.2-pre1
+===============
+
+pvfs2-1.3.1
===============
- ib: add memory registration caching
- ib: add support for cancel operation
- ib: fix minor protocol problems
- ib: cleanup build
+- better pvfs2-client and pvfs2-client-core logging
+- --enable-fast was broken
+- fix compile error on FC3 and RHEL 2.6.9 kernels
+- async i/o support (but needs libaio and libaio-devel at this time)
+- "trusted ports"
+- --enable-strict now compiles w/ a lot fewer warnings
+- fixed timestamp problems for pvfs2 files
+- fixed bugs in zero-fill handling
+- no longer ship generated .c files from .sm. instead, ship the sm parser
+ (allows for easier release patching)
+- Phil Carns: server checks fs id on startup
+- Phil Carns: --num-dfiles option to pvfs2-genconfig
+- Phil Carns: fix setgid suport
+- Phil Carns: proper symlink support (created as 777, no way to change them)
+- Lots of portability fixes. PVFS2 now builds on Darwin (userspace, no
+ kernel)
pvfs2-1.3.0
Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/Makefile.in,v
diff -p -u -r1.202 -r1.202.2.1
--- Makefile.in 2 Nov 2005 21:45:31 -0000 1.202
+++ Makefile.in 11 Nov 2005 22:18:51 -0000 1.202.2.1
@@ -67,6 +67,9 @@ BUILD_VIS = @BUILD_VIS@
BUILD_KARMA = @BUILD_KARMA@
BUILD_EPOLL = @BUILD_EPOLL@
BUILD_SERVER = @BUILD_SERVER@
+NEEDS_LIBRT = @NEEDS_LIBRT@
+TARGET_OS_DARWIN = @TARGET_OS_DARWIN@
+TARGET_OS_LINUX = @TARGET_OS_LINUX@
GNUC = @GNUC@
INTELC = @INTELC@
# configure default is silent, unless --enable-verbose-build in
@@ -141,7 +144,7 @@ CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
LDSHARED = $(CC) -shared
PICFLAGS = -fPIC
-LDFLAGS += -L lib
+LDFLAGS += -Llib
LIBS += -lpvfs2 @LIBS@
MMAP_RA_CACHE = @MMAP_RA_CACHE@
TRUSTED_CONNECTIONS = @TRUSTED_CONNECTIONS@
@@ -217,7 +220,12 @@ SERVERCFLAGS = -D__GEN_POSIX_LOCKING__ -
# server side flow protocol connecting BMI with NCAC cache
SERVERCFLAGS += -D__STATIC_FLOWPROTO_BMI_CACHE__
-SERVERLIBS = -lrt -lpthread -lpvfs2-server @LIBS@ @DB_LIB@
+ifdef NEEDS_LIBRT
+ SERVERLIBS = -lrt
+endif
+
+SERVERLIBS += -lpthread -lpvfs2-server @LIBS@ @DB_LIB@
+
# you can optionally disable thread safety support in the client
# though it's not recommended unless *required*.
#
@@ -654,7 +662,7 @@ clean::
endif
# builds a tarball of the source tree suitable for distribution
-dist: $(SMCGEN) cleaner
+dist: cleaner
@sh $(srcdir)/maint/make-dist.sh $(srcdir) @PVFS2_VERSION@
# some stuff that is cleaned in both distclean and dist targets
@@ -678,9 +686,7 @@ distclean: cleaner docsclean
rm -f src/server/simple.conf
rm -f src/server/server.conf-localhost
rm -f src/apps/admin/pvfs2-config
-ifndef DIST_RELEASE
rm -f $(SMCGEN)
-endif
# this is where we include all of our automatic dependencies.
# NOTE: we wrap this in ifneq's in order to prevent the
@@ -758,6 +764,11 @@ install:: install_doc
install -d $(prefix)/lib
install -m 755 $(LIBRARIES) $(prefix)/lib
+
+ifdef TARGET_OS_DARWIN
+# TOC needs to be regenerated in libs after they get moved
+ ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES))
+endif
install -d $(prefix)/bin
install -m 755 $(ADMINTOOLS) $(prefix)/bin
Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure.in,v
diff -p -u -r1.259 -r1.259.2.1
--- configure.in 3 Nov 2005 15:18:46 -0000 1.259
+++ configure.in 11 Nov 2005 22:18:51 -0000 1.259.2.1
@@ -6,7 +6,6 @@ dnl You may need to use autoheader as we
dnl sanity checks, output header, location of scripts used here
AC_INIT(include/pvfs2-types.h)
-AC_CONFIG_HEADER(pvfs2-config.h)
AC_CONFIG_AUX_DIR(maint/config)
dnl
@@ -19,7 +18,7 @@ CONFIGURE_TIME=`date -u +"%Y-%m-%d-%H%M%
PVFS2_MAJOR=1
PVFS2_MINOR=3
PVFS2_SUB=1
-dnl PVFS2_PRE=""
+#PVFS2_PRE=""
PVFS2_PRE="pre1-$CONFIGURE_TIME"
PVFS2_VERSION=$PVFS2_MAJOR.$PVFS2_MINOR.$PVFS2_SUB$PVFS2_PRE
@@ -37,6 +36,19 @@ if test "x$USR_CFLAGS" = "x"; then
USR_CFLAGS_SET=no
fi
+AC_CONFIG_HEADER(pvfs2-config.h)
+
+AC_CHECK_HEADER([sys/vfs.h],
+ [AC_DEFINE(HAVE_SYS_VFS_H, 1, Define if sys/vfs.h exists)])
+AC_CHECK_HEADER([sys/mount.h],
+ [AC_DEFINE(HAVE_SYS_MOUNT_H, 1, Define if sys/mount.h exists)])
+
+AC_CHECK_HEADERS([mntent.h, fstab.h])
+
+AC_CHECK_HEADERS(stdarg.h)
+
+AC_CHECK_SIZEOF([long int])
+
dnl Check for utilities that we need during the build process
AC_PROG_INSTALL
AC_PROG_CC
@@ -684,13 +696,7 @@ AC_ARG_ENABLE(fast,
if test "x$USR_CFLAGS_SET" = "xno"; then
CFLAGS="$CFLAGS -DNDEBUG -O3 -DGOSSIP_DISABLE_DEBUG"
fi
-],
-[
-if test "x$USR_CFLAGS_SET" = "xno"; then
- CFLAGS="$CFLAGS -g"
-fi
-]
-)
+])
dnl Options that are not yet working
dnl --------------------------------
@@ -711,7 +717,7 @@ AC_ARG_ENABLE(strict,
[ --enable-strict Turn on strict debugging with gcc],
[
if test "x$USR_CFLAGS_SET" = "xno"; then
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
fi
],
[
@@ -817,6 +823,25 @@ if test "x$NEED_BERKELEY_DB" = "xyes" ;
fi
dnl end of NEED_BERKELEY_DB section
+if test "x$BUILD_SERVER" = "x1"; then
+ dnl check if -lrt is required
+ AX_CHECK_NEEDS_LIBRT
+fi
+
+case "$host_os" in
+
+ *darwin*)
+ AC_DEFINE([TARGET_OS_DARWIN], 1, Define if on darwin)
+ TARGET_OS_DARWIN=1
+ AC_SUBST(TARGET_OS_DARWIN)
+ ;;
+ *linux*)
+ AC_DEFINE([TARGET_OS_LINUX], 1, Define if on linux)
+ TARGET_OS_LINUX=1
+ AC_SUBST(TARGET_OS_LINUX)
+ ;;
+esac
+
AC_CHECK_HEADERS(netdb.h)
AC_CHECK_HEADERS(arpa/inet.h)
AC_CHECK_HEADERS(sys/socket.h)
@@ -926,7 +951,7 @@ dnl --
dnl Check for SDL
AC_MSG_CHECKING([for SDL])
SDL_CONFIG=`which sdl-config 2> /dev/null`
-if ! test -z $SDL_CONFIG && test -x $SDL_CONFIG; then
+if ! test -z "$SDL_CONFIG" && test -x "$SDL_CONFIG"; then
AC_MSG_RESULT(yes)
SDL_VERSION=`sdl-config --version`
VISCFLAGS=`sdl-config --cflags`
@@ -948,6 +973,12 @@ if ! test -z $SDL_CONFIG && test -x $SDL
else
AC_MSG_RESULT(no)
fi
+
+dnl check if O_LARGEFILE needs to be used with open or if off_t is already int64
+AC_TRY_COMPILE(
+ [#include <fcntl.h>],
+ [open(NULL, O_LARGEFILE, O_RDONLY);],
+ [AC_DEFINE(USE_O_LARGEFILE, 1, Define if O_LARGEFILE is defined)])
dnl create any missing subdirectories that wouldn't be created
dnl by AC_OUTPUT below (which won't create intermediate dirs).
Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -p -u -r1.55 -r1.55.2.1
--- pvfs2-config.h.in 19 Oct 2005 20:58:34 -0000 1.55
+++ pvfs2-config.h.in 11 Nov 2005 22:18:51 -0000 1.55.2.1
@@ -34,6 +34,9 @@
/* Define to 1 if you have the <execinfo.h> header file. */
#undef HAVE_EXECINFO_H
+/* Define to 1 if you have the <fstab.h> header file. */
+#undef HAVE_FSTAB_H
+
/* Define if kernel has generic_getxattr */
#undef HAVE_GENERIC_GETXATTR
@@ -103,6 +106,9 @@
/* Define if kernel setxattr has const void* argument */
#undef HAVE_SETXATTR_CONST_ARG
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -130,6 +136,9 @@
/* Define to 1 if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H
+/* Define if sys/mount.h exists */
+#undef HAVE_SYS_MOUNT_H
+
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
@@ -139,6 +148,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define if sys/vfs.h exists */
+#undef HAVE_SYS_VFS_H
+
/* Define if DB open function takes a txnid parameter */
#undef HAVE_TXNID_PARAMETER_TO_DB_OPEN
@@ -178,11 +190,20 @@
/* sub version number */
#undef PVFS2_VERSION_SUB
+/* The size of a `long int', as computed by sizeof. */
+#undef SIZEOF_LONG_INT
+
/* The size of a `void *', as computed by sizeof. */
#undef SIZEOF_VOID_P
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+
+/* Define if on darwin */
+#undef TARGET_OS_DARWIN
+
+/* Define if on linux */
+#undef TARGET_OS_LINUX
/* Define if mtrace memory leak detection was enabled */
#undef WITH_MTRACE
More information about the PVFS2-CVS
mailing list