[idms-dbma-devel]: COMMIT - r107 - in branches/nonblocking_io/modules/engines/diskIO: . c10klocaldis
Status: Pre-Alpha
Brought to you by:
nkukard
Menu
▾
▴
[idms-dbma-devel]: COMMIT - r107 - in branches/nonblocking_io/modules/engines/diskIO: . c10klocaldisk
|
From: <sv...@li...> - 2005-09-20 08:23:11
|
Author: nkukard
Date: 2005-09-20 08:22:16 +0000 (Tue, 20 Sep 2005)
New Revision: 107
Added:
branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/
branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.am
branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.in
branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/TODO
branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c
Removed:
branches/nonblocking_io/modules/engines/diskIO/localdisk/
Modified:
branches/nonblocking_io/modules/engines/diskIO/Makefile.am
branches/nonblocking_io/modules/engines/diskIO/Makefile.in
Log:
* Updated disk io modules
Modified: branches/nonblocking_io/modules/engines/diskIO/Makefile.am
===================================================================
--- branches/nonblocking_io/modules/engines/diskIO/Makefile.am 2005-05-09 19:55:13 UTC (rev 106)
+++ branches/nonblocking_io/modules/engines/diskIO/Makefile.am 2005-09-20 08:22:16 UTC (rev 107)
@@ -1,7 +1,7 @@
GLIB_LIBS=@GLIB_LIBS@
GLIB_CFLAGS=@GLIB_CFLAGS@
-SUBDIRS=localdisk
+SUBDIRS=c10klocaldisk
noinst_LTLIBRARIES = libdiskio.la
libdiskio_la_SOURCES = diskio.c
Modified: branches/nonblocking_io/modules/engines/diskIO/Makefile.in
===================================================================
--- branches/nonblocking_io/modules/engines/diskIO/Makefile.in 2005-05-09 19:55:13 UTC (rev 106)
+++ branches/nonblocking_io/modules/engines/diskIO/Makefile.in 2005-09-20 08:22:16 UTC (rev 107)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,11 +57,11 @@
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libdiskio_la_SOURCES)
DIST_SOURCES = $(libdiskio_la_SOURCES)
@@ -185,7 +185,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = localdisk
+SUBDIRS = c10klocaldisk
noinst_LTLIBRARIES = libdiskio.la
libdiskio_la_SOURCES = diskio.c
libdiskio_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(AM_CFLAGS)
@@ -264,11 +264,11 @@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libdiskio_la-diskio.lo: diskio.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdiskio_la_CFLAGS) $(CFLAGS) -MT libdiskio_la-diskio.lo -MD -MP -MF "$(DEPDIR)/libdiskio_la-diskio.Tpo" -c -o libdiskio_la-diskio.lo `test -f 'diskio.c' || echo '$(srcdir)/'`diskio.c; \
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdiskio_la_CFLAGS) $(CFLAGS) -MT libdiskio_la-diskio.lo -MD -MP -MF "$(DEPDIR)/libdiskio_la-diskio.Tpo" -c -o libdiskio_la-diskio.lo `test -f 'diskio.c' || echo '$(srcdir)/'`diskio.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libdiskio_la-diskio.Tpo" "$(DEPDIR)/libdiskio_la-diskio.Plo"; else rm -f "$(DEPDIR)/libdiskio_la-diskio.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='diskio.c' object='libdiskio_la-diskio.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdiskio_la_CFLAGS) $(CFLAGS) -c -o libdiskio_la-diskio.lo `test -f 'diskio.c' || echo '$(srcdir)/'`diskio.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdiskio_la_CFLAGS) $(CFLAGS) -c -o libdiskio_la-diskio.lo `test -f 'diskio.c' || echo '$(srcdir)/'`diskio.c
mostlyclean-libtool:
-rm -f *.lo
@@ -287,7 +287,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -299,7 +305,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -307,7 +313,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -328,7 +340,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
Added: branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.am
===================================================================
--- branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.am 2005-05-09 19:55:13 UTC (rev 106)
+++ branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.am 2005-09-20 08:22:16 UTC (rev 107)
@@ -0,0 +1,8 @@
+GLIB_LIBS=@GLIB_LIBS@
+GLIB_CFLAGS=@GLIB_CFLAGS@
+
+module_LTLIBRARIES = diskio_c10klocaldisk.la
+diskio_c10klocaldisk_la_SOURCES = localdisk.c
+diskio_c10klocaldisk_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(AM_CFLAGS)
+diskio_c10klocaldisk_la_LDFLAGS = $(GLIB_LIBS) -module -avoid-version
+
Added: branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.in
===================================================================
--- branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.in 2005-05-09 19:55:13 UTC (rev 106)
+++ branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/Makefile.in 2005-09-20 08:22:16 UTC (rev 107)
@@ -0,0 +1,476 @@
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+SOURCES = $(diskio_c10klocaldisk_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/engines/diskIO/c10klocaldisk
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(moduledir)"
+moduleLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(module_LTLIBRARIES)
+diskio_c10klocaldisk_la_LIBADD =
+am_diskio_c10klocaldisk_la_OBJECTS = \
+ diskio_c10klocaldisk_la-localdisk.lo
+diskio_c10klocaldisk_la_OBJECTS = \
+ $(am_diskio_c10klocaldisk_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(diskio_c10klocaldisk_la_SOURCES)
+DIST_SOURCES = $(diskio_c10klocaldisk_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XML2_CONFIG = @XML2_CONFIG@
+XML_CPPFLAGS = @XML_CPPFLAGS@
+XML_LIBS = @XML_LIBS@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+module_LTLIBRARIES = diskio_c10klocaldisk.la
+diskio_c10klocaldisk_la_SOURCES = localdisk.c
+diskio_c10klocaldisk_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(AM_CFLAGS)
+diskio_c10klocaldisk_la_LDFLAGS = $(GLIB_LIBS) -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/diskIO/c10klocaldisk/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/engines/diskIO/c10klocaldisk/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
+ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(module_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \
+ done
+
+clean-moduleLTLIBRARIES:
+ -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
+ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+diskio_c10klocaldisk.la: $(diskio_c10klocaldisk_la_OBJECTS) $(diskio_c10klocaldisk_la_DEPENDENCIES)
+ $(LINK) -rpath $(moduledir) $(diskio_c10klocaldisk_la_LDFLAGS) $(diskio_c10klocaldisk_la_OBJECTS) $(diskio_c10klocaldisk_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskio_c10klocaldisk_la-localdisk.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+diskio_c10klocaldisk_la-localdisk.lo: localdisk.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskio_c10klocaldisk_la_CFLAGS) $(CFLAGS) -MT diskio_c10klocaldisk_la-localdisk.lo -MD -MP -MF "$(DEPDIR)/diskio_c10klocaldisk_la-localdisk.Tpo" -c -o diskio_c10klocaldisk_la-localdisk.lo `test -f 'localdisk.c' || echo '$(srcdir)/'`localdisk.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/diskio_c10klocaldisk_la-localdisk.Tpo" "$(DEPDIR)/diskio_c10klocaldisk_la-localdisk.Plo"; else rm -f "$(DEPDIR)/diskio_c10klocaldisk_la-localdisk.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='localdisk.c' object='diskio_c10klocaldisk_la-localdisk.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskio_c10klocaldisk_la_CFLAGS) $(CFLAGS) -c -o diskio_c10klocaldisk_la-localdisk.lo `test -f 'localdisk.c' || echo '$(srcdir)/'`localdisk.c
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(moduledir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-moduleLTLIBRARIES
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-moduleLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-moduleLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-moduleLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-moduleLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/TODO
===================================================================
Added: branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c
===================================================================
--- branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c 2005-05-09 19:55:13 UTC (rev 106)
+++ branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c 2005-09-20 08:22:16 UTC (rev 107)
@@ -0,0 +1,190 @@
+/*
+ * c10k-localdisk.c - Local disk stuff, specific to c10k
+ * Copyright (C) 2002-2005, Linux Based Systems Design
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ * 26/04/2005 - Nigel Kukard <nk...@lb...>
+ * * Initial design
+*/
+
+
+#include <glib.h>
+#include <errno.h>
+#include <stdlib.h>
+#include "debug.h"
+#include "modules.h"
+#include "../diskio.h"
+
+
+/*
+ * Static stuff we need
+ */
+
+static GList *ioRequests = NULL; /* Queue of io requests being processed */
+
+static fd_set inputFDs;
+static fd_set outputFDs;
+static int noticePipe[2]; /* Notifications pipe, if this changes fsck the timeout... see whats happening */
+
+
+
+/* Disk IO thread */
+static gpointer diskio_thread(gpointer data)
+{
+ struct timeval tv, tmp_tv;
+ unsigned char result = 1;
+
+
+ D_PRINT(D_NOTICE,"Starting C10K Local Disk IO Engine");
+ pipe(noticePipe);
+ /* Watch our file descriptor */
+ FD_ZERO(&inputFDs);
+ FD_ZERO(&outputFDs);
+ FD_SET(noticePipe[0],&inputFDs);
+ /* Set the timeout period */
+ tv.tv_sec = 5;
+ tv.tv_usec = 0;
+
+ /* Loop */
+ while (result == 1)
+ {
+ fd_set tmp_wfds;
+ fd_set tmp_rfds;
+ int retVal;
+ GList *item;
+
+
+ /* Restore our params... */
+ tmp_wfds = outputFDs;
+ tmp_rfds = inputFDs;
+ tmp_tv = tv;
+
+ /* Do select() */
+ retVal = select(FD_SETSIZE, &tmp_rfds, &tmp_wfds, NULL, &tmp_tv);
+
+ /* And find result... */
+ switch (retVal)
+ {
+ /* Something funny has happened */
+ case -1:
+ /* Check if we've been interrupted */
+ if (errno == EINTR)
+ {
+ D_PRINT(D_NOTICE,"select() interrupted by system call");
+ result = D_NOTICE;
+ }
+ else
+ {
+ D_PRINT(D_ERROR,"select() error: %s",strerror(errno));
+ result = D_ERROR;
+ }
+ break;
+
+ /* Nothing changed, so process only timeout stuff */
+ case 0:
+ /* Check for stale disk IO operations */
+ D_PRINT(D_NOTICE,"idle");
+ break;
+
+ /* Something changed... process */
+ default:
+#if 0
+ /* Check if we were triggered to process another IO operation */
+ if (FD_ISSET(noticePipe[0],&tmp_rfds))
+ {
+ char tmpBuf[SOCK_IO_BUF_LEN];
+
+
+ D_PRINT(D_DEBUG,"Triggered request");
+
+ /* Clear pipe */
+ read(noticePipe[0],&tmpBuf,SOCK_IO_BUF_LEN);
+
+ // FIXME - pick IO request off queue */
+ } // if (FD_ISSET(noticePipe[0],&tmp_rfds))
+
+
+ if (FD_ISSET(dbConn->sock,&tmp_wfds) || FD_ISSET(dbConn->sock,&tmp_rfds))
+ {
+ FD_CLR(dbConn->sock,&outputFDs);
+ FD_CLR(dbConn->sock,&inputFDs);
+ } // while (item)
+#endif
+ break;
+
+ } // switch (retVal)
+ } // while (result == 1)
+
+ return NULL;
+}
+
+
+/* Abstraction layer open function */
+static int localdisk_open(struct dioFile_t *file, char *filename, int flags)
+{
+ D_PRINT(D_DEBUG,"localdisk.c: open %s",filename);
+ return D_OK;
+}
+
+
+#if 0
+/* Authenticate user */
+int pgsql_authenticate(struct authInfo_t *authInfo)
+{
+ D_PRINT(D_NOTICE,"Queuing authentication");
+
+ // Append & notify
+ authQueue = g_list_append(authQueue,authInfo);
+ write(noticePipe[1],"1",1);
+
+ D_PRINT(D_NOTICE,"Authentication queued");
+
+ return D_OK;
+}
+#endif
+
+/* Initialize this module */
+struct module_t *module_init()
+{
+ struct module_t *myself = NULL;
+ struct dioCmds_t *dioCmds = NULL;
+ GThread *diskIOThread;
+
+
+ D_PRINT(D_NOTICE,"Registered C10K Local Disk IO Engine");
+
+ myself = malloc(sizeof(struct module_t));
+ dioCmds = malloc(sizeof(struct dioCmds_t));
+
+ /* Start the disk IO thread */
+ diskIOThread = g_thread_create(&diskio_thread,NULL,FALSE,NULL);
+
+ /* Setup our commands */
+ dioCmds->dio_open = localdisk_open;
+ dioCmds->dio_read = NULL;
+ dioCmds->dio_write = NULL;
+ dioCmds->dio_close = NULL;
+
+ /* Setup module_t structure */
+ myself->name = "c10k-localdisk";
+ myself->type = DISKIO_MODULE;
+ myself->cmdStruct = dioCmds;
+
+ return myself;
+}
+
+// vim:ts=4
|
