Thread: [Libsysio-commit] HEAD: libsysio Makefile.am Rules.make configure.in
Brought to you by:
lward
From: Lee W. <lw...@us...> - 2004-01-21 14:44:57
|
Update of /cvsroot/libsysio/libsysio In directory sc8-pr-cvs1:/tmp/cvs-serv23555 Modified Files: Makefile.am Rules.make configure.in Log Message: A roll-up patch from CFS (Eric Mei <er...@cl...>) - intent.diff small changes on intent related behavior. I simply follow the lustre kernel code here. - open() need to pass down param 'flags'. - 'setattr' related syscalls, like chown/chmod/utime/..., don't need intent during path resolution. - sockets.diff your socket driver. - nativefs.diff only add fcntl code into native driver. not sure whether it's complete, but ok for current testing. - trace.diff this patch add SYSIO_ENTER/SYSIO_LEAVE macros. Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- Makefile.am 16 Dec 2003 15:43:14 -0000 1.9 +++ Makefile.am 21 Jan 2004 14:44:53 -0000 1.10 @@ -13,17 +13,61 @@ include $(top_srcdir)/dev/stdfd/module.m include $(top_srcdir)/drivers/incore/module.mk include $(top_srcdir)/drivers/native/module.mk include $(top_srcdir)/drivers/yod/module.mk +include $(top_srcdir)/drivers/sockets/module.mk lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a -__LIBBUILD_DIR__libsysio_a_SOURCES = $(SRCDIR_SRCS) $(STDFD_SRCS) \ - $(INCORE_SRCS) $(NATIVE_SRCS) $(YOD_SRCS) +if WITH_STDFD_DEV +OPTIONAL_STDFD_SRCS = $(STDFD_SRCS) +else +OPTIONAL_STDFD_SRCS = +endif + +if WITH_INCORE_DRIVER +OPTIONAL_INCORE_SRCS = $(INCORE_SRCS) +else +OPTIONAL_INCORE_SRCS = +endif + +if WITH_NATIVE_DRIVER +OPTIONAL_NATIVE_SRCS = $(NATIVE_SRCS) +else +OPTIONAL_NATIVE_SRCS = +endif + +if WITH_SOCKETS_DRIVER +OPTIONAL_SOCKETS_SRCS = $(SOCKETS_SRCS) +else +OPTIONAL_SOCKETS_SRCS = +endif + +if WITH_CPLANT_YOD +OPTIONAL_YOD_SRCS = $(YOD_SRCS) +else +OPTIONAL_YOD_SRCS = +endif + +__LIBBUILD_DIR__libsysio_a_SOURCES = \ + $(SRCDIR_SRCS) \ + $(OPTIONAL_STDFD_SRCS) \ + $(OPTIONAL_INCORE_SRCS) \ + $(OPTIONAL_SOCKETS_SRCS) \ + $(OPTIONAL_NATIVE_SRCS) \ + $(OPTIONAL_YOD_SRCS) + +# +# Cygwin related? Configure seems to do this for us when appropriate. Why +# was this here? +# +# Commented out by Lee; Wed Jan 21 08:21:33 EST 2004 +# +#__LIBBUILD_DIR__libsysio_a_CFLAGS = -fPIC include $(top_srcdir)/Rules.make EXTRA_DIST = Rules.make $(TESTS_EXTRA) $(SRCDIR_EXTRA) \ $(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \ - $(NATIVE_EXTRA) $(YOD_EXTRA) + $(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA) AM_CPPFLAGS += ${YOD_DRIVER_FLAGS} Index: Rules.make =================================================================== RCS file: /cvsroot/libsysio/libsysio/Rules.make,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -b -B -p -r1.4 -r1.5 --- Rules.make 24 Mar 2003 22:06:38 -0000 1.4 +++ Rules.make 21 Jan 2004 14:44:53 -0000 1.5 @@ -5,6 +5,14 @@ else STFD_DEV_CPPFLAGS = endif +if WITH_SOCKETS_DRIVER +SOCKETS_CPPFLAGS=-DWITH_SOCKETS=1 +else +SOCKETS_CPPFLAGS= +endif + DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) -AM_CPPFLAGS = $(AUTOMOUNT) $(DEV_CPPFLAGS) -I$(top_srcdir)/include +AM_CPPFLAGS = \ + $(AUTOMOUNT) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \ + -I$(top_srcdir)/include Index: configure.in =================================================================== RCS file: /cvsroot/libsysio/libsysio/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- configure.in 12 Jan 2004 18:10:32 -0000 1.13 +++ configure.in 21 Jan 2004 14:44:53 -0000 1.14 @@ -122,6 +122,17 @@ AC_ARG_WITH(cplant_tests, [with_cplant_tests=no]) AM_CONDITIONAL(WITH_CPLANT_TESTS, test x$with_cplant_tests != xno) +AC_ARG_WITH(sockets, + AC_HELP_STRING([--with-sockets], + [build sockets interface driver]), + [ case "${withval}" in + yes) ;; + no) ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-sockets) ;; + esac], + [with_sockets=no]) +AM_CONDITIONAL(WITH_SOCKETS_DRIVER, test x$with_sockets = xyes) + # We keep the original values in `$config_*' and never modify them, so we # can write them unchanged into config.make. Everything else uses # $machine, $vendor, and $os, and changes them whenever convenient. |
From: Lee W. <lw...@us...> - 2008-06-17 15:17:33
|
Update of /cvsroot/libsysio/libsysio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32385 Modified Files: Makefile.am Rules.make configure.in Log Message: Integrate and initialize new, built-in, stddev pseudo-driver that gives us /dev/null, /dev/zero, and /dev/full functionality. Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -b -B -p -r1.15 -r1.16 --- Makefile.am 16 Jul 2004 13:34:43 -0000 1.15 +++ Makefile.am 17 Jun 2008 15:17:30 -0000 1.16 @@ -9,6 +9,7 @@ endif include $(top_srcdir)/src/module.mk include $(top_srcdir)/include/module.mk include $(top_srcdir)/tests/module.mk +include $(top_srcdir)/dev/module.mk include $(top_srcdir)/dev/stdfd/module.mk include $(top_srcdir)/drivers/incore/module.mk include $(top_srcdir)/drivers/native/module.mk @@ -23,6 +24,12 @@ else OPTIONAL_STDFD_SRCS = endif +if WITH_STDDEV_DEV +OPTIONAL_STDDEV_SRCS = $(STDDEV_SRCS) +else +OPTIONAL_STDDEV_SRCS = +endif + if WITH_INCORE_DRIVER OPTIONAL_INCORE_SRCS = $(INCORE_SRCS) else @@ -56,6 +63,7 @@ AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS) __LIBBUILD_DIR__libsysio_a_SOURCES = \ $(SRCDIR_SRCS) \ + $(OPTIONAL_STDDEV_SRCS) \ $(OPTIONAL_STDFD_SRCS) \ $(OPTIONAL_INCORE_SRCS) \ $(OPTIONAL_SOCKETS_SRCS) \ @@ -65,7 +73,7 @@ __LIBBUILD_DIR__libsysio_a_SOURCES = \ include $(top_srcdir)/Rules.make EXTRA_DIST = Rules.make misc/init-env.sh $(TESTS_EXTRA) $(SRCDIR_EXTRA) \ - $(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \ + $(INCLUDE_EXTRA) $(STDDEV_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \ $(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA) AM_CPPFLAGS += ${YOD_DRIVER_FLAGS} Index: Rules.make =================================================================== RCS file: /cvsroot/libsysio/libsysio/Rules.make,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- Rules.make 20 Aug 2007 19:28:12 -0000 1.13 +++ Rules.make 17 Jun 2008 15:17:30 -0000 1.14 @@ -3,6 +3,11 @@ STDFD_DEV_CPPFLAGS =-DSTDFD_DEV=1 -I$(to else STFD_DEV_CPPFLAGS = endif +if WITH_STDDEV_DEV +STDDEV_DEV_CPPFLAGS =-DSTDDEV_DEV=1 -I$(top_srcdir)/dev +else +STDEV_DEV_CPPFLAGS = +endif if WITH_SOCKETS_DRIVER SOCKETS_CPPFLAGS=-DWITH_SOCKETS=1 @@ -10,7 +15,7 @@ else SOCKETS_CPPFLAGS= endif -DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) +DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) $(STDDEV_DEV_CPPFLAGS) AM_CPPFLAGS = \ $(TRACING) \ Index: configure.in =================================================================== RCS file: /cvsroot/libsysio/libsysio/configure.in,v retrieving revision 1.39 retrieving revision 1.40 diff -u -w -b -B -p -r1.39 -r1.40 --- configure.in 16 Apr 2008 12:49:39 -0000 1.39 +++ configure.in 17 Jun 2008 15:17:30 -0000 1.40 @@ -92,6 +92,17 @@ AC_ARG_WITH(stdfd-dev, [with_stdfd_dev=yes]) AM_CONDITIONAL(WITH_STDFD_DEV, test x$with_stdfd_dev = xyes) +AC_ARG_WITH(stddev-dev, + AC_HELP_STRING([--with-stddev-dev], + [build standard file descriptors pseudo-driver]), + [ case "${withval}" in + yes) ;; + no) ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-stddev-dev) ;; + esac], + [with_stddev_dev=yes]) +AM_CONDITIONAL(WITH_STDDEV_DEV, test x$with_stddev_dev = xyes) + AC_ARG_WITH(zero-sum-memory, AC_HELP_STRING([--with-zero-sum-memory], [free all dynamically allocated memory at the end -- useful for debugging]), |
From: Lee W. <lw...@us...> - 2008-06-17 17:19:04
|
Update of /cvsroot/libsysio/libsysio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12543 Modified Files: Makefile.am Rules.make configure.in Log Message: Begin adding support for thread-safe operation. In detail: 1) Add smp.h and smp_posix.c 2) Add a big lock, wrapping the user API with appropriate mutex_lock and mutex_unlock calls. NB; initialization is *not* thread safe. 3) Add support for P_{GET,LOCK}, PB_LOCK, I_{GET,LOCK}, FIL_{GET,LOCK} and alter all related ref/de-ref usage to use get/put or lock/unlock as appropriate. 4) Remedial (no-op) support for MNT_GET. By default, POSIX threads supoprt is not enabled. To enable, use --with-threads, or --with-threads=yes, or --with-threads=posix. Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -b -B -p -r1.16 -r1.17 --- Makefile.am 17 Jun 2008 15:17:30 -0000 1.16 +++ Makefile.am 17 Jun 2008 17:18:56 -0000 1.17 @@ -63,6 +63,7 @@ AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS) __LIBBUILD_DIR__libsysio_a_SOURCES = \ $(SRCDIR_SRCS) \ + $(THREAD_MODEL_POSIX_SRCS) \ $(OPTIONAL_STDDEV_SRCS) \ $(OPTIONAL_STDFD_SRCS) \ $(OPTIONAL_INCORE_SRCS) \ Index: Rules.make =================================================================== RCS file: /cvsroot/libsysio/libsysio/Rules.make,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- Rules.make 17 Jun 2008 15:17:30 -0000 1.14 +++ Rules.make 17 Jun 2008 17:18:56 -0000 1.15 @@ -17,7 +17,14 @@ endif DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) $(STDDEV_DEV_CPPFLAGS) +if WITH_THREAD_MODEL_POSIX +THREAD_MODEL_POSIX_COMPILER_FLAGS=-pthread +else +THREAD_MODEL_POSIX_COMPILER_FLAGS= +endif + AM_CPPFLAGS = \ + $(THREAD_MODEL_POSIX_COMPILER_FLAGS) \ $(TRACING) \ $(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \ $(DEFER_INIT_CWD) $(SYSIO_LABEL_NAMES) $(_HAVE_STATVFS) \ Index: configure.in =================================================================== RCS file: /cvsroot/libsysio/libsysio/configure.in,v retrieving revision 1.40 retrieving revision 1.41 diff -u -w -b -B -p -r1.40 -r1.41 --- configure.in 17 Jun 2008 15:17:30 -0000 1.40 +++ configure.in 17 Jun 2008 17:18:56 -0000 1.41 @@ -215,6 +215,23 @@ AC_ARG_WITH(alternate-symbols, esac]) AC_SUBST(SYSIO_LABEL_NAMES) +AC_ARG_WITH(threads, + AC_HELP_STRING([--with-threads@<:@=<model>@:>@], + [Enable thread-safe operation via named model]), + [ case "${withval}" in + yes|posix) AC_DEFINE(THREAD_MODEL_POSIX);; + no) ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-threads) ;; + esac], + [with_threads=no]) +if test x$with_threads = xyes; then + with_threads=posix +fi +if test x$with_threads = xposix; then + AC_DEFINE(THREAD_MODEL_POSIX) +fi +AM_CONDITIONAL(WITH_THREAD_MODEL_POSIX, test x$with_threads = xposix) + # We keep the original values in `$config_*' and never modify them, so we # can write them unchanged into config.make. Everything else uses # $machine, $vendor, and $os, and changes them whenever convenient. |
From: Ruth K. <rk...@us...> - 2008-10-15 22:01:11
|
Update of /cvsroot/libsysio/libsysio In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25646 Modified Files: Makefile.am Rules.make configure.in Log Message: Removing obsolete code related to cplant yod, lustre hack, and sockets driver. Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -b -B -p -r1.17 -r1.18 --- Makefile.am 17 Jun 2008 17:18:56 -0000 1.17 +++ Makefile.am 15 Oct 2008 22:01:01 -0000 1.18 @@ -13,8 +13,6 @@ include $(top_srcdir)/dev/module.mk include $(top_srcdir)/dev/stdfd/module.mk include $(top_srcdir)/drivers/incore/module.mk include $(top_srcdir)/drivers/native/module.mk -include $(top_srcdir)/drivers/yod/module.mk -include $(top_srcdir)/drivers/sockets/module.mk lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a @@ -42,42 +40,19 @@ else OPTIONAL_NATIVE_SRCS = endif -if WITH_SOCKETS_DRIVER -OPTIONAL_SOCKETS_SRCS = $(SOCKETS_SRCS) -else -OPTIONAL_SOCKETS_SRCS = -endif - -if WITH_CPLANT_YOD -OPTIONAL_YOD_SRCS = $(YOD_SRCS) -else -OPTIONAL_YOD_SRCS = -endif - -if WITH_LUSTRE_HACK -# it would be better that let configure script check this -OPTIONAL_LUSTRE_CFLAGS = -fPIC -endif - -AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS) - __LIBBUILD_DIR__libsysio_a_SOURCES = \ $(SRCDIR_SRCS) \ $(THREAD_MODEL_POSIX_SRCS) \ $(OPTIONAL_STDDEV_SRCS) \ $(OPTIONAL_STDFD_SRCS) \ $(OPTIONAL_INCORE_SRCS) \ - $(OPTIONAL_SOCKETS_SRCS) \ - $(OPTIONAL_NATIVE_SRCS) \ - $(OPTIONAL_YOD_SRCS) + $(OPTIONAL_NATIVE_SRCS) include $(top_srcdir)/Rules.make EXTRA_DIST = Rules.make misc/init-env.sh $(TESTS_EXTRA) $(SRCDIR_EXTRA) \ $(INCLUDE_EXTRA) $(STDDEV_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \ - $(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA) - -AM_CPPFLAGS += ${YOD_DRIVER_FLAGS} + $(NATIVE_EXTRA) really-clean: testsclean maintainer-clean -rm -rf autom4te-2.53.cache Index: Rules.make =================================================================== RCS file: /cvsroot/libsysio/libsysio/Rules.make,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -b -B -p -r1.15 -r1.16 --- Rules.make 17 Jun 2008 17:18:56 -0000 1.15 +++ Rules.make 15 Oct 2008 22:01:01 -0000 1.16 @@ -9,12 +9,6 @@ else STDEV_DEV_CPPFLAGS = endif -if WITH_SOCKETS_DRIVER -SOCKETS_CPPFLAGS=-DWITH_SOCKETS=1 -else -SOCKETS_CPPFLAGS= -endif - DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) $(STDDEV_DEV_CPPFLAGS) if WITH_THREAD_MODEL_POSIX @@ -26,6 +20,6 @@ endif AM_CPPFLAGS = \ $(THREAD_MODEL_POSIX_COMPILER_FLAGS) \ $(TRACING) \ - $(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \ + $(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) \ $(DEFER_INIT_CWD) $(SYSIO_LABEL_NAMES) $(_HAVE_STATVFS) \ -I$(top_srcdir)/include Index: configure.in =================================================================== RCS file: /cvsroot/libsysio/libsysio/configure.in,v retrieving revision 1.42 retrieving revision 1.43 diff -u -w -b -B -p -r1.42 -r1.43 --- configure.in 11 Jul 2008 18:25:05 -0000 1.42 +++ configure.in 15 Oct 2008 22:01:01 -0000 1.43 @@ -148,63 +148,6 @@ AC_ARG_WITH(tracing, AM_CONDITIONAL(WITH_TRACING, test x$with_tracing = xyes) AC_SUBST(TRACING) -AC_ARG_WITH(cplant_yod, - AC_HELP_STRING([--with-cplant-yod],[build cplant yod I/O driver]), - [ case "${withval}" in - yes) if test x${with_stdfd_dev} != xyes; then - with_stdfd_dev=yes - AM_CONDITIONAL(WITH_STDFD_DEV, test x$with_stdfd_dev = xyes) - fi ;; - no) ;; - *) AC_MSG_ERROR(bad value ${withval} for --with-cplant-yod);; - esac], - [with_cplant_yod=no]) -AM_CONDITIONAL(WITH_CPLANT_YOD, test x$with_cplant_yod = xyes) - -AC_ARG_WITH(cplant_tests, - AC_HELP_STRING([--with-cplant-tests=<cplant-build-path>], - [build libsysio tests for cplant platform]), - [ case "${withval}" in - yes) AC_MSG_ERROR(need path to compiler for --with-cplant-tests);; - no) with_cplant_tests=no;; - *) CC=${withval} - CCDEPMODE=${CC} - CPP="${CC} -E" - AC_CHECK_FILE(${CC}, - [ if test x${with_cplant_yod} != xyes; then - with_cplant_yod=yes - AM_CONDITIONAL(WITH_CPLANT_YOD, test x$with_cplant_yod = xyes) - fi], - [ AC_MSG_ERROR(path not found ${CC} for --with-cplant-tests) ]);; - esac], - [with_cplant_tests=no]) -AM_CONDITIONAL(WITH_CPLANT_TESTS, test x$with_cplant_tests != xno) - -AC_ARG_WITH(sockets, - AC_HELP_STRING([--with-sockets], - [build sockets interface driver (EXPERIMENTAL)]), - [ case "${withval}" in - yes) AC_MSG_ERROR(the sockets driver is broken right now);; - no) ;; - *) AC_MSG_ERROR(bad value ${withval} for --with-sockets) ;; - esac], - [with_sockets=no]) -AM_CONDITIONAL(WITH_SOCKETS_DRIVER, test x$with_sockets = xyes) - -AC_ARG_WITH(lustre-hack, - AC_HELP_STRING([--with-lustre-hack], - [have hacking code which needed to support liblustre driver (EXPERIMENTAL)]), - [ case "${withval}" in - yes) ;; - no) ;; - *) AC_MSG_ERROR(bad value ${withval} for --with-lustre-hack) ;; - esac], - [with_lustre_hack=no]) -AM_CONDITIONAL(WITH_LUSTRE_HACK, test x$with_lustre_hack = xyes) -if test x$with_lustre_hack = xyes; then - AC_DEFINE(HAVE_LUSTRE_HACK) -fi - AC_ARG_WITH(alternate-symbols, AC_HELP_STRING([--with-alternate-symbols@<:@=<qualifier>@:>@], [Prepend standard, public, symbols with a unique qualifer]), @@ -416,8 +359,6 @@ EOF done]) if test $sysio_asm_global_directive = UNKNOWN; then AC_MSG_ERROR(cannot determine asm global directive) -#else -# AC_DEFINE_UNQUOTED(ASM_GLOBAL_DIRECTIVE, ${sysio_asm_global_directive}) fi AC_CACHE_CHECK(for .set assembler directive, @@ -441,9 +382,6 @@ EOF sysio_asm_set_directive=no fi rm -f conftest*]) -#if test $sysio_asm_set_directive = yes; then -# AC_DEFINE(HAVE_ASM_SET_DIRECTIVE) -#fi AC_CACHE_CHECK(for assembler .weak directive, sysio_asm_weak_directive, [dnl |