* [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff
@ 2013-07-31 15:15 Ian Campbell
2013-07-31 15:15 ` [PATCH 1/9] tools: move xm and xend under tools python Ian Campbell
` (11 more replies)
0 siblings, 12 replies; 30+ messages in thread
From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw)
To: xen-devel; +Cc: Keir Fraser, Ian Jackson
depends on "autoconf: regenerate configure scripts with 4.4 version"
This series removes some of the really old deadwood from the tools build
and makes some other things which are on their way out configurable at
build time with a default depending on how far down the slope I judge
them to be.
* nuke in tree copy of libaio
* nuke obsolete tools: xsview, miniterm, lomount & sv
* make xend optional, still on by default (for now!)
* disable blktap1 by default (needs qemu patch, just posted)
* some cleanup of .*ignore
Ian.
^ permalink raw reply [flat|nested] 30+ messages in thread* [PATCH 1/9] tools: move xm and xend under tools python 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:03 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 2/9] tools: make building xend configurable Ian Campbell ` (10 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- tools/misc/Makefile | 2 +- tools/misc/xend | 110 -------------------------------------------- tools/misc/xm | 7 --- tools/python/Makefile | 4 ++ tools/python/xen/xend/xend | 110 ++++++++++++++++++++++++++++++++++++++++++++ tools/python/xen/xm/xm | 7 +++ 6 files changed, 122 insertions(+), 118 deletions(-) delete mode 100644 tools/misc/xend delete mode 100755 tools/misc/xm create mode 100644 tools/python/xen/xend/xend create mode 100755 tools/python/xen/xm/xm diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 520ef80..73b55dd 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,7 +22,7 @@ INSTALL_BIN-y := xencons xencov_split INSTALL_BIN-$(CONFIG_X86) += xen-detect INSTALL_BIN := $(INSTALL_BIN-y) -INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview \ +INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xsview xenpm xen-tmem-list-parse gtraceview \ gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool diff --git a/tools/misc/xend b/tools/misc/xend deleted file mode 100644 index 9ef0210..0000000 --- a/tools/misc/xend +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/env python -# -*- mode: python; -*- -#============================================================================ -# Copyright (C) 2004 Mike Wray <mike.wray@hp.com> -# Copyright (C) 2005-2006 XenSource Inc -#============================================================================ - -"""Xen management daemon. - Provides console server and HTTP management api. - - Run: - xend start - - Restart: - xend restart - - The daemon is stopped with: - xend stop - - The daemon should reconnect to device control interfaces - and recover its state when restarted. - - On Solaris, the daemons are SMF managed, and you should not attempt - to start xend by hand. -""" -import fcntl -import glob -import os -import os.path -import sys -import socket -import signal -import time -import commands - -from xen.xend.server import SrvDaemon - -class CheckError(ValueError): - pass - -def hline(): - print >>sys.stderr, "*" * 70 - -def msg(message): - print >>sys.stderr, "*" * 3, message - -def check_logging(): - """Check python logging is installed and raise an error if not. - Logging is standard from Python 2.3 on. - """ - try: - import logging - except ImportError: - hline() - msg("Python logging is not installed.") - msg("Use 'make install-logging' at the xen root to install.") - msg("") - msg("Alternatively download and install from") - msg("http://www.red-dove.com/python_logging.html") - hline() - raise CheckError("logging is not installed") - -def check_user(): - """Check that the effective user id is 0 (root). - """ - if os.geteuid() != 0: - hline() - msg("Xend must be run as root.") - hline() - raise CheckError("invalid user") - -def start_daemon(daemon, *args): - if os.fork() == 0: - os.execvp(daemon, (daemon,) + args) - -def start_blktapctrl(): - start_daemon("blktapctrl", "") - -def main(): - try: - check_logging() - check_user() - except CheckError: - sys.exit(1) - - daemon = SrvDaemon.instance() - if not sys.argv[1:]: - print 'usage: %s {start|stop|reload|restart}' % sys.argv[0] - elif sys.argv[1] == 'start': - if os.uname()[0] != "SunOS": - start_blktapctrl() - return daemon.start() - elif sys.argv[1] == 'trace_start': - start_blktapctrl() - return daemon.start(trace=1) - elif sys.argv[1] == 'stop': - return daemon.stop() - elif sys.argv[1] == 'reload': - return daemon.reloadConfig() - elif sys.argv[1] == 'restart': - start_blktapctrl() - return daemon.stop() or daemon.start() - elif sys.argv[1] == 'status': - return daemon.status() - else: - print 'not an option:', sys.argv[1] - return 1 - -if __name__ == '__main__': - sys.exit(main()) diff --git a/tools/misc/xm b/tools/misc/xm deleted file mode 100755 index f4fd200..0000000 --- a/tools/misc/xm +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python -# -*- mode: python; -*- -import sys - -from xen.xm import main - -main.main(sys.argv) diff --git a/tools/python/Makefile b/tools/python/Makefile index 9be1122..8461d0f 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -23,6 +23,10 @@ install: install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \ $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_PYTHON_PROG) xen/xm/xm $(DESTDIR)$(SBINDIR)/xm + $(INSTALL_PYTHON_PROG) xen/xend/xend $(DESTDIR)$(SBINDIR)/xend + install-dtd: all $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(SHAREDIR)/xen diff --git a/tools/python/xen/xend/xend b/tools/python/xen/xend/xend new file mode 100644 index 0000000..9ef0210 --- /dev/null +++ b/tools/python/xen/xend/xend @@ -0,0 +1,110 @@ +#!/usr/bin/env python +# -*- mode: python; -*- +#============================================================================ +# Copyright (C) 2004 Mike Wray <mike.wray@hp.com> +# Copyright (C) 2005-2006 XenSource Inc +#============================================================================ + +"""Xen management daemon. + Provides console server and HTTP management api. + + Run: + xend start + + Restart: + xend restart + + The daemon is stopped with: + xend stop + + The daemon should reconnect to device control interfaces + and recover its state when restarted. + + On Solaris, the daemons are SMF managed, and you should not attempt + to start xend by hand. +""" +import fcntl +import glob +import os +import os.path +import sys +import socket +import signal +import time +import commands + +from xen.xend.server import SrvDaemon + +class CheckError(ValueError): + pass + +def hline(): + print >>sys.stderr, "*" * 70 + +def msg(message): + print >>sys.stderr, "*" * 3, message + +def check_logging(): + """Check python logging is installed and raise an error if not. + Logging is standard from Python 2.3 on. + """ + try: + import logging + except ImportError: + hline() + msg("Python logging is not installed.") + msg("Use 'make install-logging' at the xen root to install.") + msg("") + msg("Alternatively download and install from") + msg("http://www.red-dove.com/python_logging.html") + hline() + raise CheckError("logging is not installed") + +def check_user(): + """Check that the effective user id is 0 (root). + """ + if os.geteuid() != 0: + hline() + msg("Xend must be run as root.") + hline() + raise CheckError("invalid user") + +def start_daemon(daemon, *args): + if os.fork() == 0: + os.execvp(daemon, (daemon,) + args) + +def start_blktapctrl(): + start_daemon("blktapctrl", "") + +def main(): + try: + check_logging() + check_user() + except CheckError: + sys.exit(1) + + daemon = SrvDaemon.instance() + if not sys.argv[1:]: + print 'usage: %s {start|stop|reload|restart}' % sys.argv[0] + elif sys.argv[1] == 'start': + if os.uname()[0] != "SunOS": + start_blktapctrl() + return daemon.start() + elif sys.argv[1] == 'trace_start': + start_blktapctrl() + return daemon.start(trace=1) + elif sys.argv[1] == 'stop': + return daemon.stop() + elif sys.argv[1] == 'reload': + return daemon.reloadConfig() + elif sys.argv[1] == 'restart': + start_blktapctrl() + return daemon.stop() or daemon.start() + elif sys.argv[1] == 'status': + return daemon.status() + else: + print 'not an option:', sys.argv[1] + return 1 + +if __name__ == '__main__': + sys.exit(main()) diff --git a/tools/python/xen/xm/xm b/tools/python/xen/xm/xm new file mode 100755 index 0000000..f4fd200 --- /dev/null +++ b/tools/python/xen/xm/xm @@ -0,0 +1,7 @@ +#!/usr/bin/env python +# -*- mode: python; -*- +import sys + +from xen.xm import main + +main.main(sys.argv) -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 1/9] tools: move xm and xend under tools python 2013-07-31 15:15 ` [PATCH 1/9] tools: move xm and xend under tools python Ian Campbell @ 2013-08-07 15:03 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:03 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 1/9] tools: move xm and xend under tools python"): > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 2/9] tools: make building xend configurable. 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell 2013-07-31 15:15 ` [PATCH 1/9] tools: move xm and xend under tools python Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:04 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 3/9] tools: remove in tree libaio Ian Campbell ` (9 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell xend has been deprecated for 2 releases now. Lets make it possible to not even build it. For now I'm leaving the default of on but I would like to change that before the 4.4 release. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- config/Tools.mk.in | 1 + tools/configure | 26 ++++++++++++++++++++++++++ tools/configure.ac | 1 + tools/examples/Makefile | 33 ++++++++++++++++----------------- tools/hotplug/Linux/Makefile | 5 ++++- tools/hotplug/NetBSD/Makefile | 3 ++- tools/python/Makefile | 10 ++++++++-- tools/python/setup.py | 35 ++++++++++++++++++++++++++--------- 8 files changed, 84 insertions(+), 30 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 5e2c6d8..ef41c2a 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -52,6 +52,7 @@ CONFIG_LOMOUNT := @lomount@ CONFIG_OVMF := @ovmf@ CONFIG_ROMBIOS := @rombios@ CONFIG_SEABIOS := @seabios@ +CONFIG_XEND := @xend@ #System options CONFIG_SYSTEM_LIBAIO:= @system_aio@ diff --git a/tools/configure b/tools/configure index 079646c..6e2f758 100755 --- a/tools/configure +++ b/tools/configure @@ -654,6 +654,7 @@ APPEND_LIB APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES +xend debug seabios rombios @@ -734,6 +735,7 @@ enable_ovmf enable_rombios enable_seabios enable_debug +enable_xend ' ac_precious_vars='build_alias host_alias @@ -1394,6 +1396,7 @@ Optional Features: --disable-rombios Disable ROM BIOS (default is ENABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) + --disable-xend Disable xend toolstack (default is ENABLED) Some influential environment variables: CC C compiler command @@ -3654,6 +3657,29 @@ debug=$ax_cv_debug +# Check whether --enable-xend was given. +if test "${enable_xend+set}" = set; then : + enableval=$enable_xend; +fi + + +if test "x$enable_xend" = "xno"; then : + + ax_cv_xend="n" + +elif test "x$enable_xend" = "xyes"; then : + + ax_cv_xend="y" + +elif test -z $ax_cv_xend; then : + + ax_cv_xend="y" + +fi +xend=$ax_cv_xend + + + diff --git a/tools/configure.ac b/tools/configure.ac index 4f5e688..d6eba44 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -59,6 +59,7 @@ AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) +AX_ARG_DEFAULT_ENABLE([xend], [Disable xend toolstack]) AC_ARG_VAR([PREPEND_INCLUDES], [List of include folders to prepend to CFLAGS (without -I)]) diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 8cea724..cc853fa 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -1,31 +1,30 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -# Init scripts. -XEND_INITD = init.d/xend -XENDOMAINS_INITD = init.d/xendomains -XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains - # Xen configuration dir and configs to go there. XEN_READMES = README XEN_READMES += README.incompatibilities -XEN_CONFIGS = xend-config.sxp -XEN_CONFIGS += xm-config.xml -XEN_CONFIGS += xmexample1 -XEN_CONFIGS += xmexample2 -XEN_CONFIGS += xmexample3 -XEN_CONFIGS += xmexample.hvm -XEN_CONFIGS += xmexample.hvm-stubdom -XEN_CONFIGS += xmexample.pv-grub -XEN_CONFIGS += xmexample.nbd -XEN_CONFIGS += xmexample.vti + +XEN_CONFIGS-$(CONFIG_XEND) += xend-config.sxp +XEN_CONFIGS-$(CONFIG_XEND) += xm-config.xml +XEN_CONFIGS-$(CONFIG_XEND) += xmexample1 +XEN_CONFIGS-$(CONFIG_XEND) += xmexample2 +XEN_CONFIGS-$(CONFIG_XEND) += xmexample3 +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm-stubdom +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.pv-grub +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.nbd +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.vti +XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-quirks.sxp +XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-permissive.sxp + XEN_CONFIGS += xlexample.hvm XEN_CONFIGS += xlexample.pvlinux -XEN_CONFIGS += xend-pci-quirks.sxp -XEN_CONFIGS += xend-pci-permissive.sxp XEN_CONFIGS += xl.conf XEN_CONFIGS += cpupool +XEN_CONFIGS += $(XEN_CONFIGS-y) + .PHONY: all all: diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 8b0d7f4..b7737ab 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -28,7 +28,8 @@ XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA += block-common.sh UDEV_RULES_DIR = $(CONFIG_DIR)/udev -UDEV_RULES = xen-backend.rules xend.rules +UDEV_RULES-$(CONFIG_XEND) = xend.rules +UDEV_RULES = xen-backend.rules $(UDEV_RULES-y) .PHONY: all all: @@ -44,7 +45,9 @@ install: all install-initd install-scripts install-udev install-initd: [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) +ifeq ($(CONFIG_XEND),y) $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR) +endif $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR) $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 2ae5a34..3d7f222 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -8,7 +8,8 @@ XEN_SCRIPTS += vif-bridge XEN_SCRIPTS += vif-ip XEN_SCRIPT_DATA = -XEN_RCD_PROG = rc.d/xencommons rc.d/xend rc.d/xendomains rc.d/xen-watchdog +XEN_RCD_PROG-$(CONFIG_XEND) = rc.d/xend +XEN_RCD_PROG = rc.d/xencommons $(XEN_RCD_PROG-y) rc.d/xendomains rc.d/xen-watchdog .PHONY: all all: diff --git a/tools/python/Makefile b/tools/python/Makefile index 8461d0f..3d0f8f0 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -16,20 +16,26 @@ build: genpath genwrap.py $(XEN_ROOT)/tools/libxl/libxl_types.idl \ $(XEN_ROOT)/tools/libxl/libxl_types.idl \ xen/lowlevel/xl/_pyxl_types.h \ xen/lowlevel/xl/_pyxl_types.c - CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build + CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build --xend=$(CONFIG_XEND) .PHONY: install install: install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \ - $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force + $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force --xend=$(CONFIG_XEND) $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +ifeq ($(CONFIG_XEND),y) $(INSTALL_PYTHON_PROG) xen/xm/xm $(DESTDIR)$(SBINDIR)/xm $(INSTALL_PYTHON_PROG) xen/xend/xend $(DESTDIR)$(SBINDIR)/xend +endif install-dtd: all +ifeq ($(CONFIG_XEND),y) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(SHAREDIR)/xen +else + : +endif .PHONY: test test: diff --git a/tools/python/setup.py b/tools/python/setup.py index 42a70fc..4f66564 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -1,6 +1,6 @@ from distutils.core import setup, Extension -import os +import os, sys XEN_ROOT = "../.." @@ -95,11 +95,19 @@ if plat == 'SunOS': if plat == 'Linux': modules.extend([ checkpoint, netlink ]) -setup(name = 'xen', - version = '3.0', - description = 'Xen', - packages = ['xen', - 'xen.lowlevel', +enable_xend = True +new_argv = [] +for arg in sys.argv: + if arg == "--xend=y": + enable_xend = True + elif arg == "--xend=n": + enable_xend = False + else: + new_argv.append(arg) +sys.argv = new_argv + +if enable_xend: + xend_packages = [ 'xen.util', 'xen.util.xsm', 'xen.util.xsm.dummy', @@ -110,14 +118,23 @@ setup(name = 'xen', 'xen.xend.xenstore', 'xen.xm', 'xen.web', - 'xen.sv', - 'xen.xsview', 'xen.remus', 'xen.xend.tests', 'xen.xend.server.tests', 'xen.xend.xenstore.tests', 'xen.xm.tests' - ], + ] +else: + xend_packages = [] + +setup(name = 'xen', + version = '3.0', + description = 'Xen', + packages = ['xen', + 'xen.lowlevel', + 'xen.sv', + 'xen.xsview', + ] + xend_packages, ext_package = "xen.lowlevel", ext_modules = modules ) -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 2/9] tools: make building xend configurable. 2013-07-31 15:15 ` [PATCH 2/9] tools: make building xend configurable Ian Campbell @ 2013-08-07 15:04 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:04 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 2/9] tools: make building xend configurable."): > xend has been deprecated for 2 releases now. Lets make it possible to not even > build it. > > For now I'm leaving the default of on but I would like to change that before > the 4.4 release. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 3/9] tools: remove in tree libaio 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell 2013-07-31 15:15 ` [PATCH 1/9] tools: move xm and xend under tools python Ian Campbell 2013-07-31 15:15 ` [PATCH 2/9] tools: make building xend configurable Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-01 8:38 ` Egger, Christoph 2013-08-07 15:06 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 4/9] tools: delete xsview Ian Campbell ` (8 subsequent siblings) 11 siblings, 2 replies; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell We have defaulted to using the system libaio for a while now and I din't think there are any relevant distros which don't have it that running Xen 4.4 would be reasonable on. Also it has caused confusion because it is not ever wanted on ARM, but the build system doesn't express that (could be fixed, but deleting is the right thing to do anyway). Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- .gitignore | 2 - .hgignore | 2 - README | 2 +- config/Tools.mk.in | 1 - tools/Makefile | 6 - tools/blktap/drivers/Makefile | 6 - tools/blktap2/drivers/Makefile | 7 - tools/config.h.in | 3 + tools/configure | 9 +- tools/configure.ac | 2 +- tools/libaio/COPYING | 515 ------------------------------- tools/libaio/ChangeLog | 43 --- tools/libaio/INSTALL | 18 - tools/libaio/Makefile | 40 --- tools/libaio/TODO | 4 - tools/libaio/harness/Makefile | 37 --- tools/libaio/harness/README | 19 -- tools/libaio/harness/attic/0.t | 9 - tools/libaio/harness/attic/1.t | 9 - tools/libaio/harness/cases/10.t | 53 ---- tools/libaio/harness/cases/11.t | 39 --- tools/libaio/harness/cases/12.t | 49 --- tools/libaio/harness/cases/13.t | 66 ---- tools/libaio/harness/cases/14.t | 90 ------ tools/libaio/harness/cases/2.t | 41 --- tools/libaio/harness/cases/3.t | 25 -- tools/libaio/harness/cases/4.t | 72 ----- tools/libaio/harness/cases/5.t | 47 --- tools/libaio/harness/cases/6.t | 57 ---- tools/libaio/harness/cases/7.t | 27 -- tools/libaio/harness/cases/8.t | 49 --- tools/libaio/harness/cases/aio_setup.h | 98 ------ tools/libaio/harness/cases/common-7-8.h | 37 --- tools/libaio/harness/main.c | 39 --- tools/libaio/harness/runtests.sh | 19 -- tools/libaio/libaio.spec | 187 ----------- tools/libaio/man/aio.3 | 315 ------------------- tools/libaio/man/aio_cancel.3 | 137 -------- tools/libaio/man/aio_cancel64.3 | 50 --- tools/libaio/man/aio_error.3 | 81 ----- tools/libaio/man/aio_error64.3 | 64 ---- tools/libaio/man/aio_fsync.3 | 139 --------- tools/libaio/man/aio_fsync64.3 | 51 --- tools/libaio/man/aio_init.3 | 96 ------ tools/libaio/man/aio_read.3 | 146 --------- tools/libaio/man/aio_read64.3 | 60 ---- tools/libaio/man/aio_return.3 | 71 ----- tools/libaio/man/aio_return64.3 | 51 --- tools/libaio/man/aio_suspend.3 | 123 -------- tools/libaio/man/aio_suspend64.3 | 51 --- tools/libaio/man/aio_write.3 | 176 ----------- tools/libaio/man/aio_write64.3 | 61 ---- tools/libaio/man/io.3 | 351 --------------------- tools/libaio/man/io_cancel.1 | 21 -- tools/libaio/man/io_cancel.3 | 65 ---- tools/libaio/man/io_destroy.1 | 17 - tools/libaio/man/io_fsync.3 | 82 ----- tools/libaio/man/io_getevents.1 | 29 -- tools/libaio/man/io_getevents.3 | 79 ----- tools/libaio/man/io_prep_fsync.3 | 89 ------ tools/libaio/man/io_prep_pread.3 | 79 ----- tools/libaio/man/io_prep_pwrite.3 | 77 ----- tools/libaio/man/io_queue_init.3 | 63 ---- tools/libaio/man/io_queue_release.3 | 48 --- tools/libaio/man/io_queue_run.3 | 50 --- tools/libaio/man/io_queue_wait.3 | 56 ---- tools/libaio/man/io_set_callback.3 | 44 --- tools/libaio/man/io_setup.1 | 15 - tools/libaio/man/io_submit.1 | 109 ------- tools/libaio/man/io_submit.3 | 135 -------- tools/libaio/man/lio_listio.3 | 229 -------------- tools/libaio/man/lio_listio64.3 | 39 --- tools/libaio/src/Makefile | 67 ---- tools/libaio/src/compat-0_1.c | 62 ---- tools/libaio/src/io_cancel.c | 23 -- tools/libaio/src/io_destroy.c | 23 -- tools/libaio/src/io_getevents.c | 57 ---- tools/libaio/src/io_queue_init.c | 33 -- tools/libaio/src/io_queue_release.c | 27 -- tools/libaio/src/io_queue_run.c | 39 --- tools/libaio/src/io_queue_wait.c | 31 -- tools/libaio/src/io_setup.c | 23 -- tools/libaio/src/io_submit.c | 23 -- tools/libaio/src/libaio.h | 222 ------------- tools/libaio/src/libaio.map | 22 -- tools/libaio/src/raw_syscall.c | 19 -- tools/libaio/src/syscall-alpha.h | 209 ------------- tools/libaio/src/syscall-i386.h | 72 ----- tools/libaio/src/syscall-ppc.h | 98 ------ tools/libaio/src/syscall-s390.h | 131 -------- tools/libaio/src/syscall-x86_64.h | 63 ---- tools/libaio/src/syscall.h | 27 -- tools/libaio/src/vsys_def.h | 24 -- 93 files changed, 12 insertions(+), 6361 deletions(-) delete mode 100644 tools/libaio/COPYING delete mode 100644 tools/libaio/ChangeLog delete mode 100644 tools/libaio/INSTALL delete mode 100644 tools/libaio/Makefile delete mode 100644 tools/libaio/TODO delete mode 100644 tools/libaio/harness/Makefile delete mode 100644 tools/libaio/harness/README delete mode 100644 tools/libaio/harness/attic/0.t delete mode 100644 tools/libaio/harness/attic/1.t delete mode 100644 tools/libaio/harness/cases/10.t delete mode 100644 tools/libaio/harness/cases/11.t delete mode 100644 tools/libaio/harness/cases/12.t delete mode 100644 tools/libaio/harness/cases/13.t delete mode 100644 tools/libaio/harness/cases/14.t delete mode 100644 tools/libaio/harness/cases/2.t delete mode 100644 tools/libaio/harness/cases/3.t delete mode 100644 tools/libaio/harness/cases/4.t delete mode 100644 tools/libaio/harness/cases/5.t delete mode 100644 tools/libaio/harness/cases/6.t delete mode 100644 tools/libaio/harness/cases/7.t delete mode 100644 tools/libaio/harness/cases/8.t delete mode 100644 tools/libaio/harness/cases/aio_setup.h delete mode 100644 tools/libaio/harness/cases/common-7-8.h delete mode 100644 tools/libaio/harness/main.c delete mode 100644 tools/libaio/harness/runtests.sh delete mode 100644 tools/libaio/libaio.spec delete mode 100644 tools/libaio/man/aio.3 delete mode 100644 tools/libaio/man/aio_cancel.3 delete mode 100644 tools/libaio/man/aio_cancel64.3 delete mode 100644 tools/libaio/man/aio_error.3 delete mode 100644 tools/libaio/man/aio_error64.3 delete mode 100644 tools/libaio/man/aio_fsync.3 delete mode 100644 tools/libaio/man/aio_fsync64.3 delete mode 100644 tools/libaio/man/aio_init.3 delete mode 100644 tools/libaio/man/aio_read.3 delete mode 100644 tools/libaio/man/aio_read64.3 delete mode 100644 tools/libaio/man/aio_return.3 delete mode 100644 tools/libaio/man/aio_return64.3 delete mode 100644 tools/libaio/man/aio_suspend.3 delete mode 100644 tools/libaio/man/aio_suspend64.3 delete mode 100644 tools/libaio/man/aio_write.3 delete mode 100644 tools/libaio/man/aio_write64.3 delete mode 100644 tools/libaio/man/io.3 delete mode 100644 tools/libaio/man/io_cancel.1 delete mode 100644 tools/libaio/man/io_cancel.3 delete mode 100644 tools/libaio/man/io_destroy.1 delete mode 100644 tools/libaio/man/io_fsync.3 delete mode 100644 tools/libaio/man/io_getevents.1 delete mode 100644 tools/libaio/man/io_getevents.3 delete mode 100644 tools/libaio/man/io_prep_fsync.3 delete mode 100644 tools/libaio/man/io_prep_pread.3 delete mode 100644 tools/libaio/man/io_prep_pwrite.3 delete mode 100644 tools/libaio/man/io_queue_init.3 delete mode 100644 tools/libaio/man/io_queue_release.3 delete mode 100644 tools/libaio/man/io_queue_run.3 delete mode 100644 tools/libaio/man/io_queue_wait.3 delete mode 100644 tools/libaio/man/io_set_callback.3 delete mode 100644 tools/libaio/man/io_setup.1 delete mode 100644 tools/libaio/man/io_submit.1 delete mode 100644 tools/libaio/man/io_submit.3 delete mode 100644 tools/libaio/man/lio_listio.3 delete mode 100644 tools/libaio/man/lio_listio64.3 delete mode 100644 tools/libaio/src/Makefile delete mode 100644 tools/libaio/src/compat-0_1.c delete mode 100644 tools/libaio/src/io_cancel.c delete mode 100644 tools/libaio/src/io_destroy.c delete mode 100644 tools/libaio/src/io_getevents.c delete mode 100644 tools/libaio/src/io_queue_init.c delete mode 100644 tools/libaio/src/io_queue_release.c delete mode 100644 tools/libaio/src/io_queue_run.c delete mode 100644 tools/libaio/src/io_queue_wait.c delete mode 100644 tools/libaio/src/io_setup.c delete mode 100644 tools/libaio/src/io_submit.c delete mode 100644 tools/libaio/src/libaio.h delete mode 100644 tools/libaio/src/libaio.map delete mode 100644 tools/libaio/src/raw_syscall.c delete mode 100644 tools/libaio/src/syscall-alpha.h delete mode 100644 tools/libaio/src/syscall-i386.h delete mode 100644 tools/libaio/src/syscall-ppc.h delete mode 100644 tools/libaio/src/syscall-s390.h delete mode 100644 tools/libaio/src/syscall-x86_64.h delete mode 100644 tools/libaio/src/syscall.h delete mode 100644 tools/libaio/src/vsys_def.h diff --git a/.gitignore b/.gitignore index 960c29e..62462b4 100644 --- a/.gitignore +++ b/.gitignore @@ -208,8 +208,6 @@ tools/libxl/testenum.c tools/libxl/tmp.* tools/libxl/_libxl.api-for-check tools/libxl/*.api-ok -tools/libaio/src/*.ol -tools/libaio/src/*.os tools/misc/cpuperf/cpuperf-perfcntr tools/misc/cpuperf/cpuperf-xen tools/misc/lomount/lomount diff --git a/.hgignore b/.hgignore index f3877a9..9822a8d 100644 --- a/.hgignore +++ b/.hgignore @@ -201,8 +201,6 @@ ^tools/libxl/_libxl\.api-for-check ^tools/libxl/libxl\.api-ok ^tools/libvchan/vchan-node[12]$ -^tools/libaio/src/.*\.ol$ -^tools/libaio/src/.*\.os$ ^tools/misc/cpuperf/cpuperf-perfcntr$ ^tools/misc/cpuperf/cpuperf-xen$ ^tools/misc/lomount/lomount$ diff --git a/README b/README index 9f6c9f5..8689ce1 100644 --- a/README +++ b/README @@ -51,7 +51,7 @@ provided by your OS distributor: * Development install of uuid (e.g. uuid-dev) * Development install of yajl (e.g. libyajl-dev) * Development install of libaio (e.g. libaio-dev) version 0.3.107 or - greater. Set CONFIG_SYSTEM_LIBAIO in .config if this is not available. + greater. * Development install of GLib v2.0 (e.g. libglib2.0-dev) * Development install of Pixman (e.g. libpixman-1-dev) * pkg-config diff --git a/config/Tools.mk.in b/config/Tools.mk.in index ef41c2a..bb3acbd 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -55,7 +55,6 @@ CONFIG_SEABIOS := @seabios@ CONFIG_XEND := @xend@ #System options -CONFIG_SYSTEM_LIBAIO:= @system_aio@ ZLIB := @zlib@ CONFIG_LIBICONV := @libiconv@ CONFIG_GCRYPT := @libgcrypt@ diff --git a/tools/Makefile b/tools/Makefile index e44a3e9..51d2336 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,10 +1,6 @@ XEN_ROOT = $(CURDIR)/.. include $(XEN_ROOT)/tools/Rules.mk -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) -SUBDIRS-libaio := libaio -endif - SUBDIRS-y := SUBDIRS-y += include SUBDIRS-y += libxc @@ -19,13 +15,11 @@ SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xenstat -SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) SUBDIRS-$(CONFIG_Linux) += memshr ifeq ($(CONFIG_X86),y) SUBDIRS-$(CONFIG_Linux) += blktap endif SUBDIRS-$(CONFIG_Linux) += blktap2 -SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) SUBDIRS-$(CONFIG_NetBSD) += blktap2 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 941592e..7461a95 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -27,13 +27,7 @@ CFLAGS += -I $(MEMSHR_DIR) MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) -LIBAIO_DIR = ../../libaio/src -CFLAGS += -I $(LIBAIO_DIR) -AIOLIBS := $(LIBAIO_DIR)/libaio.a -else AIOLIBS := -laio -endif CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index f47abb3..5c6ab6a 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -28,14 +28,7 @@ REMUS-OBJS += hashtable.o REMUS-OBJS += hashtable_itr.o REMUS-OBJS += hashtable_utility.o -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) -CFLAGS += -I $(LIBAIO_DIR) -LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src -tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := $(LIBAIO_DIR)/libaio.a -tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS += -I$(LIBAIO_DIR) -else tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := -laio -endif MEMSHRLIBS := ifeq ($(CONFIG_Linux), __fixme__) diff --git a/tools/config.h.in b/tools/config.h.in index a67910b..8bda0bd 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -3,6 +3,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `aio' library (-laio). */ +#undef HAVE_LIBAIO + /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO diff --git a/tools/configure b/tools/configure index 6e2f758..b52dd2a 100755 --- a/tools/configure +++ b/tools/configure @@ -7375,9 +7375,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aio_io_setup" >&5 $as_echo "$ac_cv_lib_aio_io_setup" >&6; } if test "x$ac_cv_lib_aio_io_setup" = x""yes; then : - system_aio="y" + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAIO 1 +_ACEOF + + LIBS="-laio $LIBS" + else - system_aio="n" + as_fn_error $? "Could not find libaio" "$LINENO" 5 fi diff --git a/tools/configure.ac b/tools/configure.ac index d6eba44..f629318 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -155,7 +155,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) -AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) +AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) AC_SUBST(system_aio) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AX_CHECK_EXTFS diff --git a/tools/libaio/COPYING b/tools/libaio/COPYING deleted file mode 100644 index c4792dd..0000000 --- a/tools/libaio/COPYING +++ /dev/null @@ -1,515 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -^L - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -^L - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. -\f - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -^L - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -^L - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -^L - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -^L - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -^L - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS -^L - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - <one line to give the library's name and a brief idea of what it -does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper -mail. - -You should also get your employer (if you work as a programmer) or -your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James -Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/tools/libaio/ChangeLog b/tools/libaio/ChangeLog deleted file mode 100644 index ddcf6e3..0000000 --- a/tools/libaio/ChangeLog +++ /dev/null @@ -1,43 +0,0 @@ -0.4.0 - - remove libredhat-kernel - - add rough outline for man pages - - make the compiled io_getevents() add the extra parameter and - pass the timeout for updating as per 2.5 - - fixes for ia64, now works - - fixes for x86-64 - - powerpc support from Gianni Tedesco <gianni@ecsc.co.uk> - - disable the NULL check in harness/cases/4.t on ia64: ia64 - maps the 0 page and causes this check to fail. - -0.3.15 - - use real syscall interface, but don't break source compatibility - yet (that will happen with 0.4.0) - -0.3.13 - - add test cases - -0.3.11 - - use library versioning of libredhat-kernel to always provide a - fallback - -0.3.9 - - add io_queue_release function - -0.3.8 - - make clean deletes libredhat-kernel.so.1 - - const struct timespec * - - add make srpm target - -0.3.7 - - fix assembly function .types - - export io_getevents - - fix io_submit function prototype to match the kernel - - provide /usr/lib/libredhat-kernel.so link for compilation - (do NOT link against libredhat-kernel.so directly) - - fix soname to libaio.so.1 - - fix dummy libredhat-kernel's soname - - work around nfs bug - - provide and install libredhat-kernel.so.1 stub - - Makefile improvements - - make sure dummy libredhat-kernel.so only returns -ENOSYS - diff --git a/tools/libaio/INSTALL b/tools/libaio/INSTALL deleted file mode 100644 index 29b9077..0000000 --- a/tools/libaio/INSTALL +++ /dev/null @@ -1,18 +0,0 @@ -To install the library, execute the command: - - make prefix=`pwd`/usr install - -which will install the binaries and header files into the directory -usr. Set prefix=/usr to get them installed into the main system. - -Please note: Do not attempt to install on the system the -"libredhat-kernel.so" file. It is a dummy shared library -provided only for the purpose of being able to bootstrap -this facility while running on systems without the correct -libredhat-kernel.so built. The contents of the included -libredhat-kernel.so are only stubs; this library is NOT -functional for anything except the internal purpose of -linking libaio.so against the provided stubs. At runtime, -libaio.so requires a real libredhat-kernel.so library; this -is provided by the Red Hat kernel RPM packages with async -I/O functionality. diff --git a/tools/libaio/Makefile b/tools/libaio/Makefile deleted file mode 100644 index 7f5c344..0000000 --- a/tools/libaio/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -NAME=libaio -SPECFILE=$(NAME).spec -VERSION=$(shell awk '/Version:/ { print $$2 }' $(SPECFILE)) -RELEASE=$(shell awk '/Release:/ { print $$2 }' $(SPECFILE)) -CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE)) -RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm") - -prefix=/usr -includedir=$(prefix)/include -libdir=$(prefix)/lib - -default: all - -all: - @$(MAKE) -C src - -install: all - -clean: - @$(MAKE) -C src clean - @$(MAKE) -C harness clean - -tag-archive: - @cvs -Q tag -F $(CVSTAG) - -create-archive: tag-archive - @rm -rf /tmp/$(NAME) - @cd /tmp && cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(NAME) || echo GRRRrrrrr -- ignore [export aborted] - @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) - @cd /tmp && tar czSpf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) - @rm -rf /tmp/$(NAME)-$(VERSION) - @cp /tmp/$(NAME)-$(VERSION).tar.gz . - @rm -f /tmp/$(NAME)-$(VERSION).tar.gz - @echo " " - @echo "The final archive is ./$(NAME)-$(VERSION).tar.gz." - -archive: clean tag-archive create-archive - -srpm: create-archive - $(RPMBUILD) --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" --nodeps -bs $(SPECFILE) diff --git a/tools/libaio/TODO b/tools/libaio/TODO deleted file mode 100644 index 0a9ac15..0000000 --- a/tools/libaio/TODO +++ /dev/null @@ -1,4 +0,0 @@ -- Write man pages. -- Make -static links against libaio work. -- Fallback on userspace if the kernel calls return -ENOSYS. - diff --git a/tools/libaio/harness/Makefile b/tools/libaio/harness/Makefile deleted file mode 100644 index d2483fd..0000000 --- a/tools/libaio/harness/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# foo. -TEST_SRCS:=$(shell find cases/ -name \*.t | sort -n -t/ -k2) -PROGS:=$(patsubst %.t,%.p,$(TEST_SRCS)) -HARNESS_SRCS:=main.c -# io_queue.c - -CFLAGS=-Wall -Werror -g -O -laio -#-lpthread -lrt - -all: $(PROGS) - -$(PROGS): %.p: %.t $(HARNESS_SRCS) - $(CC) $(CFLAGS) -DTEST_NAME=\"$<\" -o $@ main.c - -clean: - rm -f $(PROGS) *.o runtests.out rofile wofile rwfile - -.PHONY: - -testdir/rofile: .PHONY - rm -f $@ - echo "test" >$@ - chmod 400 $@ - -testdir/wofile: .PHONY - rm -f $@ - echo "test" >$@ - chmod 200 $@ - -testdir/rwfile: .PHONY - rm -f $@ - echo "test" >$@ - chmod 600 $@ - -check: $(PROGS) testdir/rofile testdir/rwfile testdir/wofile - ./runtests.sh $(PROGS) - diff --git a/tools/libaio/harness/README b/tools/libaio/harness/README deleted file mode 100644 index 5557370..0000000 --- a/tools/libaio/harness/README +++ /dev/null @@ -1,19 +0,0 @@ -Notes on running this test suite: - -To run the test suite, run "make check". All test cases should pass -and there should be 0 fails. - -Several of the test cases require a directory on the filesystem under -test for the creation of test files, as well as the generation of -error conditions. The test cases assume the directories (or symlinks -to directories) are as follows: - - testdir/ - - used for general read/write test cases. Must have at - least as much free space as the machine has RAM (up - to 768MB). - testdir.enospc/ - - a filesystem that has space for writing 8KB out, but - fails with -ENOSPC beyond 8KB. - testdir.ext2/ - - must be an ext2 filesystem. diff --git a/tools/libaio/harness/attic/0.t b/tools/libaio/harness/attic/0.t deleted file mode 100644 index 033e62c..0000000 --- a/tools/libaio/harness/attic/0.t +++ /dev/null @@ -1,9 +0,0 @@ -/* 0.t - Test harness check: okay. -*/ -int test_main(void) -{ - printf("test_main: okay\n"); - return 0; -} - diff --git a/tools/libaio/harness/attic/1.t b/tools/libaio/harness/attic/1.t deleted file mode 100644 index 799ffd1..0000000 --- a/tools/libaio/harness/attic/1.t +++ /dev/null @@ -1,9 +0,0 @@ -/* 1.t - Test harness check: fail. -*/ -int test_main(void) -{ - printf("test_main: fail\n"); - return 1; -} - diff --git a/tools/libaio/harness/cases/10.t b/tools/libaio/harness/cases/10.t deleted file mode 100644 index 9d3beb2..0000000 --- a/tools/libaio/harness/cases/10.t +++ /dev/null @@ -1,53 +0,0 @@ -/* 10.t - uses testdir.enospc/rwfile -- Check results on out-of-space and out-of-quota. (10.t) - - write that fills filesystem but does not go over should succeed - - write that fills filesystem and goes over should be partial - - write to full filesystem should return -ENOSPC - - read beyond end of file after ENOSPC should return 0 -*/ -#include "aio_setup.h" - -#include <sys/time.h> -#include <sys/resource.h> -#include <unistd.h> - -int test_main(void) -{ -/* Note: changing either of these requires updating the ext2-enospc.img - * filesystem image. Also, if SIZE is less than PAGE_SIZE, problems - * crop up due to ext2's preallocation. - */ -#define LIMIT 65536 -#define SIZE 65536 - char *buf; - int rwfd; - int status = 0, res; - - rwfd = open("testdir.enospc/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); - assert(rwfd != -1); - res = ftruncate(rwfd, 0); assert(res == 0); - buf = malloc(SIZE); assert(buf != NULL); - memset(buf, 0, SIZE); - - - status |= attempt_rw(rwfd, buf, SIZE, LIMIT-SIZE, WRITE, SIZE); - status |= attempt_rw(rwfd, buf, SIZE, LIMIT-SIZE, READ, SIZE); - - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, WRITE, -ENOSPC); - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); - - res = ftruncate(rwfd, 0); assert(res == 0); - - status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE, WRITE, SIZE-1); - status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE, READ, SIZE-1); - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); - - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, WRITE, -ENOSPC); - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); - status |= attempt_rw(rwfd, buf, 0, LIMIT, WRITE, 0); - - res = close(rwfd); assert(res == 0); - res = unlink("testdir.enospc/rwfile"); assert(res == 0); - return status; -} - diff --git a/tools/libaio/harness/cases/11.t b/tools/libaio/harness/cases/11.t deleted file mode 100644 index efcf6d4..0000000 --- a/tools/libaio/harness/cases/11.t +++ /dev/null @@ -1,39 +0,0 @@ -/* 11.t - uses testdir/rwfile -- repeated read / write of same page (to check accounting) (11.t) -*/ -#include "aio_setup.h" - -#include <sys/time.h> -#include <sys/resource.h> -#include <unistd.h> - -int test_main(void) -{ -#define COUNT 1000000 -#define SIZE 256 - char *buf; - int rwfd; - int status = 0; - int i; - - rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); - assert(rwfd != -1); - buf = malloc(SIZE); assert(buf != NULL); - memset(buf, 0, SIZE); - - for (i=0; i<COUNT; i++) { - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE_SILENT, SIZE); - if (status) - break; - } - printf("completed %d out of %d writes\n", i, COUNT); - for (i=0; i<COUNT; i++) { - status |= attempt_rw(rwfd, buf, SIZE, 0, READ_SILENT, SIZE); - if (status) - break; - } - printf("completed %d out of %d reads\n", i, COUNT); - - return status; -} - diff --git a/tools/libaio/harness/cases/12.t b/tools/libaio/harness/cases/12.t deleted file mode 100644 index 3499204..0000000 --- a/tools/libaio/harness/cases/12.t +++ /dev/null @@ -1,49 +0,0 @@ -/* 12.t -- ioctx access across fork() (12.t) - */ -#include <sys/types.h> -#include <sys/wait.h> -#include <unistd.h> -#include <signal.h> - -#include "aio_setup.h" - -void test_child(void) -{ - int res; - res = attempt_io_submit(io_ctx, 0, NULL, -EINVAL); - fflush(stdout); - _exit(res); -} - -int test_main(void) -{ - int res, status; - pid_t pid; - - if (attempt_io_submit(io_ctx, 0, NULL, 0)) - return 1; - - sigblock(sigmask(SIGCHLD) | siggetmask()); - fflush(NULL); - pid = fork(); assert(pid != -1); - - if (pid == 0) - test_child(); - - res = waitpid(pid, &status, 0); - - if (WIFEXITED(status)) { - int failed = (WEXITSTATUS(status) != 0); - printf("child exited with status %d%s\n", WEXITSTATUS(status), - failed ? " -- FAILED" : ""); - return failed; - } - - /* anything else: failed */ - if (WIFSIGNALED(status)) - printf("child killed by signal %d -- FAILED.\n", - WTERMSIG(status)); - - return 1; -} diff --git a/tools/libaio/harness/cases/13.t b/tools/libaio/harness/cases/13.t deleted file mode 100644 index 5f18005..0000000 --- a/tools/libaio/harness/cases/13.t +++ /dev/null @@ -1,66 +0,0 @@ -/* 13.t - uses testdir/rwfile -- Submit multiple writes larger than aio-max-size (deadlocks on older - aio code) -*/ -#include "aio_setup.h" - -#include <sys/time.h> -#include <sys/resource.h> -#include <unistd.h> - -int test_main(void) -{ -#define SIZE (1024 * 1024) -#define IOS 8 - struct iocb iocbs[IOS]; - struct iocb *iocb_list[IOS]; - char *bufs[IOS]; - int rwfd; - int status = 0, res; - int i; - - rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); - assert(rwfd != -1); - res = ftruncate(rwfd, 0); assert(res == 0); - - for (i=0; i<IOS; i++) { - bufs[i] = malloc(SIZE); - assert(bufs[i] != NULL); - memset(bufs[i], 0, SIZE); - - io_prep_pwrite(&iocbs[i], rwfd, bufs[i], SIZE, i * SIZE); - iocb_list[i] = &iocbs[i]; - } - - status |= attempt_io_submit(io_ctx, IOS, iocb_list, IOS); - - for (i=0; i<IOS; i++) { - struct timespec ts = { tv_sec: 30, tv_nsec: 0 }; - struct io_event event; - struct iocb *iocb; - - res = io_getevents(io_ctx, 0, 1, &event, &ts); - if (res != 1) { - status |= 1; - printf("io_getevents failed [%d] with res=%d [%s]\n", - i, res, (res < 0) ? strerror(-res) : "okay"); - break; - } - - if (event.res != SIZE) - status |= 1; - - iocb = (void *)event.obj; - printf("event[%d]: write[%d] %s, returned: %ld [%s]\n", - i, (int)(iocb - &iocbs[0]), - (event.res != SIZE) ? "failed" : "okay", - (long)event.res, - (event.res < 0) ? strerror(-event.res) : "okay" - ); - } - - res = ftruncate(rwfd, 0); assert(res == 0); - res = close(rwfd); assert(res == 0); - return status; -} - diff --git a/tools/libaio/harness/cases/14.t b/tools/libaio/harness/cases/14.t deleted file mode 100644 index 514622b..0000000 --- a/tools/libaio/harness/cases/14.t +++ /dev/null @@ -1,90 +0,0 @@ -#include <sys/types.h> -#include <sys/wait.h> -#include <unistd.h> -#include <signal.h> - -#include "aio_setup.h" -#include <sys/mman.h> - -#define SIZE 768*1024*1024 - -//just submit an I/O - -int test_child(void) -{ - char *buf; - int rwfd; - int res; - long size; - struct iocb iocb; - struct iocb *iocbs[] = { &iocb }; - int loop = 10; - int i; - - aio_setup(1024); - - size = SIZE; - - printf("size = %ld\n", size); - - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != --1); - res = ftruncate(rwfd, 0); assert(res == 0); - buf = malloc(size); assert(buf != -NULL); - - for(i=0;i<loop;i++) { - - switch(i%2) { - case 0: - io_prep_pwrite(&iocb, rwfd, buf, size, 0); - break; - case 1: - io_prep_pread(&iocb, rwfd, buf, size, 0); - } - - res = io_submit(io_ctx, 1, iocbs); - if (res != 1) { - printf("child: submit: io_submit res=%d [%s]\n", res, -strerror(-res)); - _exit(1); - } - } - - res = ftruncate(rwfd, 0); assert(res == 0); - - _exit(0); -} - -/* from 12.t */ -int test_main(void) -{ - int res, status; - pid_t pid; - - if (attempt_io_submit(io_ctx, 0, NULL, 0)) - return 1; - - sigblock(sigmask(SIGCHLD) | siggetmask()); - fflush(NULL); - pid = fork(); assert(pid != -1); - - if (pid == 0) - test_child(); - - res = waitpid(pid, &status, 0); - - if (WIFEXITED(status)) { - int failed = (WEXITSTATUS(status) != 0); - printf("child exited with status %d%s\n", WEXITSTATUS(status), - failed ? " -- FAILED" : ""); - return failed; - } - - /* anything else: failed */ - if (WIFSIGNALED(status)) - printf("child killed by signal %d -- FAILED.\n", - WTERMSIG(status)); - - return 1; -} diff --git a/tools/libaio/harness/cases/2.t b/tools/libaio/harness/cases/2.t deleted file mode 100644 index 3a0212d..0000000 --- a/tools/libaio/harness/cases/2.t +++ /dev/null @@ -1,41 +0,0 @@ -/* 2.t -- io_setup (#2) - - with invalid context pointer - - with maxevents <= 0 - - with an already initialized ctxp -*/ - -int attempt(int n, io_context_t *ctxp, int expect) -{ - int res; - - printf("expect %3d: io_setup(%5d, %p) = ", expect, n, ctxp); - fflush(stdout); - res = io_setup(n, ctxp); - printf("%3d [%s]%s\n", res, strerror(-res), - (res != expect) ? " -- FAILED" : ""); - if (res != expect) - return 1; - - return 0; -} - -int test_main(void) -{ - io_context_t ctx; - int status = 0; - - ctx = NULL; - status |= attempt(-1000, KERNEL_RW_POINTER, -EFAULT); - status |= attempt( 1000, KERNEL_RW_POINTER, -EFAULT); - status |= attempt( 0, KERNEL_RW_POINTER, -EFAULT); - status |= attempt(-1000, &ctx, -EINVAL); - status |= attempt( -1, &ctx, -EINVAL); - status |= attempt( 0, &ctx, -EINVAL); - assert(ctx == NULL); - status |= attempt( 1, &ctx, 0); - status |= attempt( 1, &ctx, -EINVAL); - - return status; -} - diff --git a/tools/libaio/harness/cases/3.t b/tools/libaio/harness/cases/3.t deleted file mode 100644 index 7773d80..0000000 --- a/tools/libaio/harness/cases/3.t +++ /dev/null @@ -1,25 +0,0 @@ -/* 3.t -- io_submit/io_getevents with invalid addresses (3.t) - -*/ -#include "aio_setup.h" - -int test_main(void) -{ - struct iocb a, b; - struct iocb *good_ios[] = { &a, &b }; - struct iocb *bad1_ios[] = { NULL, &b }; - struct iocb *bad2_ios[] = { KERNEL_RW_POINTER, &a }; - int status = 0; - - status |= attempt_io_submit(BAD_CTX, 1, good_ios, -EINVAL); - status |= attempt_io_submit( io_ctx, 0, good_ios, 0); - status |= attempt_io_submit( io_ctx, 1, NULL, -EFAULT); - status |= attempt_io_submit( io_ctx, 1, (void *)-1, -EFAULT); - status |= attempt_io_submit( io_ctx, 2, bad1_ios, -EFAULT); - status |= attempt_io_submit( io_ctx, 2, bad2_ios, -EFAULT); - status |= attempt_io_submit( io_ctx, -1, good_ios, -EINVAL); - - return status; -} - diff --git a/tools/libaio/harness/cases/4.t b/tools/libaio/harness/cases/4.t deleted file mode 100644 index 972b4f2..0000000 --- a/tools/libaio/harness/cases/4.t +++ /dev/null @@ -1,72 +0,0 @@ -/* 4.t -- read of descriptor without read permission (4.t) -- write to descriptor without write permission (4.t) -- check that O_APPEND writes actually append - -*/ -#include "aio_setup.h" - -#define SIZE 512 -#define READ 'r' -#define WRITE 'w' -int attempt(int fd, void *buf, int count, long long pos, int rw, int expect) -{ - struct iocb iocb; - int res; - - switch(rw) { - case READ: io_prep_pread (&iocb, fd, buf, count, pos); break; - case WRITE: io_prep_pwrite(&iocb, fd, buf, count, pos); break; - } - - printf("expect %3d: (%c), res = ", expect, rw); - fflush(stdout); - res = sync_submit(&iocb); - printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "Success", - (res != expect) ? " -- FAILED" : ""); - if (res != expect) - return 1; - - return 0; -} - -int test_main(void) -{ - char buf[SIZE]; - int rofd, wofd, rwfd; - int status = 0, res; - - memset(buf, 0, SIZE); - - rofd = open("testdir/rofile", O_RDONLY); assert(rofd != -1); - wofd = open("testdir/wofile", O_WRONLY); assert(wofd != -1); - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); - - status |= attempt(rofd, buf, SIZE, 0, WRITE, -EBADF); - status |= attempt(wofd, buf, SIZE, 0, READ, -EBADF); - status |= attempt(rwfd, buf, SIZE, 0, WRITE, SIZE); - status |= attempt(rwfd, buf, SIZE, 0, READ, SIZE); - status |= attempt(rwfd, buf, SIZE, -1, READ, -EINVAL); - status |= attempt(rwfd, buf, SIZE, -1, WRITE, -EINVAL); - - rwfd = open("testdir/rwfile", O_RDWR|O_APPEND); assert(rwfd != -1); - res = ftruncate(rwfd, 0); assert(res == 0); - status |= attempt(rwfd, buf, SIZE, 0, READ, 0); - status |= attempt(rwfd, "1234", 4, 0, WRITE, 4); - status |= attempt(rwfd, "5678", 4, 0, WRITE, 4); - memset(buf, 0, SIZE); - status |= attempt(rwfd, buf, SIZE, 0, READ, 8); - printf("read after append: [%s]\n", buf); - assert(memcmp(buf, "12345678", 8) == 0); - - status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, READ, -EFAULT); - status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, WRITE, -EFAULT); - - /* Some architectures map the 0 page. Ugh. */ -#if !defined(__ia64__) - status |= attempt(rwfd, NULL, SIZE, 0, WRITE, -EFAULT); -#endif - - return status; -} - diff --git a/tools/libaio/harness/cases/5.t b/tools/libaio/harness/cases/5.t deleted file mode 100644 index 7669fd7..0000000 --- a/tools/libaio/harness/cases/5.t +++ /dev/null @@ -1,47 +0,0 @@ -/* 5.t -- Write from a mmap() of the same file. (5.t) -*/ -#include "aio_setup.h" -#include <sys/mman.h> - -int test_main(void) -{ - int page_size = getpagesize(); -#define SIZE 512 - char *buf; - int rwfd; - int status = 0, res; - - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); - res = ftruncate(rwfd, 512); assert(res == 0); - - buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0); - assert(buf != (char *)-1); - - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); - - res = munmap(buf, page_size); assert(res == 0); - buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0); - assert(buf != (char *)-1); - - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); - - res = munmap(buf, page_size); assert(res == 0); - buf = mmap(0, page_size, PROT_READ, MAP_SHARED, rwfd, 0); - assert(buf != (char *)-1); - - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, -EFAULT); - - res = munmap(buf, page_size); assert(res == 0); - buf = mmap(0, page_size, PROT_WRITE, MAP_SHARED, rwfd, 0); - assert(buf != (char *)-1); - - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, -EFAULT); - - return status; -} - diff --git a/tools/libaio/harness/cases/6.t b/tools/libaio/harness/cases/6.t deleted file mode 100644 index cea4b01..0000000 --- a/tools/libaio/harness/cases/6.t +++ /dev/null @@ -1,57 +0,0 @@ -/* 6.t -- huge reads (pinned pages) (6.t) -- huge writes (6.t) -*/ -#include "aio_setup.h" -#include <sys/mman.h> - -long getmemsize(void) -{ - FILE *f = fopen("/proc/meminfo", "r"); - long size; - int gotit = 0; - char str[256]; - - assert(f != NULL); - while (NULL != fgets(str, 255, f)) { - str[255] = 0; - if (0 == memcmp(str, "MemTotal:", 9)) { - if (1 == sscanf(str + 9, "%ld", &size)) { - gotit = 1; - break; - } - } - } - fclose(f); - - assert(gotit != 0); - return size; -} - -int test_main(void) -{ - char *buf; - int rwfd; - int status = 0, res; - long size; - - size = getmemsize(); - printf("size = %ld\n", size); - assert(size >= (16 * 1024)); - if (size > (768 * 1024)) - size = 768 * 1024; - size *= 1024; - - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); - res = ftruncate(rwfd, 0); assert(res == 0); - buf = malloc(size); assert(buf != NULL); - - //memset(buf, 0, size); - status |= attempt_rw(rwfd, buf, size, 0, WRITE, size); - status |= attempt_rw(rwfd, buf, size, 0, READ, size); - - //res = ftruncate(rwfd, 0); assert(res == 0); - - return status; -} - diff --git a/tools/libaio/harness/cases/7.t b/tools/libaio/harness/cases/7.t deleted file mode 100644 index d2d6cbc..0000000 --- a/tools/libaio/harness/cases/7.t +++ /dev/null @@ -1,27 +0,0 @@ -/* 7.t -- Write overlapping the file size rlimit boundary: should be a short - write. (7.t) -- Write at the file size rlimit boundary: should give EFBIG. (I think - the spec requires that you do NOT deliver SIGXFSZ in this case, where - you would do so for sync IO.) (7.t) -- Special case: a write of zero bytes at or beyond the file size rlimit - boundary must return success. (7.t) -*/ - -#include <sys/resource.h> - -void SET_RLIMIT(long long limit) -{ - struct rlimit rlim; - int res; - - rlim.rlim_cur = limit; assert(rlim.rlim_cur == limit); - rlim.rlim_max = limit; assert(rlim.rlim_max == limit); - - res = setrlimit(RLIMIT_FSIZE, &rlim); assert(res == 0); -} - -#define LIMIT 8192 -#define FILENAME "testdir/rwfile" - -#include "common-7-8.h" diff --git a/tools/libaio/harness/cases/8.t b/tools/libaio/harness/cases/8.t deleted file mode 100644 index 8a3d83e..0000000 --- a/tools/libaio/harness/cases/8.t +++ /dev/null @@ -1,49 +0,0 @@ -/* 8.t -- Ditto for the above three tests at the offset maximum (largest - possible ext2/3 file size.) (8.t) - */ -#include <sys/vfs.h> - -#define EXT2_OLD_SUPER_MAGIC 0xEF51 -#define EXT2_SUPER_MAGIC 0xEF53 - -long long get_fs_limit(int fd) -{ - struct statfs s; - int res; - long long lim = 0; - - res = fstatfs(fd, &s); assert(res == 0); - - switch(s.f_type) { - case EXT2_OLD_SUPER_MAGIC: - case EXT2_SUPER_MAGIC: -#if 0 - { - long long tmp; - tmp = s.f_bsize / 4; - /* 12 direct + indirect block + dind + tind */ - lim = 12 + tmp + tmp * tmp + tmp * tmp * tmp; - lim *= s.f_bsize; - printf("limit(%ld) = %Ld\n", (long)s.f_bsize, lim); - } -#endif - switch(s.f_bsize) { - case 4096: lim = 2199023251456; break; - default: - printf("unknown ext2 blocksize %ld\n", (long)s.f_bsize); - exit(3); - } - break; - default: - printf("unknown filesystem 0x%08lx\n", (long)s.f_type); - exit(3); - } - return lim; -} - -#define SET_RLIMIT(x) do ; while (0) -#define LIMIT get_fs_limit(rwfd) -#define FILENAME "testdir.ext2/rwfile" - -#include "common-7-8.h" diff --git a/tools/libaio/harness/cases/aio_setup.h b/tools/libaio/harness/cases/aio_setup.h deleted file mode 100644 index 37c9618..0000000 --- a/tools/libaio/harness/cases/aio_setup.h +++ /dev/null @@ -1,98 +0,0 @@ -io_context_t io_ctx; -#define BAD_CTX ((io_context_t)-1) - -void aio_setup(int n) -{ - int res = io_queue_init(n, &io_ctx); - if (res != 0) { - printf("io_queue_setup(%d) returned %d (%s)\n", - n, res, strerror(-res)); - exit(3); - } -} - -int attempt_io_submit(io_context_t ctx, long nr, struct iocb *ios[], int expect) -{ - int res; - - printf("expect %3d: io_submit(%10p, %3ld, %10p) = ", expect, ctx, nr, ios); - fflush(stdout); - res = io_submit(ctx, nr, ios); - printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "", - (res != expect) ? " -- FAILED" : ""); - if (res != expect) - return 1; - - return 0; -} - -int sync_submit(struct iocb *iocb) -{ - struct io_event event; - struct iocb *iocbs[] = { iocb }; - int res; - - /* 30 second timeout should be enough */ - struct timespec ts; - ts.tv_sec = 30; - ts.tv_nsec = 0; - - res = io_submit(io_ctx, 1, iocbs); - if (res != 1) { - printf("sync_submit: io_submit res=%d [%s]\n", res, strerror(-res)); - return res; - } - - res = io_getevents(io_ctx, 0, 1, &event, &ts); - if (res != 1) { - printf("sync_submit: io_getevents res=%d [%s]\n", res, strerror(-res)); - return res; - } - return event.res; -} - -#define SETUP aio_setup(1024) - - -#define READ 'r' -#define WRITE 'w' -#define READ_SILENT 'R' -#define WRITE_SILENT 'W' -int attempt_rw(int fd, void *buf, int count, long long pos, int rw, int expect) -{ - struct iocb iocb; - int res; - int silent = 0; - - switch(rw) { - case READ_SILENT: - silent = 1; - case READ: - io_prep_pread (&iocb, fd, buf, count, pos); - break; - case WRITE_SILENT: - silent = 1; - case WRITE: - io_prep_pwrite(&iocb, fd, buf, count, pos); - break; - } - - if (!silent) { - printf("expect %5d: (%c), res = ", expect, rw); - fflush(stdout); - } - res = sync_submit(&iocb); - if (!silent || res != expect) { - if (silent) - printf("expect %5d: (%c), res = ", expect, rw); - printf("%5d [%s]%s\n", res, - (res <= 0) ? strerror(-res) : "Success", - (res != expect) ? " -- FAILED" : ""); - } - - if (res != expect) - return 1; - - return 0; -} - diff --git a/tools/libaio/harness/cases/common-7-8.h b/tools/libaio/harness/cases/common-7-8.h deleted file mode 100644 index 3ec2bb4..0000000 --- a/tools/libaio/harness/cases/common-7-8.h +++ /dev/null @@ -1,37 +0,0 @@ -/* common-7-8.h -*/ -#include "aio_setup.h" - -#include <unistd.h> - -#define SIZE 512 - -int test_main(void) -{ - char *buf; - int rwfd; - int status = 0, res; - long long limit; - - rwfd = open(FILENAME, O_RDWR); assert(rwfd != -1); - res = ftruncate(rwfd, 0); assert(res == 0); - buf = malloc(SIZE); assert(buf != NULL); - memset(buf, 0, SIZE); - - limit = LIMIT; - - SET_RLIMIT(limit); - - status |= attempt_rw(rwfd, buf, SIZE, limit-SIZE, WRITE, SIZE); - status |= attempt_rw(rwfd, buf, SIZE, limit-SIZE, READ, SIZE); - - status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE, WRITE, SIZE-1); - status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE, READ, SIZE-1); - - status |= attempt_rw(rwfd, buf, SIZE, limit, WRITE, -EFBIG); - status |= attempt_rw(rwfd, buf, SIZE, limit, READ, 0); - status |= attempt_rw(rwfd, buf, 0, limit, WRITE, 0); - - return status; -} - diff --git a/tools/libaio/harness/main.c b/tools/libaio/harness/main.c deleted file mode 100644 index 74b2764..0000000 --- a/tools/libaio/harness/main.c +++ /dev/null @@ -1,39 +0,0 @@ -#include <stdio.h> -#include <errno.h> -#include <assert.h> -#include <stdlib.h> - -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> - -#include <libaio.h> - -#if defined(__i386__) -#define KERNEL_RW_POINTER ((void *)0xc0010000) -#else -//#warning Not really sure where kernel memory is. Guessing. -#define KERNEL_RW_POINTER ((void *)0xffffffffc0010000) -#endif - - -char test_name[] = TEST_NAME; - -#include TEST_NAME - -int main(void) -{ - int res; - -#if defined(SETUP) - SETUP; -#endif - - res = test_main(); - printf("test %s completed %s.\n", test_name, - res ? "FAILED" : "PASSED" - ); - fflush(stdout); - return res ? 1 : 0; -} diff --git a/tools/libaio/harness/runtests.sh b/tools/libaio/harness/runtests.sh deleted file mode 100644 index d763d88..0000000 --- a/tools/libaio/harness/runtests.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -passes=0 -fails=0 - -echo "Test run starting at" `date` - -while [ $# -ge 1 ] ; do - this_test=$1 - shift - echo "Starting $this_test" - $this_test 2>&1 - res=$? - if [ $res -eq 0 ] ; then str="" ; passes=$[passes + 1] ; else str=" -- FAILED" ; fails=$[fails + 1] ; fi - echo "Completed $this_test with $res$str". -done - -echo "Pass: $passes Fail: $fails" -echo "Test run complete at" `date` diff --git a/tools/libaio/libaio.spec b/tools/libaio/libaio.spec deleted file mode 100644 index bdcc5b2..0000000 --- a/tools/libaio/libaio.spec +++ /dev/null @@ -1,187 +0,0 @@ -Name: libaio -Version: 0.3.106 -Release: 1 -Summary: Linux-native asynchronous I/O access library -Copyright: LGPL -Group: System Environment/Libraries -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -# Fix ExclusiveArch as we implement this functionality on more architectures -ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6 - -%description -The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a -richer API and capability set than the simple POSIX async I/O facility. -This library, libaio, provides the Linux-native API for async I/O. -The POSIX async I/O facility requires this library in order to provide -kernel-accelerated async I/O capabilities, as do applications which -require the Linux-native async I/O API. - -%package devel -Summary: Development files for Linux-native asynchronous I/O access -Group: Development/System -Requires: libaio -Provides: libaio.so.1 - -%description devel -This package provides header files to include and libraries to link with -for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). - -%prep -%setup - -%build -make - -%install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -make install prefix=$RPM_BUILD_ROOT/usr \ - libdir=$RPM_BUILD_ROOT/%{_libdir} \ - root=$RPM_BUILD_ROOT - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root) -%attr(0755,root,root) %{_libdir}/libaio.so.* -%doc COPYING TODO - -%files devel -%defattr(-,root,root) -%attr(0644,root,root) %{_includedir}/* -%attr(0755,root,root) %{_libdir}/libaio.so -%attr(0644,root,root) %{_libdir}/libaio.a - -%changelog -* Tue Jan 3 2006 Jeff Moyer <jmoyer@redhat.com> - 0.3.106-1 -- Add a .proc directive for the ia64_aio_raw_syscall macro. This sounds a lot - like the previous entry, but that one fixed the __ia64_raw_syscall macro, - located in syscall-ia64.h. This macro is in raw_syscall.c, which pretty much - only exists for ia64. This bug prevented the package from building with - newer version of gcc. - -* Mon Aug 1 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.105-1 -- Add a .proc directive for the ia64 raw syscall macro. - -* Fri Apr 1 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.104-1 -- Add Alpha architecture support. (Sergey Tikhonov <tsv@solvo.ru>) - -* Tue Jan 25 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.103-1 -- Fix SONAME breakage. In changing file names around, I also changed the - SONAME, which is a no no. - -* Thu Oct 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.102-1 -- S390 asm had a bug; I forgot to update the clobber list. Lucky for me, - newer compilers complain about such things. -- Also update the s390 asm to look more like the new kernel variants. - -* Wed Oct 13 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.101-1 -- Revert syscall return values to be -ERRNO. This was an inadvertant bug - introduced when clobber lists changed. -- add ppc64pseries and ppc64iseries to exclusivearch - -* Tue Sep 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.100-1 -- Switch around the tests for _PPC_ and _powerpc64_ so that the ppc64 - platforms get the right padding. - -* Wed Jul 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-4 -- Ok, there was a race in moving the cvs module. Someone rebuild from - the old cvs into fc3. *sigh* bumping rev. - -* Wed Jul 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-3 -- Actually provide libaio.so.1. - -* Tue Mar 30 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-2 -- Apparently the 0.3.93 patch was not meant for 0.3.96. Backed it out. - -* Tue Mar 30 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-1 -- Fix compat calls. -- make library .so.1.0.0 and make symlinks properly. -- Fix header file for inclusion in c++ code. - -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.98-2 -- bah. fix version nr in changelog. - -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.98-1 -- fix compiler warnings. - -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.97-2 -- make srpm was using rpm to do a build. changed that to use rpmbuild if - it exists, and fallback to rpm if it doesn't. - -* Tue Feb 24 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.97-1 -- Use libc syscall(2) instead of rolling our own calling mechanism. This - change is inspired due to a failure to build with newer gcc, since clobber - lists were wrong. -- Add -fpic to the CFLAGS for all architectures. Should address bz #109457. -- change a #include from <linux/types.h> to <sys/types.h>. Fixes a build - issue on s390. - -* Wed Jul 7 2003 Bill Nottingham <notting@redhat.com> 0.3.96-3 -- fix paths on lib64 arches - -* Wed Jun 18 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.96-2 -- optimization in io_getevents from Arjan van de Ven in 0.3.96-1 -- deal with ia64 in 0.3.96-2 - -* Wed May 28 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.95-1 -- ppc bugfix from Julie DeWandel - -* Tue May 20 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.94-1 -- symbol versioning fix from Ulrich Drepper - -* Mon Jan 27 2003 Benjamin LaHaise <bcrl@redhat.com> -- bump to 0.3.93-3 for rebuild. - -* Mon Dec 16 2002 Benjamin LaHaise <bcrl@redhat.com> -- libaio 0.3.93 test release -- add powerpc support from Gianni Tedesco <gianni@ecsc.co.uk> -- add s/390 support from Arnd Bergmann <arnd@bergmann-dalldorf.de> - -* Fri Sep 12 2002 Benjamin LaHaise <bcrl@redhat.com> -- libaio 0.3.92 test release -- build on x86-64 - -* Thu Sep 12 2002 Benjamin LaHaise <bcrl@redhat.com> -- libaio 0.3.91 test release -- build on ia64 -- remove libredhat-kernel from the .spec file - -* Thu Sep 5 2002 Benjamin LaHaise <bcrl@redhat.com> -- libaio 0.3.90 test release - -* Mon Apr 29 2002 Benjamin LaHaise <bcrl@redhat.com> -- add requires initscripts >= 6.47-1 to get boot time libredhat-kernel - linkage correct. -- typo fix - -* Thu Apr 25 2002 Benjamin LaHaise <bcrl@redhat.com> -- make /usr/lib/libredhat-kernel.so point to /lib/libredhat-kernel.so.1.0.0 - -* Mon Apr 15 2002 Tim Powers <timp@redhat.com> -- make the post scriptlet not use /bin/sh - -* Sat Apr 12 2002 Benjamin LaHaise <bcrl@redhat.com> -- add /lib/libredhat-kernel* to %files. - -* Fri Apr 12 2002 Benjamin LaHaise <bcrl@redhat.com> -- make the dummy install as /lib/libredhat-kernel.so.1.0.0 so - that ldconfig will link against it if no other is installed. - -* Tue Jan 22 2002 Benjamin LaHaise <bcrl@redhat.com> -- add io_getevents - -* Tue Jan 22 2002 Michael K. Johnson <johnsonm@redhat.com> -- Make linker happy with /usr/lib symlink for libredhat-kernel.so - -* Mon Jan 21 2002 Michael K. Johnson <johnsonm@redhat.com> -- Added stub library - -* Sun Jan 20 2002 Michael K. Johnson <johnsonm@redhat.com> -- Initial packaging diff --git a/tools/libaio/man/aio.3 b/tools/libaio/man/aio.3 deleted file mode 100644 index 6dc3c63..0000000 --- a/tools/libaio/man/aio.3 +++ /dev/null @@ -1,315 +0,0 @@ -.TH aio 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio \- Asynchronous IO -.SH SYNOPSIS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.fi -.SH DESCRIPTION -The POSIX.1b standard defines a new set of I/O operations which can -significantly reduce the time an application spends waiting at I/O. The -new functions allow a program to initiate one or more I/O operations and -then immediately resume normal work while the I/O operations are -executed in parallel. This functionality is available if the -.IR "unistd.h" -file defines the symbol -.B "_POSIX_ASYNCHRONOUS_IO" -. - -These functions are part of the library with realtime functions named -.IR "librt" -. They are not actually part of the -.IR "libc" -binary. -The implementation of these functions can be done using support in the -kernel (if available) or using an implementation based on threads at -userlevel. In the latter case it might be necessary to link applications -with the thread library -.IR "libpthread" -in addition to -.IR "librt" -and -.IR "libaio" -. - -All AIO operations operate on files which were opened previously. There -might be arbitrarily many operations running for one file. The -asynchronous I/O operations are controlled using a data structure named -.IR "struct aiocb" -It is defined in -.IR "aio.h" - as follows. - -.nf -struct aiocb -{ - int aio_fildes; /* File desriptor. */ - int aio_lio_opcode; /* Operation to be performed. */ - int aio_reqprio; /* Request priority offset. */ - volatile void *aio_buf; /* Location of buffer. */ - size_t aio_nbytes; /* Length of transfer. */ - struct sigevent aio_sigevent; /* Signal number and value. */ - - /* Internal members. */ - struct aiocb *__next_prio; - int __abs_prio; - int __policy; - int __error_code; - __ssize_t __return_value; - -#ifndef __USE_FILE_OFFSET64 - __off_t aio_offset; /* File offset. */ - char __pad[sizeof (__off64_t) - sizeof (__off_t)]; -#else - __off64_t aio_offset; /* File offset. */ -#endif - char __unused[32]; -}; - -.fi -The POSIX.1b standard mandates that the -.IR "struct aiocb" -structure -contains at least the members described in the following table. There -might be more elements which are used by the implementation, but -depending upon these elements is not portable and is highly deprecated. - -.TP -.IR "int aio_fildes" -This element specifies the file descriptor to be used for the -operation. It must be a legal descriptor, otherwise the operation will -fail. - -The device on which the file is opened must allow the seek operation. -I.e., it is not possible to use any of the AIO operations on devices -like terminals where an -.IR "lseek" - call would lead to an error. -.TP -.IR "off_t aio_offset" -This element specifies the offset in the file at which the operation (input -or output) is performed. Since the operations are carried out in arbitrary -order and more than one operation for one file descriptor can be -started, one cannot expect a current read/write position of the file -descriptor. -.TP -.IR "volatile void *aio_buf" -This is a pointer to the buffer with the data to be written or the place -where the read data is stored. -.TP -.IR "size_t aio_nbytes" -This element specifies the length of the buffer pointed to by -.IR "aio_buf" -. -.TP -.IR "int aio_reqprio" -If the platform has defined -.B "_POSIX_PRIORITIZED_IO" -and -.B "_POSIX_PRIORITY_SCHEDULING" -, the AIO requests are -processed based on the current scheduling priority. The -.IR "aio_reqprio" -element can then be used to lower the priority of the -AIO operation. -.TP -.IR "struct sigevent aio_sigevent" -This element specifies how the calling process is notified once the -operation terminates. If the -.IR "sigev_notify" -element is -.B "SIGEV_NONE" -, no notification is sent. If it is -.B "SIGEV_SIGNAL" -, -the signal determined by -.IR "sigev_signo" -is sent. Otherwise, -.IR "sigev_notify" -must be -.B "SIGEV_THREAD" -. In this case, a thread -is created which starts executing the function pointed to by -.IR "sigev_notify_function" -. -.TP -.IR "int aio_lio_opcode" -This element is only used by the -.IR "lio_listio" - and -.IR "lio_listio64" - functions. Since these functions allow an -arbitrary number of operations to start at once, and each operation can be -input or output (or nothing), the information must be stored in the -control block. The possible values are: -.TP -.B "LIO_READ" -Start a read operation. Read from the file at position -.IR "aio_offset" - and store the next -.IR "aio_nbytes" - bytes in the -buffer pointed to by -.IR "aio_buf" -. -.TP -.B "LIO_WRITE" -Start a write operation. Write -.IR "aio_nbytes" -bytes starting at -.IR "aio_buf" -into the file starting at position -.IR "aio_offset" -. -.TP -.B "LIO_NOP" -Do nothing for this control block. This value is useful sometimes when -an array of -.IR "struct aiocb" -values contains holes, i.e., some of the -values must not be handled although the whole array is presented to the -.IR "lio_listio" -function. - -When the sources are compiled using -.B "_FILE_OFFSET_BITS == 64" -on a -32 bit machine, this type is in fact -.IR "struct aiocb64" -, since the LFS -interface transparently replaces the -.IR "struct aiocb" -definition. -.PP -For use with the AIO functions defined in the LFS, there is a similar type -defined which replaces the types of the appropriate members with larger -types but otherwise is equivalent to -.IR "struct aiocb" -. Particularly, -all member names are the same. - -.nf -/* The same for the 64bit offsets. Please note that the members aio_fildes - to __return_value have to be the same in aiocb and aiocb64. */ -#ifdef __USE_LARGEFILE64 -struct aiocb64 -{ - int aio_fildes; /* File desriptor. */ - int aio_lio_opcode; /* Operation to be performed. */ - int aio_reqprio; /* Request priority offset. */ - volatile void *aio_buf; /* Location of buffer. */ - size_t aio_nbytes; /* Length of transfer. */ - struct sigevent aio_sigevent; /* Signal number and value. */ - - /* Internal members. */ - struct aiocb *__next_prio; - int __abs_prio; - int __policy; - int __error_code; - __ssize_t __return_value; - - __off64_t aio_offset; /* File offset. */ - char __unused[32]; -}; - -.fi -.TP -.IR "int aio_fildes" -This element specifies the file descriptor which is used for the -operation. It must be a legal descriptor since otherwise the operation -fails for obvious reasons. -The device on which the file is opened must allow the seek operation. -I.e., it is not possible to use any of the AIO operations on devices -like terminals where an -.IR "lseek" - call would lead to an error. -.TP -.IR "off64_t aio_offset" -This element specifies at which offset in the file the operation (input -or output) is performed. Since the operation are carried in arbitrary -order and more than one operation for one file descriptor can be -started, one cannot expect a current read/write position of the file -descriptor. -.TP -.IR "volatile void *aio_buf" -This is a pointer to the buffer with the data to be written or the place -where the read data is stored. -.TP -.IR "size_t aio_nbytes" -This element specifies the length of the buffer pointed to by -.IR "aio_buf" -. -.TP -.IR "int aio_reqprio" -If for the platform -.B "_POSIX_PRIORITIZED_IO" -and -.B "_POSIX_PRIORITY_SCHEDULING" -are defined the AIO requests are -processed based on the current scheduling priority. The -.IR "aio_reqprio" -element can then be used to lower the priority of the -AIO operation. -.TP -.IR "struct sigevent aio_sigevent" -This element specifies how the calling process is notified once the -operation terminates. If the -.IR "sigev_notify" -, element is -.B "SIGEV_NONE" -no notification is sent. If it is -.B "SIGEV_SIGNAL" -, -the signal determined by -.IR "sigev_signo" -is sent. Otherwise, -.IR "sigev_notify" - must be -.B "SIGEV_THREAD" -in which case a thread -which starts executing the function pointed to by -.IR "sigev_notify_function" -. -.TP -.IR "int aio_lio_opcode" -This element is only used by the -.IR "lio_listio" -and -.IR "lio_listio64" -functions. Since these functions allow an -arbitrary number of operations to start at once, and since each operation can be -input or output (or nothing), the information must be stored in the -control block. See the description of -.IR "struct aiocb" -for a description -of the possible values. -.PP -When the sources are compiled using -.B "_FILE_OFFSET_BITS == 64" -on a -32 bit machine, this type is available under the name -.IR "struct aiocb64" -, since the LFS transparently replaces the old interface. -.SH "RETURN VALUES" -.SH ERRORS -.SH "SEE ALSO" -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_cancel.3 b/tools/libaio/man/aio_cancel.3 deleted file mode 100644 index 502c83c..0000000 --- a/tools/libaio/man/aio_cancel.3 +++ /dev/null @@ -1,137 +0,0 @@ -.TH aio_cancel 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_cancel - Cancel asynchronous I/O requests -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_cancel (int fildes " , struct aiocb *aiocbp " )" -.fi -.SH DESCRIPTION -When one or more requests are asynchronously processed, it might be -useful in some situations to cancel a selected operation, e.g., if it -becomes obvious that the written data is no longer accurate and would -have to be overwritten soon. As an example, assume an application, which -writes data in files in a situation where new incoming data would have -to be written in a file which will be updated by an enqueued request. -The POSIX AIO implementation provides such a function, but this function -is not capable of forcing the cancellation of the request. It is up to the -implementation to decide whether it is possible to cancel the operation -or not. Therefore using this function is merely a hint. -.B "The libaio implementation does not implement the cancel operation in the" -.B "POSIX libraries". -.PP -The -.IR aio_cancel -function can be used to cancel one or more -outstanding requests. If the -.IR aiocbp -parameter is -.IR NULL -, the -function tries to cancel all of the outstanding requests which would process -the file descriptor -.IR fildes -(i.e., whose -.IR aio_fildes -member -is -.IR fildes -). If -.IR aiocbp is not -.IR NULL -, -.IR aio_cancel -attempts to cancel the specific request pointed to by -.IR aiocbp. - -For requests which were successfully canceled, the normal notification -about the termination of the request should take place. I.e., depending -on the -.IR "struct sigevent" -object which controls this, nothing -happens, a signal is sent or a thread is started. If the request cannot -be canceled, it terminates the usual way after performing the operation. -After a request is successfully canceled, a call to -.IR aio_error -with -a reference to this request as the parameter will return -.B ECANCELED -and a call to -.IR aio_return -will return -.IR -1. -If the request wasn't canceled and is still running the error status is -still -.B EINPROGRESS. -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -, this -function is in fact -.IR aio_cancel64 -since the LFS interface -transparently replaces the normal implementation. - -.SH "RETURN VALUES" -.TP -.B AIO_CANCELED -If there were -requests which haven't terminated and which were successfully canceled. -.TP -.B AIO_NOTCANCELED -If there is one or more requests left which couldn't be canceled, -. In this case -.IR aio_error -must be used to find out which of the, perhaps multiple, requests (in -.IR aiocbp -is -.IR NULL -) weren't successfully canceled. -.TP -.B AIO_ALLDONE -If all -requests already terminated at the time -.IR aio_cancel -is called the -return value is -. -.SH ERRORS -If an error occurred during the execution of -.IR aio_cancel -the -function returns -.IR -1 -and sets -.IR errno -to one of the following -values. -.TP -.B EBADF -The file descriptor -.IR fildes -is not valid. -.TP -.B ENOSYS -.IR aio_cancel -is not implemented. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_cancel64.3 b/tools/libaio/man/aio_cancel64.3 deleted file mode 100644 index ede775b..0000000 --- a/tools/libaio/man/aio_cancel64.3 +++ /dev/null @@ -1,50 +0,0 @@ -.TH aio_cancel64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_cancel64 \- Cancel asynchronous I/O requests -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_cancel64 (int fildes, struct aiocb64 *aiocbp)" -.fi -.SH DESCRIPTION -This function is similar to -.IR aio_cancel -with the only difference -that the argument is a reference to a variable of type -.IR struct aiocb64 -. - -When the sources are compiled with -.IR _FILE_OFFSET_BITS == 64 -, this -function is available under the name -.IR aio_cancel -and so -transparently replaces the interface for small files on 32 bit -machines. -.SH "RETURN VALUES" -See aio_cancel(3). -.SH ERRORS -See aio_cancel(3). -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_error.3 b/tools/libaio/man/aio_error.3 deleted file mode 100644 index 12b82cf..0000000 --- a/tools/libaio/man/aio_error.3 +++ /dev/null @@ -1,81 +0,0 @@ -.TH aio_error 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_error \- Getting the Status of AIO Operations -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_error (const struct aiocb *aiocbp)" -.fi -.SH DESCRIPTION -The function -.IR aio_error -determines the error state of the request described by the -.IR "struct aiocb" -variable pointed to by -.I aiocbp -. - -When the operation is performed truly asynchronously (as with -.IR "aio_read" -and -.IR "aio_write" -and with -.IR "lio_listio" -when the mode is -.IR "LIO_NOWAIT" -), one sometimes needs to know whether a -specific request already terminated and if so, what the result was. -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -this function is in fact -.IR "aio_error64" -since the LFS interface transparently replaces the normal implementation. -.SH "RETURN VALUES" -If the request has not yet terminated the value returned is always -.IR "EINPROGRESS" -. Once the request has terminated the value -.IR "aio_error" -returns is either -.I 0 -if the request completed successfully or it returns the value which would be stored in the -.IR "errno" -variable if the request would have been done using -.IR "read" -, -.IR "write" -, or -.IR "fsync" -. -.SH ERRORS -.TP -.IR "ENOSYS" -if it is not implemented. It -could also return -.TP -.IR "EINVAL" -if the -.I aiocbp -parameter does not -refer to an asynchronous operation whose return status is not yet known. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_error64.3 b/tools/libaio/man/aio_error64.3 deleted file mode 100644 index 3333161..0000000 --- a/tools/libaio/man/aio_error64.3 +++ /dev/null @@ -1,64 +0,0 @@ -.TH aio_error64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_error64 \- Return errors -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_error64 (const struct aiocb64 *aiocbp)" -.fi -.SH DESCRIPTION -This function is similar to -.IR aio_error -with the only difference -that the argument is a reference to a variable of type -.IR "struct aiocb64". -.PP -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -this -function is available under the name -.IR aio_error -and so -transparently replaces the interface for small files on 32 bit -machines. -.SH "RETURN VALUES" -If the request has not yet terminated the value returned is always -.IR "EINPROGRESS" -. Once the request has terminated the value -.IR "aio_error" -returns is either -.I 0 -if the request completed successfully or it returns the value which would be stored in the -.IR "errno" -variable if the request would have been done using -.IR "read" -, -.IR "write" -, or -.IR "fsync" -. -.SH ERRORS -See -.IR aio_error(3). -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_fsync.3 b/tools/libaio/man/aio_fsync.3 deleted file mode 100644 index 637f0f6..0000000 --- a/tools/libaio/man/aio_fsync.3 +++ /dev/null @@ -1,139 +0,0 @@ -.TH aio_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_fsync \- Synchronize a file's complete in-core state with that on disk -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_fsync (int op, struct aiocb aiocbp)" -.fi -.SH DESCRIPTION -.PP -When dealing with asynchronous operations it is sometimes necessary to -get into a consistent state. This would mean for AIO that one wants to -know whether a certain request or a group of request were processed. -This could be done by waiting for the notification sent by the system -after the operation terminated, but this sometimes would mean wasting -resources (mainly computation time). Instead POSIX.1b defines two -functions which will help with most kinds of consistency. -.PP -The -.IR aio_fsync -and -.IR "aio_fsync64" -functions are only available -if the symbol -.IR "_POSIX_SYNCHRONIZED_IO" -is defined in -.I unistd.h -. - -Calling this function forces all I/O operations operating queued at the -time of the function call operating on the file descriptor -.IR "aiocbp->aio_fildes" -into the synchronized I/O completion state . The -.IR "aio_fsync" -function returns -immediately but the notification through the method described in -.IR "aiocbp->aio_sigevent" -will happen only after all requests for this -file descriptor have terminated and the file is synchronized. This also -means that requests for this very same file descriptor which are queued -after the synchronization request are not affected. - -If -.IR "op" -is -.IR "O_DSYNC" -the synchronization happens as with a call -to -.IR "fdatasync" -. Otherwise -.IR "op" -should be -.IR "O_SYNC" -and -the synchronization happens as with -.IR "fsync" -. - -As long as the synchronization has not happened, a call to -.IR "aio_error" -with the reference to the object pointed to by -.IR "aiocbp" -returns -.IR "EINPROGRESS" -. Once the synchronization is -done -.IR "aio_error" -return -.IR 0 -if the synchronization was not -successful. Otherwise the value returned is the value to which the -.IR "fsync" -or -.IR "fdatasync" -function would have set the -.IR "errno" -variable. In this case nothing can be assumed about the -consistency for the data written to this file descriptor. - -.SH "RETURN VALUES" -The return value of this function is -.IR 0 -if the request was -successfully enqueued. Otherwise the return value is -.IR -1 -and -.IR "errno". -.SH ERRORS -.TP -.B EAGAIN -The request could not be enqueued due to temporary lack of resources. -.TP -.B EBADF -The file descriptor -.IR "aiocbp->aio_fildes" -is not valid or not open -for writing. -.TP -.B EINVAL -The implementation does not support I/O synchronization or the -.IR "op" -parameter is other than -.IR "O_DSYNC" -and -.IR "O_SYNC" -. -.TP -.B ENOSYS -This function is not implemented. -.PP -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" - this -function is in fact -.IR "aio_return64" -since the LFS interface -transparently replaces the normal implementation. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_fsync64.3 b/tools/libaio/man/aio_fsync64.3 deleted file mode 100644 index 5dce22d..0000000 --- a/tools/libaio/man/aio_fsync64.3 +++ /dev/null @@ -1,51 +0,0 @@ -.TH aio_fsync64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_fsync64 \- Synchronize a file's complete in-core state with that on disk -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_fsync64 (int op, struct aiocb64 *aiocbp)" -.fi -.SH DESCRIPTION -This function is similar to -.IR aio_fsync -with the only difference -that the argument is a reference to a variable of type -.IR "struct aiocb64". - -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -this -function is available under the name -.IR aio_fsync -and so -transparently replaces the interface for small files on 32 bit -machines. -.SH "RETURN VALUES" -See -.IR aio_fsync. -.SH ERRORS -See -.IR aio_fsync. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_init.3 b/tools/libaio/man/aio_init.3 deleted file mode 100644 index 3b0ec95..0000000 --- a/tools/libaio/man/aio_init.3 +++ /dev/null @@ -1,96 +0,0 @@ -.TH aio_init 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_init \- How to optimize the AIO implementation -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "void aio_init (const struct aioinit *init)" -.fi -.SH DESCRIPTION - -The POSIX standard does not specify how the AIO functions are -implemented. They could be system calls, but it is also possible to -emulate them at userlevel. - -At the point of this writing, the available implementation is a userlevel -implementation which uses threads for handling the enqueued requests. -While this implementation requires making some decisions about -limitations, hard limitations are something which is best avoided -in the GNU C library. Therefore, the GNU C library provides a means -for tuning the AIO implementation according to the individual use. - -.BI "struct aioinit" -.PP -This data type is used to pass the configuration or tunable parameters -to the implementation. The program has to initialize the members of -this struct and pass it to the implementation using the -.IR aio_init -function. -.TP -.B "int aio_threads" -This member specifies the maximal number of threads which may be used -at any one time. -.TP -.B "int aio_num" -This number provides an estimate on the maximal number of simultaneously -enqueued requests. -.TP -.B "int aio_locks" -Unused. -.TP -.B "int aio_usedba" -Unused. -.TP -.B "int aio_debug" -Unused. -.TP -.B "int aio_numusers" -Unused. -.TP -.B "int aio_reserved[2]" -Unused. -.PP -This function must be called before any other AIO function. Calling it -is completely voluntary, as it is only meant to help the AIO -implementation perform better. - -Before calling the -.IR aio_init -, function the members of a variable of -type -.IR "struct aioinit" -must be initialized. Then a reference to -this variable is passed as the parameter to -.IR aio_init -which itself -may or may not pay attention to the hints. - -It is a extension which follows a proposal from the SGI implementation in -.IR Irix 6 -. It is not covered by POSIX.1b or Unix98. -.SH "RETURN VALUES" -The function has no return value. -.SH ERRORS -The function has no error cases defined. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_read.3 b/tools/libaio/man/aio_read.3 deleted file mode 100644 index 5bcb6c8..0000000 --- a/tools/libaio/man/aio_read.3 +++ /dev/null @@ -1,146 +0,0 @@ -.TH aio_read 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_read \- Initiate an asynchronous read operation -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_read (struct aiocb *aiocbp)" -.fi -.SH DESCRIPTION -This function initiates an asynchronous read operation. It -immediately returns after the operation was enqueued or when an -error was encountered. - -The first -.IR "aiocbp->aio_nbytes" -bytes of the file for which -.IR "aiocbp->aio_fildes" -is a descriptor are written to the buffer -starting at -.IR "aiocbp->aio_buf" -. Reading starts at the absolute -position -.IR "aiocbp->aio_offset" -in the file. - -If prioritized I/O is supported by the platform the -.IR "aiocbp->aio_reqprio" -value is used to adjust the priority before -the request is actually enqueued. - -The calling process is notified about the termination of the read -request according to the -.IR "aiocbp->aio_sigevent" -value. - -.SH "RETURN VALUES" -When -.IR "aio_read" -returns, the return value is zero if no error -occurred that can be found before the process is enqueued. If such an -early error is found, the function returns -.IR -1 -and sets -.IR "errno". - -.PP -If -.IR "aio_read" -returns zero, the current status of the request -can be queried using -.IR "aio_error" -and -.IR "aio_return" -functions. -As long as the value returned by -.IR "aio_error" -is -.IR "EINPROGRESS" -the operation has not yet completed. If -.IR "aio_error" -returns zero, -the operation successfully terminated, otherwise the value is to be -interpreted as an error code. If the function terminated, the result of -the operation can be obtained using a call to -.IR "aio_return" -. The -returned value is the same as an equivalent call to -.IR "read" -would -have returned. -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -this -function is in fact -.IR "aio_read64" -since the LFS interface transparently -replaces the normal implementation. - -.SH ERRORS -In the case of an early error: -.TP -.B EAGAIN -The request was not enqueued due to (temporarily) exceeded resource -limitations. -.TP -.B ENOSYS -The -.IR "aio_read" -function is not implemented. -.TP -.B EBADF -The -.IR "aiocbp->aio_fildes" -descriptor is not valid. This condition -need not be recognized before enqueueing the request and so this error -might also be signaled asynchronously. -.TP -.B EINVAL -The -.IR "aiocbp->aio_offset" -or -.IR "aiocbp->aio_reqpiro" -value is -invalid. This condition need not be recognized before enqueueing the -request and so this error might also be signaled asynchronously. - -.PP -In the case of a normal return, possible error codes returned by -.IR "aio_error" -are: -.TP -.B EBADF -The -.IR "aiocbp->aio_fildes" -descriptor is not valid. -.TP -.B ECANCELED -The operation was canceled before the operation was finished -.TP -.B EINVAL -The -.IR "aiocbp->aio_offset" -value is invalid. -.PP -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_read64.3 b/tools/libaio/man/aio_read64.3 deleted file mode 100644 index 8e407a5..0000000 --- a/tools/libaio/man/aio_read64.3 +++ /dev/null @@ -1,60 +0,0 @@ -.TH aio_read64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_read64 \- Initiate an asynchronous read operation -.SH SYNOPSYS -.nf -.B #include <errno.h> -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_read64 (struct aiocb *aiocbp)" -.fi -.SH DESCRIPTION -This function is similar to the -.IR "aio_read" -function. The only -difference is that on -.IR "32 bit" -machines, the file descriptor should -be opened in the large file mode. Internally, -.IR "aio_read64" -uses -functionality equivalent to -.IR "lseek64" -to position the file descriptor correctly for the reading, -as opposed to -.IR "lseek" -functionality used in -.IR "aio_read". - -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -, this -function is available under the name -.IR "aio_read" -and so transparently -replaces the interface for small files on 32 bit machines. -.SH "RETURN VALUES" -See -.IR aio_read. -.SH ERRORS -See -.IR aio_read. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_return.3 b/tools/libaio/man/aio_return.3 deleted file mode 100644 index 1e3335f..0000000 --- a/tools/libaio/man/aio_return.3 +++ /dev/null @@ -1,71 +0,0 @@ -.TH aio_return 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_return \- Retrieve status of asynchronous I/O operation -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "ssize_t aio_return (const struct aiocb *aiocbp)" -.fi -.SH DESCRIPTION -This function can be used to retrieve the return status of the operation -carried out by the request described in the variable pointed to by -.IR aiocbp -. As long as the error status of this request as returned -by -.IR aio_error -is -.IR EINPROGRESS -the return of this function is -undefined. - -Once the request is finished this function can be used exactly once to -retrieve the return value. Following calls might lead to undefined -behavior. -When the sources are compiled with -.B "_FILE_OFFSET_BITS == 64" -this function is in fact -.IR aio_return64 -since the LFS interface -transparently replaces the normal implementation. -.SH "RETURN VALUES" -The return value itself is the value which would have been -returned by the -.IR read -, -.IR write -, or -.IR fsync -call. -.SH ERRORS -The function can return -.TP -.B ENOSYS -if it is not implemented. -.TP -.B EINVAL -if the -.IR aiocbp -parameter does not -refer to an asynchronous operation whose return status is not yet known. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_return64.3 b/tools/libaio/man/aio_return64.3 deleted file mode 100644 index 7e78362..0000000 --- a/tools/libaio/man/aio_return64.3 +++ /dev/null @@ -1,51 +0,0 @@ -.TH aio_read64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_read64 \- Retrieve status of asynchronous I/O operation -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_return64 (const struct aiocb64 *aiocbp)" -.fi -.SH DESCRIPTION -This function is similar to -.IR "aio_return" -with the only difference -that the argument is a reference to a variable of type -.IR "struct aiocb64". - -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -this -function is available under the name -.IR "aio_return" -and so -transparently replaces the interface for small files on 32 bit -machines. -.SH "RETURN VALUES" -See -.IR aio_return. -.SH ERRORS -See -.IR aio_return. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_suspend.3 b/tools/libaio/man/aio_suspend.3 deleted file mode 100644 index cae1b65..0000000 --- a/tools/libaio/man/aio_suspend.3 +++ /dev/null @@ -1,123 +0,0 @@ -.TH aio_suspend 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_suspend \- Wait until one or more requests of a specific set terminates. -.SH SYNOPSYS -.nf -.B "#include <errno.h>" -.sp -.br -.B "#include <aio.h>" -.sp -.br -.BI "int aio_suspend (const struct aiocb *const list[], int nent, const struct timespec *timeout)" -.fi -.SH DESCRIPTION -Another method of synchronization is to wait until one or more requests of a -specific set terminated. This could be achieved by the -.IR "aio_*" -functions to notify the initiating process about the termination but in -some situations this is not the ideal solution. In a program which -constantly updates clients somehow connected to the server it is not -always the best solution to go round robin since some connections might -be slow. On the other hand letting the -.IR "aio_*" -function notify the -caller might also be not the best solution since whenever the process -works on preparing data for on client it makes no sense to be -interrupted by a notification since the new client will not be handled -before the current client is served. For situations like this -.IR "aio_suspend" -should be used. -.PP -When calling this function, the calling thread is suspended until at -least one of the requests pointed to by the -.IR "nent" -elements of the -array -.IR "list" -has completed. If any of the requests has already -completed at the time -.IR "aio_suspend" -is called, the function returns -immediately. Whether a request has terminated or not is determined by -comparing the error status of the request with -.IR "EINPROGRESS" -. If -an element of -.IR "list" -is -.IR "NULL" -, the entry is simply ignored. - -If no request has finished, the calling process is suspended. If -.IR "timeout" -is -.IR "NULL" -, the process is not woken until a request -has finished. If -.IR "timeout" -is not -.IR "NULL" -, the process remains -suspended at least as long as specified in -.IR "timeout" -. In this case, -.IR "aio_suspend" -returns with an error. -.PP -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -this -function is in fact -.IR "aio_suspend64" -since the LFS interface -transparently replaces the normal implementation. -.SH "RETURN VALUES" -The return value of the function is -.IR 0 -if one or more requests -from the -.IR "list" -have terminated. Otherwise the function returns -.IR -1 -and -.IR "errno" -is set. -.SH ERRORS -.TP -.B EAGAIN -None of the requests from the -.IR "list" -completed in the time specified -by -.IR "timeout" -. -.TP -.B EINTR -A signal interrupted the -.IR "aio_suspend" -function. This signal might -also be sent by the AIO implementation while signalling the termination -of one of the requests. -.TP -.B ENOSYS -The -.IR "aio_suspend" -function is not implemented. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_suspend64.3 b/tools/libaio/man/aio_suspend64.3 deleted file mode 100644 index 2f289ec..0000000 --- a/tools/libaio/man/aio_suspend64.3 +++ /dev/null @@ -1,51 +0,0 @@ -.TH aio_suspend64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_suspend64 \- Wait until one or more requests of a specific set terminates -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_suspend64 (const struct aiocb64 *const list[], int nent, const struct timespec *timeout)" -.fi -.SH DESCRIPTION -This function is similar to -.IR "aio_suspend" -with the only difference -that the argument is a reference to a variable of type -.IR "struct aiocb64". - -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -this -function is available under the name -.IR "aio_suspend" -and so -transparently replaces the interface for small files on 32 bit -machines. -.SH "RETURN VALUES" -See -.IR aio_suspend. -.SH ERRORS -See -.IR aio_suspend. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_write(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_write.3 b/tools/libaio/man/aio_write.3 deleted file mode 100644 index 7c0cfd0..0000000 --- a/tools/libaio/man/aio_write.3 +++ /dev/null @@ -1,176 +0,0 @@ -.TH aio_write 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_write \- Initiate an asynchronous write operation -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_write (struct aiocb * aiocbp);" -.fi -.SH DESCRIPTION -This function initiates an asynchronous write operation. The function -call immediately returns after the operation was enqueued or if before -this happens an error was encountered. - -The first -.IR "aiocbp->aio_nbytes" -bytes from the buffer starting at -.IR "aiocbp->aio_buf" -are written to the file for which -.IR "aiocbp->aio_fildes" -is an descriptor, starting at the absolute -position -.IR "aiocbp->aio_offset" -in the file. - -If prioritized I/O is supported by the platform, the -.IR "aiocbp->aio_reqprio " -value is used to adjust the priority before -the request is actually enqueued. - -The calling process is notified about the termination of the read -request according to the -.IR "aiocbp->aio_sigevent" -value. - -When -.IR "aio_write" -returns, the return value is zero if no error -occurred that can be found before the process is enqueued. If such an -early error is found the function returns -.IR -1 -and sets -.IR "errno" -to one of the following values. - -.TP -.B EAGAIN -The request was not enqueued due to (temporarily) exceeded resource -limitations. -.TP -.B ENOSYS -The -.IR "aio_write" -function is not implemented. -.TP -.B EBADF -The -.IR "aiocbp->aio_fildes" -descriptor is not valid. This condition -may not be recognized before enqueueing the request, and so this error -might also be signaled asynchronously. -.TP -.B EINVAL -The -.IR "aiocbp->aio_offset" -or -.IR "aiocbp->aio_reqprio" -value is -invalid. This condition may not be recognized before enqueueing the -request and so this error might also be signaled asynchronously. -.PP - -In the case -.IR "aio_write" -returns zero, the current status of the -request can be queried using -.IR "aio_error" -and -.IR "aio_return" -functions. As long as the value returned by -.IR "aio_error" -is -.IR "EINPROGRESS" -the operation has not yet completed. If -.IR "aio_error" -returns zero, the operation successfully terminated, -otherwise the value is to be interpreted as an error code. If the -function terminated, the result of the operation can be get using a call -to -.IR "aio_return" -. The returned value is the same as an equivalent -call to -.IR "read" -would have returned. Possible error codes returned -by -.IR "aio_error" -are: - -.TP -.B EBADF -The -.IR "aiocbp->aio_fildes" -descriptor is not valid. -.TP -.B ECANCELED -The operation was canceled before the operation was finished. -.TP -.B EINVAL -The -.IR "aiocbp->aio_offset" -value is invalid. -.PP -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -, this -function is in fact -.IR "aio_write64" -since the LFS interface transparently -replaces the normal implementation. -.SH "RETURN VALUES" -When -.IR "aio_write" -returns, the return value is zero if no error -occurred that can be found before the process is enqueued. If such an -early error is found the function returns -.IR -1 -and sets -.IR "errno" -to one of the following values. -.SH ERRORS -.TP -.B EAGAIN -The request was not enqueued due to (temporarily) exceeded resource -limitations. -.TP -.B ENOSYS -The -.IR "aio_write" -function is not implemented. -.TP -.B EBADF -The -.IR "aiocbp->aio_fildes" -descriptor is not valid. This condition -may not be recognized before enqueueing the request, and so this error -might also be signaled asynchronously. -.TP -.B EINVAL -The -.IR "aiocbp->aio_offset" -or -.IR "aiocbp->aio_reqprio" -value is -invalid. This condition may not be recognized before enqueueing the -request and so this error might also be signaled asynchronously. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write64(3), -.BR errno(3), diff --git a/tools/libaio/man/aio_write64.3 b/tools/libaio/man/aio_write64.3 deleted file mode 100644 index 1080903..0000000 --- a/tools/libaio/man/aio_write64.3 +++ /dev/null @@ -1,61 +0,0 @@ -.TH aio_write64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -aio_write64 \- Initiate an asynchronous write operation -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <aio.h> -.sp -.br -.BI "int aio_write64 (struct aiocb *aiocbp)" -.fi -.SH DESCRIPTION -This function is similar to the -.IR "aio_write" -function. The only -difference is that on -.IR "32 bit" -machines the file descriptor should -be opened in the large file mode. Internally -.IR "aio_write64" -uses -functionality equivalent to -.IR "lseek64" -to position the file descriptor correctly for the writing, -as opposed to -.IR "lseek" -functionality used in -.IR "aio_write". - -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -, this -function is available under the name -.IR "aio_write" -and so transparently -replaces the interface for small files on 32 bit machines. -.SH "RETURN VALUES" -See -.IR aio_write. -.SH ERRORS -See -.IR aio_write. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR errno(3), diff --git a/tools/libaio/man/io.3 b/tools/libaio/man/io.3 deleted file mode 100644 index d910a68..0000000 --- a/tools/libaio/man/io.3 +++ /dev/null @@ -1,351 +0,0 @@ -.TH io 3 2002-09-12 "Linux 2.4" Linux IO" -.SH NAME -io \- Asynchronous IO -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <libio.h> -.sp -.fi -.SH DESCRIPTION -The libaio library defines a new set of I/O operations which can -significantly reduce the time an application spends waiting at I/O. The -new functions allow a program to initiate one or more I/O operations and -then immediately resume normal work while the I/O operations are -executed in parallel. - -These functions are part of the library with realtime functions named -.IR "libaio" -. They are not actually part of the -.IR "libc" -binary. -The implementation of these functions can be done using support in the -kernel. - -All IO operations operate on files which were opened previously. There -might be arbitrarily many operations running for one file. The -asynchronous I/O operations are controlled using a data structure named -.IR "struct iocb" -It is defined in -.IR "libio.h" -as follows. - -.nf - -typedef struct io_context *io_context_t; - -typedef enum io_iocb_cmd { - IO_CMD_PREAD = 0, - IO_CMD_PWRITE = 1, - - IO_CMD_FSYNC = 2, - IO_CMD_FDSYNC = 3, - - IO_CMD_POLL = 5, - IO_CMD_NOOP = 6, -} io_iocb_cmd_t; - -struct io_iocb_common { - void *buf; - unsigned __pad1; - long nbytes; - unsigned __pad2; - long long offset; - long long __pad3, __pad4; -}; /* result code is the amount read or -'ve errno */ - - -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; - union { - struct io_iocb_common c; - struct io_iocb_vector v; - struct io_iocb_poll poll; - struct io_iocb_sockaddr saddr; - } u; -}; - - -.fi -.TP -.IR "int aio_fildes" -This element specifies the file descriptor to be used for the -operation. It must be a legal descriptor, otherwise the operation will -fail. - -The device on which the file is opened must allow the seek operation. -I.e., it is not possible to use any of the IO operations on devices -like terminals where an -.IR "lseek" -call would lead to an error. -.TP -.IR "long u.c.offset" -This element specifies the offset in the file at which the operation (input -or output) is performed. Since the operations are carried out in arbitrary -order and more than one operation for one file descriptor can be -started, one cannot expect a current read/write position of the file -descriptor. -.TP -.IR "void *buf" -This is a pointer to the buffer with the data to be written or the place -where the read data is stored. -.TP -.IR "long u.c.nbytes" -This element specifies the length of the buffer pointed to by -.IR "io_buf" -. -.TP -.IR "int aio_reqprio" -Is not currently used. -.TP -.B "IO_CMD_PREAD" -Start a read operation. Read from the file at position -.IR "u.c.offset" -and store the next -.IR "u.c.nbytes" -bytes in the -buffer pointed to by -.IR "buf" -. -.TP -.B "IO_CMD_PWRITE" -Start a write operation. Write -.IR "u.c.nbytes" -bytes starting at -.IR "buf" -into the file starting at position -.IR "u.c.offset" -. -.TP -.B "IO_CMD_NOP" -Do nothing for this control block. This value is useful sometimes when -an array of -.IR "struct iocb" -values contains holes, i.e., some of the -values must not be handled although the whole array is presented to the -.IR "io_submit" -function. -.TP -.B "IO_CMD_FSYNC" -.TP -.B "IO_CMD_POLL" -This is experimental. -.SH EXAMPLE -.nf -/* - * Simplistic version of copy command using async i/o - * - * From: Stephen Hemminger <shemminger@osdl.org> - * Copy file by using a async I/O state machine. - * 1. Start read request - * 2. When read completes turn it into a write request - * 3. When write completes decrement counter and free resources - * - * - * Usage: aiocp file(s) desination - */ - -#include <unistd.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/param.h> -#include <fcntl.h> -#include <errno.h> - -#include <libaio.h> - -#define AIO_BLKSIZE (64*1024) -#define AIO_MAXIO 32 - -static int busy = 0; // # of I/O's in flight -static int tocopy = 0; // # of blocks left to copy -static int dstfd = -1; // destination file descriptor -static const char *dstname = NULL; -static const char *srcname = NULL; - - -/* Fatal error handler */ -static void io_error(const char *func, int rc) -{ - if (rc == -ENOSYS) - fprintf(stderr, "AIO not in this kernel\n"); - else if (rc < 0 && -rc < sys_nerr) - fprintf(stderr, "%s: %s\n", func, sys_errlist[-rc]); - else - fprintf(stderr, "%s: error %d\n", func, rc); - - if (dstfd > 0) - close(dstfd); - if (dstname) - unlink(dstname); - exit(1); -} - -/* - * Write complete callback. - * Adjust counts and free resources - */ -static void wr_done(io_context_t ctx, struct iocb *iocb, long res, long res2) -{ - if (res2 != 0) { - io_error("aio write", res2); - } - if (res != iocb->u.c.nbytes) { - fprintf(stderr, "write missed bytes expect %d got %d\n", iocb->u.c.nbytes, res2); - exit(1); - } - --tocopy; - --busy; - free(iocb->u.c.buf); - - memset(iocb, 0xff, sizeof(iocb)); // paranoia - free(iocb); - write(2, "w", 1); -} - -/* - * Read complete callback. - * Change read iocb into a write iocb and start it. - */ -static void rd_done(io_context_t ctx, struct iocb *iocb, long res, long res2) -{ - /* library needs accessors to look at iocb? */ - int iosize = iocb->u.c.nbytes; - char *buf = iocb->u.c.buf; - off_t offset = iocb->u.c.offset; - - if (res2 != 0) - io_error("aio read", res2); - if (res != iosize) { - fprintf(stderr, "read missing bytes expect %d got %d\n", iocb->u.c.nbytes, res); - exit(1); - } - - - /* turn read into write */ - io_prep_pwrite(iocb, dstfd, buf, iosize, offset); - io_set_callback(iocb, wr_done); - if (1 != (res = io_submit(ctx, 1, &iocb))) - io_error("io_submit write", res); - write(2, "r", 1); -} - - -int main(int argc, char *const *argv) -{ - int srcfd; - struct stat st; - off_t length = 0, offset = 0; - io_context_t myctx; - - if (argc != 3 || argv[1][0] == '-') { - fprintf(stderr, "Usage: aiocp SOURCE DEST"); - exit(1); - } - if ((srcfd = open(srcname = argv[1], O_RDONLY)) < 0) { - perror(srcname); - exit(1); - } - if (fstat(srcfd, &st) < 0) { - perror("fstat"); - exit(1); - } - length = st.st_size; - - if ((dstfd = open(dstname = argv[2], O_WRONLY | O_CREAT, 0666)) < 0) { - close(srcfd); - perror(dstname); - exit(1); - } - - /* initialize state machine */ - memset(&myctx, 0, sizeof(myctx)); - io_queue_init(AIO_MAXIO, &myctx); - tocopy = howmany(length, AIO_BLKSIZE); - - while (tocopy > 0) { - int i, rc; - /* Submit as many reads as once as possible upto AIO_MAXIO */ - int n = MIN(MIN(AIO_MAXIO - busy, AIO_MAXIO / 2), - howmany(length - offset, AIO_BLKSIZE)); - if (n > 0) { - struct iocb *ioq[n]; - - for (i = 0; i < n; i++) { - struct iocb *io = (struct iocb *) malloc(sizeof(struct iocb)); - int iosize = MIN(length - offset, AIO_BLKSIZE); - char *buf = (char *) malloc(iosize); - - if (NULL == buf || NULL == io) { - fprintf(stderr, "out of memory\n"); - exit(1); - } - - io_prep_pread(io, srcfd, buf, iosize, offset); - io_set_callback(io, rd_done); - ioq[i] = io; - offset += iosize; - } - - rc = io_submit(myctx, n, ioq); - if (rc < 0) - io_error("io_submit", rc); - - busy += n; - } - - // Handle IO's that have completed - rc = io_queue_run(myctx); - if (rc < 0) - io_error("io_queue_run", rc); - - // if we have maximum number of i/o's in flight - // then wait for one to complete - if (busy == AIO_MAXIO) { - rc = io_queue_wait(myctx, NULL); - if (rc < 0) - io_error("io_queue_wait", rc); - } - - } - - close(srcfd); - close(dstfd); - exit(0); -} - -/* - * Results look like: - * [alanm@toolbox ~/MOT3]$ ../taio kernel-source-2.4.8-0.4g.ppc.rpm abc - * rrrrrrrrrrrrrrrwwwrwrrwwrrwrwwrrwrwrwwrrwrwrrrrwwrwwwrrwrrrwwwwwwwwwwwwwwwww - * rrrrrrrrrrrrrrwwwrrwrwrwrwrrwwwwwwwwwwwwwwrrrrrrrrrrrrrrrrrrwwwwrwrwwrwrwrwr - * wrrrrrrrwwwwwwwwwwwwwrrrwrrrwrrwrwwwwwwwwwwrrrrwwrwrrrrrrrrrrrwwwwwwwwwwwrww - * wwwrrrrrrrrwwrrrwwrwrwrwwwrrrrrrrwwwrrwwwrrwrwwwwwwwwrrrrrrrwwwrrrrrrrwwwwww - * wwwwwwwrwrrrrrrrrwrrwrrwrrwrwrrrwrrrwrrrwrwwwwwwwwwwwwwwwwwwrrrwwwrrrrrrrrrr - * rrwrrrrrrwrrwwwwwwwwwwwwwwwwrwwwrrwrwwrrrrrrrrrrrrrrrrrrrwwwwwwwwwwwwwwwwwww - * rrrrrwrrwrwrwrrwrrrwwwwwwwwrrrrwrrrwrwwrwrrrwrrwrrrrwwwwwwwrwrwwwwrwwrrrwrrr - * rrrwwwwwwwrrrrwwrrrrrrrrrrrrwrwrrrrwwwwwwwwwwwwwwrwrrrrwwwwrwrrrrwrwwwrrrwww - * rwwrrrrrrrwrrrrrrrrrrrrwwwwrrrwwwrwrrwwwwwwwwwwwwwwwwwwwwwrrrrrrrwwwwwwwrw - */ -.fi -.SH "SEE ALSO" -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_cancel.1 b/tools/libaio/man/io_cancel.1 deleted file mode 100644 index 16e898a..0000000 --- a/tools/libaio/man/io_cancel.1 +++ /dev/null @@ -1,21 +0,0 @@ -.\"/* sys_io_cancel: -.\" * Attempts to cancel an iocb previously passed to io_submit. If -.\" * the operation is successfully cancelled, the resulting event is -.\" * copied into the memory pointed to by result without being placed -.\" * into the completion queue and 0 is returned. May fail with -.\" * -EFAULT if any of the data structures pointed to are invalid. -.\" * May fail with -EINVAL if aio_context specified by ctx_id is -.\" * invalid. May fail with -EAGAIN if the iocb specified was not -.\" * cancelled. Will fail with -ENOSYS if not implemented. -.\" */ -.\" -.TH io_cancel 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_cancel \- cancel io requests -.SH SYNOPSIS -.B #include <errno.h> -.br -.B #include <libaio.h> -.LP -.BI "int io_submit(io_context_t " ctx ", struct iocb *" iocb ", struct io_event *" result ");" - diff --git a/tools/libaio/man/io_cancel.3 b/tools/libaio/man/io_cancel.3 deleted file mode 100644 index 9a16084..0000000 --- a/tools/libaio/man/io_cancel.3 +++ /dev/null @@ -1,65 +0,0 @@ -.TH io_cancel 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_cancel \- Cancel io requests -.SH SYNOPSIS -.nf -.B #include <errno.h> -.sp -.br -.B #include <libaio.h> -.sp -.br -.BI "int io_cancel(io_context_t ctx, struct iocb *iocb)" -.br -.sp -struct iocb { - void *data; /* Return in the io completion event */ - unsigned key; /* For use in identifying io requests */ - short aio_lio_opcode; - short aio_reqprio; /* Not used */ - int aio_fildes; -}; -.fi -.SH DESCRIPTION -Attempts to cancel an iocb previously passed to io_submit. If -the operation is successfully cancelled, the resulting event is -copied into the memory pointed to by result without being placed -into the completion queue. -.PP -When one or more requests are asynchronously processed, it might be -useful in some situations to cancel a selected operation, e.g., if it -becomes obvious that the written data is no longer accurate and would -have to be overwritten soon. As an example, assume an application, which -writes data in files in a situation where new incoming data would have -to be written in a file which will be updated by an enqueued request. -.SH "RETURN VALUES" -0 is returned on success , otherwise returns Errno. -.SH ERRORS -.TP -.B EFAULT -If any of the data structures pointed to are invalid. -.TP -.B EINVAL -If aio_context specified by ctx_id is -invalid. -.TP -.B EAGAIN -If the iocb specified was not -cancelled. -.TP -.B ENOSYS -if not implemented. -.SH "SEE ALSO" -.BR io(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_destroy.1 b/tools/libaio/man/io_destroy.1 deleted file mode 100644 index 177683b..0000000 --- a/tools/libaio/man/io_destroy.1 +++ /dev/null @@ -1,17 +0,0 @@ -.\"/* sys_io_destroy: -.\" * Destroy the aio_context specified. May cancel any outstanding -.\" * AIOs and block on completion. Will fail with -ENOSYS if not -.\" * implemented. May fail with -EFAULT if the context pointed to -.\" * is invalid. -.\" */ -.\" libaio provides this as io_queue_release. -.TH io_destroy 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_destroy \- destroy an io context -.SH SYNOPSIS -.B #include <errno.h> -.br -.B #include <libaio.h> -.LP -.BI "int io_destroy(io_context_t " ctx ");" - diff --git a/tools/libaio/man/io_fsync.3 b/tools/libaio/man/io_fsync.3 deleted file mode 100644 index 53eb63d..0000000 --- a/tools/libaio/man/io_fsync.3 +++ /dev/null @@ -1,82 +0,0 @@ -./" static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) -./" { -./" io_prep_fsync(iocb, fd); -./" io_set_callback(iocb, cb); -./" return io_submit(ctx, 1, &iocb); -./" } -.TH io_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -io_fsync \- Synchronize a file's complete in-core state with that on disk -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <libaio.h> -.sp -.br -.BI "int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd)" -.sp -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.sp -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); -.sp -.fi -.SH DESCRIPTION -When dealing with asynchronous operations it is sometimes necessary to -get into a consistent state. This would mean for AIO that one wants to -know whether a certain request or a group of request were processed. -This could be done by waiting for the notification sent by the system -after the operation terminated, but this sometimes would mean wasting -resources (mainly computation time). -.PP -Calling this function forces all I/O operations operating queued at the -time of the function call operating on the file descriptor -.IR "iocb->io_fildes" -into the synchronized I/O completion state . The -.IR "io_fsync" -function returns -immediately but the notification through the method described in -.IR "io_callback" -will happen only after all requests for this -file descriptor have terminated and the file is synchronized. This also -means that requests for this very same file descriptor which are queued -after the synchronization request are not affected. -.SH "RETURN VALUES" -Returns 0, otherwise returns errno. -.SH ERRORS -.TP -.B EFAULT -.I iocbs -referenced data outside of the program's accessible address space. -.TP -.B EINVAL -.I ctx -refers to an unitialized aio context, the iocb pointed to by -.I iocbs -contains an improperly initialized iocb, -.TP -.B EBADF -The iocb contains a file descriptor that does not exist. -.TP -.B EINVAL -The file specified in the iocb does not support the given io operation. -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_getevents(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_getevents.1 b/tools/libaio/man/io_getevents.1 deleted file mode 100644 index 27730b9..0000000 --- a/tools/libaio/man/io_getevents.1 +++ /dev/null @@ -1,29 +0,0 @@ -./"/* io_getevents: -./" * Attempts to read at least min_nr events and up to nr events from -./" * the completion queue for the aio_context specified by ctx_id. May -./" * fail with -EINVAL if ctx_id is invalid, if min_nr is out of range, -./" * if nr is out of range, if when is out of range. May fail with -./" * -EFAULT if any of the memory specified to is invalid. May return -./" * 0 or < min_nr if no events are available and the timeout specified -./" * by when has elapsed, where when == NULL specifies an infinite -./" * timeout. Note that the timeout pointed to by when is relative and -./" * will be updated if not NULL and the operation blocks. Will fail -./" * with -ENOSYS if not implemented. -./" */ -./"asmlinkage long sys_io_getevents(io_context_t ctx_id, -./" long min_nr, -./" long nr, -./" struct io_event *events, -./" struct timespec *timeout) -./" -.TH io_getevents 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_getevents \- read resulting events from io requests -.SH SYNOPSIS -.B #include <errno.h> -.br -.B #include <libaio.h> -.sp -.BI "int io_getevents(io_context_t " ctx ", long " min_nr ", long " nr ", struct io_events *" events "[], struct timespec *" timeout ");" - - diff --git a/tools/libaio/man/io_getevents.3 b/tools/libaio/man/io_getevents.3 deleted file mode 100644 index 8e9ddc8..0000000 --- a/tools/libaio/man/io_getevents.3 +++ /dev/null @@ -1,79 +0,0 @@ -./"/* io_getevents: -./" * Attempts to read at least min_nr events and up to nr events from -./" * the completion queue for the aio_context specified by ctx_id. May -./" * fail with -EINVAL if ctx_id is invalid, if min_nr is out of range, -./" * if nr is out of range, if when is out of range. May fail with -./" * -EFAULT if any of the memory specified to is invalid. May return -./" * 0 or < min_nr if no events are available and the timeout specified -./" * by when has elapsed, where when == NULL specifies an infinite -./" * timeout. Note that the timeout pointed to by when is relative and -./" * will be updated if not NULL and the operation blocks. Will fail -./" * with -ENOSYS if not implemented. -./" */ -./"asmlinkage long sys_io_getevents(io_context_t ctx_id, -./" long min_nr, -./" long nr, -./" struct io_event *events, -./" struct timespec *timeout) -./" -.TH io_getevents 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_getevents \- Read resulting events from io requests -.SH SYNOPSIS -.nf -.B #include <errno.h> -.sp -.br -.B #include <libaio.h> -.br -.sp -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.sp -struct io_event { - unsigned PADDED(data, __pad1); - unsigned PADDED(obj, __pad2); - unsigned PADDED(res, __pad3); - unsigned PADDED(res2, __pad4); -}; -.sp -.BI "int io_getevents(io_context_t " ctx ", long " nr ", struct io_event *" events "[], struct timespec *" timeout ");" - -.fi -.SH DESCRIPTION -Attempts to read up to nr events from -the completion queue for the aio_context specified by ctx. -.SH "RETURN VALUES" -May return -0 if no events are available and the timeout specified -by when has elapsed, where when == NULL specifies an infinite -timeout. Note that the timeout pointed to by when is relative and -will be updated if not NULL and the operation blocks. Will fail -with ENOSYS if not implemented. -.SH ERRORS -.TP -.B EINVAL -if ctx_id is invalid, if min_nr is out of range, -if nr is out of range, if when is out of range. -.TP -.B EFAULT -if any of the memory specified to is invalid. -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_prep_fsync.3 b/tools/libaio/man/io_prep_fsync.3 deleted file mode 100644 index 4cf935a..0000000 --- a/tools/libaio/man/io_prep_fsync.3 +++ /dev/null @@ -1,89 +0,0 @@ -./" static inline void io_prep_fsync(struct iocb *iocb, int fd) -./" { -./" memset(iocb, 0, sizeof(*iocb)); -./" iocb->aio_fildes = fd; -./" iocb->aio_lio_opcode = IO_CMD_FSYNC; -./" iocb->aio_reqprio = 0; -./" } -.TH io_prep_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -io_prep_fsync \- Synchronize a file's complete in-core state with that on disk -.SH SYNOPSYS -.nf -.B #include <errno.h> -.br -.sp -.B #include <libaio.h> -.br -.sp -.BI "static inline void io_prep_fsync(struct iocb *iocb, int fd)" -.sp -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.sp -.fi -.SH DESCRIPTION -This is an inline convenience function for setting up an iocbv for a FSYNC request. -.br -The file for which -.TP -.IR "iocb->aio_fildes = fd" -is a descriptor is set up with -the command -.TP -.IR "iocb->aio_lio_opcode = IO_CMD_FSYNC: -. -.PP -The io_prep_fsync() function shall set up an IO_CMD_FSYNC operation -to asynchronously force all I/O -operations associated with the file indicated by the file -descriptor aio_fildes member of the iocb structure referenced by -the iocb argument and queued at the time of the call to -io_submit() to the synchronized I/O completion state. The function -call shall return when the synchronization request has been -initiated or queued to the file or device (even when the data -cannot be synchronized immediately). - -All currently queued I/O operations shall be completed as if by a call -to fsync(); that is, as defined for synchronized I/O file -integrity completion. If the -operation queued by io_prep_fsync() fails, then, as for fsync(), -outstanding I/O operations are not guaranteed to have -been completed. - -If io_prep_fsync() succeeds, then it is only the I/O that was queued -at the time of the call to io_submit() that is guaranteed to be -forced to the relevant completion state. The completion of -subsequent I/O on the file descriptor is not guaranteed to be -completed in a synchronized fashion. -.PP -This function returns immediately . To schedule the operation, the -function -.IR io_submit -must be called. -.PP -Simultaneous asynchronous operations using the same iocb produce -undefined results. -.SH "RETURN VALUES" -None -.SH ERRORS -None -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_prep_pread.3 b/tools/libaio/man/io_prep_pread.3 deleted file mode 100644 index 5938aec..0000000 --- a/tools/libaio/man/io_prep_pread.3 +++ /dev/null @@ -1,79 +0,0 @@ -./" static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -./" { -./" memset(iocb, 0, sizeof(*iocb)); -./" iocb->aio_fildes = fd; -./" iocb->aio_lio_opcode = IO_CMD_PREAD; -./" iocb->aio_reqprio = 0; -./" iocb->u.c.buf = buf; -./" iocb->u.c.nbytes = count; -./" iocb->u.c.offset = offset; -./" } -.TH io_prep_pread 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -io_prep_pread \- Set up asynchronous read -.SH SYNOPSYS -.nf -.B #include <errno.h> -.sp -.br -.B #include <libaio.h> -.br -.sp -.BI "inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -" -.sp -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.fi -.SH DESCRIPTION -.IR io_prep_pread -is an inline convenience function designed to facilitate the initialization of -the iocb for an asynchronous read operation. - -The first -.TP -.IR "iocb->u.c.nbytes = count" -bytes of the file for which -.TP -.IR "iocb->aio_fildes = fd" -is a descriptor are written to the buffer -starting at -.TP -.IR "iocb->u.c.buf = buf" -. -.br -Reading starts at the absolute position -.TP -.IR "ioc->u.c.offset = offset" -in the file. -.PP -This function returns immediately . To schedule the operation, the -function -.IR io_submit -must be called. -.PP -Simultaneous asynchronous operations using the same iocb produce -undefined results. -.SH "RETURN VALUES" -None -.SH ERRORS -None -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_prep_pwrite.3 b/tools/libaio/man/io_prep_pwrite.3 deleted file mode 100644 index 68b3500..0000000 --- a/tools/libaio/man/io_prep_pwrite.3 +++ /dev/null @@ -1,77 +0,0 @@ -./" static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -./" { -./" memset(iocb, 0, sizeof(*iocb)); -./" iocb->aio_fildes = fd; -./" iocb->aio_lio_opcode = IO_CMD_PWRITE; -./" iocb->aio_reqprio = 0; -./" iocb->u.c.buf = buf; -./" iocb->u.c.nbytes = count; -./" iocb->u.c.offset = offset; -./" } -.TH io_prep_pwrite 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -io_prep_pwrite \- Set up iocb for asynchronous writes -.SH SYNOPSYS -.nf -.B #include <errno.h> -.br -.sp -.B #include <libaio.h> -.br -.sp -.BI "inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -" -.sp -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.fi -.SH DESCRIPTION -io_prep_write is a convenicence function for setting up parallel writes. - -The first -.TP -.IR "iocb->u.c.nbytes = count" -bytes of the file for which -.TP -.IR "iocb->aio_fildes = fd" -is a descriptor are written from the buffer -starting at -.TP -.IR "iocb->u.c.buf = buf" -. -.br -Writing starts at the absolute position -.TP -.IR "ioc->u.c.offset = offset" -in the file. -.PP -This function returns immediately . To schedule the operation, the -function -.IR io_submit -must be called. -.PP -Simultaneous asynchronous operations using the same iocb produce -undefined results. -.SH "RETURN VALUES" -None -.SH ERRORS -None -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_queue_init.3 b/tools/libaio/man/io_queue_init.3 deleted file mode 100644 index 317f631..0000000 --- a/tools/libaio/man/io_queue_init.3 +++ /dev/null @@ -1,63 +0,0 @@ -.TH io_queue_init 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_queue_init \- Initialize asynchronous io state machine - -.SH SYNOPSIS -.nf -.B #include <errno.h> -.br -.sp -.B #include <libaio.h> -.br -.sp -.BI "int io_queue_init(int maxevents, io_context_t *ctx );" -.sp -.fi -.SH DESCRIPTION -.B io_queue_init -Attempts to create an aio context capable of receiving at least -.IR maxevents -events. -.IR ctx -must point to an aio context that already exists and must be initialized -to -.IR 0 -before the call. -If the operation is successful, *cxtp is filled with the resulting handle. -.SH "RETURN VALUES" -On success, -.B io_queue_init -returns 0. Otherwise, -error is return, where -error is one of the Exxx values defined in the Errors section. -.SH ERRORS -.TP -.B EFAULT -.I iocbs -referenced data outside of the program's accessible address space. -.TP -.B EINVAL -.I maxevents -is <= 0 or -.IR ctx -is an invalid memory locattion. -.TP -.B ENOSYS -Not implemented -.TP -.B EAGAIN -.IR "maxevents > max_aio_reqs" -where max_aio_reqs is a tunable value. -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_queue_release.3 b/tools/libaio/man/io_queue_release.3 deleted file mode 100644 index 06b9ec0..0000000 --- a/tools/libaio/man/io_queue_release.3 +++ /dev/null @@ -1,48 +0,0 @@ -.TH io_queue_release 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_queue_release \- Release the context associated with the userspace handle -.SH SYNOPSIS -.nf -.B #include <errno.h> -.br -.B #include <libaio.h> -.br -.sp -.BI "int io_queue_release(io_context_t ctx)" -.sp -.SH DESCRIPTION -.B io_queue_release -destroys the context associated with the userspace handle. May cancel any outstanding -AIOs and block on completion. - -.B cts. -.SH "RETURN VALUES" -On success, -.B io_queue_release -returns 0. Otherwise, -error is return, where -error is one of the Exxx values defined in the Errors section. -.SH ERRORS -.TP -.B EINVAL -.I ctx -refers to an unitialized aio context, the iocb pointed to by -.I iocbs -contains an improperly initialized iocb, -.TP -.B ENOSYS -Not implemented -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) - diff --git a/tools/libaio/man/io_queue_run.3 b/tools/libaio/man/io_queue_run.3 deleted file mode 100644 index 57dd417..0000000 --- a/tools/libaio/man/io_queue_run.3 +++ /dev/null @@ -1,50 +0,0 @@ -.TH io_queue_run 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_queue_run \- Handle completed io requests -.SH SYNOPSIS -.nf -.B #include <errno.h> -.br -.sp -.B #include <libaio.h> -.br -.sp -.BI "int io_queue_run(io_context_t ctx );" -.sp -.fi -.SH DESCRIPTION -.B io_queue_run -Attempts to read all the events events from -the completion queue for the aio_context specified by ctx_id. -.SH "RETURN VALUES" -May return -0 if no events are available. -Will fail with -ENOSYS if not implemented. -.SH ERRORS -.TP -.B EFAULT -.I iocbs -referenced data outside of the program's accessible address space. -.TP -.B EINVAL -.I ctx -refers to an unitialized aio context, the iocb pointed to by -.I iocbs -contains an improperly initialized iocb, -.TP -.B ENOSYS -Not implemented -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_queue_wait.3 b/tools/libaio/man/io_queue_wait.3 deleted file mode 100644 index 2306663..0000000 --- a/tools/libaio/man/io_queue_wait.3 +++ /dev/null @@ -1,56 +0,0 @@ -.TH io_queue_wait 2 2002-09-03 "Linux 2.4" "Linux AIO" -.SH NAME -io_queue_wait \- Wait for io requests to complete -.SH SYNOPSIS -.nf -.B #include <errno.h> -.br -.sp -.B #include <libaio.h> -.br -.sp -.BI "int io_queue_wait(io_context_t ctx, const struct timespec *timeout);" -.fi -.SH DESCRIPTION -Attempts to read an event from -the completion queue for the aio_context specified by ctx_id. -.SH "RETURN VALUES" -May return -0 if no events are available and the timeout specified -by when has elapsed, where when == NULL specifies an infinite -timeout. Note that the timeout pointed to by when is relative and -will be updated if not NULL and the operation blocks. Will fail -with -ENOSYS if not implemented. -.SH "RETURN VALUES" -On success, -.B io_queue_wait -returns 0. Otherwise, -error is return, where -error is one of the Exxx values defined in the Errors section. -.SH ERRORS -.TP -.B EFAULT -.I iocbs -referenced data outside of the program's accessible address space. -.TP -.B EINVAL -.I ctx -refers to an unitialized aio context, the iocb pointed to by -.I iocbs -contains an improperly initialized iocb, -.TP -.B ENOSYS -Not implemented -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_set_callback(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_set_callback.3 b/tools/libaio/man/io_set_callback.3 deleted file mode 100644 index a8ca789..0000000 --- a/tools/libaio/man/io_set_callback.3 +++ /dev/null @@ -1,44 +0,0 @@ -./"\x03static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) -.TH io_set_callback 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -io_set_callback \- Set up io completion callback function -.SH SYNOPSYS -.nf -.B #include <errno.h> -.br -.sp -.B #include <libaio.h> -.br -.sp -.BI "static inline void io_set_callback(struct iocb *iocb, io_callback_t cb)" -.sp -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.sp -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); -.sp -.fi -.SH DESCRIPTION -The callback is not done if the caller uses raw events from -io_getevents, only with the library helpers -.SH "RETURN VALUES" -.SH ERRORS -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_submit(3), -.BR errno(3) diff --git a/tools/libaio/man/io_setup.1 b/tools/libaio/man/io_setup.1 deleted file mode 100644 index 68690e1..0000000 --- a/tools/libaio/man/io_setup.1 +++ /dev/null @@ -1,15 +0,0 @@ -./"/* sys_io_setup: -./" * Create an aio_context capable of receiving at least nr_events. -./" * ctxp must not point to an aio_context that already exists, and -./" * must be initialized to 0 prior to the call. On successful -./" * creation of the aio_context, *ctxp is filled in with the resulting -./" * handle. May fail with -EINVAL if *ctxp is not initialized, -./" * if the specified nr_events exceeds internal limits. May fail -./" * with -EAGAIN if the specified nr_events exceeds the user's limit -./" * of available events. May fail with -ENOMEM if insufficient kernel -./" * resources are available. May fail with -EFAULT if an invalid -./" * pointer is passed for ctxp. Will fail with -ENOSYS if not -./" * implemented. -./" */ -./" -- note: libaio is actually providing io_queue_init and io_queue_grow -./" as separate functions. For now io_setup is the same as io_queue_grow. diff --git a/tools/libaio/man/io_submit.1 b/tools/libaio/man/io_submit.1 deleted file mode 100644 index f66e80f..0000000 --- a/tools/libaio/man/io_submit.1 +++ /dev/null @@ -1,109 +0,0 @@ -.TH io_submit 2 2002-09-02 "Linux 2.4" "Linux AIO" -.SH NAME -io_submit \- submit io requests -.SH SYNOPSIS -.B #include <errno.h> -.br -.B #include <libaio.h> -.LP -.BI "int io_submit(io_context_t " ctx ", long " nr ", struct iocb *" iocbs "[]);" -.SH DESCRIPTION -.B io_submit -submits to the io_context -.I ctx -up to -.I nr -I/O requests pointed to by the vector -.IR iocbs . - -The -.B iocb -structure is defined as something like -.sp -.RS -.nf -struct iocb { - void *data; -.\" unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.fi -.RE -.sp -.I data -is a an opaque pointer which will upon completion be returned in the -.B io_event -structure by -.BR io_getevents (2). -.\" and io_wait(2) -Callers will typically use this to point directly or indirectly to a -callback function. -.sp -.I aio_lio_opcode -is the I/O operation requested. Callers will typically set this and the -arguments to the I/O operation calling the -.BR io_prep_ (3) -function corresponding to the operation. -.sp -.I aio_reqprio -is the priority of the request. Higher values have more priority; the -normal priority is 0. -.sp -.I aio_fildes -is the file descriptor for the I/O operation. -Callers will typically set this and the -arguments to the I/O operation calling the -.BR io_prep_ *(3) -function corresponding to the operation. -.sp -The caller may not modify the contents or resubmit a submitted -.B iocb -structure until after the operation completes or is canceled. -The implementation of -.BR io_submit (2) -is permitted to modify reserved fields of the -.B iocb -structure. -.SH "RETURN VALUES" -If able to submit at least one iocb, -.B io_submit -returns the number of iocbs submitted successfully. Otherwise, -.RI - error -is returned, where -.I error -is one of the Exxx values defined in the Errors section. -.SH ERRORS -.TP -.B EFAULT -.I iocbs -referenced data outside of the program's accessible address space. -.TP -.B EINVAL -.I nr -is negative, -.I ctx -refers to an uninitialized aio context, the iocb pointed to by -.IR iocbs [0] -is improperly initialized or specifies an unsupported operation. -.TP -.B EBADF -The iocb pointed to by -.IR iocbs [0] -contains a file descriptor that does not exist. -.TP -.B EAGAIN -Insufficient resources were available to queue any operations. -.SH "SEE ALSO" -.BR io_setup (2), -.BR io_destroy (2), -.BR io_getevents (2), -.\".BR io_wait (2), -.BR io_prep_pread (3), -.BR io_prep_pwrite (3), -.BR io_prep_fsync (3), -.BR io_prep_fdsync (3), -.BR io_prep_noop (3), -.BR io_cancel (2), -.BR errno (3) diff --git a/tools/libaio/man/io_submit.3 b/tools/libaio/man/io_submit.3 deleted file mode 100644 index b6966ef..0000000 --- a/tools/libaio/man/io_submit.3 +++ /dev/null @@ -1,135 +0,0 @@ -./"/* sys_io_submit: -./" * Queue the nr iocbs pointed to by iocbpp for processing. Returns -./" * the number of iocbs queued. May return -EINVAL if the aio_context -./" * specified by ctx_id is invalid, if nr is < 0, if the iocb at -./" * *iocbpp[0] is not properly initialized, if the operation specified -./" * is invalid for the file descriptor in the iocb. May fail with -./" * -EFAULT if any of the data structures point to invalid data. May -./" * fail with -EBADF if the file descriptor specified in the first -./" * iocb is invalid. May fail with -EAGAIN if insufficient resources -./" * are available to queue any iocbs. Will return 0 if nr is 0. Will -./" * fail with -ENOSYS if not implemented. -./" */ -.TH io_submit 2 2002-09-02 "Linux 2.4" "Linux AIO" -.SH NAME -io_submit \- Submit io requests -.SH SYNOPSIS -.nf -.B #include <errno.h> -.br -.sp -.B #include <libaio.h> -.br -.sp -.BI "int io_submit(io_context_t " ctx ", long " nr ", struct iocb *" iocbs "[]);" -.sp -struct iocb { - void *data; - unsigned key; - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; -}; -.fi -.SH DESCRIPTION -.B io_submit -submits -.I nr -iocbs for processing for a given io context ctx. - -The -.IR "io_submit" -function can be used to enqueue an arbitrary -number of read and write requests at one time. The requests can all be -meant for the same file, all for different files or every solution in -between. - -.IR "io_submit" -gets the -.IR "nr" -requests from the array pointed to -by -.IR "iocbs" -. The operation to be performed is determined by the -.IR "aio_lio_opcode" -member in each element of -.IR "iocbs" -. If this -field is -.B "IO_CMD_PREAD" -a read operation is enqueued, similar to a call -of -.IR "io_prep_pread" -for this element of the array (except that the way -the termination is signalled is different, as we will see below). If -the -.IR "aio_lio_opcode" -member is -.B "IO_CMD_PWRITE" -a write operation -is enqueued. Otherwise the -.IR "aio_lio_opcode" -must be -.B "IO_CMD_NOP" -in which case this element of -.IR "iocbs" -is simply ignored. This -``operation'' is useful in situations where one has a fixed array of -.IR "struct iocb" -elements from which only a few need to be handled at -a time. Another situation is where the -.IR "io_submit" -call was -canceled before all requests are processed and the remaining requests have to be reissued. - -The other members of each element of the array pointed to by -.IR "iocbs" -must have values suitable for the operation as described in -the documentation for -.IR "io_prep_pread" -and -.IR "io_prep_pwrite" -above. - -The function returns immediately after -having enqueued all the requests. -On success, -.B io_submit -returns the number of iocbs submitted successfully. Otherwise, -error is return, where -error is one of the Exxx values defined in the Errors section. -.PP -If an error is detected, then the behavior is undefined. -.PP -Simultaneous asynchronous operations using the same iocb produce -undefined results. -.SH ERRORS -.TP -.B EFAULT -.I iocbs -referenced data outside of the program's accessible address space. -.TP -.B EINVAL -.I ctx -refers to an unitialized aio context, the iocb pointed to by -.I iocbs -contains an improperly initialized iocb, -.TP -.B EBADF -The iocb contains a file descriptor that does not exist. -.TP -.B EINVAL -The file specified in the iocb does not support the given io operation. -.SH "SEE ALSO" -.BR io(3), -.BR io_cancel(3), -.BR io_fsync(3), -.BR io_getevents(3), -.BR io_prep_fsync(3), -.BR io_prep_pread(3), -.BR io_prep_pwrite(3), -.BR io_queue_init(3), -.BR io_queue_release(3), -.BR io_queue_run(3), -.BR io_queue_wait(3), -.BR io_set_callback(3), -.BR errno(3) diff --git a/tools/libaio/man/lio_listio.3 b/tools/libaio/man/lio_listio.3 deleted file mode 100644 index 9b5b5e4..0000000 --- a/tools/libaio/man/lio_listio.3 +++ /dev/null @@ -1,229 +0,0 @@ -.TH lio_listio 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -lio_listio - List directed I/O -.SH SYNOPSYS -.B #include <errno.h> -.br -.B #include <libaio.h> -.LP -.BI "int lio_listio (int mode, struct aiocb *const list[], int nent, struct sigevent *sig)" -.nf -.SH DESCRIPTION - -Besides these functions with the more or less traditional interface, -POSIX.1b also defines a function which can initiate more than one -operation at a time, and which can handle freely mixed read and write -operations. It is therefore similar to a combination of -.IR readv -and -.IR "writev" -. - -The -.IR "lio_listio" -function can be used to enqueue an arbitrary -number of read and write requests at one time. The requests can all be -meant for the same file, all for different files or every solution in -between. - -.IR "lio_listio" -gets the -.IR "nent" -requests from the array pointed to -by -.IR "list" -. The operation to be performed is determined by the -.IR "aio_lio_opcode" -member in each element of -.IR "list" -. If this -field is -.B "LIO_READ" -a read operation is enqueued, similar to a call -of -.IR "aio_read" -for this element of the array (except that the way -the termination is signalled is different, as we will see below). If -the -.IR "aio_lio_opcode" -member is -.B "LIO_WRITE" -a write operation -is enqueued. Otherwise the -.IR "aio_lio_opcode" -must be -.B "LIO_NOP" -in which case this element of -.IR "list" -is simply ignored. This -``operation'' is useful in situations where one has a fixed array of -.IR "struct aiocb" -elements from which only a few need to be handled at -a time. Another situation is where the -.IR "lio_listio" -call was -canceled before all requests are processed and the remaining requests have to be reissued. - -The other members of each element of the array pointed to by -.IR "list" -must have values suitable for the operation as described in -the documentation for -.IR "aio_read" -and -.IR "aio_write" -above. - -The -.IR "mode" -argument determines how -.IR "lio_listio" -behaves after -having enqueued all the requests. If -.IR "mode" -is -.B "LIO_WAIT" -it -waits until all requests terminated. Otherwise -.IR "mode" -must be -.B "LIO_NOWAIT" -and in this case the function returns immediately after -having enqueued all the requests. In this case the caller gets a -notification of the termination of all requests according to the -.IR "sig" -parameter. If -.IR "sig" -is -.B "NULL" -no notification is -send. Otherwise a signal is sent or a thread is started, just as -described in the description for -.IR "aio_read" -or -.IR "aio_write" -. - -When the sources are compiled with -.B "_FILE_OFFSET_BITS == 64" -, this -function is in fact -.IR "lio_listio64" -since the LFS interface -transparently replaces the normal implementation. -.SH "RETURN VALUES" -If -.IR "mode" -is -.B "LIO_WAIT" -, the return value of -.IR "lio_listio" -is -.IR 0 -when all requests completed successfully. Otherwise the -function return -.IR 1 -and -.IR "errno" -is set accordingly. To find -out which request or requests failed one has to use the -.IR "aio_error" -function on all the elements of the array -.IR "list" -. - -In case -.IR "mode" -is -.B "LIO_NOWAIT" -, the function returns -.IR 0 -if -all requests were enqueued correctly. The current state of the requests -can be found using -.IR "aio_error" -and -.IR "aio_return" -as described -above. If -.IR "lio_listio" -returns -.IR -1 -in this mode, the -global variable -.IR "errno" -is set accordingly. If a request did not -yet terminate, a call to -.IR "aio_error" -returns -.B "EINPROGRESS" -. If -the value is different, the request is finished and the error value (or - -.IR 0 -) is returned and the result of the operation can be retrieved -using -.IR "aio_return" -. -.SH ERRORS -Possible values for -.IR "errno" -are: - -.TP -.B EAGAIN -The resources necessary to queue all the requests are not available at -the moment. The error status for each element of -.IR "list" -must be -checked to determine which request failed. - -Another reason could be that the system wide limit of AIO requests is -exceeded. This cannot be the case for the implementation on GNU systems -since no arbitrary limits exist. -.TP -.B EINVAL -The -.IR "mode" -parameter is invalid or -.IR "nent" -is larger than -.B "AIO_LISTIO_MAX" -. -.TP -.B EIO -One or more of the request's I/O operations failed. The error status of -each request should be checked to determine which one failed. -.TP -.B ENOSYS -The -.IR "lio_listio" -function is not supported. -.PP - -If the -.IR "mode" -parameter is -.B "LIO_NOWAIT" -and the caller cancels -a request, the error status for this request returned by -.IR "aio_error" -is -.B "ECANCELED" -. -.SH "SEE ALSO" -.BR aio(3), -.BR aio_cancel(3), -.BR aio_cancel64(3), -.BR aio_error(3), -.BR aio_error64(3), -.BR aio_fsync(3), -.BR aio_fsync64(3), -.BR aio_init(3), -.BR aio_read(3), -.BR aio_read64(3), -.BR aio_return(3), -.BR aio_return64(3), -.BR aio_suspend(3), -.BR aio_suspend64(3), -.BR aio_write(3), -.BR aio_write64(3) diff --git a/tools/libaio/man/lio_listio64.3 b/tools/libaio/man/lio_listio64.3 deleted file mode 100644 index 97f6955..0000000 --- a/tools/libaio/man/lio_listio64.3 +++ /dev/null @@ -1,39 +0,0 @@ -.TH lio_listio64 3 2002-09-12 "Linux 2.4" Linux AIO" -.SH NAME -lio_listio64 \- List directed I/O -.SH SYNOPSYS -.B #include <errno.h> -.br -.B #include <libaio.h> -.LP -.BI "int lio_listio64 (int mode, struct aiocb *const list[], int nent, struct sigevent *sig)" -.nf -.SH DESCRIPTION -This function is similar to the -.IR "code{lio_listio" -function. The only -difference is that on -.IR "32 bit" -machines, the file descriptor should -be opened in the large file mode. Internally, -.IR "lio_listio64" -uses -functionality equivalent to -.IR lseek64" -to position the file descriptor correctly for the reading or -writing, as opposed to -.IR "lseek" -functionality used in -.IR "lio_listio". - -When the sources are compiled with -.IR "_FILE_OFFSET_BITS == 64" -, this -function is available under the name -.IR "lio_listio" -and so -transparently replaces the interface for small files on 32 bit -machines. -.SH "RETURN VALUES" -.SH ERRORS -.SH "SEE ALSO" diff --git a/tools/libaio/src/Makefile b/tools/libaio/src/Makefile deleted file mode 100644 index 575ad61..0000000 --- a/tools/libaio/src/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -prefix=$(PREFIX) -includedir=$(prefix)/include -libdir=$(prefix)/lib - -ARCH := $(shell uname -m | sed -e s/i.86/i386/) -CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC -SO_CFLAGS=-shared $(CFLAGS) -L_CFLAGS=$(CFLAGS) -LINK_FLAGS= - -soname=libaio.so.1 -minor=0 -micro=1 -libname=$(soname).$(minor).$(micro) -all_targets += libaio.a $(libname) - -all: $(all_targets) - -# libaio provided functions -libaio_srcs := io_queue_init.c io_queue_release.c -libaio_srcs += io_queue_wait.c io_queue_run.c - -# real syscalls -libaio_srcs += io_getevents.c io_submit.c io_cancel.c -libaio_srcs += io_setup.c io_destroy.c - -# internal functions -libaio_srcs += raw_syscall.c - -# old symbols -libaio_srcs += compat-0_1.c - -libaio_objs := $(patsubst %.c,%.ol,$(libaio_srcs)) -libaio_sobjs := $(patsubst %.c,%.os,$(libaio_srcs)) - -$(libaio_objs) $(libaio_sobjs): libaio.h vsys_def.h - -%.os: %.c - $(CC) $(SO_CFLAGS) -c -o $@ $< - -%.ol: %.c - $(CC) $(L_CFLAGS) -c -o $@ $< - - -libaio.a: $(libaio_objs) - rm -f libaio.a - $(AR) r libaio.a $^ - $(RANLIB) libaio.a - -$(libname): $(libaio_sobjs) libaio.map - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) - -install: $(all_targets) - install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h - install -D -m 644 libaio.a $(DESTDIR)$(libdir)/libaio.a - install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) - ln -sf $(libname) $(DESTDIR)$(libdir)/$(soname) - ln -sf $(libname) $(DESTDIR)$(libdir)/libaio.so - -$(libaio_objs): libaio.h - -clean: - rm -f $(all_targets) $(libaio_objs) $(libaio_sobjs) $(soname).new - rm -f *.so* *.a *.o diff --git a/tools/libaio/src/compat-0_1.c b/tools/libaio/src/compat-0_1.c deleted file mode 100644 index 53d520b..0000000 --- a/tools/libaio/src/compat-0_1.c +++ /dev/null @@ -1,62 +0,0 @@ -/* libaio Linux async I/O interface - - compat-0_1.c : compatibility symbols for libaio 0.1.x-0.3.x - - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <stdlib.h> -#include <sys/time.h> - -#include "libaio.h" -#include "vsys_def.h" - -#include "syscall.h" - - -/* ABI change. Provide partial compatibility on this one for now. */ -SYMVER(compat0_1_io_cancel, io_cancel, 0.1); -int compat0_1_io_cancel(io_context_t ctx, struct iocb *iocb) -{ - struct io_event event; - - /* FIXME: the old ABI would return the event on the completion queue */ - return io_cancel(ctx, iocb, &event); -} - -SYMVER(compat0_1_io_queue_wait, io_queue_wait, 0.1); -int compat0_1_io_queue_wait(io_context_t ctx, struct timespec *when) -{ - struct timespec timeout; - if (when) - timeout = *when; - return io_getevents(ctx, 0, 0, NULL, when ? &timeout : NULL); -} - - -/* ABI change. Provide backwards compatibility for this one. */ -SYMVER(compat0_1_io_getevents, io_getevents, 0.1); -int compat0_1_io_getevents(io_context_t ctx_id, long nr, - struct io_event *events, - const struct timespec *const_timeout) -{ - struct timespec timeout; - if (const_timeout) - timeout = *const_timeout; - return io_getevents(ctx_id, 1, nr, events, - const_timeout ? &timeout : NULL); -} - diff --git a/tools/libaio/src/io_cancel.c b/tools/libaio/src/io_cancel.c deleted file mode 100644 index 2f0f5f4..0000000 --- a/tools/libaio/src/io_cancel.c +++ /dev/null @@ -1,23 +0,0 @@ -/* io_cancel.c - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <libaio.h> -#include "syscall.h" - -io_syscall3(int, io_cancel_0_4, io_cancel, io_context_t, ctx, struct iocb *, iocb, struct io_event *, event) -DEFSYMVER(io_cancel_0_4, io_cancel, 0.4) diff --git a/tools/libaio/src/io_destroy.c b/tools/libaio/src/io_destroy.c deleted file mode 100644 index 0ab6bd1..0000000 --- a/tools/libaio/src/io_destroy.c +++ /dev/null @@ -1,23 +0,0 @@ -/* io_destroy - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <errno.h> -#include <libaio.h> -#include "syscall.h" - -io_syscall1(int, io_destroy, io_destroy, io_context_t, ctx) diff --git a/tools/libaio/src/io_getevents.c b/tools/libaio/src/io_getevents.c deleted file mode 100644 index 5a05174..0000000 --- a/tools/libaio/src/io_getevents.c +++ /dev/null @@ -1,57 +0,0 @@ -/* io_getevents.c - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <libaio.h> -#include <errno.h> -#include <stdlib.h> -#include <time.h> -#include "syscall.h" - -io_syscall5(int, __io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout) - -#define AIO_RING_MAGIC 0xa10a10a1 - -/* Ben will hate me for this */ -struct aio_ring { - unsigned id; /* kernel internal index number */ - unsigned nr; /* number of io_events */ - unsigned head; - unsigned tail; - - unsigned magic; - unsigned compat_features; - unsigned incompat_features; - unsigned header_length; /* size of aio_ring */ -}; - -int io_getevents_0_4(io_context_t ctx, long min_nr, long nr, struct io_event * events, struct timespec * timeout) -{ - struct aio_ring *ring; - ring = (struct aio_ring*)ctx; - if (ring==NULL || ring->magic != AIO_RING_MAGIC) - goto do_syscall; - if (timeout!=NULL && timeout->tv_sec == 0 && timeout->tv_nsec == 0) { - if (ring->head == ring->tail) - return 0; - } - -do_syscall: - return __io_getevents_0_4(ctx, min_nr, nr, events, timeout); -} - -DEFSYMVER(io_getevents_0_4, io_getevents, 0.4) diff --git a/tools/libaio/src/io_queue_init.c b/tools/libaio/src/io_queue_init.c deleted file mode 100644 index 563d137..0000000 --- a/tools/libaio/src/io_queue_init.c +++ /dev/null @@ -1,33 +0,0 @@ -/* io_queue_init.c - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <libaio.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> - -#include "syscall.h" - -int io_queue_init(int maxevents, io_context_t *ctxp) -{ - if (maxevents > 0) { - *ctxp = NULL; - return io_setup(maxevents, ctxp); - } - return -EINVAL; -} diff --git a/tools/libaio/src/io_queue_release.c b/tools/libaio/src/io_queue_release.c deleted file mode 100644 index 94bbb86..0000000 --- a/tools/libaio/src/io_queue_release.c +++ /dev/null @@ -1,27 +0,0 @@ -/* io_queue_release.c - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <libaio.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> - -int io_queue_release(io_context_t ctx) -{ - return io_destroy(ctx); -} diff --git a/tools/libaio/src/io_queue_run.c b/tools/libaio/src/io_queue_run.c deleted file mode 100644 index e0132f4..0000000 --- a/tools/libaio/src/io_queue_run.c +++ /dev/null @@ -1,39 +0,0 @@ -/* io_submit - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <libaio.h> -#include <errno.h> -#include <stdlib.h> -#include <time.h> - -int io_queue_run(io_context_t ctx) -{ - static struct timespec timeout = { 0, 0 }; - struct io_event event; - int ret; - - /* FIXME: batch requests? */ - while (1 == (ret = io_getevents(ctx, 0, 1, &event, &timeout))) { - io_callback_t cb = (io_callback_t)event.data; - struct iocb *iocb = event.obj; - - cb(ctx, iocb, event.res, event.res2); - } - - return ret; -} diff --git a/tools/libaio/src/io_queue_wait.c b/tools/libaio/src/io_queue_wait.c deleted file mode 100644 index 538d2f3..0000000 --- a/tools/libaio/src/io_queue_wait.c +++ /dev/null @@ -1,31 +0,0 @@ -/* io_submit - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#define NO_SYSCALL_ERRNO -#include <sys/types.h> -#include <libaio.h> -#include <errno.h> -#include "syscall.h" - -struct timespec; - -int io_queue_wait_0_4(io_context_t ctx, struct timespec *timeout) -{ - return io_getevents(ctx, 0, 0, NULL, timeout); -} -DEFSYMVER(io_queue_wait_0_4, io_queue_wait, 0.4) diff --git a/tools/libaio/src/io_setup.c b/tools/libaio/src/io_setup.c deleted file mode 100644 index 4ba1afc..0000000 --- a/tools/libaio/src/io_setup.c +++ /dev/null @@ -1,23 +0,0 @@ -/* io_setup - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <errno.h> -#include <libaio.h> -#include "syscall.h" - -io_syscall2(int, io_setup, io_setup, int, maxevents, io_context_t *, ctxp) diff --git a/tools/libaio/src/io_submit.c b/tools/libaio/src/io_submit.c deleted file mode 100644 index e22ba54..0000000 --- a/tools/libaio/src/io_submit.c +++ /dev/null @@ -1,23 +0,0 @@ -/* io_submit - libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <errno.h> -#include <libaio.h> -#include "syscall.h" - -io_syscall3(int, io_submit, io_submit, io_context_t, ctx, long, nr, struct iocb **, iocbs) diff --git a/tools/libaio/src/libaio.h b/tools/libaio/src/libaio.h deleted file mode 100644 index 6574601..0000000 --- a/tools/libaio/src/libaio.h +++ /dev/null @@ -1,222 +0,0 @@ -/* /usr/include/libaio.h - * - * Copyright 2000,2001,2002 Red Hat, Inc. - * - * Written by Benjamin LaHaise <bcrl@redhat.com> - * - * libaio Linux async I/O interface - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __LIBAIO_H -#define __LIBAIO_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include <sys/types.h> -#include <string.h> - -struct timespec; -struct sockaddr; -struct iovec; -struct iocb; - -typedef struct io_context *io_context_t; - -typedef enum io_iocb_cmd { - IO_CMD_PREAD = 0, - IO_CMD_PWRITE = 1, - - IO_CMD_FSYNC = 2, - IO_CMD_FDSYNC = 3, - - IO_CMD_POLL = 5, - IO_CMD_NOOP = 6, -} io_iocb_cmd_t; - -#if defined(__i386__) /* little endian, 32 bits */ -#define PADDED(x, y) x; unsigned y -#define PADDEDptr(x, y) x; unsigned y -#define PADDEDul(x, y) unsigned long x; unsigned y -#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) -#define PADDED(x, y) x, y -#define PADDEDptr(x, y) x -#define PADDEDul(x, y) unsigned long x -#elif defined(__powerpc64__) /* big endian, 64 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x,y) x -#define PADDEDul(x, y) unsigned long x -#elif defined(__PPC__) /* big endian, 32 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x, y) unsigned y; x -#define PADDEDul(x, y) unsigned y; unsigned long x -#elif defined(__s390x__) /* big endian, 64 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x,y) x -#define PADDEDul(x, y) unsigned long x -#elif defined(__s390__) /* big endian, 32 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x, y) unsigned y; x -#define PADDEDul(x, y) unsigned y; unsigned long x -#else -#error endian? -#endif - -struct io_iocb_poll { - PADDED(int events, __pad1); -}; /* result code is the set of result flags or -'ve errno */ - -struct io_iocb_sockaddr { - struct sockaddr *addr; - int len; -}; /* result code is the length of the sockaddr, or -'ve errno */ - -struct io_iocb_common { - PADDEDptr(void *buf, __pad1); - PADDEDul(nbytes, __pad2); - long long offset; - long long __pad3, __pad4; -}; /* result code is the amount read or -'ve errno */ - -struct io_iocb_vector { - const struct iovec *vec; - int nr; - long long offset; -}; /* result code is the amount read or -'ve errno */ - -struct iocb { - PADDEDptr(void *data, __pad1); /* Return in the io completion event */ - PADDED(unsigned key, __pad2); /* For use in identifying io requests */ - - short aio_lio_opcode; - short aio_reqprio; - int aio_fildes; - - union { - struct io_iocb_common c; - struct io_iocb_vector v; - struct io_iocb_poll poll; - struct io_iocb_sockaddr saddr; - } u; -}; - -struct io_event { - PADDEDptr(void *data, __pad1); - PADDEDptr(struct iocb *obj, __pad2); - PADDEDul(res, __pad3); - PADDEDul(res2, __pad4); -}; - -#undef PADDED -#undef PADDEDptr -#undef PADDEDul - -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); - -/* library wrappers */ -extern int io_queue_init(int maxevents, io_context_t *ctxp); -/*extern int io_queue_grow(io_context_t ctx, int new_maxevents);*/ -extern int io_queue_release(io_context_t ctx); -/*extern int io_queue_wait(io_context_t ctx, struct timespec *timeout);*/ -extern int io_queue_run(io_context_t ctx); - -/* Actual syscalls */ -extern int io_setup(int maxevents, io_context_t *ctxp); -extern int io_destroy(io_context_t ctx); -extern int io_submit(io_context_t ctx, long nr, struct iocb *ios[]); -extern int io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt); -extern int io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout); - - -static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) -{ - iocb->data = (void *)cb; -} - -static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -{ - memset(iocb, 0, sizeof(*iocb)); - iocb->aio_fildes = fd; - iocb->aio_lio_opcode = IO_CMD_PREAD; - iocb->aio_reqprio = 0; - iocb->u.c.buf = buf; - iocb->u.c.nbytes = count; - iocb->u.c.offset = offset; -} - -static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -{ - memset(iocb, 0, sizeof(*iocb)); - iocb->aio_fildes = fd; - iocb->aio_lio_opcode = IO_CMD_PWRITE; - iocb->aio_reqprio = 0; - iocb->u.c.buf = buf; - iocb->u.c.nbytes = count; - iocb->u.c.offset = offset; -} - -static inline void io_prep_poll(struct iocb *iocb, int fd, int events) -{ - memset(iocb, 0, sizeof(*iocb)); - iocb->aio_fildes = fd; - iocb->aio_lio_opcode = IO_CMD_POLL; - iocb->aio_reqprio = 0; - iocb->u.poll.events = events; -} - -static inline int io_poll(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd, int events) -{ - io_prep_poll(iocb, fd, events); - io_set_callback(iocb, cb); - return io_submit(ctx, 1, &iocb); -} - -static inline void io_prep_fsync(struct iocb *iocb, int fd) -{ - memset(iocb, 0, sizeof(*iocb)); - iocb->aio_fildes = fd; - iocb->aio_lio_opcode = IO_CMD_FSYNC; - iocb->aio_reqprio = 0; -} - -static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) -{ - io_prep_fsync(iocb, fd); - io_set_callback(iocb, cb); - return io_submit(ctx, 1, &iocb); -} - -static inline void io_prep_fdsync(struct iocb *iocb, int fd) -{ - memset(iocb, 0, sizeof(*iocb)); - iocb->aio_fildes = fd; - iocb->aio_lio_opcode = IO_CMD_FDSYNC; - iocb->aio_reqprio = 0; -} - -static inline int io_fdsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) -{ - io_prep_fdsync(iocb, fd); - io_set_callback(iocb, cb); - return io_submit(ctx, 1, &iocb); -} - -#ifdef __cplusplus -} -#endif - -#endif /* __LIBAIO_H */ diff --git a/tools/libaio/src/libaio.map b/tools/libaio/src/libaio.map deleted file mode 100644 index dc37725..0000000 --- a/tools/libaio/src/libaio.map +++ /dev/null @@ -1,22 +0,0 @@ -LIBAIO_0.1 { - global: - io_queue_init; - io_queue_run; - io_queue_wait; - io_queue_release; - io_cancel; - io_submit; - io_getevents; - local: - *; - -}; - -LIBAIO_0.4 { - global: - io_setup; - io_destroy; - io_cancel; - io_getevents; - io_queue_wait; -} LIBAIO_0.1; diff --git a/tools/libaio/src/raw_syscall.c b/tools/libaio/src/raw_syscall.c deleted file mode 100644 index c3fe4b8..0000000 --- a/tools/libaio/src/raw_syscall.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "syscall.h" - -#if defined(__ia64__) -/* based on code from glibc by Jes Sorensen */ -__asm__(".text\n" - ".globl __ia64_aio_raw_syscall\n" - ".proc __ia64_aio_raw_syscall\n" - "__ia64_aio_raw_syscall:\n" - "alloc r2=ar.pfs,1,0,8,0\n" - "mov r15=r32\n" - "break 0x100000\n" - ";;" - "br.ret.sptk.few b0\n" - ".size __ia64_aio_raw_syscall, . - __ia64_aio_raw_syscall\n" - ".endp __ia64_aio_raw_syscall" -); -#endif - -; diff --git a/tools/libaio/src/syscall-alpha.h b/tools/libaio/src/syscall-alpha.h deleted file mode 100644 index 467b74f..0000000 --- a/tools/libaio/src/syscall-alpha.h +++ /dev/null @@ -1,209 +0,0 @@ -#define __NR_io_setup 398 -#define __NR_io_destroy 399 -#define __NR_io_getevents 400 -#define __NR_io_submit 401 -#define __NR_io_cancel 402 - -#define inline_syscall_r0_asm -#define inline_syscall_r0_out_constraint "=v" - -#define inline_syscall_clobbers \ - "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", \ - "$22", "$23", "$24", "$25", "$27", "$28", "memory" - -#define inline_syscall0(name, args...) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19) \ - : "0"(_sc_0) \ - : inline_syscall_clobbers, \ - "$16", "$17", "$18", "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} - -#define inline_syscall1(name,arg1) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16) \ - : "0"(_sc_0), "2"(_sc_16) \ - : inline_syscall_clobbers, \ - "$17", "$18", "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} - -#define inline_syscall2(name,arg1,arg2) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_17 __asm__("$17"); \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - _sc_17 = (long) (arg2); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3 %4" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17) \ - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17) \ - : inline_syscall_clobbers, \ - "$18", "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} - -#define inline_syscall3(name,arg1,arg2,arg3) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_17 __asm__("$17"); \ - register long _sc_18 __asm__("$18"); \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - _sc_17 = (long) (arg2); \ - _sc_18 = (long) (arg3); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3 %4 %5" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ - "=r"(_sc_18) \ - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ - "4"(_sc_18) \ - : inline_syscall_clobbers, "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} - -#define inline_syscall4(name,arg1,arg2,arg3,arg4) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_17 __asm__("$17"); \ - register long _sc_18 __asm__("$18"); \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - _sc_17 = (long) (arg2); \ - _sc_18 = (long) (arg3); \ - _sc_19 = (long) (arg4); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3 %4 %5 %6" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ - "=r"(_sc_18) \ - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ - "4"(_sc_18), "1"(_sc_19) \ - : inline_syscall_clobbers, "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} - -#define inline_syscall5(name,arg1,arg2,arg3,arg4,arg5) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_17 __asm__("$17"); \ - register long _sc_18 __asm__("$18"); \ - register long _sc_19 __asm__("$19"); \ - register long _sc_20 __asm__("$20"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - _sc_17 = (long) (arg2); \ - _sc_18 = (long) (arg3); \ - _sc_19 = (long) (arg4); \ - _sc_20 = (long) (arg5); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ - "=r"(_sc_18), "=r"(_sc_20) \ - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ - "4"(_sc_18), "1"(_sc_19), "5"(_sc_20) \ - : inline_syscall_clobbers, "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} - -#define inline_syscall6(name,arg1,arg2,arg3,arg4,arg5,arg6) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_17 __asm__("$17"); \ - register long _sc_18 __asm__("$18"); \ - register long _sc_19 __asm__("$19"); \ - register long _sc_20 __asm__("$20"); \ - register long _sc_21 __asm__("$21"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - _sc_17 = (long) (arg2); \ - _sc_18 = (long) (arg3); \ - _sc_19 = (long) (arg4); \ - _sc_20 = (long) (arg5); \ - _sc_21 = (long) (arg6); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7 %8" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ - "=r"(_sc_18), "=r"(_sc_20), "=r"(_sc_21) \ - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), "4"(_sc_18), \ - "1"(_sc_19), "5"(_sc_20), "6"(_sc_21) \ - : inline_syscall_clobbers); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} - -#define INLINE_SYSCALL1(name, nr, args...) \ -({ \ - long _sc_ret, _sc_err; \ - inline_syscall##nr(__NR_##name, args); \ - if (_sc_err != 0) \ - { \ - _sc_ret = -(_sc_ret); \ - } \ - _sc_ret; \ -}) - -#define io_syscall1(type,fname,sname,type1,arg1) \ -type fname(type1 arg1) \ -{ \ - return (type)INLINE_SYSCALL1(sname, 1, arg1); \ -} - -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -type fname(type1 arg1,type2 arg2) \ -{ \ - return (type)INLINE_SYSCALL1(sname, 2, arg1, arg2); \ -} - -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -type fname(type1 arg1,type2 arg2,type3 arg3) \ -{ \ - return (type)INLINE_SYSCALL1(sname, 3, arg1, arg2, arg3); \ -} - -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -{ \ - return (type)INLINE_SYSCALL1(sname, 4, arg1, arg2, arg3, arg4); \ -} - -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ - type5,arg5) \ -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -{ \ - return (type)INLINE_SYSCALL1(sname, 5, arg1, arg2, arg3, arg4, arg5);\ -} diff --git a/tools/libaio/src/syscall-i386.h b/tools/libaio/src/syscall-i386.h deleted file mode 100644 index 9576975..0000000 --- a/tools/libaio/src/syscall-i386.h +++ /dev/null @@ -1,72 +0,0 @@ -#define __NR_io_setup 245 -#define __NR_io_destroy 246 -#define __NR_io_getevents 247 -#define __NR_io_submit 248 -#define __NR_io_cancel 249 - -#define io_syscall1(type,fname,sname,type1,arg1) \ -type fname(type1 arg1) \ -{ \ -long __res; \ -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ - "int $0x80\n" \ - "xchgl %%edi,%%ebx" \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1))); \ -return __res; \ -} - -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -type fname(type1 arg1,type2 arg2) \ -{ \ -long __res; \ -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ - "int $0x80\n" \ - "xchgl %%edi,%%ebx" \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2))); \ -return __res; \ -} - -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -type fname(type1 arg1,type2 arg2,type3 arg3) \ -{ \ -long __res; \ -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ - "int $0x80\n" \ - "xchgl %%edi,%%ebx" \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2)), \ - "d" ((long)(arg3))); \ -return __res; \ -} - -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -{ \ -long __res; \ -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ - "int $0x80\n" \ - "xchgl %%edi,%%ebx" \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2)), \ - "d" ((long)(arg3)),"S" ((long)(arg4))); \ -return __res; \ -} - -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ - type5,arg5) \ -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -{ \ -long __res; \ -long tmp; \ -__asm__ volatile ("movl %%ebx,%7\n" \ - "movl %2,%%ebx\n" \ - "int $0x80\n" \ - "movl %7,%%ebx" \ - : "=a" (__res) \ - : "0" (__NR_##sname),"rm" ((long)(arg1)),"c" ((long)(arg2)), \ - "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)), \ - "m" (tmp)); \ -return __res; \ -} diff --git a/tools/libaio/src/syscall-ppc.h b/tools/libaio/src/syscall-ppc.h deleted file mode 100644 index 435513e..0000000 --- a/tools/libaio/src/syscall-ppc.h +++ /dev/null @@ -1,98 +0,0 @@ -#include <asm/unistd.h> -#include <errno.h> - -#define __NR_io_setup 227 -#define __NR_io_destroy 228 -#define __NR_io_getevents 229 -#define __NR_io_submit 230 -#define __NR_io_cancel 231 - -/* On powerpc a system call basically clobbers the same registers like a - * function call, with the exception of LR (which is needed for the - * "sc; bnslr" sequence) and CR (where only CR0.SO is clobbered to signal - * an error return status). - */ -#ifndef __syscall_nr -#define __syscall_nr(nr, type, name, args...) \ - unsigned long __sc_ret, __sc_err; \ - { \ - register unsigned long __sc_0 __asm__ ("r0"); \ - register unsigned long __sc_3 __asm__ ("r3"); \ - register unsigned long __sc_4 __asm__ ("r4"); \ - register unsigned long __sc_5 __asm__ ("r5"); \ - register unsigned long __sc_6 __asm__ ("r6"); \ - register unsigned long __sc_7 __asm__ ("r7"); \ - register unsigned long __sc_8 __asm__ ("r8"); \ - \ - __sc_loadargs_##nr(name, args); \ - __asm__ __volatile__ \ - ("sc \n\t" \ - "mfcr %0 " \ - : "=&r" (__sc_0), \ - "=&r" (__sc_3), "=&r" (__sc_4), \ - "=&r" (__sc_5), "=&r" (__sc_6), \ - "=&r" (__sc_7), "=&r" (__sc_8) \ - : __sc_asm_input_##nr \ - : "cr0", "ctr", "memory", \ - "r9", "r10","r11", "r12"); \ - __sc_ret = __sc_3; \ - __sc_err = __sc_0; \ - } \ - if (__sc_err & 0x10000000) return -((int)__sc_ret); \ - return (type) __sc_ret -#endif - -#define __sc_loadargs_0(name, dummy...) \ - __sc_0 = __NR_##name -#define __sc_loadargs_1(name, arg1) \ - __sc_loadargs_0(name); \ - __sc_3 = (unsigned long) (arg1) -#define __sc_loadargs_2(name, arg1, arg2) \ - __sc_loadargs_1(name, arg1); \ - __sc_4 = (unsigned long) (arg2) -#define __sc_loadargs_3(name, arg1, arg2, arg3) \ - __sc_loadargs_2(name, arg1, arg2); \ - __sc_5 = (unsigned long) (arg3) -#define __sc_loadargs_4(name, arg1, arg2, arg3, arg4) \ - __sc_loadargs_3(name, arg1, arg2, arg3); \ - __sc_6 = (unsigned long) (arg4) -#define __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5) \ - __sc_loadargs_4(name, arg1, arg2, arg3, arg4); \ - __sc_7 = (unsigned long) (arg5) - -#define __sc_asm_input_0 "0" (__sc_0) -#define __sc_asm_input_1 __sc_asm_input_0, "1" (__sc_3) -#define __sc_asm_input_2 __sc_asm_input_1, "2" (__sc_4) -#define __sc_asm_input_3 __sc_asm_input_2, "3" (__sc_5) -#define __sc_asm_input_4 __sc_asm_input_3, "4" (__sc_6) -#define __sc_asm_input_5 __sc_asm_input_4, "5" (__sc_7) - -#define io_syscall1(type,fname,sname,type1,arg1) \ -type fname(type1 arg1) \ -{ \ - __syscall_nr(1, type, sname, arg1); \ -} - -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -type fname(type1 arg1, type2 arg2) \ -{ \ - __syscall_nr(2, type, sname, arg1, arg2); \ -} - -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -type fname(type1 arg1, type2 arg2, type3 arg3) \ -{ \ - __syscall_nr(3, type, sname, arg1, arg2, arg3); \ -} - -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -{ \ - __syscall_nr(4, type, sname, arg1, arg2, arg3, arg4); \ -} - -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ -{ \ - __syscall_nr(5, type, sname, arg1, arg2, arg3, arg4, arg5); \ -} diff --git a/tools/libaio/src/syscall-s390.h b/tools/libaio/src/syscall-s390.h deleted file mode 100644 index 3ec5ee3..0000000 --- a/tools/libaio/src/syscall-s390.h +++ /dev/null @@ -1,131 +0,0 @@ -#define __NR_io_setup 243 -#define __NR_io_destroy 244 -#define __NR_io_getevents 245 -#define __NR_io_submit 246 -#define __NR_io_cancel 247 - -#define io_svc_clobber "1", "cc", "memory" - -#define io_syscall1(type,fname,sname,type1,arg1) \ -type fname(type1 arg1) { \ - register type1 __arg1 asm("2") = arg1; \ - register long __svcres asm("2"); \ - long __res; \ - __asm__ __volatile__ ( \ - " .if %1 < 256\n" \ - " svc %b1\n" \ - " .else\n" \ - " la %%r1,%1\n" \ - " .svc 0\n" \ - " .endif" \ - : "=d" (__svcres) \ - : "i" (__NR_##sname), \ - "0" (__arg1) \ - : io_svc_clobber ); \ - __res = __svcres; \ - return (type) __res; \ -} - -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -type fname(type1 arg1, type2 arg2) { \ - register type1 __arg1 asm("2") = arg1; \ - register type2 __arg2 asm("3") = arg2; \ - register long __svcres asm("2"); \ - long __res; \ - __asm__ __volatile__ ( \ - " .if %1 < 256\n" \ - " svc %b1\n" \ - " .else\n" \ - " la %%r1,%1\n" \ - " svc 0\n" \ - " .endif" \ - : "=d" (__svcres) \ - : "i" (__NR_##sname), \ - "0" (__arg1), \ - "d" (__arg2) \ - : io_svc_clobber ); \ - __res = __svcres; \ - return (type) __res; \ -} - -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2, \ - type3,arg3) \ -type fname(type1 arg1, type2 arg2, type3 arg3) { \ - register type1 __arg1 asm("2") = arg1; \ - register type2 __arg2 asm("3") = arg2; \ - register type3 __arg3 asm("4") = arg3; \ - register long __svcres asm("2"); \ - long __res; \ - __asm__ __volatile__ ( \ - " .if %1 < 256\n" \ - " svc %b1\n" \ - " .else\n" \ - " la %%r1,%1\n" \ - " svc 0\n" \ - " .endif" \ - : "=d" (__svcres) \ - : "i" (__NR_##sname), \ - "0" (__arg1), \ - "d" (__arg2), \ - "d" (__arg3) \ - : io_svc_clobber ); \ - __res = __svcres; \ - return (type) __res; \ -} - -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2, \ - type3,arg3,type4,arg4) \ -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ - register type1 __arg1 asm("2") = arg1; \ - register type2 __arg2 asm("3") = arg2; \ - register type3 __arg3 asm("4") = arg3; \ - register type4 __arg4 asm("5") = arg4; \ - register long __svcres asm("2"); \ - long __res; \ - __asm__ __volatile__ ( \ - " .if %1 < 256\n" \ - " svc %b1\n" \ - " .else\n" \ - " la %%r1,%1\n" \ - " svc 0\n" \ - " .endif" \ - : "=d" (__svcres) \ - : "i" (__NR_##sname), \ - "0" (__arg1), \ - "d" (__arg2), \ - "d" (__arg3), \ - "d" (__arg4) \ - : io_svc_clobber ); \ - __res = __svcres; \ - return (type) __res; \ -} - -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2, \ - type3,arg3,type4,arg4,type5,arg5) \ -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \ - type5 arg5) { \ - register type1 __arg1 asm("2") = arg1; \ - register type2 __arg2 asm("3") = arg2; \ - register type3 __arg3 asm("4") = arg3; \ - register type4 __arg4 asm("5") = arg4; \ - register type5 __arg5 asm("6") = arg5; \ - register long __svcres asm("2"); \ - long __res; \ - __asm__ __volatile__ ( \ - " .if %1 < 256\n" \ - " svc %b1\n" \ - " .else\n" \ - " la %%r1,%1\n" \ - " svc 0\n" \ - " .endif" \ - : "=d" (__svcres) \ - : "i" (__NR_##sname), \ - "0" (__arg1), \ - "d" (__arg2), \ - "d" (__arg3), \ - "d" (__arg4), \ - "d" (__arg5) \ - : io_svc_clobber ); \ - __res = __svcres; \ - return (type) __res; \ -} diff --git a/tools/libaio/src/syscall-x86_64.h b/tools/libaio/src/syscall-x86_64.h deleted file mode 100644 index 9361856..0000000 --- a/tools/libaio/src/syscall-x86_64.h +++ /dev/null @@ -1,63 +0,0 @@ -#define __NR_io_setup 206 -#define __NR_io_destroy 207 -#define __NR_io_getevents 208 -#define __NR_io_submit 209 -#define __NR_io_cancel 210 - -#define __syscall_clobber "r11","rcx","memory" -#define __syscall "syscall" - -#define io_syscall1(type,fname,sname,type1,arg1) \ -type fname(type1 arg1) \ -{ \ -long __res; \ -__asm__ volatile (__syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)) : __syscall_clobber ); \ -return __res; \ -} - -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -type fname(type1 arg1,type2 arg2) \ -{ \ -long __res; \ -__asm__ volatile (__syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \ -return __res; \ -} - -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -type fname(type1 arg1,type2 arg2,type3 arg3) \ -{ \ -long __res; \ -__asm__ volatile (__syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ - "d" ((long)(arg3)) : __syscall_clobber); \ -return __res; \ -} - -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -{ \ -long __res; \ -__asm__ volatile ("movq %5,%%r10 ;" __syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ - "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \ -return __res; \ -} - -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ - type5,arg5) \ -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -{ \ -long __res; \ -__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ - "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \ - __syscall_clobber,"r8","r10" ); \ -return __res; \ -} diff --git a/tools/libaio/src/syscall.h b/tools/libaio/src/syscall.h deleted file mode 100644 index 0283825..0000000 --- a/tools/libaio/src/syscall.h +++ /dev/null @@ -1,27 +0,0 @@ -#include <sys/syscall.h> -#include <unistd.h> - -#define _SYMSTR(str) #str -#define SYMSTR(str) _SYMSTR(str) - -#define SYMVER(compat_sym, orig_sym, ver_sym) \ - __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@LIBAIO_" SYMSTR(ver_sym)); - -#define DEFSYMVER(compat_sym, orig_sym, ver_sym) \ - __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@@LIBAIO_" SYMSTR(ver_sym)); - -#if defined(__i386__) -#include "syscall-i386.h" -#elif defined(__x86_64__) -#include "syscall-x86_64.h" -#elif defined(__ia64__) -#include "syscall-ia64.h" -#elif defined(__PPC__) -#include "syscall-ppc.h" -#elif defined(__s390__) -#include "syscall-s390.h" -#elif defined(__alpha__) -#include "syscall-alpha.h" -#else -#error "add syscall-arch.h" -#endif diff --git a/tools/libaio/src/vsys_def.h b/tools/libaio/src/vsys_def.h deleted file mode 100644 index 13d032e..0000000 --- a/tools/libaio/src/vsys_def.h +++ /dev/null @@ -1,24 +0,0 @@ -/* libaio Linux async I/O interface - Copyright 2002 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -extern int vsys_io_setup(unsigned nr_reqs, io_context_t *ctxp); -extern int vsys_io_destroy(io_context_t ctx); -extern int vsys_io_submit(io_context_t ctx, long nr, struct iocb *iocbs[]); -extern int vsys_io_cancel(io_context_t ctx, struct iocb *iocb); -extern int vsys_io_wait(io_context_t ctx, struct iocb *iocb, const struct timespec *when); -extern int vsys_io_getevents(io_context_t ctx_id, long nr, struct io_event *events, const struct timespec *timeout); - -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 3/9] tools: remove in tree libaio 2013-07-31 15:15 ` [PATCH 3/9] tools: remove in tree libaio Ian Campbell @ 2013-08-01 8:38 ` Egger, Christoph 2013-08-01 14:39 ` Ian Campbell 2013-08-07 15:06 ` Ian Jackson 1 sibling, 1 reply; 30+ messages in thread From: Egger, Christoph @ 2013-08-01 8:38 UTC (permalink / raw) To: Ian Campbell; +Cc: ian.jackson, keir, xen-devel On 31.07.13 17:15, Ian Campbell wrote: > We have defaulted to using the system libaio for a while now and I din't think > there are any relevant distros which don't have it that running Xen 4.4 would > be reasonable on. > > Also it has caused confusion because it is not ever wanted on ARM, but the > build system doesn't express that (could be fixed, but deleting is the right > thing to do anyway). ... and switch to posixaio to not break platforms w/o libaio. Christoph > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > --- > .gitignore | 2 - > .hgignore | 2 - > README | 2 +- > config/Tools.mk.in | 1 - > tools/Makefile | 6 - > tools/blktap/drivers/Makefile | 6 - > tools/blktap2/drivers/Makefile | 7 - > tools/config.h.in | 3 + > tools/configure | 9 +- > tools/configure.ac | 2 +- > tools/libaio/COPYING | 515 ------------------------------- > tools/libaio/ChangeLog | 43 --- > tools/libaio/INSTALL | 18 - > tools/libaio/Makefile | 40 --- > tools/libaio/TODO | 4 - > tools/libaio/harness/Makefile | 37 --- > tools/libaio/harness/README | 19 -- > tools/libaio/harness/attic/0.t | 9 - > tools/libaio/harness/attic/1.t | 9 - > tools/libaio/harness/cases/10.t | 53 ---- > tools/libaio/harness/cases/11.t | 39 --- > tools/libaio/harness/cases/12.t | 49 --- > tools/libaio/harness/cases/13.t | 66 ---- > tools/libaio/harness/cases/14.t | 90 ------ > tools/libaio/harness/cases/2.t | 41 --- > tools/libaio/harness/cases/3.t | 25 -- > tools/libaio/harness/cases/4.t | 72 ----- > tools/libaio/harness/cases/5.t | 47 --- > tools/libaio/harness/cases/6.t | 57 ---- > tools/libaio/harness/cases/7.t | 27 -- > tools/libaio/harness/cases/8.t | 49 --- > tools/libaio/harness/cases/aio_setup.h | 98 ------ > tools/libaio/harness/cases/common-7-8.h | 37 --- > tools/libaio/harness/main.c | 39 --- > tools/libaio/harness/runtests.sh | 19 -- > tools/libaio/libaio.spec | 187 ----------- > tools/libaio/man/aio.3 | 315 ------------------- > tools/libaio/man/aio_cancel.3 | 137 -------- > tools/libaio/man/aio_cancel64.3 | 50 --- > tools/libaio/man/aio_error.3 | 81 ----- > tools/libaio/man/aio_error64.3 | 64 ---- > tools/libaio/man/aio_fsync.3 | 139 --------- > tools/libaio/man/aio_fsync64.3 | 51 --- > tools/libaio/man/aio_init.3 | 96 ------ > tools/libaio/man/aio_read.3 | 146 --------- > tools/libaio/man/aio_read64.3 | 60 ---- > tools/libaio/man/aio_return.3 | 71 ----- > tools/libaio/man/aio_return64.3 | 51 --- > tools/libaio/man/aio_suspend.3 | 123 -------- > tools/libaio/man/aio_suspend64.3 | 51 --- > tools/libaio/man/aio_write.3 | 176 ----------- > tools/libaio/man/aio_write64.3 | 61 ---- > tools/libaio/man/io.3 | 351 --------------------- > tools/libaio/man/io_cancel.1 | 21 -- > tools/libaio/man/io_cancel.3 | 65 ---- > tools/libaio/man/io_destroy.1 | 17 - > tools/libaio/man/io_fsync.3 | 82 ----- > tools/libaio/man/io_getevents.1 | 29 -- > tools/libaio/man/io_getevents.3 | 79 ----- > tools/libaio/man/io_prep_fsync.3 | 89 ------ > tools/libaio/man/io_prep_pread.3 | 79 ----- > tools/libaio/man/io_prep_pwrite.3 | 77 ----- > tools/libaio/man/io_queue_init.3 | 63 ---- > tools/libaio/man/io_queue_release.3 | 48 --- > tools/libaio/man/io_queue_run.3 | 50 --- > tools/libaio/man/io_queue_wait.3 | 56 ---- > tools/libaio/man/io_set_callback.3 | 44 --- > tools/libaio/man/io_setup.1 | 15 - > tools/libaio/man/io_submit.1 | 109 ------- > tools/libaio/man/io_submit.3 | 135 -------- > tools/libaio/man/lio_listio.3 | 229 -------------- > tools/libaio/man/lio_listio64.3 | 39 --- > tools/libaio/src/Makefile | 67 ---- > tools/libaio/src/compat-0_1.c | 62 ---- > tools/libaio/src/io_cancel.c | 23 -- > tools/libaio/src/io_destroy.c | 23 -- > tools/libaio/src/io_getevents.c | 57 ---- > tools/libaio/src/io_queue_init.c | 33 -- > tools/libaio/src/io_queue_release.c | 27 -- > tools/libaio/src/io_queue_run.c | 39 --- > tools/libaio/src/io_queue_wait.c | 31 -- > tools/libaio/src/io_setup.c | 23 -- > tools/libaio/src/io_submit.c | 23 -- > tools/libaio/src/libaio.h | 222 ------------- > tools/libaio/src/libaio.map | 22 -- > tools/libaio/src/raw_syscall.c | 19 -- > tools/libaio/src/syscall-alpha.h | 209 ------------- > tools/libaio/src/syscall-i386.h | 72 ----- > tools/libaio/src/syscall-ppc.h | 98 ------ > tools/libaio/src/syscall-s390.h | 131 -------- > tools/libaio/src/syscall-x86_64.h | 63 ---- > tools/libaio/src/syscall.h | 27 -- > tools/libaio/src/vsys_def.h | 24 -- > 93 files changed, 12 insertions(+), 6361 deletions(-) > delete mode 100644 tools/libaio/COPYING > delete mode 100644 tools/libaio/ChangeLog > delete mode 100644 tools/libaio/INSTALL > delete mode 100644 tools/libaio/Makefile > delete mode 100644 tools/libaio/TODO > delete mode 100644 tools/libaio/harness/Makefile > delete mode 100644 tools/libaio/harness/README > delete mode 100644 tools/libaio/harness/attic/0.t > delete mode 100644 tools/libaio/harness/attic/1.t > delete mode 100644 tools/libaio/harness/cases/10.t > delete mode 100644 tools/libaio/harness/cases/11.t > delete mode 100644 tools/libaio/harness/cases/12.t > delete mode 100644 tools/libaio/harness/cases/13.t > delete mode 100644 tools/libaio/harness/cases/14.t > delete mode 100644 tools/libaio/harness/cases/2.t > delete mode 100644 tools/libaio/harness/cases/3.t > delete mode 100644 tools/libaio/harness/cases/4.t > delete mode 100644 tools/libaio/harness/cases/5.t > delete mode 100644 tools/libaio/harness/cases/6.t > delete mode 100644 tools/libaio/harness/cases/7.t > delete mode 100644 tools/libaio/harness/cases/8.t > delete mode 100644 tools/libaio/harness/cases/aio_setup.h > delete mode 100644 tools/libaio/harness/cases/common-7-8.h > delete mode 100644 tools/libaio/harness/main.c > delete mode 100644 tools/libaio/harness/runtests.sh > delete mode 100644 tools/libaio/libaio.spec > delete mode 100644 tools/libaio/man/aio.3 > delete mode 100644 tools/libaio/man/aio_cancel.3 > delete mode 100644 tools/libaio/man/aio_cancel64.3 > delete mode 100644 tools/libaio/man/aio_error.3 > delete mode 100644 tools/libaio/man/aio_error64.3 > delete mode 100644 tools/libaio/man/aio_fsync.3 > delete mode 100644 tools/libaio/man/aio_fsync64.3 > delete mode 100644 tools/libaio/man/aio_init.3 > delete mode 100644 tools/libaio/man/aio_read.3 > delete mode 100644 tools/libaio/man/aio_read64.3 > delete mode 100644 tools/libaio/man/aio_return.3 > delete mode 100644 tools/libaio/man/aio_return64.3 > delete mode 100644 tools/libaio/man/aio_suspend.3 > delete mode 100644 tools/libaio/man/aio_suspend64.3 > delete mode 100644 tools/libaio/man/aio_write.3 > delete mode 100644 tools/libaio/man/aio_write64.3 > delete mode 100644 tools/libaio/man/io.3 > delete mode 100644 tools/libaio/man/io_cancel.1 > delete mode 100644 tools/libaio/man/io_cancel.3 > delete mode 100644 tools/libaio/man/io_destroy.1 > delete mode 100644 tools/libaio/man/io_fsync.3 > delete mode 100644 tools/libaio/man/io_getevents.1 > delete mode 100644 tools/libaio/man/io_getevents.3 > delete mode 100644 tools/libaio/man/io_prep_fsync.3 > delete mode 100644 tools/libaio/man/io_prep_pread.3 > delete mode 100644 tools/libaio/man/io_prep_pwrite.3 > delete mode 100644 tools/libaio/man/io_queue_init.3 > delete mode 100644 tools/libaio/man/io_queue_release.3 > delete mode 100644 tools/libaio/man/io_queue_run.3 > delete mode 100644 tools/libaio/man/io_queue_wait.3 > delete mode 100644 tools/libaio/man/io_set_callback.3 > delete mode 100644 tools/libaio/man/io_setup.1 > delete mode 100644 tools/libaio/man/io_submit.1 > delete mode 100644 tools/libaio/man/io_submit.3 > delete mode 100644 tools/libaio/man/lio_listio.3 > delete mode 100644 tools/libaio/man/lio_listio64.3 > delete mode 100644 tools/libaio/src/Makefile > delete mode 100644 tools/libaio/src/compat-0_1.c > delete mode 100644 tools/libaio/src/io_cancel.c > delete mode 100644 tools/libaio/src/io_destroy.c > delete mode 100644 tools/libaio/src/io_getevents.c > delete mode 100644 tools/libaio/src/io_queue_init.c > delete mode 100644 tools/libaio/src/io_queue_release.c > delete mode 100644 tools/libaio/src/io_queue_run.c > delete mode 100644 tools/libaio/src/io_queue_wait.c > delete mode 100644 tools/libaio/src/io_setup.c > delete mode 100644 tools/libaio/src/io_submit.c > delete mode 100644 tools/libaio/src/libaio.h > delete mode 100644 tools/libaio/src/libaio.map > delete mode 100644 tools/libaio/src/raw_syscall.c > delete mode 100644 tools/libaio/src/syscall-alpha.h > delete mode 100644 tools/libaio/src/syscall-i386.h > delete mode 100644 tools/libaio/src/syscall-ppc.h > delete mode 100644 tools/libaio/src/syscall-s390.h > delete mode 100644 tools/libaio/src/syscall-x86_64.h > delete mode 100644 tools/libaio/src/syscall.h > delete mode 100644 tools/libaio/src/vsys_def.h > > diff --git a/.gitignore b/.gitignore > index 960c29e..62462b4 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -208,8 +208,6 @@ tools/libxl/testenum.c > tools/libxl/tmp.* > tools/libxl/_libxl.api-for-check > tools/libxl/*.api-ok > -tools/libaio/src/*.ol > -tools/libaio/src/*.os > tools/misc/cpuperf/cpuperf-perfcntr > tools/misc/cpuperf/cpuperf-xen > tools/misc/lomount/lomount > diff --git a/.hgignore b/.hgignore > index f3877a9..9822a8d 100644 > --- a/.hgignore > +++ b/.hgignore > @@ -201,8 +201,6 @@ > ^tools/libxl/_libxl\.api-for-check > ^tools/libxl/libxl\.api-ok > ^tools/libvchan/vchan-node[12]$ > -^tools/libaio/src/.*\.ol$ > -^tools/libaio/src/.*\.os$ > ^tools/misc/cpuperf/cpuperf-perfcntr$ > ^tools/misc/cpuperf/cpuperf-xen$ > ^tools/misc/lomount/lomount$ > diff --git a/README b/README > index 9f6c9f5..8689ce1 100644 > --- a/README > +++ b/README > @@ -51,7 +51,7 @@ provided by your OS distributor: > * Development install of uuid (e.g. uuid-dev) > * Development install of yajl (e.g. libyajl-dev) > * Development install of libaio (e.g. libaio-dev) version 0.3.107 or > - greater. Set CONFIG_SYSTEM_LIBAIO in .config if this is not available. > + greater. > * Development install of GLib v2.0 (e.g. libglib2.0-dev) > * Development install of Pixman (e.g. libpixman-1-dev) > * pkg-config > diff --git a/config/Tools.mk.in b/config/Tools.mk.in > index ef41c2a..bb3acbd 100644 > --- a/config/Tools.mk.in > +++ b/config/Tools.mk.in > @@ -55,7 +55,6 @@ CONFIG_SEABIOS := @seabios@ > CONFIG_XEND := @xend@ > > #System options > -CONFIG_SYSTEM_LIBAIO:= @system_aio@ > ZLIB := @zlib@ > CONFIG_LIBICONV := @libiconv@ > CONFIG_GCRYPT := @libgcrypt@ > diff --git a/tools/Makefile b/tools/Makefile > index e44a3e9..51d2336 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -1,10 +1,6 @@ > XEN_ROOT = $(CURDIR)/.. > include $(XEN_ROOT)/tools/Rules.mk > > -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) > -SUBDIRS-libaio := libaio > -endif > - > SUBDIRS-y := > SUBDIRS-y += include > SUBDIRS-y += libxc > @@ -19,13 +15,11 @@ SUBDIRS-$(CONFIG_X86) += firmware > SUBDIRS-y += console > SUBDIRS-y += xenmon > SUBDIRS-y += xenstat > -SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > SUBDIRS-$(CONFIG_Linux) += memshr > ifeq ($(CONFIG_X86),y) > SUBDIRS-$(CONFIG_Linux) += blktap > endif > SUBDIRS-$(CONFIG_Linux) += blktap2 > -SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) > SUBDIRS-$(CONFIG_NetBSD) += blktap2 > SUBDIRS-$(CONFIG_NetBSD) += xenbackendd > SUBDIRS-y += libfsimage > diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile > index 941592e..7461a95 100644 > --- a/tools/blktap/drivers/Makefile > +++ b/tools/blktap/drivers/Makefile > @@ -27,13 +27,7 @@ CFLAGS += -I $(MEMSHR_DIR) > MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a > endif > > -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) > -LIBAIO_DIR = ../../libaio/src > -CFLAGS += -I $(LIBAIO_DIR) > -AIOLIBS := $(LIBAIO_DIR)/libaio.a > -else > AIOLIBS := -laio > -endif > > CFLAGS += $(PTHREAD_CFLAGS) > LDFLAGS += $(PTHREAD_LDFLAGS) > diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile > index f47abb3..5c6ab6a 100644 > --- a/tools/blktap2/drivers/Makefile > +++ b/tools/blktap2/drivers/Makefile > @@ -28,14 +28,7 @@ REMUS-OBJS += hashtable.o > REMUS-OBJS += hashtable_itr.o > REMUS-OBJS += hashtable_utility.o > > -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) > -CFLAGS += -I $(LIBAIO_DIR) > -LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src > -tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := $(LIBAIO_DIR)/libaio.a > -tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS += -I$(LIBAIO_DIR) > -else > tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := -laio > -endif > > MEMSHRLIBS := > ifeq ($(CONFIG_Linux), __fixme__) > diff --git a/tools/config.h.in b/tools/config.h.in > index a67910b..8bda0bd 100644 > --- a/tools/config.h.in > +++ b/tools/config.h.in > @@ -3,6 +3,9 @@ > /* Define to 1 if you have the <inttypes.h> header file. */ > #undef HAVE_INTTYPES_H > > +/* Define to 1 if you have the `aio' library (-laio). */ > +#undef HAVE_LIBAIO > + > /* Define to 1 if you have the `crypto' library (-lcrypto). */ > #undef HAVE_LIBCRYPTO > > diff --git a/tools/configure b/tools/configure > index 6e2f758..b52dd2a 100755 > --- a/tools/configure > +++ b/tools/configure > @@ -7375,9 +7375,14 @@ fi > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aio_io_setup" >&5 > $as_echo "$ac_cv_lib_aio_io_setup" >&6; } > if test "x$ac_cv_lib_aio_io_setup" = x""yes; then : > - system_aio="y" > + cat >>confdefs.h <<_ACEOF > +#define HAVE_LIBAIO 1 > +_ACEOF > + > + LIBS="-laio $LIBS" > + > else > - system_aio="n" > + as_fn_error $? "Could not find libaio" "$LINENO" 5 > fi > > > diff --git a/tools/configure.ac b/tools/configure.ac > index d6eba44..f629318 100644 > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -155,7 +155,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ > AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) > ]) > AC_SUBST(zlib) > -AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) > +AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) > AC_SUBST(system_aio) > AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) > AX_CHECK_EXTFS > diff --git a/tools/libaio/COPYING b/tools/libaio/COPYING > deleted file mode 100644 > index c4792dd..0000000 > --- a/tools/libaio/COPYING > +++ /dev/null > @@ -1,515 +0,0 @@ > - > - GNU LESSER GENERAL PUBLIC LICENSE > - Version 2.1, February 1999 > - > - Copyright (C) 1991, 1999 Free Software Foundation, Inc. > - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - Everyone is permitted to copy and distribute verbatim copies > - of this license document, but changing it is not allowed. > - > -[This is the first released version of the Lesser GPL. It also counts > - as the successor of the GNU Library Public License, version 2, hence > - the version number 2.1.] > - > - Preamble > - > - The licenses for most software are designed to take away your > -freedom to share and change it. By contrast, the GNU General Public > -Licenses are intended to guarantee your freedom to share and change > -free software--to make sure the software is free for all its users. > - > - This license, the Lesser General Public License, applies to some > -specially designated software packages--typically libraries--of the > -Free Software Foundation and other authors who decide to use it. You > -can use it too, but we suggest you first think carefully about whether > -this license or the ordinary General Public License is the better > -strategy to use in any particular case, based on the explanations > -below. > - > - When we speak of free software, we are referring to freedom of use, > -not price. Our General Public Licenses are designed to make sure that > -you have the freedom to distribute copies of free software (and charge > -for this service if you wish); that you receive source code or can get > -it if you want it; that you can change the software and use pieces of > -it in new free programs; and that you are informed that you can do > -these things. > - > - To protect your rights, we need to make restrictions that forbid > -distributors to deny you these rights or to ask you to surrender these > -rights. These restrictions translate to certain responsibilities for > -you if you distribute copies of the library or if you modify it. > - > - For example, if you distribute copies of the library, whether gratis > -or for a fee, you must give the recipients all the rights that we gave > -you. You must make sure that they, too, receive or can get the source > -code. If you link other code with the library, you must provide > -complete object files to the recipients, so that they can relink them > -with the library after making changes to the library and recompiling > -it. And you must show them these terms so they know their rights. > - > - We protect your rights with a two-step method: (1) we copyright the > -library, and (2) we offer you this license, which gives you legal > -permission to copy, distribute and/or modify the library. > - > - To protect each distributor, we want to make it very clear that > -there is no warranty for the free library. Also, if the library is > -modified by someone else and passed on, the recipients should know > -that what they have is not the original version, so that the original > -author's reputation will not be affected by problems that might be > -introduced by others. > -^L > - Finally, software patents pose a constant threat to the existence of > -any free program. We wish to make sure that a company cannot > -effectively restrict the users of a free program by obtaining a > -restrictive license from a patent holder. Therefore, we insist that > -any patent license obtained for a version of the library must be > -consistent with the full freedom of use specified in this license. > - > - Most GNU software, including some libraries, is covered by the > -ordinary GNU General Public License. This license, the GNU Lesser > -General Public License, applies to certain designated libraries, and > -is quite different from the ordinary General Public License. We use > -this license for certain libraries in order to permit linking those > -libraries into non-free programs. > - > - When a program is linked with a library, whether statically or using > -a shared library, the combination of the two is legally speaking a > -combined work, a derivative of the original library. The ordinary > -General Public License therefore permits such linking only if the > -entire combination fits its criteria of freedom. The Lesser General > -Public License permits more lax criteria for linking other code with > -the library. > - > - We call this license the "Lesser" General Public License because it > -does Less to protect the user's freedom than the ordinary General > -Public License. It also provides other free software developers Less > -of an advantage over competing non-free programs. These disadvantages > -are the reason we use the ordinary General Public License for many > -libraries. However, the Lesser license provides advantages in certain > -special circumstances. > - > - For example, on rare occasions, there may be a special need to > -encourage the widest possible use of a certain library, so that it > -becomes > -a de-facto standard. To achieve this, non-free programs must be > -allowed to use the library. A more frequent case is that a free > -library does the same job as widely used non-free libraries. In this > -case, there is little to gain by limiting the free library to free > -software only, so we use the Lesser General Public License. > - > - In other cases, permission to use a particular library in non-free > -programs enables a greater number of people to use a large body of > -free software. For example, permission to use the GNU C Library in > -non-free programs enables many more people to use the whole GNU > -operating system, as well as its variant, the GNU/Linux operating > -system. > - > - Although the Lesser General Public License is Less protective of the > -users' freedom, it does ensure that the user of a program that is > -linked with the Library has the freedom and the wherewithal to run > -that program using a modified version of the Library. > - > - The precise terms and conditions for copying, distribution and > -modification follow. Pay close attention to the difference between a > -"work based on the library" and a "work that uses the library". The > -former contains code derived from the library, whereas the latter must > -be combined with the library in order to run. > -^L > - GNU LESSER GENERAL PUBLIC LICENSE > - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION > - > - 0. This License Agreement applies to any software library or other > -program which contains a notice placed by the copyright holder or > -other authorized party saying it may be distributed under the terms of > -this Lesser General Public License (also called "this License"). > -Each licensee is addressed as "you". > - > - A "library" means a collection of software functions and/or data > -prepared so as to be conveniently linked with application programs > -(which use some of those functions and data) to form executables. > - > - The "Library", below, refers to any such software library or work > -which has been distributed under these terms. A "work based on the > -Library" means either the Library or any derivative work under > -copyright law: that is to say, a work containing the Library or a > -portion of it, either verbatim or with modifications and/or translated > -straightforwardly into another language. (Hereinafter, translation is > -included without limitation in the term "modification".) > - > - "Source code" for a work means the preferred form of the work for > -making modifications to it. For a library, complete source code means > -all the source code for all modules it contains, plus any associated > -interface definition files, plus the scripts used to control > -compilation > -and installation of the library. > - > - Activities other than copying, distribution and modification are not > -covered by this License; they are outside its scope. The act of > -running a program using the Library is not restricted, and output from > -such a program is covered only if its contents constitute a work based > -on the Library (independent of the use of the Library in a tool for > -writing it). Whether that is true depends on what the Library does > -and what the program that uses the Library does. > - > - 1. You may copy and distribute verbatim copies of the Library's > -complete source code as you receive it, in any medium, provided that > -you conspicuously and appropriately publish on each copy an > -appropriate copyright notice and disclaimer of warranty; keep intact > -all the notices that refer to this License and to the absence of any > -warranty; and distribute a copy of this License along with the > -Library. > - > - You may charge a fee for the physical act of transferring a copy, > -and you may at your option offer warranty protection in exchange for a > -fee. > -\f > - 2. You may modify your copy or copies of the Library or any portion > -of it, thus forming a work based on the Library, and copy and > -distribute such modifications or work under the terms of Section 1 > -above, provided that you also meet all of these conditions: > - > - a) The modified work must itself be a software library. > - > - b) You must cause the files modified to carry prominent notices > - stating that you changed the files and the date of any change. > - > - c) You must cause the whole of the work to be licensed at no > - charge to all third parties under the terms of this License. > - > - d) If a facility in the modified Library refers to a function or a > - table of data to be supplied by an application program that uses > - the facility, other than as an argument passed when the facility > - is invoked, then you must make a good faith effort to ensure that, > - in the event an application does not supply such function or > - table, the facility still operates, and performs whatever part of > - its purpose remains meaningful. > - > - (For example, a function in a library to compute square roots has > - a purpose that is entirely well-defined independent of the > - application. Therefore, Subsection 2d requires that any > - application-supplied function or table used by this function must > - be optional: if the application does not supply it, the square > - root function must still compute square roots.) > - > -These requirements apply to the modified work as a whole. If > -identifiable sections of that work are not derived from the Library, > -and can be reasonably considered independent and separate works in > -themselves, then this License, and its terms, do not apply to those > -sections when you distribute them as separate works. But when you > -distribute the same sections as part of a whole which is a work based > -on the Library, the distribution of the whole must be on the terms of > -this License, whose permissions for other licensees extend to the > -entire whole, and thus to each and every part regardless of who wrote > -it. > - > -Thus, it is not the intent of this section to claim rights or contest > -your rights to work written entirely by you; rather, the intent is to > -exercise the right to control the distribution of derivative or > -collective works based on the Library. > - > -In addition, mere aggregation of another work not based on the Library > -with the Library (or with a work based on the Library) on a volume of > -a storage or distribution medium does not bring the other work under > -the scope of this License. > - > - 3. You may opt to apply the terms of the ordinary GNU General Public > -License instead of this License to a given copy of the Library. To do > -this, you must alter all the notices that refer to this License, so > -that they refer to the ordinary GNU General Public License, version 2, > -instead of to this License. (If a newer version than version 2 of the > -ordinary GNU General Public License has appeared, then you can specify > -that version instead if you wish.) Do not make any other change in > -these notices. > -^L > - Once this change is made in a given copy, it is irreversible for > -that copy, so the ordinary GNU General Public License applies to all > -subsequent copies and derivative works made from that copy. > - > - This option is useful when you wish to copy part of the code of > -the Library into a program that is not a library. > - > - 4. You may copy and distribute the Library (or a portion or > -derivative of it, under Section 2) in object code or executable form > -under the terms of Sections 1 and 2 above provided that you accompany > -it with the complete corresponding machine-readable source code, which > -must be distributed under the terms of Sections 1 and 2 above on a > -medium customarily used for software interchange. > - > - If distribution of object code is made by offering access to copy > -from a designated place, then offering equivalent access to copy the > -source code from the same place satisfies the requirement to > -distribute the source code, even though third parties are not > -compelled to copy the source along with the object code. > - > - 5. A program that contains no derivative of any portion of the > -Library, but is designed to work with the Library by being compiled or > -linked with it, is called a "work that uses the Library". Such a > -work, in isolation, is not a derivative work of the Library, and > -therefore falls outside the scope of this License. > - > - However, linking a "work that uses the Library" with the Library > -creates an executable that is a derivative of the Library (because it > -contains portions of the Library), rather than a "work that uses the > -library". The executable is therefore covered by this License. > -Section 6 states terms for distribution of such executables. > - > - When a "work that uses the Library" uses material from a header file > -that is part of the Library, the object code for the work may be a > -derivative work of the Library even though the source code is not. > -Whether this is true is especially significant if the work can be > -linked without the Library, or if the work is itself a library. The > -threshold for this to be true is not precisely defined by law. > - > - If such an object file uses only numerical parameters, data > -structure layouts and accessors, and small macros and small inline > -functions (ten lines or less in length), then the use of the object > -file is unrestricted, regardless of whether it is legally a derivative > -work. (Executables containing this object code plus portions of the > -Library will still fall under Section 6.) > - > - Otherwise, if the work is a derivative of the Library, you may > -distribute the object code for the work under the terms of Section 6. > -Any executables containing that work also fall under Section 6, > -whether or not they are linked directly with the Library itself. > -^L > - 6. As an exception to the Sections above, you may also combine or > -link a "work that uses the Library" with the Library to produce a > -work containing portions of the Library, and distribute that work > -under terms of your choice, provided that the terms permit > -modification of the work for the customer's own use and reverse > -engineering for debugging such modifications. > - > - You must give prominent notice with each copy of the work that the > -Library is used in it and that the Library and its use are covered by > -this License. You must supply a copy of this License. If the work > -during execution displays copyright notices, you must include the > -copyright notice for the Library among them, as well as a reference > -directing the user to the copy of this License. Also, you must do one > -of these things: > - > - a) Accompany the work with the complete corresponding > - machine-readable source code for the Library including whatever > - changes were used in the work (which must be distributed under > - Sections 1 and 2 above); and, if the work is an executable linked > - with the Library, with the complete machine-readable "work that > - uses the Library", as object code and/or source code, so that the > - user can modify the Library and then relink to produce a modified > - executable containing the modified Library. (It is understood > - that the user who changes the contents of definitions files in the > - Library will not necessarily be able to recompile the application > - to use the modified definitions.) > - > - b) Use a suitable shared library mechanism for linking with the > - Library. A suitable mechanism is one that (1) uses at run time a > - copy of the library already present on the user's computer system, > - rather than copying library functions into the executable, and (2) > - will operate properly with a modified version of the library, if > - the user installs one, as long as the modified version is > - interface-compatible with the version that the work was made with. > - > - c) Accompany the work with a written offer, valid for at > - least three years, to give the same user the materials > - specified in Subsection 6a, above, for a charge no more > - than the cost of performing this distribution. > - > - d) If distribution of the work is made by offering access to copy > - from a designated place, offer equivalent access to copy the above > - specified materials from the same place. > - > - e) Verify that the user has already received a copy of these > - materials or that you have already sent this user a copy. > - > - For an executable, the required form of the "work that uses the > -Library" must include any data and utility programs needed for > -reproducing the executable from it. However, as a special exception, > -the materials to be distributed need not include anything that is > -normally distributed (in either source or binary form) with the major > -components (compiler, kernel, and so on) of the operating system on > -which the executable runs, unless that component itself accompanies > -the executable. > - > - It may happen that this requirement contradicts the license > -restrictions of other proprietary libraries that do not normally > -accompany the operating system. Such a contradiction means you cannot > -use both them and the Library together in an executable that you > -distribute. > -^L > - 7. You may place library facilities that are a work based on the > -Library side-by-side in a single library together with other library > -facilities not covered by this License, and distribute such a combined > -library, provided that the separate distribution of the work based on > -the Library and of the other library facilities is otherwise > -permitted, and provided that you do these two things: > - > - a) Accompany the combined library with a copy of the same work > - based on the Library, uncombined with any other library > - facilities. This must be distributed under the terms of the > - Sections above. > - > - b) Give prominent notice with the combined library of the fact > - that part of it is a work based on the Library, and explaining > - where to find the accompanying uncombined form of the same work. > - > - 8. You may not copy, modify, sublicense, link with, or distribute > -the Library except as expressly provided under this License. Any > -attempt otherwise to copy, modify, sublicense, link with, or > -distribute the Library is void, and will automatically terminate your > -rights under this License. However, parties who have received copies, > -or rights, from you under this License will not have their licenses > -terminated so long as such parties remain in full compliance. > - > - 9. You are not required to accept this License, since you have not > -signed it. However, nothing else grants you permission to modify or > -distribute the Library or its derivative works. These actions are > -prohibited by law if you do not accept this License. Therefore, by > -modifying or distributing the Library (or any work based on the > -Library), you indicate your acceptance of this License to do so, and > -all its terms and conditions for copying, distributing or modifying > -the Library or works based on it. > - > - 10. Each time you redistribute the Library (or any work based on the > -Library), the recipient automatically receives a license from the > -original licensor to copy, distribute, link with or modify the Library > -subject to these terms and conditions. You may not impose any further > -restrictions on the recipients' exercise of the rights granted herein. > -You are not responsible for enforcing compliance by third parties with > -this License. > -^L > - 11. If, as a consequence of a court judgment or allegation of patent > -infringement or for any other reason (not limited to patent issues), > -conditions are imposed on you (whether by court order, agreement or > -otherwise) that contradict the conditions of this License, they do not > -excuse you from the conditions of this License. If you cannot > -distribute so as to satisfy simultaneously your obligations under this > -License and any other pertinent obligations, then as a consequence you > -may not distribute the Library at all. For example, if a patent > -license would not permit royalty-free redistribution of the Library by > -all those who receive copies directly or indirectly through you, then > -the only way you could satisfy both it and this License would be to > -refrain entirely from distribution of the Library. > - > -If any portion of this section is held invalid or unenforceable under > -any particular circumstance, the balance of the section is intended to > -apply, and the section as a whole is intended to apply in other > -circumstances. > - > -It is not the purpose of this section to induce you to infringe any > -patents or other property right claims or to contest validity of any > -such claims; this section has the sole purpose of protecting the > -integrity of the free software distribution system which is > -implemented by public license practices. Many people have made > -generous contributions to the wide range of software distributed > -through that system in reliance on consistent application of that > -system; it is up to the author/donor to decide if he or she is willing > -to distribute software through any other system and a licensee cannot > -impose that choice. > - > -This section is intended to make thoroughly clear what is believed to > -be a consequence of the rest of this License. > - > - 12. If the distribution and/or use of the Library is restricted in > -certain countries either by patents or by copyrighted interfaces, the > -original copyright holder who places the Library under this License > -may add an explicit geographical distribution limitation excluding those > -countries, so that distribution is permitted only in or among > -countries not thus excluded. In such case, this License incorporates > -the limitation as if written in the body of this License. > - > - 13. The Free Software Foundation may publish revised and/or new > -versions of the Lesser General Public License from time to time. > -Such new versions will be similar in spirit to the present version, > -but may differ in detail to address new problems or concerns. > - > -Each version is given a distinguishing version number. If the Library > -specifies a version number of this License which applies to it and > -"any later version", you have the option of following the terms and > -conditions either of that version or of any later version published by > -the Free Software Foundation. If the Library does not specify a > -license version number, you may choose any version ever published by > -the Free Software Foundation. > -^L > - 14. If you wish to incorporate parts of the Library into other free > -programs whose distribution conditions are incompatible with these, > -write to the author to ask for permission. For software which is > -copyrighted by the Free Software Foundation, write to the Free > -Software Foundation; we sometimes make exceptions for this. Our > -decision will be guided by the two goals of preserving the free status > -of all derivatives of our free software and of promoting the sharing > -and reuse of software generally. > - > - NO WARRANTY > - > - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO > -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. > -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR > -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY > -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE > -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE > -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME > -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. > - > - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN > -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY > -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU > -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR > -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE > -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING > -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A > -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF > -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH > -DAMAGES. > - > - END OF TERMS AND CONDITIONS > -^L > - How to Apply These Terms to Your New Libraries > - > - If you develop a new library, and you want it to be of the greatest > -possible use to the public, we recommend making it free software that > -everyone can redistribute and change. You can do so by permitting > -redistribution under these terms (or, alternatively, under the terms > -of the ordinary General Public License). > - > - To apply these terms, attach the following notices to the library. > -It is safest to attach them to the start of each source file to most > -effectively convey the exclusion of warranty; and each file should > -have at least the "copyright" line and a pointer to where the full > -notice is found. > - > - > - <one line to give the library's name and a brief idea of what it > -does.> > - Copyright (C) <year> <name of author> > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - > -Also add information on how to contact you by electronic and paper > -mail. > - > -You should also get your employer (if you work as a programmer) or > -your > -school, if any, to sign a "copyright disclaimer" for the library, if > -necessary. Here is a sample; alter the names: > - > - Yoyodyne, Inc., hereby disclaims all copyright interest in the > - library `Frob' (a library for tweaking knobs) written by James > -Random Hacker. > - > - <signature of Ty Coon>, 1 April 1990 > - Ty Coon, President of Vice > - > -That's all there is to it! > - > - > diff --git a/tools/libaio/ChangeLog b/tools/libaio/ChangeLog > deleted file mode 100644 > index ddcf6e3..0000000 > --- a/tools/libaio/ChangeLog > +++ /dev/null > @@ -1,43 +0,0 @@ > -0.4.0 > - - remove libredhat-kernel > - - add rough outline for man pages > - - make the compiled io_getevents() add the extra parameter and > - pass the timeout for updating as per 2.5 > - - fixes for ia64, now works > - - fixes for x86-64 > - - powerpc support from Gianni Tedesco <gianni@ecsc.co.uk> > - - disable the NULL check in harness/cases/4.t on ia64: ia64 > - maps the 0 page and causes this check to fail. > - > -0.3.15 > - - use real syscall interface, but don't break source compatibility > - yet (that will happen with 0.4.0) > - > -0.3.13 > - - add test cases > - > -0.3.11 > - - use library versioning of libredhat-kernel to always provide a > - fallback > - > -0.3.9 > - - add io_queue_release function > - > -0.3.8 > - - make clean deletes libredhat-kernel.so.1 > - - const struct timespec * > - - add make srpm target > - > -0.3.7 > - - fix assembly function .types > - - export io_getevents > - - fix io_submit function prototype to match the kernel > - - provide /usr/lib/libredhat-kernel.so link for compilation > - (do NOT link against libredhat-kernel.so directly) > - - fix soname to libaio.so.1 > - - fix dummy libredhat-kernel's soname > - - work around nfs bug > - - provide and install libredhat-kernel.so.1 stub > - - Makefile improvements > - - make sure dummy libredhat-kernel.so only returns -ENOSYS > - > diff --git a/tools/libaio/INSTALL b/tools/libaio/INSTALL > deleted file mode 100644 > index 29b9077..0000000 > --- a/tools/libaio/INSTALL > +++ /dev/null > @@ -1,18 +0,0 @@ > -To install the library, execute the command: > - > - make prefix=`pwd`/usr install > - > -which will install the binaries and header files into the directory > -usr. Set prefix=/usr to get them installed into the main system. > - > -Please note: Do not attempt to install on the system the > -"libredhat-kernel.so" file. It is a dummy shared library > -provided only for the purpose of being able to bootstrap > -this facility while running on systems without the correct > -libredhat-kernel.so built. The contents of the included > -libredhat-kernel.so are only stubs; this library is NOT > -functional for anything except the internal purpose of > -linking libaio.so against the provided stubs. At runtime, > -libaio.so requires a real libredhat-kernel.so library; this > -is provided by the Red Hat kernel RPM packages with async > -I/O functionality. > diff --git a/tools/libaio/Makefile b/tools/libaio/Makefile > deleted file mode 100644 > index 7f5c344..0000000 > --- a/tools/libaio/Makefile > +++ /dev/null > @@ -1,40 +0,0 @@ > -NAME=libaio > -SPECFILE=$(NAME).spec > -VERSION=$(shell awk '/Version:/ { print $$2 }' $(SPECFILE)) > -RELEASE=$(shell awk '/Release:/ { print $$2 }' $(SPECFILE)) > -CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE)) > -RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm") > - > -prefix=/usr > -includedir=$(prefix)/include > -libdir=$(prefix)/lib > - > -default: all > - > -all: > - @$(MAKE) -C src > - > -install: all > - > -clean: > - @$(MAKE) -C src clean > - @$(MAKE) -C harness clean > - > -tag-archive: > - @cvs -Q tag -F $(CVSTAG) > - > -create-archive: tag-archive > - @rm -rf /tmp/$(NAME) > - @cd /tmp && cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(NAME) || echo GRRRrrrrr -- ignore [export aborted] > - @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) > - @cd /tmp && tar czSpf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) > - @rm -rf /tmp/$(NAME)-$(VERSION) > - @cp /tmp/$(NAME)-$(VERSION).tar.gz . > - @rm -f /tmp/$(NAME)-$(VERSION).tar.gz > - @echo " " > - @echo "The final archive is ./$(NAME)-$(VERSION).tar.gz." > - > -archive: clean tag-archive create-archive > - > -srpm: create-archive > - $(RPMBUILD) --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" --nodeps -bs $(SPECFILE) > diff --git a/tools/libaio/TODO b/tools/libaio/TODO > deleted file mode 100644 > index 0a9ac15..0000000 > --- a/tools/libaio/TODO > +++ /dev/null > @@ -1,4 +0,0 @@ > -- Write man pages. > -- Make -static links against libaio work. > -- Fallback on userspace if the kernel calls return -ENOSYS. > - > diff --git a/tools/libaio/harness/Makefile b/tools/libaio/harness/Makefile > deleted file mode 100644 > index d2483fd..0000000 > --- a/tools/libaio/harness/Makefile > +++ /dev/null > @@ -1,37 +0,0 @@ > -# foo. > -TEST_SRCS:=$(shell find cases/ -name \*.t | sort -n -t/ -k2) > -PROGS:=$(patsubst %.t,%.p,$(TEST_SRCS)) > -HARNESS_SRCS:=main.c > -# io_queue.c > - > -CFLAGS=-Wall -Werror -g -O -laio > -#-lpthread -lrt > - > -all: $(PROGS) > - > -$(PROGS): %.p: %.t $(HARNESS_SRCS) > - $(CC) $(CFLAGS) -DTEST_NAME=\"$<\" -o $@ main.c > - > -clean: > - rm -f $(PROGS) *.o runtests.out rofile wofile rwfile > - > -.PHONY: > - > -testdir/rofile: .PHONY > - rm -f $@ > - echo "test" >$@ > - chmod 400 $@ > - > -testdir/wofile: .PHONY > - rm -f $@ > - echo "test" >$@ > - chmod 200 $@ > - > -testdir/rwfile: .PHONY > - rm -f $@ > - echo "test" >$@ > - chmod 600 $@ > - > -check: $(PROGS) testdir/rofile testdir/rwfile testdir/wofile > - ./runtests.sh $(PROGS) > - > diff --git a/tools/libaio/harness/README b/tools/libaio/harness/README > deleted file mode 100644 > index 5557370..0000000 > --- a/tools/libaio/harness/README > +++ /dev/null > @@ -1,19 +0,0 @@ > -Notes on running this test suite: > - > -To run the test suite, run "make check". All test cases should pass > -and there should be 0 fails. > - > -Several of the test cases require a directory on the filesystem under > -test for the creation of test files, as well as the generation of > -error conditions. The test cases assume the directories (or symlinks > -to directories) are as follows: > - > - testdir/ > - - used for general read/write test cases. Must have at > - least as much free space as the machine has RAM (up > - to 768MB). > - testdir.enospc/ > - - a filesystem that has space for writing 8KB out, but > - fails with -ENOSPC beyond 8KB. > - testdir.ext2/ > - - must be an ext2 filesystem. > diff --git a/tools/libaio/harness/attic/0.t b/tools/libaio/harness/attic/0.t > deleted file mode 100644 > index 033e62c..0000000 > --- a/tools/libaio/harness/attic/0.t > +++ /dev/null > @@ -1,9 +0,0 @@ > -/* 0.t > - Test harness check: okay. > -*/ > -int test_main(void) > -{ > - printf("test_main: okay\n"); > - return 0; > -} > - > diff --git a/tools/libaio/harness/attic/1.t b/tools/libaio/harness/attic/1.t > deleted file mode 100644 > index 799ffd1..0000000 > --- a/tools/libaio/harness/attic/1.t > +++ /dev/null > @@ -1,9 +0,0 @@ > -/* 1.t > - Test harness check: fail. > -*/ > -int test_main(void) > -{ > - printf("test_main: fail\n"); > - return 1; > -} > - > diff --git a/tools/libaio/harness/cases/10.t b/tools/libaio/harness/cases/10.t > deleted file mode 100644 > index 9d3beb2..0000000 > --- a/tools/libaio/harness/cases/10.t > +++ /dev/null > @@ -1,53 +0,0 @@ > -/* 10.t - uses testdir.enospc/rwfile > -- Check results on out-of-space and out-of-quota. (10.t) > - - write that fills filesystem but does not go over should succeed > - - write that fills filesystem and goes over should be partial > - - write to full filesystem should return -ENOSPC > - - read beyond end of file after ENOSPC should return 0 > -*/ > -#include "aio_setup.h" > - > -#include <sys/time.h> > -#include <sys/resource.h> > -#include <unistd.h> > - > -int test_main(void) > -{ > -/* Note: changing either of these requires updating the ext2-enospc.img > - * filesystem image. Also, if SIZE is less than PAGE_SIZE, problems > - * crop up due to ext2's preallocation. > - */ > -#define LIMIT 65536 > -#define SIZE 65536 > - char *buf; > - int rwfd; > - int status = 0, res; > - > - rwfd = open("testdir.enospc/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); > - assert(rwfd != -1); > - res = ftruncate(rwfd, 0); assert(res == 0); > - buf = malloc(SIZE); assert(buf != NULL); > - memset(buf, 0, SIZE); > - > - > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT-SIZE, WRITE, SIZE); > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT-SIZE, READ, SIZE); > - > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, WRITE, -ENOSPC); > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); > - > - res = ftruncate(rwfd, 0); assert(res == 0); > - > - status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE, WRITE, SIZE-1); > - status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE, READ, SIZE-1); > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); > - > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, WRITE, -ENOSPC); > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); > - status |= attempt_rw(rwfd, buf, 0, LIMIT, WRITE, 0); > - > - res = close(rwfd); assert(res == 0); > - res = unlink("testdir.enospc/rwfile"); assert(res == 0); > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/11.t b/tools/libaio/harness/cases/11.t > deleted file mode 100644 > index efcf6d4..0000000 > --- a/tools/libaio/harness/cases/11.t > +++ /dev/null > @@ -1,39 +0,0 @@ > -/* 11.t - uses testdir/rwfile > -- repeated read / write of same page (to check accounting) (11.t) > -*/ > -#include "aio_setup.h" > - > -#include <sys/time.h> > -#include <sys/resource.h> > -#include <unistd.h> > - > -int test_main(void) > -{ > -#define COUNT 1000000 > -#define SIZE 256 > - char *buf; > - int rwfd; > - int status = 0; > - int i; > - > - rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); > - assert(rwfd != -1); > - buf = malloc(SIZE); assert(buf != NULL); > - memset(buf, 0, SIZE); > - > - for (i=0; i<COUNT; i++) { > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE_SILENT, SIZE); > - if (status) > - break; > - } > - printf("completed %d out of %d writes\n", i, COUNT); > - for (i=0; i<COUNT; i++) { > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ_SILENT, SIZE); > - if (status) > - break; > - } > - printf("completed %d out of %d reads\n", i, COUNT); > - > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/12.t b/tools/libaio/harness/cases/12.t > deleted file mode 100644 > index 3499204..0000000 > --- a/tools/libaio/harness/cases/12.t > +++ /dev/null > @@ -1,49 +0,0 @@ > -/* 12.t > -- ioctx access across fork() (12.t) > - */ > -#include <sys/types.h> > -#include <sys/wait.h> > -#include <unistd.h> > -#include <signal.h> > - > -#include "aio_setup.h" > - > -void test_child(void) > -{ > - int res; > - res = attempt_io_submit(io_ctx, 0, NULL, -EINVAL); > - fflush(stdout); > - _exit(res); > -} > - > -int test_main(void) > -{ > - int res, status; > - pid_t pid; > - > - if (attempt_io_submit(io_ctx, 0, NULL, 0)) > - return 1; > - > - sigblock(sigmask(SIGCHLD) | siggetmask()); > - fflush(NULL); > - pid = fork(); assert(pid != -1); > - > - if (pid == 0) > - test_child(); > - > - res = waitpid(pid, &status, 0); > - > - if (WIFEXITED(status)) { > - int failed = (WEXITSTATUS(status) != 0); > - printf("child exited with status %d%s\n", WEXITSTATUS(status), > - failed ? " -- FAILED" : ""); > - return failed; > - } > - > - /* anything else: failed */ > - if (WIFSIGNALED(status)) > - printf("child killed by signal %d -- FAILED.\n", > - WTERMSIG(status)); > - > - return 1; > -} > diff --git a/tools/libaio/harness/cases/13.t b/tools/libaio/harness/cases/13.t > deleted file mode 100644 > index 5f18005..0000000 > --- a/tools/libaio/harness/cases/13.t > +++ /dev/null > @@ -1,66 +0,0 @@ > -/* 13.t - uses testdir/rwfile > -- Submit multiple writes larger than aio-max-size (deadlocks on older > - aio code) > -*/ > -#include "aio_setup.h" > - > -#include <sys/time.h> > -#include <sys/resource.h> > -#include <unistd.h> > - > -int test_main(void) > -{ > -#define SIZE (1024 * 1024) > -#define IOS 8 > - struct iocb iocbs[IOS]; > - struct iocb *iocb_list[IOS]; > - char *bufs[IOS]; > - int rwfd; > - int status = 0, res; > - int i; > - > - rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); > - assert(rwfd != -1); > - res = ftruncate(rwfd, 0); assert(res == 0); > - > - for (i=0; i<IOS; i++) { > - bufs[i] = malloc(SIZE); > - assert(bufs[i] != NULL); > - memset(bufs[i], 0, SIZE); > - > - io_prep_pwrite(&iocbs[i], rwfd, bufs[i], SIZE, i * SIZE); > - iocb_list[i] = &iocbs[i]; > - } > - > - status |= attempt_io_submit(io_ctx, IOS, iocb_list, IOS); > - > - for (i=0; i<IOS; i++) { > - struct timespec ts = { tv_sec: 30, tv_nsec: 0 }; > - struct io_event event; > - struct iocb *iocb; > - > - res = io_getevents(io_ctx, 0, 1, &event, &ts); > - if (res != 1) { > - status |= 1; > - printf("io_getevents failed [%d] with res=%d [%s]\n", > - i, res, (res < 0) ? strerror(-res) : "okay"); > - break; > - } > - > - if (event.res != SIZE) > - status |= 1; > - > - iocb = (void *)event.obj; > - printf("event[%d]: write[%d] %s, returned: %ld [%s]\n", > - i, (int)(iocb - &iocbs[0]), > - (event.res != SIZE) ? "failed" : "okay", > - (long)event.res, > - (event.res < 0) ? strerror(-event.res) : "okay" > - ); > - } > - > - res = ftruncate(rwfd, 0); assert(res == 0); > - res = close(rwfd); assert(res == 0); > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/14.t b/tools/libaio/harness/cases/14.t > deleted file mode 100644 > index 514622b..0000000 > --- a/tools/libaio/harness/cases/14.t > +++ /dev/null > @@ -1,90 +0,0 @@ > -#include <sys/types.h> > -#include <sys/wait.h> > -#include <unistd.h> > -#include <signal.h> > - > -#include "aio_setup.h" > -#include <sys/mman.h> > - > -#define SIZE 768*1024*1024 > - > -//just submit an I/O > - > -int test_child(void) > -{ > - char *buf; > - int rwfd; > - int res; > - long size; > - struct iocb iocb; > - struct iocb *iocbs[] = { &iocb }; > - int loop = 10; > - int i; > - > - aio_setup(1024); > - > - size = SIZE; > - > - printf("size = %ld\n", size); > - > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != > --1); > - res = ftruncate(rwfd, 0); assert(res == 0); > - buf = malloc(size); assert(buf != > -NULL); > - > - for(i=0;i<loop;i++) { > - > - switch(i%2) { > - case 0: > - io_prep_pwrite(&iocb, rwfd, buf, size, 0); > - break; > - case 1: > - io_prep_pread(&iocb, rwfd, buf, size, 0); > - } > - > - res = io_submit(io_ctx, 1, iocbs); > - if (res != 1) { > - printf("child: submit: io_submit res=%d [%s]\n", res, > -strerror(-res)); > - _exit(1); > - } > - } > - > - res = ftruncate(rwfd, 0); assert(res == 0); > - > - _exit(0); > -} > - > -/* from 12.t */ > -int test_main(void) > -{ > - int res, status; > - pid_t pid; > - > - if (attempt_io_submit(io_ctx, 0, NULL, 0)) > - return 1; > - > - sigblock(sigmask(SIGCHLD) | siggetmask()); > - fflush(NULL); > - pid = fork(); assert(pid != -1); > - > - if (pid == 0) > - test_child(); > - > - res = waitpid(pid, &status, 0); > - > - if (WIFEXITED(status)) { > - int failed = (WEXITSTATUS(status) != 0); > - printf("child exited with status %d%s\n", WEXITSTATUS(status), > - failed ? " -- FAILED" : ""); > - return failed; > - } > - > - /* anything else: failed */ > - if (WIFSIGNALED(status)) > - printf("child killed by signal %d -- FAILED.\n", > - WTERMSIG(status)); > - > - return 1; > -} > diff --git a/tools/libaio/harness/cases/2.t b/tools/libaio/harness/cases/2.t > deleted file mode 100644 > index 3a0212d..0000000 > --- a/tools/libaio/harness/cases/2.t > +++ /dev/null > @@ -1,41 +0,0 @@ > -/* 2.t > -- io_setup (#2) > - - with invalid context pointer > - - with maxevents <= 0 > - - with an already initialized ctxp > -*/ > - > -int attempt(int n, io_context_t *ctxp, int expect) > -{ > - int res; > - > - printf("expect %3d: io_setup(%5d, %p) = ", expect, n, ctxp); > - fflush(stdout); > - res = io_setup(n, ctxp); > - printf("%3d [%s]%s\n", res, strerror(-res), > - (res != expect) ? " -- FAILED" : ""); > - if (res != expect) > - return 1; > - > - return 0; > -} > - > -int test_main(void) > -{ > - io_context_t ctx; > - int status = 0; > - > - ctx = NULL; > - status |= attempt(-1000, KERNEL_RW_POINTER, -EFAULT); > - status |= attempt( 1000, KERNEL_RW_POINTER, -EFAULT); > - status |= attempt( 0, KERNEL_RW_POINTER, -EFAULT); > - status |= attempt(-1000, &ctx, -EINVAL); > - status |= attempt( -1, &ctx, -EINVAL); > - status |= attempt( 0, &ctx, -EINVAL); > - assert(ctx == NULL); > - status |= attempt( 1, &ctx, 0); > - status |= attempt( 1, &ctx, -EINVAL); > - > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/3.t b/tools/libaio/harness/cases/3.t > deleted file mode 100644 > index 7773d80..0000000 > --- a/tools/libaio/harness/cases/3.t > +++ /dev/null > @@ -1,25 +0,0 @@ > -/* 3.t > -- io_submit/io_getevents with invalid addresses (3.t) > - > -*/ > -#include "aio_setup.h" > - > -int test_main(void) > -{ > - struct iocb a, b; > - struct iocb *good_ios[] = { &a, &b }; > - struct iocb *bad1_ios[] = { NULL, &b }; > - struct iocb *bad2_ios[] = { KERNEL_RW_POINTER, &a }; > - int status = 0; > - > - status |= attempt_io_submit(BAD_CTX, 1, good_ios, -EINVAL); > - status |= attempt_io_submit( io_ctx, 0, good_ios, 0); > - status |= attempt_io_submit( io_ctx, 1, NULL, -EFAULT); > - status |= attempt_io_submit( io_ctx, 1, (void *)-1, -EFAULT); > - status |= attempt_io_submit( io_ctx, 2, bad1_ios, -EFAULT); > - status |= attempt_io_submit( io_ctx, 2, bad2_ios, -EFAULT); > - status |= attempt_io_submit( io_ctx, -1, good_ios, -EINVAL); > - > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/4.t b/tools/libaio/harness/cases/4.t > deleted file mode 100644 > index 972b4f2..0000000 > --- a/tools/libaio/harness/cases/4.t > +++ /dev/null > @@ -1,72 +0,0 @@ > -/* 4.t > -- read of descriptor without read permission (4.t) > -- write to descriptor without write permission (4.t) > -- check that O_APPEND writes actually append > - > -*/ > -#include "aio_setup.h" > - > -#define SIZE 512 > -#define READ 'r' > -#define WRITE 'w' > -int attempt(int fd, void *buf, int count, long long pos, int rw, int expect) > -{ > - struct iocb iocb; > - int res; > - > - switch(rw) { > - case READ: io_prep_pread (&iocb, fd, buf, count, pos); break; > - case WRITE: io_prep_pwrite(&iocb, fd, buf, count, pos); break; > - } > - > - printf("expect %3d: (%c), res = ", expect, rw); > - fflush(stdout); > - res = sync_submit(&iocb); > - printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "Success", > - (res != expect) ? " -- FAILED" : ""); > - if (res != expect) > - return 1; > - > - return 0; > -} > - > -int test_main(void) > -{ > - char buf[SIZE]; > - int rofd, wofd, rwfd; > - int status = 0, res; > - > - memset(buf, 0, SIZE); > - > - rofd = open("testdir/rofile", O_RDONLY); assert(rofd != -1); > - wofd = open("testdir/wofile", O_WRONLY); assert(wofd != -1); > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); > - > - status |= attempt(rofd, buf, SIZE, 0, WRITE, -EBADF); > - status |= attempt(wofd, buf, SIZE, 0, READ, -EBADF); > - status |= attempt(rwfd, buf, SIZE, 0, WRITE, SIZE); > - status |= attempt(rwfd, buf, SIZE, 0, READ, SIZE); > - status |= attempt(rwfd, buf, SIZE, -1, READ, -EINVAL); > - status |= attempt(rwfd, buf, SIZE, -1, WRITE, -EINVAL); > - > - rwfd = open("testdir/rwfile", O_RDWR|O_APPEND); assert(rwfd != -1); > - res = ftruncate(rwfd, 0); assert(res == 0); > - status |= attempt(rwfd, buf, SIZE, 0, READ, 0); > - status |= attempt(rwfd, "1234", 4, 0, WRITE, 4); > - status |= attempt(rwfd, "5678", 4, 0, WRITE, 4); > - memset(buf, 0, SIZE); > - status |= attempt(rwfd, buf, SIZE, 0, READ, 8); > - printf("read after append: [%s]\n", buf); > - assert(memcmp(buf, "12345678", 8) == 0); > - > - status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, READ, -EFAULT); > - status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, WRITE, -EFAULT); > - > - /* Some architectures map the 0 page. Ugh. */ > -#if !defined(__ia64__) > - status |= attempt(rwfd, NULL, SIZE, 0, WRITE, -EFAULT); > -#endif > - > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/5.t b/tools/libaio/harness/cases/5.t > deleted file mode 100644 > index 7669fd7..0000000 > --- a/tools/libaio/harness/cases/5.t > +++ /dev/null > @@ -1,47 +0,0 @@ > -/* 5.t > -- Write from a mmap() of the same file. (5.t) > -*/ > -#include "aio_setup.h" > -#include <sys/mman.h> > - > -int test_main(void) > -{ > - int page_size = getpagesize(); > -#define SIZE 512 > - char *buf; > - int rwfd; > - int status = 0, res; > - > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); > - res = ftruncate(rwfd, 512); assert(res == 0); > - > - buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0); > - assert(buf != (char *)-1); > - > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); > - > - res = munmap(buf, page_size); assert(res == 0); > - buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0); > - assert(buf != (char *)-1); > - > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); > - > - res = munmap(buf, page_size); assert(res == 0); > - buf = mmap(0, page_size, PROT_READ, MAP_SHARED, rwfd, 0); > - assert(buf != (char *)-1); > - > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, -EFAULT); > - > - res = munmap(buf, page_size); assert(res == 0); > - buf = mmap(0, page_size, PROT_WRITE, MAP_SHARED, rwfd, 0); > - assert(buf != (char *)-1); > - > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, -EFAULT); > - > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/6.t b/tools/libaio/harness/cases/6.t > deleted file mode 100644 > index cea4b01..0000000 > --- a/tools/libaio/harness/cases/6.t > +++ /dev/null > @@ -1,57 +0,0 @@ > -/* 6.t > -- huge reads (pinned pages) (6.t) > -- huge writes (6.t) > -*/ > -#include "aio_setup.h" > -#include <sys/mman.h> > - > -long getmemsize(void) > -{ > - FILE *f = fopen("/proc/meminfo", "r"); > - long size; > - int gotit = 0; > - char str[256]; > - > - assert(f != NULL); > - while (NULL != fgets(str, 255, f)) { > - str[255] = 0; > - if (0 == memcmp(str, "MemTotal:", 9)) { > - if (1 == sscanf(str + 9, "%ld", &size)) { > - gotit = 1; > - break; > - } > - } > - } > - fclose(f); > - > - assert(gotit != 0); > - return size; > -} > - > -int test_main(void) > -{ > - char *buf; > - int rwfd; > - int status = 0, res; > - long size; > - > - size = getmemsize(); > - printf("size = %ld\n", size); > - assert(size >= (16 * 1024)); > - if (size > (768 * 1024)) > - size = 768 * 1024; > - size *= 1024; > - > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); > - res = ftruncate(rwfd, 0); assert(res == 0); > - buf = malloc(size); assert(buf != NULL); > - > - //memset(buf, 0, size); > - status |= attempt_rw(rwfd, buf, size, 0, WRITE, size); > - status |= attempt_rw(rwfd, buf, size, 0, READ, size); > - > - //res = ftruncate(rwfd, 0); assert(res == 0); > - > - return status; > -} > - > diff --git a/tools/libaio/harness/cases/7.t b/tools/libaio/harness/cases/7.t > deleted file mode 100644 > index d2d6cbc..0000000 > --- a/tools/libaio/harness/cases/7.t > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* 7.t > -- Write overlapping the file size rlimit boundary: should be a short > - write. (7.t) > -- Write at the file size rlimit boundary: should give EFBIG. (I think > - the spec requires that you do NOT deliver SIGXFSZ in this case, where > - you would do so for sync IO.) (7.t) > -- Special case: a write of zero bytes at or beyond the file size rlimit > - boundary must return success. (7.t) > -*/ > - > -#include <sys/resource.h> > - > -void SET_RLIMIT(long long limit) > -{ > - struct rlimit rlim; > - int res; > - > - rlim.rlim_cur = limit; assert(rlim.rlim_cur == limit); > - rlim.rlim_max = limit; assert(rlim.rlim_max == limit); > - > - res = setrlimit(RLIMIT_FSIZE, &rlim); assert(res == 0); > -} > - > -#define LIMIT 8192 > -#define FILENAME "testdir/rwfile" > - > -#include "common-7-8.h" > diff --git a/tools/libaio/harness/cases/8.t b/tools/libaio/harness/cases/8.t > deleted file mode 100644 > index 8a3d83e..0000000 > --- a/tools/libaio/harness/cases/8.t > +++ /dev/null > @@ -1,49 +0,0 @@ > -/* 8.t > -- Ditto for the above three tests at the offset maximum (largest > - possible ext2/3 file size.) (8.t) > - */ > -#include <sys/vfs.h> > - > -#define EXT2_OLD_SUPER_MAGIC 0xEF51 > -#define EXT2_SUPER_MAGIC 0xEF53 > - > -long long get_fs_limit(int fd) > -{ > - struct statfs s; > - int res; > - long long lim = 0; > - > - res = fstatfs(fd, &s); assert(res == 0); > - > - switch(s.f_type) { > - case EXT2_OLD_SUPER_MAGIC: > - case EXT2_SUPER_MAGIC: > -#if 0 > - { > - long long tmp; > - tmp = s.f_bsize / 4; > - /* 12 direct + indirect block + dind + tind */ > - lim = 12 + tmp + tmp * tmp + tmp * tmp * tmp; > - lim *= s.f_bsize; > - printf("limit(%ld) = %Ld\n", (long)s.f_bsize, lim); > - } > -#endif > - switch(s.f_bsize) { > - case 4096: lim = 2199023251456; break; > - default: > - printf("unknown ext2 blocksize %ld\n", (long)s.f_bsize); > - exit(3); > - } > - break; > - default: > - printf("unknown filesystem 0x%08lx\n", (long)s.f_type); > - exit(3); > - } > - return lim; > -} > - > -#define SET_RLIMIT(x) do ; while (0) > -#define LIMIT get_fs_limit(rwfd) > -#define FILENAME "testdir.ext2/rwfile" > - > -#include "common-7-8.h" > diff --git a/tools/libaio/harness/cases/aio_setup.h b/tools/libaio/harness/cases/aio_setup.h > deleted file mode 100644 > index 37c9618..0000000 > --- a/tools/libaio/harness/cases/aio_setup.h > +++ /dev/null > @@ -1,98 +0,0 @@ > -io_context_t io_ctx; > -#define BAD_CTX ((io_context_t)-1) > - > -void aio_setup(int n) > -{ > - int res = io_queue_init(n, &io_ctx); > - if (res != 0) { > - printf("io_queue_setup(%d) returned %d (%s)\n", > - n, res, strerror(-res)); > - exit(3); > - } > -} > - > -int attempt_io_submit(io_context_t ctx, long nr, struct iocb *ios[], int expect) > -{ > - int res; > - > - printf("expect %3d: io_submit(%10p, %3ld, %10p) = ", expect, ctx, nr, ios); > - fflush(stdout); > - res = io_submit(ctx, nr, ios); > - printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "", > - (res != expect) ? " -- FAILED" : ""); > - if (res != expect) > - return 1; > - > - return 0; > -} > - > -int sync_submit(struct iocb *iocb) > -{ > - struct io_event event; > - struct iocb *iocbs[] = { iocb }; > - int res; > - > - /* 30 second timeout should be enough */ > - struct timespec ts; > - ts.tv_sec = 30; > - ts.tv_nsec = 0; > - > - res = io_submit(io_ctx, 1, iocbs); > - if (res != 1) { > - printf("sync_submit: io_submit res=%d [%s]\n", res, strerror(-res)); > - return res; > - } > - > - res = io_getevents(io_ctx, 0, 1, &event, &ts); > - if (res != 1) { > - printf("sync_submit: io_getevents res=%d [%s]\n", res, strerror(-res)); > - return res; > - } > - return event.res; > -} > - > -#define SETUP aio_setup(1024) > - > - > -#define READ 'r' > -#define WRITE 'w' > -#define READ_SILENT 'R' > -#define WRITE_SILENT 'W' > -int attempt_rw(int fd, void *buf, int count, long long pos, int rw, int expect) > -{ > - struct iocb iocb; > - int res; > - int silent = 0; > - > - switch(rw) { > - case READ_SILENT: > - silent = 1; > - case READ: > - io_prep_pread (&iocb, fd, buf, count, pos); > - break; > - case WRITE_SILENT: > - silent = 1; > - case WRITE: > - io_prep_pwrite(&iocb, fd, buf, count, pos); > - break; > - } > - > - if (!silent) { > - printf("expect %5d: (%c), res = ", expect, rw); > - fflush(stdout); > - } > - res = sync_submit(&iocb); > - if (!silent || res != expect) { > - if (silent) > - printf("expect %5d: (%c), res = ", expect, rw); > - printf("%5d [%s]%s\n", res, > - (res <= 0) ? strerror(-res) : "Success", > - (res != expect) ? " -- FAILED" : ""); > - } > - > - if (res != expect) > - return 1; > - > - return 0; > -} > - > diff --git a/tools/libaio/harness/cases/common-7-8.h b/tools/libaio/harness/cases/common-7-8.h > deleted file mode 100644 > index 3ec2bb4..0000000 > --- a/tools/libaio/harness/cases/common-7-8.h > +++ /dev/null > @@ -1,37 +0,0 @@ > -/* common-7-8.h > -*/ > -#include "aio_setup.h" > - > -#include <unistd.h> > - > -#define SIZE 512 > - > -int test_main(void) > -{ > - char *buf; > - int rwfd; > - int status = 0, res; > - long long limit; > - > - rwfd = open(FILENAME, O_RDWR); assert(rwfd != -1); > - res = ftruncate(rwfd, 0); assert(res == 0); > - buf = malloc(SIZE); assert(buf != NULL); > - memset(buf, 0, SIZE); > - > - limit = LIMIT; > - > - SET_RLIMIT(limit); > - > - status |= attempt_rw(rwfd, buf, SIZE, limit-SIZE, WRITE, SIZE); > - status |= attempt_rw(rwfd, buf, SIZE, limit-SIZE, READ, SIZE); > - > - status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE, WRITE, SIZE-1); > - status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE, READ, SIZE-1); > - > - status |= attempt_rw(rwfd, buf, SIZE, limit, WRITE, -EFBIG); > - status |= attempt_rw(rwfd, buf, SIZE, limit, READ, 0); > - status |= attempt_rw(rwfd, buf, 0, limit, WRITE, 0); > - > - return status; > -} > - > diff --git a/tools/libaio/harness/main.c b/tools/libaio/harness/main.c > deleted file mode 100644 > index 74b2764..0000000 > --- a/tools/libaio/harness/main.c > +++ /dev/null > @@ -1,39 +0,0 @@ > -#include <stdio.h> > -#include <errno.h> > -#include <assert.h> > -#include <stdlib.h> > - > -#include <sys/types.h> > -#include <sys/stat.h> > -#include <fcntl.h> > -#include <unistd.h> > - > -#include <libaio.h> > - > -#if defined(__i386__) > -#define KERNEL_RW_POINTER ((void *)0xc0010000) > -#else > -//#warning Not really sure where kernel memory is. Guessing. > -#define KERNEL_RW_POINTER ((void *)0xffffffffc0010000) > -#endif > - > - > -char test_name[] = TEST_NAME; > - > -#include TEST_NAME > - > -int main(void) > -{ > - int res; > - > -#if defined(SETUP) > - SETUP; > -#endif > - > - res = test_main(); > - printf("test %s completed %s.\n", test_name, > - res ? "FAILED" : "PASSED" > - ); > - fflush(stdout); > - return res ? 1 : 0; > -} > diff --git a/tools/libaio/harness/runtests.sh b/tools/libaio/harness/runtests.sh > deleted file mode 100644 > index d763d88..0000000 > --- a/tools/libaio/harness/runtests.sh > +++ /dev/null > @@ -1,19 +0,0 @@ > -#!/bin/sh > - > -passes=0 > -fails=0 > - > -echo "Test run starting at" `date` > - > -while [ $# -ge 1 ] ; do > - this_test=$1 > - shift > - echo "Starting $this_test" > - $this_test 2>&1 > - res=$? > - if [ $res -eq 0 ] ; then str="" ; passes=$[passes + 1] ; else str=" -- FAILED" ; fails=$[fails + 1] ; fi > - echo "Completed $this_test with $res$str". > -done > - > -echo "Pass: $passes Fail: $fails" > -echo "Test run complete at" `date` > diff --git a/tools/libaio/libaio.spec b/tools/libaio/libaio.spec > deleted file mode 100644 > index bdcc5b2..0000000 > --- a/tools/libaio/libaio.spec > +++ /dev/null > @@ -1,187 +0,0 @@ > -Name: libaio > -Version: 0.3.106 > -Release: 1 > -Summary: Linux-native asynchronous I/O access library > -Copyright: LGPL > -Group: System Environment/Libraries > -Source: %{name}-%{version}.tar.gz > -BuildRoot: %{_tmppath}/%{name}-root > -# Fix ExclusiveArch as we implement this functionality on more architectures > -ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6 > - > -%description > -The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a > -richer API and capability set than the simple POSIX async I/O facility. > -This library, libaio, provides the Linux-native API for async I/O. > -The POSIX async I/O facility requires this library in order to provide > -kernel-accelerated async I/O capabilities, as do applications which > -require the Linux-native async I/O API. > - > -%package devel > -Summary: Development files for Linux-native asynchronous I/O access > -Group: Development/System > -Requires: libaio > -Provides: libaio.so.1 > - > -%description devel > -This package provides header files to include and libraries to link with > -for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). > - > -%prep > -%setup > - > -%build > -make > - > -%install > -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT > - > -make install prefix=$RPM_BUILD_ROOT/usr \ > - libdir=$RPM_BUILD_ROOT/%{_libdir} \ > - root=$RPM_BUILD_ROOT > - > -%clean > -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT > - > -%post -p /sbin/ldconfig > - > -%postun -p /sbin/ldconfig > - > -%files > -%defattr(-,root,root) > -%attr(0755,root,root) %{_libdir}/libaio.so.* > -%doc COPYING TODO > - > -%files devel > -%defattr(-,root,root) > -%attr(0644,root,root) %{_includedir}/* > -%attr(0755,root,root) %{_libdir}/libaio.so > -%attr(0644,root,root) %{_libdir}/libaio.a > - > -%changelog > -* Tue Jan 3 2006 Jeff Moyer <jmoyer@redhat.com> - 0.3.106-1 > -- Add a .proc directive for the ia64_aio_raw_syscall macro. This sounds a lot > - like the previous entry, but that one fixed the __ia64_raw_syscall macro, > - located in syscall-ia64.h. This macro is in raw_syscall.c, which pretty much > - only exists for ia64. This bug prevented the package from building with > - newer version of gcc. > - > -* Mon Aug 1 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.105-1 > -- Add a .proc directive for the ia64 raw syscall macro. > - > -* Fri Apr 1 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.104-1 > -- Add Alpha architecture support. (Sergey Tikhonov <tsv@solvo.ru>) > - > -* Tue Jan 25 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.103-1 > -- Fix SONAME breakage. In changing file names around, I also changed the > - SONAME, which is a no no. > - > -* Thu Oct 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.102-1 > -- S390 asm had a bug; I forgot to update the clobber list. Lucky for me, > - newer compilers complain about such things. > -- Also update the s390 asm to look more like the new kernel variants. > - > -* Wed Oct 13 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.101-1 > -- Revert syscall return values to be -ERRNO. This was an inadvertant bug > - introduced when clobber lists changed. > -- add ppc64pseries and ppc64iseries to exclusivearch > - > -* Tue Sep 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.100-1 > -- Switch around the tests for _PPC_ and _powerpc64_ so that the ppc64 > - platforms get the right padding. > - > -* Wed Jul 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-4 > -- Ok, there was a race in moving the cvs module. Someone rebuild from > - the old cvs into fc3. *sigh* bumping rev. > - > -* Wed Jul 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-3 > -- Actually provide libaio.so.1. > - > -* Tue Mar 30 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-2 > -- Apparently the 0.3.93 patch was not meant for 0.3.96. Backed it out. > - > -* Tue Mar 30 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-1 > -- Fix compat calls. > -- make library .so.1.0.0 and make symlinks properly. > -- Fix header file for inclusion in c++ code. > - > -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.98-2 > -- bah. fix version nr in changelog. > - > -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.98-1 > -- fix compiler warnings. > - > -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.97-2 > -- make srpm was using rpm to do a build. changed that to use rpmbuild if > - it exists, and fallback to rpm if it doesn't. > - > -* Tue Feb 24 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.97-1 > -- Use libc syscall(2) instead of rolling our own calling mechanism. This > - change is inspired due to a failure to build with newer gcc, since clobber > - lists were wrong. > -- Add -fpic to the CFLAGS for all architectures. Should address bz #109457. > -- change a #include from <linux/types.h> to <sys/types.h>. Fixes a build > - issue on s390. > - > -* Wed Jul 7 2003 Bill Nottingham <notting@redhat.com> 0.3.96-3 > -- fix paths on lib64 arches > - > -* Wed Jun 18 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.96-2 > -- optimization in io_getevents from Arjan van de Ven in 0.3.96-1 > -- deal with ia64 in 0.3.96-2 > - > -* Wed May 28 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.95-1 > -- ppc bugfix from Julie DeWandel > - > -* Tue May 20 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.94-1 > -- symbol versioning fix from Ulrich Drepper > - > -* Mon Jan 27 2003 Benjamin LaHaise <bcrl@redhat.com> > -- bump to 0.3.93-3 for rebuild. > - > -* Mon Dec 16 2002 Benjamin LaHaise <bcrl@redhat.com> > -- libaio 0.3.93 test release > -- add powerpc support from Gianni Tedesco <gianni@ecsc.co.uk> > -- add s/390 support from Arnd Bergmann <arnd@bergmann-dalldorf.de> > - > -* Fri Sep 12 2002 Benjamin LaHaise <bcrl@redhat.com> > -- libaio 0.3.92 test release > -- build on x86-64 > - > -* Thu Sep 12 2002 Benjamin LaHaise <bcrl@redhat.com> > -- libaio 0.3.91 test release > -- build on ia64 > -- remove libredhat-kernel from the .spec file > - > -* Thu Sep 5 2002 Benjamin LaHaise <bcrl@redhat.com> > -- libaio 0.3.90 test release > - > -* Mon Apr 29 2002 Benjamin LaHaise <bcrl@redhat.com> > -- add requires initscripts >= 6.47-1 to get boot time libredhat-kernel > - linkage correct. > -- typo fix > - > -* Thu Apr 25 2002 Benjamin LaHaise <bcrl@redhat.com> > -- make /usr/lib/libredhat-kernel.so point to /lib/libredhat-kernel.so.1.0.0 > - > -* Mon Apr 15 2002 Tim Powers <timp@redhat.com> > -- make the post scriptlet not use /bin/sh > - > -* Sat Apr 12 2002 Benjamin LaHaise <bcrl@redhat.com> > -- add /lib/libredhat-kernel* to %files. > - > -* Fri Apr 12 2002 Benjamin LaHaise <bcrl@redhat.com> > -- make the dummy install as /lib/libredhat-kernel.so.1.0.0 so > - that ldconfig will link against it if no other is installed. > - > -* Tue Jan 22 2002 Benjamin LaHaise <bcrl@redhat.com> > -- add io_getevents > - > -* Tue Jan 22 2002 Michael K. Johnson <johnsonm@redhat.com> > -- Make linker happy with /usr/lib symlink for libredhat-kernel.so > - > -* Mon Jan 21 2002 Michael K. Johnson <johnsonm@redhat.com> > -- Added stub library > - > -* Sun Jan 20 2002 Michael K. Johnson <johnsonm@redhat.com> > -- Initial packaging > diff --git a/tools/libaio/man/aio.3 b/tools/libaio/man/aio.3 > deleted file mode 100644 > index 6dc3c63..0000000 > --- a/tools/libaio/man/aio.3 > +++ /dev/null > @@ -1,315 +0,0 @@ > -.TH aio 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio \- Asynchronous IO > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.fi > -.SH DESCRIPTION > -The POSIX.1b standard defines a new set of I/O operations which can > -significantly reduce the time an application spends waiting at I/O. The > -new functions allow a program to initiate one or more I/O operations and > -then immediately resume normal work while the I/O operations are > -executed in parallel. This functionality is available if the > -.IR "unistd.h" > -file defines the symbol > -.B "_POSIX_ASYNCHRONOUS_IO" > -. > - > -These functions are part of the library with realtime functions named > -.IR "librt" > -. They are not actually part of the > -.IR "libc" > -binary. > -The implementation of these functions can be done using support in the > -kernel (if available) or using an implementation based on threads at > -userlevel. In the latter case it might be necessary to link applications > -with the thread library > -.IR "libpthread" > -in addition to > -.IR "librt" > -and > -.IR "libaio" > -. > - > -All AIO operations operate on files which were opened previously. There > -might be arbitrarily many operations running for one file. The > -asynchronous I/O operations are controlled using a data structure named > -.IR "struct aiocb" > -It is defined in > -.IR "aio.h" > - as follows. > - > -.nf > -struct aiocb > -{ > - int aio_fildes; /* File desriptor. */ > - int aio_lio_opcode; /* Operation to be performed. */ > - int aio_reqprio; /* Request priority offset. */ > - volatile void *aio_buf; /* Location of buffer. */ > - size_t aio_nbytes; /* Length of transfer. */ > - struct sigevent aio_sigevent; /* Signal number and value. */ > - > - /* Internal members. */ > - struct aiocb *__next_prio; > - int __abs_prio; > - int __policy; > - int __error_code; > - __ssize_t __return_value; > - > -#ifndef __USE_FILE_OFFSET64 > - __off_t aio_offset; /* File offset. */ > - char __pad[sizeof (__off64_t) - sizeof (__off_t)]; > -#else > - __off64_t aio_offset; /* File offset. */ > -#endif > - char __unused[32]; > -}; > - > -.fi > -The POSIX.1b standard mandates that the > -.IR "struct aiocb" > -structure > -contains at least the members described in the following table. There > -might be more elements which are used by the implementation, but > -depending upon these elements is not portable and is highly deprecated. > - > -.TP > -.IR "int aio_fildes" > -This element specifies the file descriptor to be used for the > -operation. It must be a legal descriptor, otherwise the operation will > -fail. > - > -The device on which the file is opened must allow the seek operation. > -I.e., it is not possible to use any of the AIO operations on devices > -like terminals where an > -.IR "lseek" > - call would lead to an error. > -.TP > -.IR "off_t aio_offset" > -This element specifies the offset in the file at which the operation (input > -or output) is performed. Since the operations are carried out in arbitrary > -order and more than one operation for one file descriptor can be > -started, one cannot expect a current read/write position of the file > -descriptor. > -.TP > -.IR "volatile void *aio_buf" > -This is a pointer to the buffer with the data to be written or the place > -where the read data is stored. > -.TP > -.IR "size_t aio_nbytes" > -This element specifies the length of the buffer pointed to by > -.IR "aio_buf" > -. > -.TP > -.IR "int aio_reqprio" > -If the platform has defined > -.B "_POSIX_PRIORITIZED_IO" > -and > -.B "_POSIX_PRIORITY_SCHEDULING" > -, the AIO requests are > -processed based on the current scheduling priority. The > -.IR "aio_reqprio" > -element can then be used to lower the priority of the > -AIO operation. > -.TP > -.IR "struct sigevent aio_sigevent" > -This element specifies how the calling process is notified once the > -operation terminates. If the > -.IR "sigev_notify" > -element is > -.B "SIGEV_NONE" > -, no notification is sent. If it is > -.B "SIGEV_SIGNAL" > -, > -the signal determined by > -.IR "sigev_signo" > -is sent. Otherwise, > -.IR "sigev_notify" > -must be > -.B "SIGEV_THREAD" > -. In this case, a thread > -is created which starts executing the function pointed to by > -.IR "sigev_notify_function" > -. > -.TP > -.IR "int aio_lio_opcode" > -This element is only used by the > -.IR "lio_listio" > - and > -.IR "lio_listio64" > - functions. Since these functions allow an > -arbitrary number of operations to start at once, and each operation can be > -input or output (or nothing), the information must be stored in the > -control block. The possible values are: > -.TP > -.B "LIO_READ" > -Start a read operation. Read from the file at position > -.IR "aio_offset" > - and store the next > -.IR "aio_nbytes" > - bytes in the > -buffer pointed to by > -.IR "aio_buf" > -. > -.TP > -.B "LIO_WRITE" > -Start a write operation. Write > -.IR "aio_nbytes" > -bytes starting at > -.IR "aio_buf" > -into the file starting at position > -.IR "aio_offset" > -. > -.TP > -.B "LIO_NOP" > -Do nothing for this control block. This value is useful sometimes when > -an array of > -.IR "struct aiocb" > -values contains holes, i.e., some of the > -values must not be handled although the whole array is presented to the > -.IR "lio_listio" > -function. > - > -When the sources are compiled using > -.B "_FILE_OFFSET_BITS == 64" > -on a > -32 bit machine, this type is in fact > -.IR "struct aiocb64" > -, since the LFS > -interface transparently replaces the > -.IR "struct aiocb" > -definition. > -.PP > -For use with the AIO functions defined in the LFS, there is a similar type > -defined which replaces the types of the appropriate members with larger > -types but otherwise is equivalent to > -.IR "struct aiocb" > -. Particularly, > -all member names are the same. > - > -.nf > -/* The same for the 64bit offsets. Please note that the members aio_fildes > - to __return_value have to be the same in aiocb and aiocb64. */ > -#ifdef __USE_LARGEFILE64 > -struct aiocb64 > -{ > - int aio_fildes; /* File desriptor. */ > - int aio_lio_opcode; /* Operation to be performed. */ > - int aio_reqprio; /* Request priority offset. */ > - volatile void *aio_buf; /* Location of buffer. */ > - size_t aio_nbytes; /* Length of transfer. */ > - struct sigevent aio_sigevent; /* Signal number and value. */ > - > - /* Internal members. */ > - struct aiocb *__next_prio; > - int __abs_prio; > - int __policy; > - int __error_code; > - __ssize_t __return_value; > - > - __off64_t aio_offset; /* File offset. */ > - char __unused[32]; > -}; > - > -.fi > -.TP > -.IR "int aio_fildes" > -This element specifies the file descriptor which is used for the > -operation. It must be a legal descriptor since otherwise the operation > -fails for obvious reasons. > -The device on which the file is opened must allow the seek operation. > -I.e., it is not possible to use any of the AIO operations on devices > -like terminals where an > -.IR "lseek" > - call would lead to an error. > -.TP > -.IR "off64_t aio_offset" > -This element specifies at which offset in the file the operation (input > -or output) is performed. Since the operation are carried in arbitrary > -order and more than one operation for one file descriptor can be > -started, one cannot expect a current read/write position of the file > -descriptor. > -.TP > -.IR "volatile void *aio_buf" > -This is a pointer to the buffer with the data to be written or the place > -where the read data is stored. > -.TP > -.IR "size_t aio_nbytes" > -This element specifies the length of the buffer pointed to by > -.IR "aio_buf" > -. > -.TP > -.IR "int aio_reqprio" > -If for the platform > -.B "_POSIX_PRIORITIZED_IO" > -and > -.B "_POSIX_PRIORITY_SCHEDULING" > -are defined the AIO requests are > -processed based on the current scheduling priority. The > -.IR "aio_reqprio" > -element can then be used to lower the priority of the > -AIO operation. > -.TP > -.IR "struct sigevent aio_sigevent" > -This element specifies how the calling process is notified once the > -operation terminates. If the > -.IR "sigev_notify" > -, element is > -.B "SIGEV_NONE" > -no notification is sent. If it is > -.B "SIGEV_SIGNAL" > -, > -the signal determined by > -.IR "sigev_signo" > -is sent. Otherwise, > -.IR "sigev_notify" > - must be > -.B "SIGEV_THREAD" > -in which case a thread > -which starts executing the function pointed to by > -.IR "sigev_notify_function" > -. > -.TP > -.IR "int aio_lio_opcode" > -This element is only used by the > -.IR "lio_listio" > -and > -.IR "lio_listio64" > -functions. Since these functions allow an > -arbitrary number of operations to start at once, and since each operation can be > -input or output (or nothing), the information must be stored in the > -control block. See the description of > -.IR "struct aiocb" > -for a description > -of the possible values. > -.PP > -When the sources are compiled using > -.B "_FILE_OFFSET_BITS == 64" > -on a > -32 bit machine, this type is available under the name > -.IR "struct aiocb64" > -, since the LFS transparently replaces the old interface. > -.SH "RETURN VALUES" > -.SH ERRORS > -.SH "SEE ALSO" > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_cancel.3 b/tools/libaio/man/aio_cancel.3 > deleted file mode 100644 > index 502c83c..0000000 > --- a/tools/libaio/man/aio_cancel.3 > +++ /dev/null > @@ -1,137 +0,0 @@ > -.TH aio_cancel 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_cancel - Cancel asynchronous I/O requests > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_cancel (int fildes " , struct aiocb *aiocbp " )" > -.fi > -.SH DESCRIPTION > -When one or more requests are asynchronously processed, it might be > -useful in some situations to cancel a selected operation, e.g., if it > -becomes obvious that the written data is no longer accurate and would > -have to be overwritten soon. As an example, assume an application, which > -writes data in files in a situation where new incoming data would have > -to be written in a file which will be updated by an enqueued request. > -The POSIX AIO implementation provides such a function, but this function > -is not capable of forcing the cancellation of the request. It is up to the > -implementation to decide whether it is possible to cancel the operation > -or not. Therefore using this function is merely a hint. > -.B "The libaio implementation does not implement the cancel operation in the" > -.B "POSIX libraries". > -.PP > -The > -.IR aio_cancel > -function can be used to cancel one or more > -outstanding requests. If the > -.IR aiocbp > -parameter is > -.IR NULL > -, the > -function tries to cancel all of the outstanding requests which would process > -the file descriptor > -.IR fildes > -(i.e., whose > -.IR aio_fildes > -member > -is > -.IR fildes > -). If > -.IR aiocbp is not > -.IR NULL > -, > -.IR aio_cancel > -attempts to cancel the specific request pointed to by > -.IR aiocbp. > - > -For requests which were successfully canceled, the normal notification > -about the termination of the request should take place. I.e., depending > -on the > -.IR "struct sigevent" > -object which controls this, nothing > -happens, a signal is sent or a thread is started. If the request cannot > -be canceled, it terminates the usual way after performing the operation. > -After a request is successfully canceled, a call to > -.IR aio_error > -with > -a reference to this request as the parameter will return > -.B ECANCELED > -and a call to > -.IR aio_return > -will return > -.IR -1. > -If the request wasn't canceled and is still running the error status is > -still > -.B EINPROGRESS. > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -, this > -function is in fact > -.IR aio_cancel64 > -since the LFS interface > -transparently replaces the normal implementation. > - > -.SH "RETURN VALUES" > -.TP > -.B AIO_CANCELED > -If there were > -requests which haven't terminated and which were successfully canceled. > -.TP > -.B AIO_NOTCANCELED > -If there is one or more requests left which couldn't be canceled, > -. In this case > -.IR aio_error > -must be used to find out which of the, perhaps multiple, requests (in > -.IR aiocbp > -is > -.IR NULL > -) weren't successfully canceled. > -.TP > -.B AIO_ALLDONE > -If all > -requests already terminated at the time > -.IR aio_cancel > -is called the > -return value is > -. > -.SH ERRORS > -If an error occurred during the execution of > -.IR aio_cancel > -the > -function returns > -.IR -1 > -and sets > -.IR errno > -to one of the following > -values. > -.TP > -.B EBADF > -The file descriptor > -.IR fildes > -is not valid. > -.TP > -.B ENOSYS > -.IR aio_cancel > -is not implemented. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_cancel64.3 b/tools/libaio/man/aio_cancel64.3 > deleted file mode 100644 > index ede775b..0000000 > --- a/tools/libaio/man/aio_cancel64.3 > +++ /dev/null > @@ -1,50 +0,0 @@ > -.TH aio_cancel64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_cancel64 \- Cancel asynchronous I/O requests > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_cancel64 (int fildes, struct aiocb64 *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function is similar to > -.IR aio_cancel > -with the only difference > -that the argument is a reference to a variable of type > -.IR struct aiocb64 > -. > - > -When the sources are compiled with > -.IR _FILE_OFFSET_BITS == 64 > -, this > -function is available under the name > -.IR aio_cancel > -and so > -transparently replaces the interface for small files on 32 bit > -machines. > -.SH "RETURN VALUES" > -See aio_cancel(3). > -.SH ERRORS > -See aio_cancel(3). > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_error.3 b/tools/libaio/man/aio_error.3 > deleted file mode 100644 > index 12b82cf..0000000 > --- a/tools/libaio/man/aio_error.3 > +++ /dev/null > @@ -1,81 +0,0 @@ > -.TH aio_error 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_error \- Getting the Status of AIO Operations > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_error (const struct aiocb *aiocbp)" > -.fi > -.SH DESCRIPTION > -The function > -.IR aio_error > -determines the error state of the request described by the > -.IR "struct aiocb" > -variable pointed to by > -.I aiocbp > -. > - > -When the operation is performed truly asynchronously (as with > -.IR "aio_read" > -and > -.IR "aio_write" > -and with > -.IR "lio_listio" > -when the mode is > -.IR "LIO_NOWAIT" > -), one sometimes needs to know whether a > -specific request already terminated and if so, what the result was. > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -this function is in fact > -.IR "aio_error64" > -since the LFS interface transparently replaces the normal implementation. > -.SH "RETURN VALUES" > -If the request has not yet terminated the value returned is always > -.IR "EINPROGRESS" > -. Once the request has terminated the value > -.IR "aio_error" > -returns is either > -.I 0 > -if the request completed successfully or it returns the value which would be stored in the > -.IR "errno" > -variable if the request would have been done using > -.IR "read" > -, > -.IR "write" > -, or > -.IR "fsync" > -. > -.SH ERRORS > -.TP > -.IR "ENOSYS" > -if it is not implemented. It > -could also return > -.TP > -.IR "EINVAL" > -if the > -.I aiocbp > -parameter does not > -refer to an asynchronous operation whose return status is not yet known. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_error64.3 b/tools/libaio/man/aio_error64.3 > deleted file mode 100644 > index 3333161..0000000 > --- a/tools/libaio/man/aio_error64.3 > +++ /dev/null > @@ -1,64 +0,0 @@ > -.TH aio_error64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_error64 \- Return errors > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_error64 (const struct aiocb64 *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function is similar to > -.IR aio_error > -with the only difference > -that the argument is a reference to a variable of type > -.IR "struct aiocb64". > -.PP > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -this > -function is available under the name > -.IR aio_error > -and so > -transparently replaces the interface for small files on 32 bit > -machines. > -.SH "RETURN VALUES" > -If the request has not yet terminated the value returned is always > -.IR "EINPROGRESS" > -. Once the request has terminated the value > -.IR "aio_error" > -returns is either > -.I 0 > -if the request completed successfully or it returns the value which would be stored in the > -.IR "errno" > -variable if the request would have been done using > -.IR "read" > -, > -.IR "write" > -, or > -.IR "fsync" > -. > -.SH ERRORS > -See > -.IR aio_error(3). > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_fsync.3 b/tools/libaio/man/aio_fsync.3 > deleted file mode 100644 > index 637f0f6..0000000 > --- a/tools/libaio/man/aio_fsync.3 > +++ /dev/null > @@ -1,139 +0,0 @@ > -.TH aio_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_fsync \- Synchronize a file's complete in-core state with that on disk > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_fsync (int op, struct aiocb aiocbp)" > -.fi > -.SH DESCRIPTION > -.PP > -When dealing with asynchronous operations it is sometimes necessary to > -get into a consistent state. This would mean for AIO that one wants to > -know whether a certain request or a group of request were processed. > -This could be done by waiting for the notification sent by the system > -after the operation terminated, but this sometimes would mean wasting > -resources (mainly computation time). Instead POSIX.1b defines two > -functions which will help with most kinds of consistency. > -.PP > -The > -.IR aio_fsync > -and > -.IR "aio_fsync64" > -functions are only available > -if the symbol > -.IR "_POSIX_SYNCHRONIZED_IO" > -is defined in > -.I unistd.h > -. > - > -Calling this function forces all I/O operations operating queued at the > -time of the function call operating on the file descriptor > -.IR "aiocbp->aio_fildes" > -into the synchronized I/O completion state . The > -.IR "aio_fsync" > -function returns > -immediately but the notification through the method described in > -.IR "aiocbp->aio_sigevent" > -will happen only after all requests for this > -file descriptor have terminated and the file is synchronized. This also > -means that requests for this very same file descriptor which are queued > -after the synchronization request are not affected. > - > -If > -.IR "op" > -is > -.IR "O_DSYNC" > -the synchronization happens as with a call > -to > -.IR "fdatasync" > -. Otherwise > -.IR "op" > -should be > -.IR "O_SYNC" > -and > -the synchronization happens as with > -.IR "fsync" > -. > - > -As long as the synchronization has not happened, a call to > -.IR "aio_error" > -with the reference to the object pointed to by > -.IR "aiocbp" > -returns > -.IR "EINPROGRESS" > -. Once the synchronization is > -done > -.IR "aio_error" > -return > -.IR 0 > -if the synchronization was not > -successful. Otherwise the value returned is the value to which the > -.IR "fsync" > -or > -.IR "fdatasync" > -function would have set the > -.IR "errno" > -variable. In this case nothing can be assumed about the > -consistency for the data written to this file descriptor. > - > -.SH "RETURN VALUES" > -The return value of this function is > -.IR 0 > -if the request was > -successfully enqueued. Otherwise the return value is > -.IR -1 > -and > -.IR "errno". > -.SH ERRORS > -.TP > -.B EAGAIN > -The request could not be enqueued due to temporary lack of resources. > -.TP > -.B EBADF > -The file descriptor > -.IR "aiocbp->aio_fildes" > -is not valid or not open > -for writing. > -.TP > -.B EINVAL > -The implementation does not support I/O synchronization or the > -.IR "op" > -parameter is other than > -.IR "O_DSYNC" > -and > -.IR "O_SYNC" > -. > -.TP > -.B ENOSYS > -This function is not implemented. > -.PP > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > - this > -function is in fact > -.IR "aio_return64" > -since the LFS interface > -transparently replaces the normal implementation. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_fsync64.3 b/tools/libaio/man/aio_fsync64.3 > deleted file mode 100644 > index 5dce22d..0000000 > --- a/tools/libaio/man/aio_fsync64.3 > +++ /dev/null > @@ -1,51 +0,0 @@ > -.TH aio_fsync64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_fsync64 \- Synchronize a file's complete in-core state with that on disk > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_fsync64 (int op, struct aiocb64 *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function is similar to > -.IR aio_fsync > -with the only difference > -that the argument is a reference to a variable of type > -.IR "struct aiocb64". > - > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -this > -function is available under the name > -.IR aio_fsync > -and so > -transparently replaces the interface for small files on 32 bit > -machines. > -.SH "RETURN VALUES" > -See > -.IR aio_fsync. > -.SH ERRORS > -See > -.IR aio_fsync. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_init.3 b/tools/libaio/man/aio_init.3 > deleted file mode 100644 > index 3b0ec95..0000000 > --- a/tools/libaio/man/aio_init.3 > +++ /dev/null > @@ -1,96 +0,0 @@ > -.TH aio_init 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_init \- How to optimize the AIO implementation > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "void aio_init (const struct aioinit *init)" > -.fi > -.SH DESCRIPTION > - > -The POSIX standard does not specify how the AIO functions are > -implemented. They could be system calls, but it is also possible to > -emulate them at userlevel. > - > -At the point of this writing, the available implementation is a userlevel > -implementation which uses threads for handling the enqueued requests. > -While this implementation requires making some decisions about > -limitations, hard limitations are something which is best avoided > -in the GNU C library. Therefore, the GNU C library provides a means > -for tuning the AIO implementation according to the individual use. > - > -.BI "struct aioinit" > -.PP > -This data type is used to pass the configuration or tunable parameters > -to the implementation. The program has to initialize the members of > -this struct and pass it to the implementation using the > -.IR aio_init > -function. > -.TP > -.B "int aio_threads" > -This member specifies the maximal number of threads which may be used > -at any one time. > -.TP > -.B "int aio_num" > -This number provides an estimate on the maximal number of simultaneously > -enqueued requests. > -.TP > -.B "int aio_locks" > -Unused. > -.TP > -.B "int aio_usedba" > -Unused. > -.TP > -.B "int aio_debug" > -Unused. > -.TP > -.B "int aio_numusers" > -Unused. > -.TP > -.B "int aio_reserved[2]" > -Unused. > -.PP > -This function must be called before any other AIO function. Calling it > -is completely voluntary, as it is only meant to help the AIO > -implementation perform better. > - > -Before calling the > -.IR aio_init > -, function the members of a variable of > -type > -.IR "struct aioinit" > -must be initialized. Then a reference to > -this variable is passed as the parameter to > -.IR aio_init > -which itself > -may or may not pay attention to the hints. > - > -It is a extension which follows a proposal from the SGI implementation in > -.IR Irix 6 > -. It is not covered by POSIX.1b or Unix98. > -.SH "RETURN VALUES" > -The function has no return value. > -.SH ERRORS > -The function has no error cases defined. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_read.3 b/tools/libaio/man/aio_read.3 > deleted file mode 100644 > index 5bcb6c8..0000000 > --- a/tools/libaio/man/aio_read.3 > +++ /dev/null > @@ -1,146 +0,0 @@ > -.TH aio_read 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_read \- Initiate an asynchronous read operation > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_read (struct aiocb *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function initiates an asynchronous read operation. It > -immediately returns after the operation was enqueued or when an > -error was encountered. > - > -The first > -.IR "aiocbp->aio_nbytes" > -bytes of the file for which > -.IR "aiocbp->aio_fildes" > -is a descriptor are written to the buffer > -starting at > -.IR "aiocbp->aio_buf" > -. Reading starts at the absolute > -position > -.IR "aiocbp->aio_offset" > -in the file. > - > -If prioritized I/O is supported by the platform the > -.IR "aiocbp->aio_reqprio" > -value is used to adjust the priority before > -the request is actually enqueued. > - > -The calling process is notified about the termination of the read > -request according to the > -.IR "aiocbp->aio_sigevent" > -value. > - > -.SH "RETURN VALUES" > -When > -.IR "aio_read" > -returns, the return value is zero if no error > -occurred that can be found before the process is enqueued. If such an > -early error is found, the function returns > -.IR -1 > -and sets > -.IR "errno". > - > -.PP > -If > -.IR "aio_read" > -returns zero, the current status of the request > -can be queried using > -.IR "aio_error" > -and > -.IR "aio_return" > -functions. > -As long as the value returned by > -.IR "aio_error" > -is > -.IR "EINPROGRESS" > -the operation has not yet completed. If > -.IR "aio_error" > -returns zero, > -the operation successfully terminated, otherwise the value is to be > -interpreted as an error code. If the function terminated, the result of > -the operation can be obtained using a call to > -.IR "aio_return" > -. The > -returned value is the same as an equivalent call to > -.IR "read" > -would > -have returned. > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -this > -function is in fact > -.IR "aio_read64" > -since the LFS interface transparently > -replaces the normal implementation. > - > -.SH ERRORS > -In the case of an early error: > -.TP > -.B EAGAIN > -The request was not enqueued due to (temporarily) exceeded resource > -limitations. > -.TP > -.B ENOSYS > -The > -.IR "aio_read" > -function is not implemented. > -.TP > -.B EBADF > -The > -.IR "aiocbp->aio_fildes" > -descriptor is not valid. This condition > -need not be recognized before enqueueing the request and so this error > -might also be signaled asynchronously. > -.TP > -.B EINVAL > -The > -.IR "aiocbp->aio_offset" > -or > -.IR "aiocbp->aio_reqpiro" > -value is > -invalid. This condition need not be recognized before enqueueing the > -request and so this error might also be signaled asynchronously. > - > -.PP > -In the case of a normal return, possible error codes returned by > -.IR "aio_error" > -are: > -.TP > -.B EBADF > -The > -.IR "aiocbp->aio_fildes" > -descriptor is not valid. > -.TP > -.B ECANCELED > -The operation was canceled before the operation was finished > -.TP > -.B EINVAL > -The > -.IR "aiocbp->aio_offset" > -value is invalid. > -.PP > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_read64.3 b/tools/libaio/man/aio_read64.3 > deleted file mode 100644 > index 8e407a5..0000000 > --- a/tools/libaio/man/aio_read64.3 > +++ /dev/null > @@ -1,60 +0,0 @@ > -.TH aio_read64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_read64 \- Initiate an asynchronous read operation > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_read64 (struct aiocb *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function is similar to the > -.IR "aio_read" > -function. The only > -difference is that on > -.IR "32 bit" > -machines, the file descriptor should > -be opened in the large file mode. Internally, > -.IR "aio_read64" > -uses > -functionality equivalent to > -.IR "lseek64" > -to position the file descriptor correctly for the reading, > -as opposed to > -.IR "lseek" > -functionality used in > -.IR "aio_read". > - > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -, this > -function is available under the name > -.IR "aio_read" > -and so transparently > -replaces the interface for small files on 32 bit machines. > -.SH "RETURN VALUES" > -See > -.IR aio_read. > -.SH ERRORS > -See > -.IR aio_read. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_return.3 b/tools/libaio/man/aio_return.3 > deleted file mode 100644 > index 1e3335f..0000000 > --- a/tools/libaio/man/aio_return.3 > +++ /dev/null > @@ -1,71 +0,0 @@ > -.TH aio_return 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_return \- Retrieve status of asynchronous I/O operation > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "ssize_t aio_return (const struct aiocb *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function can be used to retrieve the return status of the operation > -carried out by the request described in the variable pointed to by > -.IR aiocbp > -. As long as the error status of this request as returned > -by > -.IR aio_error > -is > -.IR EINPROGRESS > -the return of this function is > -undefined. > - > -Once the request is finished this function can be used exactly once to > -retrieve the return value. Following calls might lead to undefined > -behavior. > -When the sources are compiled with > -.B "_FILE_OFFSET_BITS == 64" > -this function is in fact > -.IR aio_return64 > -since the LFS interface > -transparently replaces the normal implementation. > -.SH "RETURN VALUES" > -The return value itself is the value which would have been > -returned by the > -.IR read > -, > -.IR write > -, or > -.IR fsync > -call. > -.SH ERRORS > -The function can return > -.TP > -.B ENOSYS > -if it is not implemented. > -.TP > -.B EINVAL > -if the > -.IR aiocbp > -parameter does not > -refer to an asynchronous operation whose return status is not yet known. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_return64.3 b/tools/libaio/man/aio_return64.3 > deleted file mode 100644 > index 7e78362..0000000 > --- a/tools/libaio/man/aio_return64.3 > +++ /dev/null > @@ -1,51 +0,0 @@ > -.TH aio_read64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_read64 \- Retrieve status of asynchronous I/O operation > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_return64 (const struct aiocb64 *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function is similar to > -.IR "aio_return" > -with the only difference > -that the argument is a reference to a variable of type > -.IR "struct aiocb64". > - > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -this > -function is available under the name > -.IR "aio_return" > -and so > -transparently replaces the interface for small files on 32 bit > -machines. > -.SH "RETURN VALUES" > -See > -.IR aio_return. > -.SH ERRORS > -See > -.IR aio_return. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_suspend.3 b/tools/libaio/man/aio_suspend.3 > deleted file mode 100644 > index cae1b65..0000000 > --- a/tools/libaio/man/aio_suspend.3 > +++ /dev/null > @@ -1,123 +0,0 @@ > -.TH aio_suspend 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_suspend \- Wait until one or more requests of a specific set terminates. > -.SH SYNOPSYS > -.nf > -.B "#include <errno.h>" > -.sp > -.br > -.B "#include <aio.h>" > -.sp > -.br > -.BI "int aio_suspend (const struct aiocb *const list[], int nent, const struct timespec *timeout)" > -.fi > -.SH DESCRIPTION > -Another method of synchronization is to wait until one or more requests of a > -specific set terminated. This could be achieved by the > -.IR "aio_*" > -functions to notify the initiating process about the termination but in > -some situations this is not the ideal solution. In a program which > -constantly updates clients somehow connected to the server it is not > -always the best solution to go round robin since some connections might > -be slow. On the other hand letting the > -.IR "aio_*" > -function notify the > -caller might also be not the best solution since whenever the process > -works on preparing data for on client it makes no sense to be > -interrupted by a notification since the new client will not be handled > -before the current client is served. For situations like this > -.IR "aio_suspend" > -should be used. > -.PP > -When calling this function, the calling thread is suspended until at > -least one of the requests pointed to by the > -.IR "nent" > -elements of the > -array > -.IR "list" > -has completed. If any of the requests has already > -completed at the time > -.IR "aio_suspend" > -is called, the function returns > -immediately. Whether a request has terminated or not is determined by > -comparing the error status of the request with > -.IR "EINPROGRESS" > -. If > -an element of > -.IR "list" > -is > -.IR "NULL" > -, the entry is simply ignored. > - > -If no request has finished, the calling process is suspended. If > -.IR "timeout" > -is > -.IR "NULL" > -, the process is not woken until a request > -has finished. If > -.IR "timeout" > -is not > -.IR "NULL" > -, the process remains > -suspended at least as long as specified in > -.IR "timeout" > -. In this case, > -.IR "aio_suspend" > -returns with an error. > -.PP > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -this > -function is in fact > -.IR "aio_suspend64" > -since the LFS interface > -transparently replaces the normal implementation. > -.SH "RETURN VALUES" > -The return value of the function is > -.IR 0 > -if one or more requests > -from the > -.IR "list" > -have terminated. Otherwise the function returns > -.IR -1 > -and > -.IR "errno" > -is set. > -.SH ERRORS > -.TP > -.B EAGAIN > -None of the requests from the > -.IR "list" > -completed in the time specified > -by > -.IR "timeout" > -. > -.TP > -.B EINTR > -A signal interrupted the > -.IR "aio_suspend" > -function. This signal might > -also be sent by the AIO implementation while signalling the termination > -of one of the requests. > -.TP > -.B ENOSYS > -The > -.IR "aio_suspend" > -function is not implemented. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_suspend64.3 b/tools/libaio/man/aio_suspend64.3 > deleted file mode 100644 > index 2f289ec..0000000 > --- a/tools/libaio/man/aio_suspend64.3 > +++ /dev/null > @@ -1,51 +0,0 @@ > -.TH aio_suspend64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_suspend64 \- Wait until one or more requests of a specific set terminates > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_suspend64 (const struct aiocb64 *const list[], int nent, const struct timespec *timeout)" > -.fi > -.SH DESCRIPTION > -This function is similar to > -.IR "aio_suspend" > -with the only difference > -that the argument is a reference to a variable of type > -.IR "struct aiocb64". > - > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -this > -function is available under the name > -.IR "aio_suspend" > -and so > -transparently replaces the interface for small files on 32 bit > -machines. > -.SH "RETURN VALUES" > -See > -.IR aio_suspend. > -.SH ERRORS > -See > -.IR aio_suspend. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_write(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_write.3 b/tools/libaio/man/aio_write.3 > deleted file mode 100644 > index 7c0cfd0..0000000 > --- a/tools/libaio/man/aio_write.3 > +++ /dev/null > @@ -1,176 +0,0 @@ > -.TH aio_write 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_write \- Initiate an asynchronous write operation > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_write (struct aiocb * aiocbp);" > -.fi > -.SH DESCRIPTION > -This function initiates an asynchronous write operation. The function > -call immediately returns after the operation was enqueued or if before > -this happens an error was encountered. > - > -The first > -.IR "aiocbp->aio_nbytes" > -bytes from the buffer starting at > -.IR "aiocbp->aio_buf" > -are written to the file for which > -.IR "aiocbp->aio_fildes" > -is an descriptor, starting at the absolute > -position > -.IR "aiocbp->aio_offset" > -in the file. > - > -If prioritized I/O is supported by the platform, the > -.IR "aiocbp->aio_reqprio " > -value is used to adjust the priority before > -the request is actually enqueued. > - > -The calling process is notified about the termination of the read > -request according to the > -.IR "aiocbp->aio_sigevent" > -value. > - > -When > -.IR "aio_write" > -returns, the return value is zero if no error > -occurred that can be found before the process is enqueued. If such an > -early error is found the function returns > -.IR -1 > -and sets > -.IR "errno" > -to one of the following values. > - > -.TP > -.B EAGAIN > -The request was not enqueued due to (temporarily) exceeded resource > -limitations. > -.TP > -.B ENOSYS > -The > -.IR "aio_write" > -function is not implemented. > -.TP > -.B EBADF > -The > -.IR "aiocbp->aio_fildes" > -descriptor is not valid. This condition > -may not be recognized before enqueueing the request, and so this error > -might also be signaled asynchronously. > -.TP > -.B EINVAL > -The > -.IR "aiocbp->aio_offset" > -or > -.IR "aiocbp->aio_reqprio" > -value is > -invalid. This condition may not be recognized before enqueueing the > -request and so this error might also be signaled asynchronously. > -.PP > - > -In the case > -.IR "aio_write" > -returns zero, the current status of the > -request can be queried using > -.IR "aio_error" > -and > -.IR "aio_return" > -functions. As long as the value returned by > -.IR "aio_error" > -is > -.IR "EINPROGRESS" > -the operation has not yet completed. If > -.IR "aio_error" > -returns zero, the operation successfully terminated, > -otherwise the value is to be interpreted as an error code. If the > -function terminated, the result of the operation can be get using a call > -to > -.IR "aio_return" > -. The returned value is the same as an equivalent > -call to > -.IR "read" > -would have returned. Possible error codes returned > -by > -.IR "aio_error" > -are: > - > -.TP > -.B EBADF > -The > -.IR "aiocbp->aio_fildes" > -descriptor is not valid. > -.TP > -.B ECANCELED > -The operation was canceled before the operation was finished. > -.TP > -.B EINVAL > -The > -.IR "aiocbp->aio_offset" > -value is invalid. > -.PP > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -, this > -function is in fact > -.IR "aio_write64" > -since the LFS interface transparently > -replaces the normal implementation. > -.SH "RETURN VALUES" > -When > -.IR "aio_write" > -returns, the return value is zero if no error > -occurred that can be found before the process is enqueued. If such an > -early error is found the function returns > -.IR -1 > -and sets > -.IR "errno" > -to one of the following values. > -.SH ERRORS > -.TP > -.B EAGAIN > -The request was not enqueued due to (temporarily) exceeded resource > -limitations. > -.TP > -.B ENOSYS > -The > -.IR "aio_write" > -function is not implemented. > -.TP > -.B EBADF > -The > -.IR "aiocbp->aio_fildes" > -descriptor is not valid. This condition > -may not be recognized before enqueueing the request, and so this error > -might also be signaled asynchronously. > -.TP > -.B EINVAL > -The > -.IR "aiocbp->aio_offset" > -or > -.IR "aiocbp->aio_reqprio" > -value is > -invalid. This condition may not be recognized before enqueueing the > -request and so this error might also be signaled asynchronously. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write64(3), > -.BR errno(3), > diff --git a/tools/libaio/man/aio_write64.3 b/tools/libaio/man/aio_write64.3 > deleted file mode 100644 > index 1080903..0000000 > --- a/tools/libaio/man/aio_write64.3 > +++ /dev/null > @@ -1,61 +0,0 @@ > -.TH aio_write64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -aio_write64 \- Initiate an asynchronous write operation > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <aio.h> > -.sp > -.br > -.BI "int aio_write64 (struct aiocb *aiocbp)" > -.fi > -.SH DESCRIPTION > -This function is similar to the > -.IR "aio_write" > -function. The only > -difference is that on > -.IR "32 bit" > -machines the file descriptor should > -be opened in the large file mode. Internally > -.IR "aio_write64" > -uses > -functionality equivalent to > -.IR "lseek64" > -to position the file descriptor correctly for the writing, > -as opposed to > -.IR "lseek" > -functionality used in > -.IR "aio_write". > - > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -, this > -function is available under the name > -.IR "aio_write" > -and so transparently > -replaces the interface for small files on 32 bit machines. > -.SH "RETURN VALUES" > -See > -.IR aio_write. > -.SH ERRORS > -See > -.IR aio_write. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR errno(3), > diff --git a/tools/libaio/man/io.3 b/tools/libaio/man/io.3 > deleted file mode 100644 > index d910a68..0000000 > --- a/tools/libaio/man/io.3 > +++ /dev/null > @@ -1,351 +0,0 @@ > -.TH io 3 2002-09-12 "Linux 2.4" Linux IO" > -.SH NAME > -io \- Asynchronous IO > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <libio.h> > -.sp > -.fi > -.SH DESCRIPTION > -The libaio library defines a new set of I/O operations which can > -significantly reduce the time an application spends waiting at I/O. The > -new functions allow a program to initiate one or more I/O operations and > -then immediately resume normal work while the I/O operations are > -executed in parallel. > - > -These functions are part of the library with realtime functions named > -.IR "libaio" > -. They are not actually part of the > -.IR "libc" > -binary. > -The implementation of these functions can be done using support in the > -kernel. > - > -All IO operations operate on files which were opened previously. There > -might be arbitrarily many operations running for one file. The > -asynchronous I/O operations are controlled using a data structure named > -.IR "struct iocb" > -It is defined in > -.IR "libio.h" > -as follows. > - > -.nf > - > -typedef struct io_context *io_context_t; > - > -typedef enum io_iocb_cmd { > - IO_CMD_PREAD = 0, > - IO_CMD_PWRITE = 1, > - > - IO_CMD_FSYNC = 2, > - IO_CMD_FDSYNC = 3, > - > - IO_CMD_POLL = 5, > - IO_CMD_NOOP = 6, > -} io_iocb_cmd_t; > - > -struct io_iocb_common { > - void *buf; > - unsigned __pad1; > - long nbytes; > - unsigned __pad2; > - long long offset; > - long long __pad3, __pad4; > -}; /* result code is the amount read or -'ve errno */ > - > - > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > - union { > - struct io_iocb_common c; > - struct io_iocb_vector v; > - struct io_iocb_poll poll; > - struct io_iocb_sockaddr saddr; > - } u; > -}; > - > - > -.fi > -.TP > -.IR "int aio_fildes" > -This element specifies the file descriptor to be used for the > -operation. It must be a legal descriptor, otherwise the operation will > -fail. > - > -The device on which the file is opened must allow the seek operation. > -I.e., it is not possible to use any of the IO operations on devices > -like terminals where an > -.IR "lseek" > -call would lead to an error. > -.TP > -.IR "long u.c.offset" > -This element specifies the offset in the file at which the operation (input > -or output) is performed. Since the operations are carried out in arbitrary > -order and more than one operation for one file descriptor can be > -started, one cannot expect a current read/write position of the file > -descriptor. > -.TP > -.IR "void *buf" > -This is a pointer to the buffer with the data to be written or the place > -where the read data is stored. > -.TP > -.IR "long u.c.nbytes" > -This element specifies the length of the buffer pointed to by > -.IR "io_buf" > -. > -.TP > -.IR "int aio_reqprio" > -Is not currently used. > -.TP > -.B "IO_CMD_PREAD" > -Start a read operation. Read from the file at position > -.IR "u.c.offset" > -and store the next > -.IR "u.c.nbytes" > -bytes in the > -buffer pointed to by > -.IR "buf" > -. > -.TP > -.B "IO_CMD_PWRITE" > -Start a write operation. Write > -.IR "u.c.nbytes" > -bytes starting at > -.IR "buf" > -into the file starting at position > -.IR "u.c.offset" > -. > -.TP > -.B "IO_CMD_NOP" > -Do nothing for this control block. This value is useful sometimes when > -an array of > -.IR "struct iocb" > -values contains holes, i.e., some of the > -values must not be handled although the whole array is presented to the > -.IR "io_submit" > -function. > -.TP > -.B "IO_CMD_FSYNC" > -.TP > -.B "IO_CMD_POLL" > -This is experimental. > -.SH EXAMPLE > -.nf > -/* > - * Simplistic version of copy command using async i/o > - * > - * From: Stephen Hemminger <shemminger@osdl.org> > - * Copy file by using a async I/O state machine. > - * 1. Start read request > - * 2. When read completes turn it into a write request > - * 3. When write completes decrement counter and free resources > - * > - * > - * Usage: aiocp file(s) desination > - */ > - > -#include <unistd.h> > -#include <stdio.h> > -#include <sys/types.h> > -#include <sys/stat.h> > -#include <sys/param.h> > -#include <fcntl.h> > -#include <errno.h> > - > -#include <libaio.h> > - > -#define AIO_BLKSIZE (64*1024) > -#define AIO_MAXIO 32 > - > -static int busy = 0; // # of I/O's in flight > -static int tocopy = 0; // # of blocks left to copy > -static int dstfd = -1; // destination file descriptor > -static const char *dstname = NULL; > -static const char *srcname = NULL; > - > - > -/* Fatal error handler */ > -static void io_error(const char *func, int rc) > -{ > - if (rc == -ENOSYS) > - fprintf(stderr, "AIO not in this kernel\n"); > - else if (rc < 0 && -rc < sys_nerr) > - fprintf(stderr, "%s: %s\n", func, sys_errlist[-rc]); > - else > - fprintf(stderr, "%s: error %d\n", func, rc); > - > - if (dstfd > 0) > - close(dstfd); > - if (dstname) > - unlink(dstname); > - exit(1); > -} > - > -/* > - * Write complete callback. > - * Adjust counts and free resources > - */ > -static void wr_done(io_context_t ctx, struct iocb *iocb, long res, long res2) > -{ > - if (res2 != 0) { > - io_error("aio write", res2); > - } > - if (res != iocb->u.c.nbytes) { > - fprintf(stderr, "write missed bytes expect %d got %d\n", iocb->u.c.nbytes, res2); > - exit(1); > - } > - --tocopy; > - --busy; > - free(iocb->u.c.buf); > - > - memset(iocb, 0xff, sizeof(iocb)); // paranoia > - free(iocb); > - write(2, "w", 1); > -} > - > -/* > - * Read complete callback. > - * Change read iocb into a write iocb and start it. > - */ > -static void rd_done(io_context_t ctx, struct iocb *iocb, long res, long res2) > -{ > - /* library needs accessors to look at iocb? */ > - int iosize = iocb->u.c.nbytes; > - char *buf = iocb->u.c.buf; > - off_t offset = iocb->u.c.offset; > - > - if (res2 != 0) > - io_error("aio read", res2); > - if (res != iosize) { > - fprintf(stderr, "read missing bytes expect %d got %d\n", iocb->u.c.nbytes, res); > - exit(1); > - } > - > - > - /* turn read into write */ > - io_prep_pwrite(iocb, dstfd, buf, iosize, offset); > - io_set_callback(iocb, wr_done); > - if (1 != (res = io_submit(ctx, 1, &iocb))) > - io_error("io_submit write", res); > - write(2, "r", 1); > -} > - > - > -int main(int argc, char *const *argv) > -{ > - int srcfd; > - struct stat st; > - off_t length = 0, offset = 0; > - io_context_t myctx; > - > - if (argc != 3 || argv[1][0] == '-') { > - fprintf(stderr, "Usage: aiocp SOURCE DEST"); > - exit(1); > - } > - if ((srcfd = open(srcname = argv[1], O_RDONLY)) < 0) { > - perror(srcname); > - exit(1); > - } > - if (fstat(srcfd, &st) < 0) { > - perror("fstat"); > - exit(1); > - } > - length = st.st_size; > - > - if ((dstfd = open(dstname = argv[2], O_WRONLY | O_CREAT, 0666)) < 0) { > - close(srcfd); > - perror(dstname); > - exit(1); > - } > - > - /* initialize state machine */ > - memset(&myctx, 0, sizeof(myctx)); > - io_queue_init(AIO_MAXIO, &myctx); > - tocopy = howmany(length, AIO_BLKSIZE); > - > - while (tocopy > 0) { > - int i, rc; > - /* Submit as many reads as once as possible upto AIO_MAXIO */ > - int n = MIN(MIN(AIO_MAXIO - busy, AIO_MAXIO / 2), > - howmany(length - offset, AIO_BLKSIZE)); > - if (n > 0) { > - struct iocb *ioq[n]; > - > - for (i = 0; i < n; i++) { > - struct iocb *io = (struct iocb *) malloc(sizeof(struct iocb)); > - int iosize = MIN(length - offset, AIO_BLKSIZE); > - char *buf = (char *) malloc(iosize); > - > - if (NULL == buf || NULL == io) { > - fprintf(stderr, "out of memory\n"); > - exit(1); > - } > - > - io_prep_pread(io, srcfd, buf, iosize, offset); > - io_set_callback(io, rd_done); > - ioq[i] = io; > - offset += iosize; > - } > - > - rc = io_submit(myctx, n, ioq); > - if (rc < 0) > - io_error("io_submit", rc); > - > - busy += n; > - } > - > - // Handle IO's that have completed > - rc = io_queue_run(myctx); > - if (rc < 0) > - io_error("io_queue_run", rc); > - > - // if we have maximum number of i/o's in flight > - // then wait for one to complete > - if (busy == AIO_MAXIO) { > - rc = io_queue_wait(myctx, NULL); > - if (rc < 0) > - io_error("io_queue_wait", rc); > - } > - > - } > - > - close(srcfd); > - close(dstfd); > - exit(0); > -} > - > -/* > - * Results look like: > - * [alanm@toolbox ~/MOT3]$ ../taio kernel-source-2.4.8-0.4g.ppc.rpm abc > - * rrrrrrrrrrrrrrrwwwrwrrwwrrwrwwrrwrwrwwrrwrwrrrrwwrwwwrrwrrrwwwwwwwwwwwwwwwww > - * rrrrrrrrrrrrrrwwwrrwrwrwrwrrwwwwwwwwwwwwwwrrrrrrrrrrrrrrrrrrwwwwrwrwwrwrwrwr > - * wrrrrrrrwwwwwwwwwwwwwrrrwrrrwrrwrwwwwwwwwwwrrrrwwrwrrrrrrrrrrrwwwwwwwwwwwrww > - * wwwrrrrrrrrwwrrrwwrwrwrwwwrrrrrrrwwwrrwwwrrwrwwwwwwwwrrrrrrrwwwrrrrrrrwwwwww > - * wwwwwwwrwrrrrrrrrwrrwrrwrrwrwrrrwrrrwrrrwrwwwwwwwwwwwwwwwwwwrrrwwwrrrrrrrrrr > - * rrwrrrrrrwrrwwwwwwwwwwwwwwwwrwwwrrwrwwrrrrrrrrrrrrrrrrrrrwwwwwwwwwwwwwwwwwww > - * rrrrrwrrwrwrwrrwrrrwwwwwwwwrrrrwrrrwrwwrwrrrwrrwrrrrwwwwwwwrwrwwwwrwwrrrwrrr > - * rrrwwwwwwwrrrrwwrrrrrrrrrrrrwrwrrrrwwwwwwwwwwwwwwrwrrrrwwwwrwrrrrwrwwwrrrwww > - * rwwrrrrrrrwrrrrrrrrrrrrwwwwrrrwwwrwrrwwwwwwwwwwwwwwwwwwwwwrrrrrrrwwwwwwwrw > - */ > -.fi > -.SH "SEE ALSO" > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_cancel.1 b/tools/libaio/man/io_cancel.1 > deleted file mode 100644 > index 16e898a..0000000 > --- a/tools/libaio/man/io_cancel.1 > +++ /dev/null > @@ -1,21 +0,0 @@ > -.\"/* sys_io_cancel: > -.\" * Attempts to cancel an iocb previously passed to io_submit. If > -.\" * the operation is successfully cancelled, the resulting event is > -.\" * copied into the memory pointed to by result without being placed > -.\" * into the completion queue and 0 is returned. May fail with > -.\" * -EFAULT if any of the data structures pointed to are invalid. > -.\" * May fail with -EINVAL if aio_context specified by ctx_id is > -.\" * invalid. May fail with -EAGAIN if the iocb specified was not > -.\" * cancelled. Will fail with -ENOSYS if not implemented. > -.\" */ > -.\" > -.TH io_cancel 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_cancel \- cancel io requests > -.SH SYNOPSIS > -.B #include <errno.h> > -.br > -.B #include <libaio.h> > -.LP > -.BI "int io_submit(io_context_t " ctx ", struct iocb *" iocb ", struct io_event *" result ");" > - > diff --git a/tools/libaio/man/io_cancel.3 b/tools/libaio/man/io_cancel.3 > deleted file mode 100644 > index 9a16084..0000000 > --- a/tools/libaio/man/io_cancel.3 > +++ /dev/null > @@ -1,65 +0,0 @@ > -.TH io_cancel 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_cancel \- Cancel io requests > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <libaio.h> > -.sp > -.br > -.BI "int io_cancel(io_context_t ctx, struct iocb *iocb)" > -.br > -.sp > -struct iocb { > - void *data; /* Return in the io completion event */ > - unsigned key; /* For use in identifying io requests */ > - short aio_lio_opcode; > - short aio_reqprio; /* Not used */ > - int aio_fildes; > -}; > -.fi > -.SH DESCRIPTION > -Attempts to cancel an iocb previously passed to io_submit. If > -the operation is successfully cancelled, the resulting event is > -copied into the memory pointed to by result without being placed > -into the completion queue. > -.PP > -When one or more requests are asynchronously processed, it might be > -useful in some situations to cancel a selected operation, e.g., if it > -becomes obvious that the written data is no longer accurate and would > -have to be overwritten soon. As an example, assume an application, which > -writes data in files in a situation where new incoming data would have > -to be written in a file which will be updated by an enqueued request. > -.SH "RETURN VALUES" > -0 is returned on success , otherwise returns Errno. > -.SH ERRORS > -.TP > -.B EFAULT > -If any of the data structures pointed to are invalid. > -.TP > -.B EINVAL > -If aio_context specified by ctx_id is > -invalid. > -.TP > -.B EAGAIN > -If the iocb specified was not > -cancelled. > -.TP > -.B ENOSYS > -if not implemented. > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_destroy.1 b/tools/libaio/man/io_destroy.1 > deleted file mode 100644 > index 177683b..0000000 > --- a/tools/libaio/man/io_destroy.1 > +++ /dev/null > @@ -1,17 +0,0 @@ > -.\"/* sys_io_destroy: > -.\" * Destroy the aio_context specified. May cancel any outstanding > -.\" * AIOs and block on completion. Will fail with -ENOSYS if not > -.\" * implemented. May fail with -EFAULT if the context pointed to > -.\" * is invalid. > -.\" */ > -.\" libaio provides this as io_queue_release. > -.TH io_destroy 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_destroy \- destroy an io context > -.SH SYNOPSIS > -.B #include <errno.h> > -.br > -.B #include <libaio.h> > -.LP > -.BI "int io_destroy(io_context_t " ctx ");" > - > diff --git a/tools/libaio/man/io_fsync.3 b/tools/libaio/man/io_fsync.3 > deleted file mode 100644 > index 53eb63d..0000000 > --- a/tools/libaio/man/io_fsync.3 > +++ /dev/null > @@ -1,82 +0,0 @@ > -./" static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) > -./" { > -./" io_prep_fsync(iocb, fd); > -./" io_set_callback(iocb, cb); > -./" return io_submit(ctx, 1, &iocb); > -./" } > -.TH io_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -io_fsync \- Synchronize a file's complete in-core state with that on disk > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <libaio.h> > -.sp > -.br > -.BI "int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd)" > -.sp > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.sp > -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); > -.sp > -.fi > -.SH DESCRIPTION > -When dealing with asynchronous operations it is sometimes necessary to > -get into a consistent state. This would mean for AIO that one wants to > -know whether a certain request or a group of request were processed. > -This could be done by waiting for the notification sent by the system > -after the operation terminated, but this sometimes would mean wasting > -resources (mainly computation time). > -.PP > -Calling this function forces all I/O operations operating queued at the > -time of the function call operating on the file descriptor > -.IR "iocb->io_fildes" > -into the synchronized I/O completion state . The > -.IR "io_fsync" > -function returns > -immediately but the notification through the method described in > -.IR "io_callback" > -will happen only after all requests for this > -file descriptor have terminated and the file is synchronized. This also > -means that requests for this very same file descriptor which are queued > -after the synchronization request are not affected. > -.SH "RETURN VALUES" > -Returns 0, otherwise returns errno. > -.SH ERRORS > -.TP > -.B EFAULT > -.I iocbs > -referenced data outside of the program's accessible address space. > -.TP > -.B EINVAL > -.I ctx > -refers to an unitialized aio context, the iocb pointed to by > -.I iocbs > -contains an improperly initialized iocb, > -.TP > -.B EBADF > -The iocb contains a file descriptor that does not exist. > -.TP > -.B EINVAL > -The file specified in the iocb does not support the given io operation. > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_getevents(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_getevents.1 b/tools/libaio/man/io_getevents.1 > deleted file mode 100644 > index 27730b9..0000000 > --- a/tools/libaio/man/io_getevents.1 > +++ /dev/null > @@ -1,29 +0,0 @@ > -./"/* io_getevents: > -./" * Attempts to read at least min_nr events and up to nr events from > -./" * the completion queue for the aio_context specified by ctx_id. May > -./" * fail with -EINVAL if ctx_id is invalid, if min_nr is out of range, > -./" * if nr is out of range, if when is out of range. May fail with > -./" * -EFAULT if any of the memory specified to is invalid. May return > -./" * 0 or < min_nr if no events are available and the timeout specified > -./" * by when has elapsed, where when == NULL specifies an infinite > -./" * timeout. Note that the timeout pointed to by when is relative and > -./" * will be updated if not NULL and the operation blocks. Will fail > -./" * with -ENOSYS if not implemented. > -./" */ > -./"asmlinkage long sys_io_getevents(io_context_t ctx_id, > -./" long min_nr, > -./" long nr, > -./" struct io_event *events, > -./" struct timespec *timeout) > -./" > -.TH io_getevents 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_getevents \- read resulting events from io requests > -.SH SYNOPSIS > -.B #include <errno.h> > -.br > -.B #include <libaio.h> > -.sp > -.BI "int io_getevents(io_context_t " ctx ", long " min_nr ", long " nr ", struct io_events *" events "[], struct timespec *" timeout ");" > - > - > diff --git a/tools/libaio/man/io_getevents.3 b/tools/libaio/man/io_getevents.3 > deleted file mode 100644 > index 8e9ddc8..0000000 > --- a/tools/libaio/man/io_getevents.3 > +++ /dev/null > @@ -1,79 +0,0 @@ > -./"/* io_getevents: > -./" * Attempts to read at least min_nr events and up to nr events from > -./" * the completion queue for the aio_context specified by ctx_id. May > -./" * fail with -EINVAL if ctx_id is invalid, if min_nr is out of range, > -./" * if nr is out of range, if when is out of range. May fail with > -./" * -EFAULT if any of the memory specified to is invalid. May return > -./" * 0 or < min_nr if no events are available and the timeout specified > -./" * by when has elapsed, where when == NULL specifies an infinite > -./" * timeout. Note that the timeout pointed to by when is relative and > -./" * will be updated if not NULL and the operation blocks. Will fail > -./" * with -ENOSYS if not implemented. > -./" */ > -./"asmlinkage long sys_io_getevents(io_context_t ctx_id, > -./" long min_nr, > -./" long nr, > -./" struct io_event *events, > -./" struct timespec *timeout) > -./" > -.TH io_getevents 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_getevents \- Read resulting events from io requests > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <libaio.h> > -.br > -.sp > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.sp > -struct io_event { > - unsigned PADDED(data, __pad1); > - unsigned PADDED(obj, __pad2); > - unsigned PADDED(res, __pad3); > - unsigned PADDED(res2, __pad4); > -}; > -.sp > -.BI "int io_getevents(io_context_t " ctx ", long " nr ", struct io_event *" events "[], struct timespec *" timeout ");" > - > -.fi > -.SH DESCRIPTION > -Attempts to read up to nr events from > -the completion queue for the aio_context specified by ctx. > -.SH "RETURN VALUES" > -May return > -0 if no events are available and the timeout specified > -by when has elapsed, where when == NULL specifies an infinite > -timeout. Note that the timeout pointed to by when is relative and > -will be updated if not NULL and the operation blocks. Will fail > -with ENOSYS if not implemented. > -.SH ERRORS > -.TP > -.B EINVAL > -if ctx_id is invalid, if min_nr is out of range, > -if nr is out of range, if when is out of range. > -.TP > -.B EFAULT > -if any of the memory specified to is invalid. > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_prep_fsync.3 b/tools/libaio/man/io_prep_fsync.3 > deleted file mode 100644 > index 4cf935a..0000000 > --- a/tools/libaio/man/io_prep_fsync.3 > +++ /dev/null > @@ -1,89 +0,0 @@ > -./" static inline void io_prep_fsync(struct iocb *iocb, int fd) > -./" { > -./" memset(iocb, 0, sizeof(*iocb)); > -./" iocb->aio_fildes = fd; > -./" iocb->aio_lio_opcode = IO_CMD_FSYNC; > -./" iocb->aio_reqprio = 0; > -./" } > -.TH io_prep_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -io_prep_fsync \- Synchronize a file's complete in-core state with that on disk > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.br > -.sp > -.B #include <libaio.h> > -.br > -.sp > -.BI "static inline void io_prep_fsync(struct iocb *iocb, int fd)" > -.sp > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.sp > -.fi > -.SH DESCRIPTION > -This is an inline convenience function for setting up an iocbv for a FSYNC request. > -.br > -The file for which > -.TP > -.IR "iocb->aio_fildes = fd" > -is a descriptor is set up with > -the command > -.TP > -.IR "iocb->aio_lio_opcode = IO_CMD_FSYNC: > -. > -.PP > -The io_prep_fsync() function shall set up an IO_CMD_FSYNC operation > -to asynchronously force all I/O > -operations associated with the file indicated by the file > -descriptor aio_fildes member of the iocb structure referenced by > -the iocb argument and queued at the time of the call to > -io_submit() to the synchronized I/O completion state. The function > -call shall return when the synchronization request has been > -initiated or queued to the file or device (even when the data > -cannot be synchronized immediately). > - > -All currently queued I/O operations shall be completed as if by a call > -to fsync(); that is, as defined for synchronized I/O file > -integrity completion. If the > -operation queued by io_prep_fsync() fails, then, as for fsync(), > -outstanding I/O operations are not guaranteed to have > -been completed. > - > -If io_prep_fsync() succeeds, then it is only the I/O that was queued > -at the time of the call to io_submit() that is guaranteed to be > -forced to the relevant completion state. The completion of > -subsequent I/O on the file descriptor is not guaranteed to be > -completed in a synchronized fashion. > -.PP > -This function returns immediately . To schedule the operation, the > -function > -.IR io_submit > -must be called. > -.PP > -Simultaneous asynchronous operations using the same iocb produce > -undefined results. > -.SH "RETURN VALUES" > -None > -.SH ERRORS > -None > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_prep_pread.3 b/tools/libaio/man/io_prep_pread.3 > deleted file mode 100644 > index 5938aec..0000000 > --- a/tools/libaio/man/io_prep_pread.3 > +++ /dev/null > @@ -1,79 +0,0 @@ > -./" static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > -./" { > -./" memset(iocb, 0, sizeof(*iocb)); > -./" iocb->aio_fildes = fd; > -./" iocb->aio_lio_opcode = IO_CMD_PREAD; > -./" iocb->aio_reqprio = 0; > -./" iocb->u.c.buf = buf; > -./" iocb->u.c.nbytes = count; > -./" iocb->u.c.offset = offset; > -./" } > -.TH io_prep_pread 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -io_prep_pread \- Set up asynchronous read > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.sp > -.br > -.B #include <libaio.h> > -.br > -.sp > -.BI "inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > -" > -.sp > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.fi > -.SH DESCRIPTION > -.IR io_prep_pread > -is an inline convenience function designed to facilitate the initialization of > -the iocb for an asynchronous read operation. > - > -The first > -.TP > -.IR "iocb->u.c.nbytes = count" > -bytes of the file for which > -.TP > -.IR "iocb->aio_fildes = fd" > -is a descriptor are written to the buffer > -starting at > -.TP > -.IR "iocb->u.c.buf = buf" > -. > -.br > -Reading starts at the absolute position > -.TP > -.IR "ioc->u.c.offset = offset" > -in the file. > -.PP > -This function returns immediately . To schedule the operation, the > -function > -.IR io_submit > -must be called. > -.PP > -Simultaneous asynchronous operations using the same iocb produce > -undefined results. > -.SH "RETURN VALUES" > -None > -.SH ERRORS > -None > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_prep_pwrite.3 b/tools/libaio/man/io_prep_pwrite.3 > deleted file mode 100644 > index 68b3500..0000000 > --- a/tools/libaio/man/io_prep_pwrite.3 > +++ /dev/null > @@ -1,77 +0,0 @@ > -./" static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > -./" { > -./" memset(iocb, 0, sizeof(*iocb)); > -./" iocb->aio_fildes = fd; > -./" iocb->aio_lio_opcode = IO_CMD_PWRITE; > -./" iocb->aio_reqprio = 0; > -./" iocb->u.c.buf = buf; > -./" iocb->u.c.nbytes = count; > -./" iocb->u.c.offset = offset; > -./" } > -.TH io_prep_pwrite 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -io_prep_pwrite \- Set up iocb for asynchronous writes > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.br > -.sp > -.B #include <libaio.h> > -.br > -.sp > -.BI "inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > -" > -.sp > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.fi > -.SH DESCRIPTION > -io_prep_write is a convenicence function for setting up parallel writes. > - > -The first > -.TP > -.IR "iocb->u.c.nbytes = count" > -bytes of the file for which > -.TP > -.IR "iocb->aio_fildes = fd" > -is a descriptor are written from the buffer > -starting at > -.TP > -.IR "iocb->u.c.buf = buf" > -. > -.br > -Writing starts at the absolute position > -.TP > -.IR "ioc->u.c.offset = offset" > -in the file. > -.PP > -This function returns immediately . To schedule the operation, the > -function > -.IR io_submit > -must be called. > -.PP > -Simultaneous asynchronous operations using the same iocb produce > -undefined results. > -.SH "RETURN VALUES" > -None > -.SH ERRORS > -None > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_queue_init.3 b/tools/libaio/man/io_queue_init.3 > deleted file mode 100644 > index 317f631..0000000 > --- a/tools/libaio/man/io_queue_init.3 > +++ /dev/null > @@ -1,63 +0,0 @@ > -.TH io_queue_init 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_queue_init \- Initialize asynchronous io state machine > - > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.br > -.sp > -.B #include <libaio.h> > -.br > -.sp > -.BI "int io_queue_init(int maxevents, io_context_t *ctx );" > -.sp > -.fi > -.SH DESCRIPTION > -.B io_queue_init > -Attempts to create an aio context capable of receiving at least > -.IR maxevents > -events. > -.IR ctx > -must point to an aio context that already exists and must be initialized > -to > -.IR 0 > -before the call. > -If the operation is successful, *cxtp is filled with the resulting handle. > -.SH "RETURN VALUES" > -On success, > -.B io_queue_init > -returns 0. Otherwise, -error is return, where > -error is one of the Exxx values defined in the Errors section. > -.SH ERRORS > -.TP > -.B EFAULT > -.I iocbs > -referenced data outside of the program's accessible address space. > -.TP > -.B EINVAL > -.I maxevents > -is <= 0 or > -.IR ctx > -is an invalid memory locattion. > -.TP > -.B ENOSYS > -Not implemented > -.TP > -.B EAGAIN > -.IR "maxevents > max_aio_reqs" > -where max_aio_reqs is a tunable value. > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_queue_release.3 b/tools/libaio/man/io_queue_release.3 > deleted file mode 100644 > index 06b9ec0..0000000 > --- a/tools/libaio/man/io_queue_release.3 > +++ /dev/null > @@ -1,48 +0,0 @@ > -.TH io_queue_release 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_queue_release \- Release the context associated with the userspace handle > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.br > -.B #include <libaio.h> > -.br > -.sp > -.BI "int io_queue_release(io_context_t ctx)" > -.sp > -.SH DESCRIPTION > -.B io_queue_release > -destroys the context associated with the userspace handle. May cancel any outstanding > -AIOs and block on completion. > - > -.B cts. > -.SH "RETURN VALUES" > -On success, > -.B io_queue_release > -returns 0. Otherwise, -error is return, where > -error is one of the Exxx values defined in the Errors section. > -.SH ERRORS > -.TP > -.B EINVAL > -.I ctx > -refers to an unitialized aio context, the iocb pointed to by > -.I iocbs > -contains an improperly initialized iocb, > -.TP > -.B ENOSYS > -Not implemented > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > - > diff --git a/tools/libaio/man/io_queue_run.3 b/tools/libaio/man/io_queue_run.3 > deleted file mode 100644 > index 57dd417..0000000 > --- a/tools/libaio/man/io_queue_run.3 > +++ /dev/null > @@ -1,50 +0,0 @@ > -.TH io_queue_run 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_queue_run \- Handle completed io requests > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.br > -.sp > -.B #include <libaio.h> > -.br > -.sp > -.BI "int io_queue_run(io_context_t ctx );" > -.sp > -.fi > -.SH DESCRIPTION > -.B io_queue_run > -Attempts to read all the events events from > -the completion queue for the aio_context specified by ctx_id. > -.SH "RETURN VALUES" > -May return > -0 if no events are available. > -Will fail with -ENOSYS if not implemented. > -.SH ERRORS > -.TP > -.B EFAULT > -.I iocbs > -referenced data outside of the program's accessible address space. > -.TP > -.B EINVAL > -.I ctx > -refers to an unitialized aio context, the iocb pointed to by > -.I iocbs > -contains an improperly initialized iocb, > -.TP > -.B ENOSYS > -Not implemented > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_queue_wait.3 b/tools/libaio/man/io_queue_wait.3 > deleted file mode 100644 > index 2306663..0000000 > --- a/tools/libaio/man/io_queue_wait.3 > +++ /dev/null > @@ -1,56 +0,0 @@ > -.TH io_queue_wait 2 2002-09-03 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_queue_wait \- Wait for io requests to complete > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.br > -.sp > -.B #include <libaio.h> > -.br > -.sp > -.BI "int io_queue_wait(io_context_t ctx, const struct timespec *timeout);" > -.fi > -.SH DESCRIPTION > -Attempts to read an event from > -the completion queue for the aio_context specified by ctx_id. > -.SH "RETURN VALUES" > -May return > -0 if no events are available and the timeout specified > -by when has elapsed, where when == NULL specifies an infinite > -timeout. Note that the timeout pointed to by when is relative and > -will be updated if not NULL and the operation blocks. Will fail > -with -ENOSYS if not implemented. > -.SH "RETURN VALUES" > -On success, > -.B io_queue_wait > -returns 0. Otherwise, -error is return, where > -error is one of the Exxx values defined in the Errors section. > -.SH ERRORS > -.TP > -.B EFAULT > -.I iocbs > -referenced data outside of the program's accessible address space. > -.TP > -.B EINVAL > -.I ctx > -refers to an unitialized aio context, the iocb pointed to by > -.I iocbs > -contains an improperly initialized iocb, > -.TP > -.B ENOSYS > -Not implemented > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_set_callback(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_set_callback.3 b/tools/libaio/man/io_set_callback.3 > deleted file mode 100644 > index a8ca789..0000000 > --- a/tools/libaio/man/io_set_callback.3 > +++ /dev/null > @@ -1,44 +0,0 @@ > -./"\x03static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) > -.TH io_set_callback 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -io_set_callback \- Set up io completion callback function > -.SH SYNOPSYS > -.nf > -.B #include <errno.h> > -.br > -.sp > -.B #include <libaio.h> > -.br > -.sp > -.BI "static inline void io_set_callback(struct iocb *iocb, io_callback_t cb)" > -.sp > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.sp > -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); > -.sp > -.fi > -.SH DESCRIPTION > -The callback is not done if the caller uses raw events from > -io_getevents, only with the library helpers > -.SH "RETURN VALUES" > -.SH ERRORS > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_submit(3), > -.BR errno(3) > diff --git a/tools/libaio/man/io_setup.1 b/tools/libaio/man/io_setup.1 > deleted file mode 100644 > index 68690e1..0000000 > --- a/tools/libaio/man/io_setup.1 > +++ /dev/null > @@ -1,15 +0,0 @@ > -./"/* sys_io_setup: > -./" * Create an aio_context capable of receiving at least nr_events. > -./" * ctxp must not point to an aio_context that already exists, and > -./" * must be initialized to 0 prior to the call. On successful > -./" * creation of the aio_context, *ctxp is filled in with the resulting > -./" * handle. May fail with -EINVAL if *ctxp is not initialized, > -./" * if the specified nr_events exceeds internal limits. May fail > -./" * with -EAGAIN if the specified nr_events exceeds the user's limit > -./" * of available events. May fail with -ENOMEM if insufficient kernel > -./" * resources are available. May fail with -EFAULT if an invalid > -./" * pointer is passed for ctxp. Will fail with -ENOSYS if not > -./" * implemented. > -./" */ > -./" -- note: libaio is actually providing io_queue_init and io_queue_grow > -./" as separate functions. For now io_setup is the same as io_queue_grow. > diff --git a/tools/libaio/man/io_submit.1 b/tools/libaio/man/io_submit.1 > deleted file mode 100644 > index f66e80f..0000000 > --- a/tools/libaio/man/io_submit.1 > +++ /dev/null > @@ -1,109 +0,0 @@ > -.TH io_submit 2 2002-09-02 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_submit \- submit io requests > -.SH SYNOPSIS > -.B #include <errno.h> > -.br > -.B #include <libaio.h> > -.LP > -.BI "int io_submit(io_context_t " ctx ", long " nr ", struct iocb *" iocbs "[]);" > -.SH DESCRIPTION > -.B io_submit > -submits to the io_context > -.I ctx > -up to > -.I nr > -I/O requests pointed to by the vector > -.IR iocbs . > - > -The > -.B iocb > -structure is defined as something like > -.sp > -.RS > -.nf > -struct iocb { > - void *data; > -.\" unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.fi > -.RE > -.sp > -.I data > -is a an opaque pointer which will upon completion be returned in the > -.B io_event > -structure by > -.BR io_getevents (2). > -.\" and io_wait(2) > -Callers will typically use this to point directly or indirectly to a > -callback function. > -.sp > -.I aio_lio_opcode > -is the I/O operation requested. Callers will typically set this and the > -arguments to the I/O operation calling the > -.BR io_prep_ (3) > -function corresponding to the operation. > -.sp > -.I aio_reqprio > -is the priority of the request. Higher values have more priority; the > -normal priority is 0. > -.sp > -.I aio_fildes > -is the file descriptor for the I/O operation. > -Callers will typically set this and the > -arguments to the I/O operation calling the > -.BR io_prep_ *(3) > -function corresponding to the operation. > -.sp > -The caller may not modify the contents or resubmit a submitted > -.B iocb > -structure until after the operation completes or is canceled. > -The implementation of > -.BR io_submit (2) > -is permitted to modify reserved fields of the > -.B iocb > -structure. > -.SH "RETURN VALUES" > -If able to submit at least one iocb, > -.B io_submit > -returns the number of iocbs submitted successfully. Otherwise, > -.RI - error > -is returned, where > -.I error > -is one of the Exxx values defined in the Errors section. > -.SH ERRORS > -.TP > -.B EFAULT > -.I iocbs > -referenced data outside of the program's accessible address space. > -.TP > -.B EINVAL > -.I nr > -is negative, > -.I ctx > -refers to an uninitialized aio context, the iocb pointed to by > -.IR iocbs [0] > -is improperly initialized or specifies an unsupported operation. > -.TP > -.B EBADF > -The iocb pointed to by > -.IR iocbs [0] > -contains a file descriptor that does not exist. > -.TP > -.B EAGAIN > -Insufficient resources were available to queue any operations. > -.SH "SEE ALSO" > -.BR io_setup (2), > -.BR io_destroy (2), > -.BR io_getevents (2), > -.\".BR io_wait (2), > -.BR io_prep_pread (3), > -.BR io_prep_pwrite (3), > -.BR io_prep_fsync (3), > -.BR io_prep_fdsync (3), > -.BR io_prep_noop (3), > -.BR io_cancel (2), > -.BR errno (3) > diff --git a/tools/libaio/man/io_submit.3 b/tools/libaio/man/io_submit.3 > deleted file mode 100644 > index b6966ef..0000000 > --- a/tools/libaio/man/io_submit.3 > +++ /dev/null > @@ -1,135 +0,0 @@ > -./"/* sys_io_submit: > -./" * Queue the nr iocbs pointed to by iocbpp for processing. Returns > -./" * the number of iocbs queued. May return -EINVAL if the aio_context > -./" * specified by ctx_id is invalid, if nr is < 0, if the iocb at > -./" * *iocbpp[0] is not properly initialized, if the operation specified > -./" * is invalid for the file descriptor in the iocb. May fail with > -./" * -EFAULT if any of the data structures point to invalid data. May > -./" * fail with -EBADF if the file descriptor specified in the first > -./" * iocb is invalid. May fail with -EAGAIN if insufficient resources > -./" * are available to queue any iocbs. Will return 0 if nr is 0. Will > -./" * fail with -ENOSYS if not implemented. > -./" */ > -.TH io_submit 2 2002-09-02 "Linux 2.4" "Linux AIO" > -.SH NAME > -io_submit \- Submit io requests > -.SH SYNOPSIS > -.nf > -.B #include <errno.h> > -.br > -.sp > -.B #include <libaio.h> > -.br > -.sp > -.BI "int io_submit(io_context_t " ctx ", long " nr ", struct iocb *" iocbs "[]);" > -.sp > -struct iocb { > - void *data; > - unsigned key; > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > -}; > -.fi > -.SH DESCRIPTION > -.B io_submit > -submits > -.I nr > -iocbs for processing for a given io context ctx. > - > -The > -.IR "io_submit" > -function can be used to enqueue an arbitrary > -number of read and write requests at one time. The requests can all be > -meant for the same file, all for different files or every solution in > -between. > - > -.IR "io_submit" > -gets the > -.IR "nr" > -requests from the array pointed to > -by > -.IR "iocbs" > -. The operation to be performed is determined by the > -.IR "aio_lio_opcode" > -member in each element of > -.IR "iocbs" > -. If this > -field is > -.B "IO_CMD_PREAD" > -a read operation is enqueued, similar to a call > -of > -.IR "io_prep_pread" > -for this element of the array (except that the way > -the termination is signalled is different, as we will see below). If > -the > -.IR "aio_lio_opcode" > -member is > -.B "IO_CMD_PWRITE" > -a write operation > -is enqueued. Otherwise the > -.IR "aio_lio_opcode" > -must be > -.B "IO_CMD_NOP" > -in which case this element of > -.IR "iocbs" > -is simply ignored. This > -``operation'' is useful in situations where one has a fixed array of > -.IR "struct iocb" > -elements from which only a few need to be handled at > -a time. Another situation is where the > -.IR "io_submit" > -call was > -canceled before all requests are processed and the remaining requests have to be reissued. > - > -The other members of each element of the array pointed to by > -.IR "iocbs" > -must have values suitable for the operation as described in > -the documentation for > -.IR "io_prep_pread" > -and > -.IR "io_prep_pwrite" > -above. > - > -The function returns immediately after > -having enqueued all the requests. > -On success, > -.B io_submit > -returns the number of iocbs submitted successfully. Otherwise, -error is return, where > -error is one of the Exxx values defined in the Errors section. > -.PP > -If an error is detected, then the behavior is undefined. > -.PP > -Simultaneous asynchronous operations using the same iocb produce > -undefined results. > -.SH ERRORS > -.TP > -.B EFAULT > -.I iocbs > -referenced data outside of the program's accessible address space. > -.TP > -.B EINVAL > -.I ctx > -refers to an unitialized aio context, the iocb pointed to by > -.I iocbs > -contains an improperly initialized iocb, > -.TP > -.B EBADF > -The iocb contains a file descriptor that does not exist. > -.TP > -.B EINVAL > -The file specified in the iocb does not support the given io operation. > -.SH "SEE ALSO" > -.BR io(3), > -.BR io_cancel(3), > -.BR io_fsync(3), > -.BR io_getevents(3), > -.BR io_prep_fsync(3), > -.BR io_prep_pread(3), > -.BR io_prep_pwrite(3), > -.BR io_queue_init(3), > -.BR io_queue_release(3), > -.BR io_queue_run(3), > -.BR io_queue_wait(3), > -.BR io_set_callback(3), > -.BR errno(3) > diff --git a/tools/libaio/man/lio_listio.3 b/tools/libaio/man/lio_listio.3 > deleted file mode 100644 > index 9b5b5e4..0000000 > --- a/tools/libaio/man/lio_listio.3 > +++ /dev/null > @@ -1,229 +0,0 @@ > -.TH lio_listio 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -lio_listio - List directed I/O > -.SH SYNOPSYS > -.B #include <errno.h> > -.br > -.B #include <libaio.h> > -.LP > -.BI "int lio_listio (int mode, struct aiocb *const list[], int nent, struct sigevent *sig)" > -.nf > -.SH DESCRIPTION > - > -Besides these functions with the more or less traditional interface, > -POSIX.1b also defines a function which can initiate more than one > -operation at a time, and which can handle freely mixed read and write > -operations. It is therefore similar to a combination of > -.IR readv > -and > -.IR "writev" > -. > - > -The > -.IR "lio_listio" > -function can be used to enqueue an arbitrary > -number of read and write requests at one time. The requests can all be > -meant for the same file, all for different files or every solution in > -between. > - > -.IR "lio_listio" > -gets the > -.IR "nent" > -requests from the array pointed to > -by > -.IR "list" > -. The operation to be performed is determined by the > -.IR "aio_lio_opcode" > -member in each element of > -.IR "list" > -. If this > -field is > -.B "LIO_READ" > -a read operation is enqueued, similar to a call > -of > -.IR "aio_read" > -for this element of the array (except that the way > -the termination is signalled is different, as we will see below). If > -the > -.IR "aio_lio_opcode" > -member is > -.B "LIO_WRITE" > -a write operation > -is enqueued. Otherwise the > -.IR "aio_lio_opcode" > -must be > -.B "LIO_NOP" > -in which case this element of > -.IR "list" > -is simply ignored. This > -``operation'' is useful in situations where one has a fixed array of > -.IR "struct aiocb" > -elements from which only a few need to be handled at > -a time. Another situation is where the > -.IR "lio_listio" > -call was > -canceled before all requests are processed and the remaining requests have to be reissued. > - > -The other members of each element of the array pointed to by > -.IR "list" > -must have values suitable for the operation as described in > -the documentation for > -.IR "aio_read" > -and > -.IR "aio_write" > -above. > - > -The > -.IR "mode" > -argument determines how > -.IR "lio_listio" > -behaves after > -having enqueued all the requests. If > -.IR "mode" > -is > -.B "LIO_WAIT" > -it > -waits until all requests terminated. Otherwise > -.IR "mode" > -must be > -.B "LIO_NOWAIT" > -and in this case the function returns immediately after > -having enqueued all the requests. In this case the caller gets a > -notification of the termination of all requests according to the > -.IR "sig" > -parameter. If > -.IR "sig" > -is > -.B "NULL" > -no notification is > -send. Otherwise a signal is sent or a thread is started, just as > -described in the description for > -.IR "aio_read" > -or > -.IR "aio_write" > -. > - > -When the sources are compiled with > -.B "_FILE_OFFSET_BITS == 64" > -, this > -function is in fact > -.IR "lio_listio64" > -since the LFS interface > -transparently replaces the normal implementation. > -.SH "RETURN VALUES" > -If > -.IR "mode" > -is > -.B "LIO_WAIT" > -, the return value of > -.IR "lio_listio" > -is > -.IR 0 > -when all requests completed successfully. Otherwise the > -function return > -.IR 1 > -and > -.IR "errno" > -is set accordingly. To find > -out which request or requests failed one has to use the > -.IR "aio_error" > -function on all the elements of the array > -.IR "list" > -. > - > -In case > -.IR "mode" > -is > -.B "LIO_NOWAIT" > -, the function returns > -.IR 0 > -if > -all requests were enqueued correctly. The current state of the requests > -can be found using > -.IR "aio_error" > -and > -.IR "aio_return" > -as described > -above. If > -.IR "lio_listio" > -returns > -.IR -1 > -in this mode, the > -global variable > -.IR "errno" > -is set accordingly. If a request did not > -yet terminate, a call to > -.IR "aio_error" > -returns > -.B "EINPROGRESS" > -. If > -the value is different, the request is finished and the error value (or > - > -.IR 0 > -) is returned and the result of the operation can be retrieved > -using > -.IR "aio_return" > -. > -.SH ERRORS > -Possible values for > -.IR "errno" > -are: > - > -.TP > -.B EAGAIN > -The resources necessary to queue all the requests are not available at > -the moment. The error status for each element of > -.IR "list" > -must be > -checked to determine which request failed. > - > -Another reason could be that the system wide limit of AIO requests is > -exceeded. This cannot be the case for the implementation on GNU systems > -since no arbitrary limits exist. > -.TP > -.B EINVAL > -The > -.IR "mode" > -parameter is invalid or > -.IR "nent" > -is larger than > -.B "AIO_LISTIO_MAX" > -. > -.TP > -.B EIO > -One or more of the request's I/O operations failed. The error status of > -each request should be checked to determine which one failed. > -.TP > -.B ENOSYS > -The > -.IR "lio_listio" > -function is not supported. > -.PP > - > -If the > -.IR "mode" > -parameter is > -.B "LIO_NOWAIT" > -and the caller cancels > -a request, the error status for this request returned by > -.IR "aio_error" > -is > -.B "ECANCELED" > -. > -.SH "SEE ALSO" > -.BR aio(3), > -.BR aio_cancel(3), > -.BR aio_cancel64(3), > -.BR aio_error(3), > -.BR aio_error64(3), > -.BR aio_fsync(3), > -.BR aio_fsync64(3), > -.BR aio_init(3), > -.BR aio_read(3), > -.BR aio_read64(3), > -.BR aio_return(3), > -.BR aio_return64(3), > -.BR aio_suspend(3), > -.BR aio_suspend64(3), > -.BR aio_write(3), > -.BR aio_write64(3) > diff --git a/tools/libaio/man/lio_listio64.3 b/tools/libaio/man/lio_listio64.3 > deleted file mode 100644 > index 97f6955..0000000 > --- a/tools/libaio/man/lio_listio64.3 > +++ /dev/null > @@ -1,39 +0,0 @@ > -.TH lio_listio64 3 2002-09-12 "Linux 2.4" Linux AIO" > -.SH NAME > -lio_listio64 \- List directed I/O > -.SH SYNOPSYS > -.B #include <errno.h> > -.br > -.B #include <libaio.h> > -.LP > -.BI "int lio_listio64 (int mode, struct aiocb *const list[], int nent, struct sigevent *sig)" > -.nf > -.SH DESCRIPTION > -This function is similar to the > -.IR "code{lio_listio" > -function. The only > -difference is that on > -.IR "32 bit" > -machines, the file descriptor should > -be opened in the large file mode. Internally, > -.IR "lio_listio64" > -uses > -functionality equivalent to > -.IR lseek64" > -to position the file descriptor correctly for the reading or > -writing, as opposed to > -.IR "lseek" > -functionality used in > -.IR "lio_listio". > - > -When the sources are compiled with > -.IR "_FILE_OFFSET_BITS == 64" > -, this > -function is available under the name > -.IR "lio_listio" > -and so > -transparently replaces the interface for small files on 32 bit > -machines. > -.SH "RETURN VALUES" > -.SH ERRORS > -.SH "SEE ALSO" > diff --git a/tools/libaio/src/Makefile b/tools/libaio/src/Makefile > deleted file mode 100644 > index 575ad61..0000000 > --- a/tools/libaio/src/Makefile > +++ /dev/null > @@ -1,67 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/Rules.mk > - > -prefix=$(PREFIX) > -includedir=$(prefix)/include > -libdir=$(prefix)/lib > - > -ARCH := $(shell uname -m | sed -e s/i.86/i386/) > -CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC > -SO_CFLAGS=-shared $(CFLAGS) > -L_CFLAGS=$(CFLAGS) > -LINK_FLAGS= > - > -soname=libaio.so.1 > -minor=0 > -micro=1 > -libname=$(soname).$(minor).$(micro) > -all_targets += libaio.a $(libname) > - > -all: $(all_targets) > - > -# libaio provided functions > -libaio_srcs := io_queue_init.c io_queue_release.c > -libaio_srcs += io_queue_wait.c io_queue_run.c > - > -# real syscalls > -libaio_srcs += io_getevents.c io_submit.c io_cancel.c > -libaio_srcs += io_setup.c io_destroy.c > - > -# internal functions > -libaio_srcs += raw_syscall.c > - > -# old symbols > -libaio_srcs += compat-0_1.c > - > -libaio_objs := $(patsubst %.c,%.ol,$(libaio_srcs)) > -libaio_sobjs := $(patsubst %.c,%.os,$(libaio_srcs)) > - > -$(libaio_objs) $(libaio_sobjs): libaio.h vsys_def.h > - > -%.os: %.c > - $(CC) $(SO_CFLAGS) -c -o $@ $< > - > -%.ol: %.c > - $(CC) $(L_CFLAGS) -c -o $@ $< > - > - > -libaio.a: $(libaio_objs) > - rm -f libaio.a > - $(AR) r libaio.a $^ > - $(RANLIB) libaio.a > - > -$(libname): $(libaio_sobjs) libaio.map > - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) > - > -install: $(all_targets) > - install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h > - install -D -m 644 libaio.a $(DESTDIR)$(libdir)/libaio.a > - install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) > - ln -sf $(libname) $(DESTDIR)$(libdir)/$(soname) > - ln -sf $(libname) $(DESTDIR)$(libdir)/libaio.so > - > -$(libaio_objs): libaio.h > - > -clean: > - rm -f $(all_targets) $(libaio_objs) $(libaio_sobjs) $(soname).new > - rm -f *.so* *.a *.o > diff --git a/tools/libaio/src/compat-0_1.c b/tools/libaio/src/compat-0_1.c > deleted file mode 100644 > index 53d520b..0000000 > --- a/tools/libaio/src/compat-0_1.c > +++ /dev/null > @@ -1,62 +0,0 @@ > -/* libaio Linux async I/O interface > - > - compat-0_1.c : compatibility symbols for libaio 0.1.x-0.3.x > - > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <stdlib.h> > -#include <sys/time.h> > - > -#include "libaio.h" > -#include "vsys_def.h" > - > -#include "syscall.h" > - > - > -/* ABI change. Provide partial compatibility on this one for now. */ > -SYMVER(compat0_1_io_cancel, io_cancel, 0.1); > -int compat0_1_io_cancel(io_context_t ctx, struct iocb *iocb) > -{ > - struct io_event event; > - > - /* FIXME: the old ABI would return the event on the completion queue */ > - return io_cancel(ctx, iocb, &event); > -} > - > -SYMVER(compat0_1_io_queue_wait, io_queue_wait, 0.1); > -int compat0_1_io_queue_wait(io_context_t ctx, struct timespec *when) > -{ > - struct timespec timeout; > - if (when) > - timeout = *when; > - return io_getevents(ctx, 0, 0, NULL, when ? &timeout : NULL); > -} > - > - > -/* ABI change. Provide backwards compatibility for this one. */ > -SYMVER(compat0_1_io_getevents, io_getevents, 0.1); > -int compat0_1_io_getevents(io_context_t ctx_id, long nr, > - struct io_event *events, > - const struct timespec *const_timeout) > -{ > - struct timespec timeout; > - if (const_timeout) > - timeout = *const_timeout; > - return io_getevents(ctx_id, 1, nr, events, > - const_timeout ? &timeout : NULL); > -} > - > diff --git a/tools/libaio/src/io_cancel.c b/tools/libaio/src/io_cancel.c > deleted file mode 100644 > index 2f0f5f4..0000000 > --- a/tools/libaio/src/io_cancel.c > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* io_cancel.c > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <libaio.h> > -#include "syscall.h" > - > -io_syscall3(int, io_cancel_0_4, io_cancel, io_context_t, ctx, struct iocb *, iocb, struct io_event *, event) > -DEFSYMVER(io_cancel_0_4, io_cancel, 0.4) > diff --git a/tools/libaio/src/io_destroy.c b/tools/libaio/src/io_destroy.c > deleted file mode 100644 > index 0ab6bd1..0000000 > --- a/tools/libaio/src/io_destroy.c > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* io_destroy > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <errno.h> > -#include <libaio.h> > -#include "syscall.h" > - > -io_syscall1(int, io_destroy, io_destroy, io_context_t, ctx) > diff --git a/tools/libaio/src/io_getevents.c b/tools/libaio/src/io_getevents.c > deleted file mode 100644 > index 5a05174..0000000 > --- a/tools/libaio/src/io_getevents.c > +++ /dev/null > @@ -1,57 +0,0 @@ > -/* io_getevents.c > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <libaio.h> > -#include <errno.h> > -#include <stdlib.h> > -#include <time.h> > -#include "syscall.h" > - > -io_syscall5(int, __io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout) > - > -#define AIO_RING_MAGIC 0xa10a10a1 > - > -/* Ben will hate me for this */ > -struct aio_ring { > - unsigned id; /* kernel internal index number */ > - unsigned nr; /* number of io_events */ > - unsigned head; > - unsigned tail; > - > - unsigned magic; > - unsigned compat_features; > - unsigned incompat_features; > - unsigned header_length; /* size of aio_ring */ > -}; > - > -int io_getevents_0_4(io_context_t ctx, long min_nr, long nr, struct io_event * events, struct timespec * timeout) > -{ > - struct aio_ring *ring; > - ring = (struct aio_ring*)ctx; > - if (ring==NULL || ring->magic != AIO_RING_MAGIC) > - goto do_syscall; > - if (timeout!=NULL && timeout->tv_sec == 0 && timeout->tv_nsec == 0) { > - if (ring->head == ring->tail) > - return 0; > - } > - > -do_syscall: > - return __io_getevents_0_4(ctx, min_nr, nr, events, timeout); > -} > - > -DEFSYMVER(io_getevents_0_4, io_getevents, 0.4) > diff --git a/tools/libaio/src/io_queue_init.c b/tools/libaio/src/io_queue_init.c > deleted file mode 100644 > index 563d137..0000000 > --- a/tools/libaio/src/io_queue_init.c > +++ /dev/null > @@ -1,33 +0,0 @@ > -/* io_queue_init.c > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <libaio.h> > -#include <sys/types.h> > -#include <sys/stat.h> > -#include <errno.h> > - > -#include "syscall.h" > - > -int io_queue_init(int maxevents, io_context_t *ctxp) > -{ > - if (maxevents > 0) { > - *ctxp = NULL; > - return io_setup(maxevents, ctxp); > - } > - return -EINVAL; > -} > diff --git a/tools/libaio/src/io_queue_release.c b/tools/libaio/src/io_queue_release.c > deleted file mode 100644 > index 94bbb86..0000000 > --- a/tools/libaio/src/io_queue_release.c > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* io_queue_release.c > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <libaio.h> > -#include <sys/types.h> > -#include <sys/stat.h> > -#include <errno.h> > - > -int io_queue_release(io_context_t ctx) > -{ > - return io_destroy(ctx); > -} > diff --git a/tools/libaio/src/io_queue_run.c b/tools/libaio/src/io_queue_run.c > deleted file mode 100644 > index e0132f4..0000000 > --- a/tools/libaio/src/io_queue_run.c > +++ /dev/null > @@ -1,39 +0,0 @@ > -/* io_submit > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <libaio.h> > -#include <errno.h> > -#include <stdlib.h> > -#include <time.h> > - > -int io_queue_run(io_context_t ctx) > -{ > - static struct timespec timeout = { 0, 0 }; > - struct io_event event; > - int ret; > - > - /* FIXME: batch requests? */ > - while (1 == (ret = io_getevents(ctx, 0, 1, &event, &timeout))) { > - io_callback_t cb = (io_callback_t)event.data; > - struct iocb *iocb = event.obj; > - > - cb(ctx, iocb, event.res, event.res2); > - } > - > - return ret; > -} > diff --git a/tools/libaio/src/io_queue_wait.c b/tools/libaio/src/io_queue_wait.c > deleted file mode 100644 > index 538d2f3..0000000 > --- a/tools/libaio/src/io_queue_wait.c > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* io_submit > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#define NO_SYSCALL_ERRNO > -#include <sys/types.h> > -#include <libaio.h> > -#include <errno.h> > -#include "syscall.h" > - > -struct timespec; > - > -int io_queue_wait_0_4(io_context_t ctx, struct timespec *timeout) > -{ > - return io_getevents(ctx, 0, 0, NULL, timeout); > -} > -DEFSYMVER(io_queue_wait_0_4, io_queue_wait, 0.4) > diff --git a/tools/libaio/src/io_setup.c b/tools/libaio/src/io_setup.c > deleted file mode 100644 > index 4ba1afc..0000000 > --- a/tools/libaio/src/io_setup.c > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* io_setup > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <errno.h> > -#include <libaio.h> > -#include "syscall.h" > - > -io_syscall2(int, io_setup, io_setup, int, maxevents, io_context_t *, ctxp) > diff --git a/tools/libaio/src/io_submit.c b/tools/libaio/src/io_submit.c > deleted file mode 100644 > index e22ba54..0000000 > --- a/tools/libaio/src/io_submit.c > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* io_submit > - libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#include <errno.h> > -#include <libaio.h> > -#include "syscall.h" > - > -io_syscall3(int, io_submit, io_submit, io_context_t, ctx, long, nr, struct iocb **, iocbs) > diff --git a/tools/libaio/src/libaio.h b/tools/libaio/src/libaio.h > deleted file mode 100644 > index 6574601..0000000 > --- a/tools/libaio/src/libaio.h > +++ /dev/null > @@ -1,222 +0,0 @@ > -/* /usr/include/libaio.h > - * > - * Copyright 2000,2001,2002 Red Hat, Inc. > - * > - * Written by Benjamin LaHaise <bcrl@redhat.com> > - * > - * libaio Linux async I/O interface > - * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2 of the License, or (at your option) any later version. > - * > - * This library 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 > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this library; if not, write to the Free Software > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#ifndef __LIBAIO_H > -#define __LIBAIO_H > - > -#ifdef __cplusplus > -extern "C" { > -#endif > - > -#include <sys/types.h> > -#include <string.h> > - > -struct timespec; > -struct sockaddr; > -struct iovec; > -struct iocb; > - > -typedef struct io_context *io_context_t; > - > -typedef enum io_iocb_cmd { > - IO_CMD_PREAD = 0, > - IO_CMD_PWRITE = 1, > - > - IO_CMD_FSYNC = 2, > - IO_CMD_FDSYNC = 3, > - > - IO_CMD_POLL = 5, > - IO_CMD_NOOP = 6, > -} io_iocb_cmd_t; > - > -#if defined(__i386__) /* little endian, 32 bits */ > -#define PADDED(x, y) x; unsigned y > -#define PADDEDptr(x, y) x; unsigned y > -#define PADDEDul(x, y) unsigned long x; unsigned y > -#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) > -#define PADDED(x, y) x, y > -#define PADDEDptr(x, y) x > -#define PADDEDul(x, y) unsigned long x > -#elif defined(__powerpc64__) /* big endian, 64 bits */ > -#define PADDED(x, y) unsigned y; x > -#define PADDEDptr(x,y) x > -#define PADDEDul(x, y) unsigned long x > -#elif defined(__PPC__) /* big endian, 32 bits */ > -#define PADDED(x, y) unsigned y; x > -#define PADDEDptr(x, y) unsigned y; x > -#define PADDEDul(x, y) unsigned y; unsigned long x > -#elif defined(__s390x__) /* big endian, 64 bits */ > -#define PADDED(x, y) unsigned y; x > -#define PADDEDptr(x,y) x > -#define PADDEDul(x, y) unsigned long x > -#elif defined(__s390__) /* big endian, 32 bits */ > -#define PADDED(x, y) unsigned y; x > -#define PADDEDptr(x, y) unsigned y; x > -#define PADDEDul(x, y) unsigned y; unsigned long x > -#else > -#error endian? > -#endif > - > -struct io_iocb_poll { > - PADDED(int events, __pad1); > -}; /* result code is the set of result flags or -'ve errno */ > - > -struct io_iocb_sockaddr { > - struct sockaddr *addr; > - int len; > -}; /* result code is the length of the sockaddr, or -'ve errno */ > - > -struct io_iocb_common { > - PADDEDptr(void *buf, __pad1); > - PADDEDul(nbytes, __pad2); > - long long offset; > - long long __pad3, __pad4; > -}; /* result code is the amount read or -'ve errno */ > - > -struct io_iocb_vector { > - const struct iovec *vec; > - int nr; > - long long offset; > -}; /* result code is the amount read or -'ve errno */ > - > -struct iocb { > - PADDEDptr(void *data, __pad1); /* Return in the io completion event */ > - PADDED(unsigned key, __pad2); /* For use in identifying io requests */ > - > - short aio_lio_opcode; > - short aio_reqprio; > - int aio_fildes; > - > - union { > - struct io_iocb_common c; > - struct io_iocb_vector v; > - struct io_iocb_poll poll; > - struct io_iocb_sockaddr saddr; > - } u; > -}; > - > -struct io_event { > - PADDEDptr(void *data, __pad1); > - PADDEDptr(struct iocb *obj, __pad2); > - PADDEDul(res, __pad3); > - PADDEDul(res2, __pad4); > -}; > - > -#undef PADDED > -#undef PADDEDptr > -#undef PADDEDul > - > -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); > - > -/* library wrappers */ > -extern int io_queue_init(int maxevents, io_context_t *ctxp); > -/*extern int io_queue_grow(io_context_t ctx, int new_maxevents);*/ > -extern int io_queue_release(io_context_t ctx); > -/*extern int io_queue_wait(io_context_t ctx, struct timespec *timeout);*/ > -extern int io_queue_run(io_context_t ctx); > - > -/* Actual syscalls */ > -extern int io_setup(int maxevents, io_context_t *ctxp); > -extern int io_destroy(io_context_t ctx); > -extern int io_submit(io_context_t ctx, long nr, struct iocb *ios[]); > -extern int io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt); > -extern int io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout); > - > - > -static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) > -{ > - iocb->data = (void *)cb; > -} > - > -static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > -{ > - memset(iocb, 0, sizeof(*iocb)); > - iocb->aio_fildes = fd; > - iocb->aio_lio_opcode = IO_CMD_PREAD; > - iocb->aio_reqprio = 0; > - iocb->u.c.buf = buf; > - iocb->u.c.nbytes = count; > - iocb->u.c.offset = offset; > -} > - > -static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > -{ > - memset(iocb, 0, sizeof(*iocb)); > - iocb->aio_fildes = fd; > - iocb->aio_lio_opcode = IO_CMD_PWRITE; > - iocb->aio_reqprio = 0; > - iocb->u.c.buf = buf; > - iocb->u.c.nbytes = count; > - iocb->u.c.offset = offset; > -} > - > -static inline void io_prep_poll(struct iocb *iocb, int fd, int events) > -{ > - memset(iocb, 0, sizeof(*iocb)); > - iocb->aio_fildes = fd; > - iocb->aio_lio_opcode = IO_CMD_POLL; > - iocb->aio_reqprio = 0; > - iocb->u.poll.events = events; > -} > - > -static inline int io_poll(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd, int events) > -{ > - io_prep_poll(iocb, fd, events); > - io_set_callback(iocb, cb); > - return io_submit(ctx, 1, &iocb); > -} > - > -static inline void io_prep_fsync(struct iocb *iocb, int fd) > -{ > - memset(iocb, 0, sizeof(*iocb)); > - iocb->aio_fildes = fd; > - iocb->aio_lio_opcode = IO_CMD_FSYNC; > - iocb->aio_reqprio = 0; > -} > - > -static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) > -{ > - io_prep_fsync(iocb, fd); > - io_set_callback(iocb, cb); > - return io_submit(ctx, 1, &iocb); > -} > - > -static inline void io_prep_fdsync(struct iocb *iocb, int fd) > -{ > - memset(iocb, 0, sizeof(*iocb)); > - iocb->aio_fildes = fd; > - iocb->aio_lio_opcode = IO_CMD_FDSYNC; > - iocb->aio_reqprio = 0; > -} > - > -static inline int io_fdsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) > -{ > - io_prep_fdsync(iocb, fd); > - io_set_callback(iocb, cb); > - return io_submit(ctx, 1, &iocb); > -} > - > -#ifdef __cplusplus > -} > -#endif > - > -#endif /* __LIBAIO_H */ > diff --git a/tools/libaio/src/libaio.map b/tools/libaio/src/libaio.map > deleted file mode 100644 > index dc37725..0000000 > --- a/tools/libaio/src/libaio.map > +++ /dev/null > @@ -1,22 +0,0 @@ > -LIBAIO_0.1 { > - global: > - io_queue_init; > - io_queue_run; > - io_queue_wait; > - io_queue_release; > - io_cancel; > - io_submit; > - io_getevents; > - local: > - *; > - > -}; > - > -LIBAIO_0.4 { > - global: > - io_setup; > - io_destroy; > - io_cancel; > - io_getevents; > - io_queue_wait; > -} LIBAIO_0.1; > diff --git a/tools/libaio/src/raw_syscall.c b/tools/libaio/src/raw_syscall.c > deleted file mode 100644 > index c3fe4b8..0000000 > --- a/tools/libaio/src/raw_syscall.c > +++ /dev/null > @@ -1,19 +0,0 @@ > -#include "syscall.h" > - > -#if defined(__ia64__) > -/* based on code from glibc by Jes Sorensen */ > -__asm__(".text\n" > - ".globl __ia64_aio_raw_syscall\n" > - ".proc __ia64_aio_raw_syscall\n" > - "__ia64_aio_raw_syscall:\n" > - "alloc r2=ar.pfs,1,0,8,0\n" > - "mov r15=r32\n" > - "break 0x100000\n" > - ";;" > - "br.ret.sptk.few b0\n" > - ".size __ia64_aio_raw_syscall, . - __ia64_aio_raw_syscall\n" > - ".endp __ia64_aio_raw_syscall" > -); > -#endif > - > -; > diff --git a/tools/libaio/src/syscall-alpha.h b/tools/libaio/src/syscall-alpha.h > deleted file mode 100644 > index 467b74f..0000000 > --- a/tools/libaio/src/syscall-alpha.h > +++ /dev/null > @@ -1,209 +0,0 @@ > -#define __NR_io_setup 398 > -#define __NR_io_destroy 399 > -#define __NR_io_getevents 400 > -#define __NR_io_submit 401 > -#define __NR_io_cancel 402 > - > -#define inline_syscall_r0_asm > -#define inline_syscall_r0_out_constraint "=v" > - > -#define inline_syscall_clobbers \ > - "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", \ > - "$22", "$23", "$24", "$25", "$27", "$28", "memory" > - > -#define inline_syscall0(name, args...) \ > -{ \ > - register long _sc_0 inline_syscall_r0_asm; \ > - register long _sc_19 __asm__("$19"); \ > - \ > - _sc_0 = name; \ > - __asm__ __volatile__ \ > - ("callsys # %0 %1 <= %2" \ > - : inline_syscall_r0_out_constraint (_sc_0), \ > - "=r"(_sc_19) \ > - : "0"(_sc_0) \ > - : inline_syscall_clobbers, \ > - "$16", "$17", "$18", "$20", "$21"); \ > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > -} > - > -#define inline_syscall1(name,arg1) \ > -{ \ > - register long _sc_0 inline_syscall_r0_asm; \ > - register long _sc_16 __asm__("$16"); \ > - register long _sc_19 __asm__("$19"); \ > - \ > - _sc_0 = name; \ > - _sc_16 = (long) (arg1); \ > - __asm__ __volatile__ \ > - ("callsys # %0 %1 <= %2 %3" \ > - : inline_syscall_r0_out_constraint (_sc_0), \ > - "=r"(_sc_19), "=r"(_sc_16) \ > - : "0"(_sc_0), "2"(_sc_16) \ > - : inline_syscall_clobbers, \ > - "$17", "$18", "$20", "$21"); \ > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > -} > - > -#define inline_syscall2(name,arg1,arg2) \ > -{ \ > - register long _sc_0 inline_syscall_r0_asm; \ > - register long _sc_16 __asm__("$16"); \ > - register long _sc_17 __asm__("$17"); \ > - register long _sc_19 __asm__("$19"); \ > - \ > - _sc_0 = name; \ > - _sc_16 = (long) (arg1); \ > - _sc_17 = (long) (arg2); \ > - __asm__ __volatile__ \ > - ("callsys # %0 %1 <= %2 %3 %4" \ > - : inline_syscall_r0_out_constraint (_sc_0), \ > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17) \ > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17) \ > - : inline_syscall_clobbers, \ > - "$18", "$20", "$21"); \ > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > -} > - > -#define inline_syscall3(name,arg1,arg2,arg3) \ > -{ \ > - register long _sc_0 inline_syscall_r0_asm; \ > - register long _sc_16 __asm__("$16"); \ > - register long _sc_17 __asm__("$17"); \ > - register long _sc_18 __asm__("$18"); \ > - register long _sc_19 __asm__("$19"); \ > - \ > - _sc_0 = name; \ > - _sc_16 = (long) (arg1); \ > - _sc_17 = (long) (arg2); \ > - _sc_18 = (long) (arg3); \ > - __asm__ __volatile__ \ > - ("callsys # %0 %1 <= %2 %3 %4 %5" \ > - : inline_syscall_r0_out_constraint (_sc_0), \ > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > - "=r"(_sc_18) \ > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ > - "4"(_sc_18) \ > - : inline_syscall_clobbers, "$20", "$21"); \ > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > -} > - > -#define inline_syscall4(name,arg1,arg2,arg3,arg4) \ > -{ \ > - register long _sc_0 inline_syscall_r0_asm; \ > - register long _sc_16 __asm__("$16"); \ > - register long _sc_17 __asm__("$17"); \ > - register long _sc_18 __asm__("$18"); \ > - register long _sc_19 __asm__("$19"); \ > - \ > - _sc_0 = name; \ > - _sc_16 = (long) (arg1); \ > - _sc_17 = (long) (arg2); \ > - _sc_18 = (long) (arg3); \ > - _sc_19 = (long) (arg4); \ > - __asm__ __volatile__ \ > - ("callsys # %0 %1 <= %2 %3 %4 %5 %6" \ > - : inline_syscall_r0_out_constraint (_sc_0), \ > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > - "=r"(_sc_18) \ > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ > - "4"(_sc_18), "1"(_sc_19) \ > - : inline_syscall_clobbers, "$20", "$21"); \ > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > -} > - > -#define inline_syscall5(name,arg1,arg2,arg3,arg4,arg5) \ > -{ \ > - register long _sc_0 inline_syscall_r0_asm; \ > - register long _sc_16 __asm__("$16"); \ > - register long _sc_17 __asm__("$17"); \ > - register long _sc_18 __asm__("$18"); \ > - register long _sc_19 __asm__("$19"); \ > - register long _sc_20 __asm__("$20"); \ > - \ > - _sc_0 = name; \ > - _sc_16 = (long) (arg1); \ > - _sc_17 = (long) (arg2); \ > - _sc_18 = (long) (arg3); \ > - _sc_19 = (long) (arg4); \ > - _sc_20 = (long) (arg5); \ > - __asm__ __volatile__ \ > - ("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7" \ > - : inline_syscall_r0_out_constraint (_sc_0), \ > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > - "=r"(_sc_18), "=r"(_sc_20) \ > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ > - "4"(_sc_18), "1"(_sc_19), "5"(_sc_20) \ > - : inline_syscall_clobbers, "$21"); \ > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > -} > - > -#define inline_syscall6(name,arg1,arg2,arg3,arg4,arg5,arg6) \ > -{ \ > - register long _sc_0 inline_syscall_r0_asm; \ > - register long _sc_16 __asm__("$16"); \ > - register long _sc_17 __asm__("$17"); \ > - register long _sc_18 __asm__("$18"); \ > - register long _sc_19 __asm__("$19"); \ > - register long _sc_20 __asm__("$20"); \ > - register long _sc_21 __asm__("$21"); \ > - \ > - _sc_0 = name; \ > - _sc_16 = (long) (arg1); \ > - _sc_17 = (long) (arg2); \ > - _sc_18 = (long) (arg3); \ > - _sc_19 = (long) (arg4); \ > - _sc_20 = (long) (arg5); \ > - _sc_21 = (long) (arg6); \ > - __asm__ __volatile__ \ > - ("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7 %8" \ > - : inline_syscall_r0_out_constraint (_sc_0), \ > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > - "=r"(_sc_18), "=r"(_sc_20), "=r"(_sc_21) \ > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), "4"(_sc_18), \ > - "1"(_sc_19), "5"(_sc_20), "6"(_sc_21) \ > - : inline_syscall_clobbers); \ > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > -} > - > -#define INLINE_SYSCALL1(name, nr, args...) \ > -({ \ > - long _sc_ret, _sc_err; \ > - inline_syscall##nr(__NR_##name, args); \ > - if (_sc_err != 0) \ > - { \ > - _sc_ret = -(_sc_ret); \ > - } \ > - _sc_ret; \ > -}) > - > -#define io_syscall1(type,fname,sname,type1,arg1) \ > -type fname(type1 arg1) \ > -{ \ > - return (type)INLINE_SYSCALL1(sname, 1, arg1); \ > -} > - > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > -type fname(type1 arg1,type2 arg2) \ > -{ \ > - return (type)INLINE_SYSCALL1(sname, 2, arg1, arg2); \ > -} > - > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > -type fname(type1 arg1,type2 arg2,type3 arg3) \ > -{ \ > - return (type)INLINE_SYSCALL1(sname, 3, arg1, arg2, arg3); \ > -} > - > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > -{ \ > - return (type)INLINE_SYSCALL1(sname, 4, arg1, arg2, arg3, arg4); \ > -} > - > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ > - type5,arg5) \ > -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ > -{ \ > - return (type)INLINE_SYSCALL1(sname, 5, arg1, arg2, arg3, arg4, arg5);\ > -} > diff --git a/tools/libaio/src/syscall-i386.h b/tools/libaio/src/syscall-i386.h > deleted file mode 100644 > index 9576975..0000000 > --- a/tools/libaio/src/syscall-i386.h > +++ /dev/null > @@ -1,72 +0,0 @@ > -#define __NR_io_setup 245 > -#define __NR_io_destroy 246 > -#define __NR_io_getevents 247 > -#define __NR_io_submit 248 > -#define __NR_io_cancel 249 > - > -#define io_syscall1(type,fname,sname,type1,arg1) \ > -type fname(type1 arg1) \ > -{ \ > -long __res; \ > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > - "int $0x80\n" \ > - "xchgl %%edi,%%ebx" \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1))); \ > -return __res; \ > -} > - > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > -type fname(type1 arg1,type2 arg2) \ > -{ \ > -long __res; \ > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > - "int $0x80\n" \ > - "xchgl %%edi,%%ebx" \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2))); \ > -return __res; \ > -} > - > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > -type fname(type1 arg1,type2 arg2,type3 arg3) \ > -{ \ > -long __res; \ > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > - "int $0x80\n" \ > - "xchgl %%edi,%%ebx" \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2)), \ > - "d" ((long)(arg3))); \ > -return __res; \ > -} > - > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > -{ \ > -long __res; \ > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > - "int $0x80\n" \ > - "xchgl %%edi,%%ebx" \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2)), \ > - "d" ((long)(arg3)),"S" ((long)(arg4))); \ > -return __res; \ > -} > - > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ > - type5,arg5) \ > -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ > -{ \ > -long __res; \ > -long tmp; \ > -__asm__ volatile ("movl %%ebx,%7\n" \ > - "movl %2,%%ebx\n" \ > - "int $0x80\n" \ > - "movl %7,%%ebx" \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"rm" ((long)(arg1)),"c" ((long)(arg2)), \ > - "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)), \ > - "m" (tmp)); \ > -return __res; \ > -} > diff --git a/tools/libaio/src/syscall-ppc.h b/tools/libaio/src/syscall-ppc.h > deleted file mode 100644 > index 435513e..0000000 > --- a/tools/libaio/src/syscall-ppc.h > +++ /dev/null > @@ -1,98 +0,0 @@ > -#include <asm/unistd.h> > -#include <errno.h> > - > -#define __NR_io_setup 227 > -#define __NR_io_destroy 228 > -#define __NR_io_getevents 229 > -#define __NR_io_submit 230 > -#define __NR_io_cancel 231 > - > -/* On powerpc a system call basically clobbers the same registers like a > - * function call, with the exception of LR (which is needed for the > - * "sc; bnslr" sequence) and CR (where only CR0.SO is clobbered to signal > - * an error return status). > - */ > -#ifndef __syscall_nr > -#define __syscall_nr(nr, type, name, args...) \ > - unsigned long __sc_ret, __sc_err; \ > - { \ > - register unsigned long __sc_0 __asm__ ("r0"); \ > - register unsigned long __sc_3 __asm__ ("r3"); \ > - register unsigned long __sc_4 __asm__ ("r4"); \ > - register unsigned long __sc_5 __asm__ ("r5"); \ > - register unsigned long __sc_6 __asm__ ("r6"); \ > - register unsigned long __sc_7 __asm__ ("r7"); \ > - register unsigned long __sc_8 __asm__ ("r8"); \ > - \ > - __sc_loadargs_##nr(name, args); \ > - __asm__ __volatile__ \ > - ("sc \n\t" \ > - "mfcr %0 " \ > - : "=&r" (__sc_0), \ > - "=&r" (__sc_3), "=&r" (__sc_4), \ > - "=&r" (__sc_5), "=&r" (__sc_6), \ > - "=&r" (__sc_7), "=&r" (__sc_8) \ > - : __sc_asm_input_##nr \ > - : "cr0", "ctr", "memory", \ > - "r9", "r10","r11", "r12"); \ > - __sc_ret = __sc_3; \ > - __sc_err = __sc_0; \ > - } \ > - if (__sc_err & 0x10000000) return -((int)__sc_ret); \ > - return (type) __sc_ret > -#endif > - > -#define __sc_loadargs_0(name, dummy...) \ > - __sc_0 = __NR_##name > -#define __sc_loadargs_1(name, arg1) \ > - __sc_loadargs_0(name); \ > - __sc_3 = (unsigned long) (arg1) > -#define __sc_loadargs_2(name, arg1, arg2) \ > - __sc_loadargs_1(name, arg1); \ > - __sc_4 = (unsigned long) (arg2) > -#define __sc_loadargs_3(name, arg1, arg2, arg3) \ > - __sc_loadargs_2(name, arg1, arg2); \ > - __sc_5 = (unsigned long) (arg3) > -#define __sc_loadargs_4(name, arg1, arg2, arg3, arg4) \ > - __sc_loadargs_3(name, arg1, arg2, arg3); \ > - __sc_6 = (unsigned long) (arg4) > -#define __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5) \ > - __sc_loadargs_4(name, arg1, arg2, arg3, arg4); \ > - __sc_7 = (unsigned long) (arg5) > - > -#define __sc_asm_input_0 "0" (__sc_0) > -#define __sc_asm_input_1 __sc_asm_input_0, "1" (__sc_3) > -#define __sc_asm_input_2 __sc_asm_input_1, "2" (__sc_4) > -#define __sc_asm_input_3 __sc_asm_input_2, "3" (__sc_5) > -#define __sc_asm_input_4 __sc_asm_input_3, "4" (__sc_6) > -#define __sc_asm_input_5 __sc_asm_input_4, "5" (__sc_7) > - > -#define io_syscall1(type,fname,sname,type1,arg1) \ > -type fname(type1 arg1) \ > -{ \ > - __syscall_nr(1, type, sname, arg1); \ > -} > - > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > -type fname(type1 arg1, type2 arg2) \ > -{ \ > - __syscall_nr(2, type, sname, arg1, arg2); \ > -} > - > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > -type fname(type1 arg1, type2 arg2, type3 arg3) \ > -{ \ > - __syscall_nr(3, type, sname, arg1, arg2, arg3); \ > -} > - > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > -{ \ > - __syscall_nr(4, type, sname, arg1, arg2, arg3, arg4); \ > -} > - > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ > -{ \ > - __syscall_nr(5, type, sname, arg1, arg2, arg3, arg4, arg5); \ > -} > diff --git a/tools/libaio/src/syscall-s390.h b/tools/libaio/src/syscall-s390.h > deleted file mode 100644 > index 3ec5ee3..0000000 > --- a/tools/libaio/src/syscall-s390.h > +++ /dev/null > @@ -1,131 +0,0 @@ > -#define __NR_io_setup 243 > -#define __NR_io_destroy 244 > -#define __NR_io_getevents 245 > -#define __NR_io_submit 246 > -#define __NR_io_cancel 247 > - > -#define io_svc_clobber "1", "cc", "memory" > - > -#define io_syscall1(type,fname,sname,type1,arg1) \ > -type fname(type1 arg1) { \ > - register type1 __arg1 asm("2") = arg1; \ > - register long __svcres asm("2"); \ > - long __res; \ > - __asm__ __volatile__ ( \ > - " .if %1 < 256\n" \ > - " svc %b1\n" \ > - " .else\n" \ > - " la %%r1,%1\n" \ > - " .svc 0\n" \ > - " .endif" \ > - : "=d" (__svcres) \ > - : "i" (__NR_##sname), \ > - "0" (__arg1) \ > - : io_svc_clobber ); \ > - __res = __svcres; \ > - return (type) __res; \ > -} > - > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > -type fname(type1 arg1, type2 arg2) { \ > - register type1 __arg1 asm("2") = arg1; \ > - register type2 __arg2 asm("3") = arg2; \ > - register long __svcres asm("2"); \ > - long __res; \ > - __asm__ __volatile__ ( \ > - " .if %1 < 256\n" \ > - " svc %b1\n" \ > - " .else\n" \ > - " la %%r1,%1\n" \ > - " svc 0\n" \ > - " .endif" \ > - : "=d" (__svcres) \ > - : "i" (__NR_##sname), \ > - "0" (__arg1), \ > - "d" (__arg2) \ > - : io_svc_clobber ); \ > - __res = __svcres; \ > - return (type) __res; \ > -} > - > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2, \ > - type3,arg3) \ > -type fname(type1 arg1, type2 arg2, type3 arg3) { \ > - register type1 __arg1 asm("2") = arg1; \ > - register type2 __arg2 asm("3") = arg2; \ > - register type3 __arg3 asm("4") = arg3; \ > - register long __svcres asm("2"); \ > - long __res; \ > - __asm__ __volatile__ ( \ > - " .if %1 < 256\n" \ > - " svc %b1\n" \ > - " .else\n" \ > - " la %%r1,%1\n" \ > - " svc 0\n" \ > - " .endif" \ > - : "=d" (__svcres) \ > - : "i" (__NR_##sname), \ > - "0" (__arg1), \ > - "d" (__arg2), \ > - "d" (__arg3) \ > - : io_svc_clobber ); \ > - __res = __svcres; \ > - return (type) __res; \ > -} > - > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2, \ > - type3,arg3,type4,arg4) \ > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ > - register type1 __arg1 asm("2") = arg1; \ > - register type2 __arg2 asm("3") = arg2; \ > - register type3 __arg3 asm("4") = arg3; \ > - register type4 __arg4 asm("5") = arg4; \ > - register long __svcres asm("2"); \ > - long __res; \ > - __asm__ __volatile__ ( \ > - " .if %1 < 256\n" \ > - " svc %b1\n" \ > - " .else\n" \ > - " la %%r1,%1\n" \ > - " svc 0\n" \ > - " .endif" \ > - : "=d" (__svcres) \ > - : "i" (__NR_##sname), \ > - "0" (__arg1), \ > - "d" (__arg2), \ > - "d" (__arg3), \ > - "d" (__arg4) \ > - : io_svc_clobber ); \ > - __res = __svcres; \ > - return (type) __res; \ > -} > - > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2, \ > - type3,arg3,type4,arg4,type5,arg5) \ > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \ > - type5 arg5) { \ > - register type1 __arg1 asm("2") = arg1; \ > - register type2 __arg2 asm("3") = arg2; \ > - register type3 __arg3 asm("4") = arg3; \ > - register type4 __arg4 asm("5") = arg4; \ > - register type5 __arg5 asm("6") = arg5; \ > - register long __svcres asm("2"); \ > - long __res; \ > - __asm__ __volatile__ ( \ > - " .if %1 < 256\n" \ > - " svc %b1\n" \ > - " .else\n" \ > - " la %%r1,%1\n" \ > - " svc 0\n" \ > - " .endif" \ > - : "=d" (__svcres) \ > - : "i" (__NR_##sname), \ > - "0" (__arg1), \ > - "d" (__arg2), \ > - "d" (__arg3), \ > - "d" (__arg4), \ > - "d" (__arg5) \ > - : io_svc_clobber ); \ > - __res = __svcres; \ > - return (type) __res; \ > -} > diff --git a/tools/libaio/src/syscall-x86_64.h b/tools/libaio/src/syscall-x86_64.h > deleted file mode 100644 > index 9361856..0000000 > --- a/tools/libaio/src/syscall-x86_64.h > +++ /dev/null > @@ -1,63 +0,0 @@ > -#define __NR_io_setup 206 > -#define __NR_io_destroy 207 > -#define __NR_io_getevents 208 > -#define __NR_io_submit 209 > -#define __NR_io_cancel 210 > - > -#define __syscall_clobber "r11","rcx","memory" > -#define __syscall "syscall" > - > -#define io_syscall1(type,fname,sname,type1,arg1) \ > -type fname(type1 arg1) \ > -{ \ > -long __res; \ > -__asm__ volatile (__syscall \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)) : __syscall_clobber ); \ > -return __res; \ > -} > - > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > -type fname(type1 arg1,type2 arg2) \ > -{ \ > -long __res; \ > -__asm__ volatile (__syscall \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \ > -return __res; \ > -} > - > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > -type fname(type1 arg1,type2 arg2,type3 arg3) \ > -{ \ > -long __res; \ > -__asm__ volatile (__syscall \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ > - "d" ((long)(arg3)) : __syscall_clobber); \ > -return __res; \ > -} > - > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > -{ \ > -long __res; \ > -__asm__ volatile ("movq %5,%%r10 ;" __syscall \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ > - "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \ > -return __res; \ > -} > - > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ > - type5,arg5) \ > -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ > -{ \ > -long __res; \ > -__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \ > - : "=a" (__res) \ > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ > - "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \ > - __syscall_clobber,"r8","r10" ); \ > -return __res; \ > -} > diff --git a/tools/libaio/src/syscall.h b/tools/libaio/src/syscall.h > deleted file mode 100644 > index 0283825..0000000 > --- a/tools/libaio/src/syscall.h > +++ /dev/null > @@ -1,27 +0,0 @@ > -#include <sys/syscall.h> > -#include <unistd.h> > - > -#define _SYMSTR(str) #str > -#define SYMSTR(str) _SYMSTR(str) > - > -#define SYMVER(compat_sym, orig_sym, ver_sym) \ > - __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@LIBAIO_" SYMSTR(ver_sym)); > - > -#define DEFSYMVER(compat_sym, orig_sym, ver_sym) \ > - __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@@LIBAIO_" SYMSTR(ver_sym)); > - > -#if defined(__i386__) > -#include "syscall-i386.h" > -#elif defined(__x86_64__) > -#include "syscall-x86_64.h" > -#elif defined(__ia64__) > -#include "syscall-ia64.h" > -#elif defined(__PPC__) > -#include "syscall-ppc.h" > -#elif defined(__s390__) > -#include "syscall-s390.h" > -#elif defined(__alpha__) > -#include "syscall-alpha.h" > -#else > -#error "add syscall-arch.h" > -#endif > diff --git a/tools/libaio/src/vsys_def.h b/tools/libaio/src/vsys_def.h > deleted file mode 100644 > index 13d032e..0000000 > --- a/tools/libaio/src/vsys_def.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* libaio Linux async I/O interface > - Copyright 2002 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2 of the License, or (at your option) any later version. > - > - This library 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 > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, write to the Free Software > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -extern int vsys_io_setup(unsigned nr_reqs, io_context_t *ctxp); > -extern int vsys_io_destroy(io_context_t ctx); > -extern int vsys_io_submit(io_context_t ctx, long nr, struct iocb *iocbs[]); > -extern int vsys_io_cancel(io_context_t ctx, struct iocb *iocb); > -extern int vsys_io_wait(io_context_t ctx, struct iocb *iocb, const struct timespec *when); > -extern int vsys_io_getevents(io_context_t ctx_id, long nr, struct io_event *events, const struct timespec *timeout); > - > ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 3/9] tools: remove in tree libaio 2013-08-01 8:38 ` Egger, Christoph @ 2013-08-01 14:39 ` Ian Campbell 0 siblings, 0 replies; 30+ messages in thread From: Ian Campbell @ 2013-08-01 14:39 UTC (permalink / raw) To: Egger, Christoph; +Cc: ian.jackson, keir, xen-devel On Thu, 2013-08-01 at 10:38 +0200, Egger, Christoph wrote: > On 31.07.13 17:15, Ian Campbell wrote: > > We have defaulted to using the system libaio for a while now and I din't think > > there are any relevant distros which don't have it that running Xen 4.4 would > > be reasonable on. > > > > Also it has caused confusion because it is not ever wanted on ARM, but the > > build system doesn't express that (could be fixed, but deleting is the right > > thing to do anyway). > > ... and switch to posixaio to not break platforms w/o libaio. I'm not sure what you are saying, is this something which has been done or which should be done? I though only blktap(1|2) used libaio, which are inherently Linux only. Ian. > > Christoph > > > > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > --- > > .gitignore | 2 - > > .hgignore | 2 - > > README | 2 +- > > config/Tools.mk.in | 1 - > > tools/Makefile | 6 - > > tools/blktap/drivers/Makefile | 6 - > > tools/blktap2/drivers/Makefile | 7 - > > tools/config.h.in | 3 + > > tools/configure | 9 +- > > tools/configure.ac | 2 +- > > tools/libaio/COPYING | 515 ------------------------------- > > tools/libaio/ChangeLog | 43 --- > > tools/libaio/INSTALL | 18 - > > tools/libaio/Makefile | 40 --- > > tools/libaio/TODO | 4 - > > tools/libaio/harness/Makefile | 37 --- > > tools/libaio/harness/README | 19 -- > > tools/libaio/harness/attic/0.t | 9 - > > tools/libaio/harness/attic/1.t | 9 - > > tools/libaio/harness/cases/10.t | 53 ---- > > tools/libaio/harness/cases/11.t | 39 --- > > tools/libaio/harness/cases/12.t | 49 --- > > tools/libaio/harness/cases/13.t | 66 ---- > > tools/libaio/harness/cases/14.t | 90 ------ > > tools/libaio/harness/cases/2.t | 41 --- > > tools/libaio/harness/cases/3.t | 25 -- > > tools/libaio/harness/cases/4.t | 72 ----- > > tools/libaio/harness/cases/5.t | 47 --- > > tools/libaio/harness/cases/6.t | 57 ---- > > tools/libaio/harness/cases/7.t | 27 -- > > tools/libaio/harness/cases/8.t | 49 --- > > tools/libaio/harness/cases/aio_setup.h | 98 ------ > > tools/libaio/harness/cases/common-7-8.h | 37 --- > > tools/libaio/harness/main.c | 39 --- > > tools/libaio/harness/runtests.sh | 19 -- > > tools/libaio/libaio.spec | 187 ----------- > > tools/libaio/man/aio.3 | 315 ------------------- > > tools/libaio/man/aio_cancel.3 | 137 -------- > > tools/libaio/man/aio_cancel64.3 | 50 --- > > tools/libaio/man/aio_error.3 | 81 ----- > > tools/libaio/man/aio_error64.3 | 64 ---- > > tools/libaio/man/aio_fsync.3 | 139 --------- > > tools/libaio/man/aio_fsync64.3 | 51 --- > > tools/libaio/man/aio_init.3 | 96 ------ > > tools/libaio/man/aio_read.3 | 146 --------- > > tools/libaio/man/aio_read64.3 | 60 ---- > > tools/libaio/man/aio_return.3 | 71 ----- > > tools/libaio/man/aio_return64.3 | 51 --- > > tools/libaio/man/aio_suspend.3 | 123 -------- > > tools/libaio/man/aio_suspend64.3 | 51 --- > > tools/libaio/man/aio_write.3 | 176 ----------- > > tools/libaio/man/aio_write64.3 | 61 ---- > > tools/libaio/man/io.3 | 351 --------------------- > > tools/libaio/man/io_cancel.1 | 21 -- > > tools/libaio/man/io_cancel.3 | 65 ---- > > tools/libaio/man/io_destroy.1 | 17 - > > tools/libaio/man/io_fsync.3 | 82 ----- > > tools/libaio/man/io_getevents.1 | 29 -- > > tools/libaio/man/io_getevents.3 | 79 ----- > > tools/libaio/man/io_prep_fsync.3 | 89 ------ > > tools/libaio/man/io_prep_pread.3 | 79 ----- > > tools/libaio/man/io_prep_pwrite.3 | 77 ----- > > tools/libaio/man/io_queue_init.3 | 63 ---- > > tools/libaio/man/io_queue_release.3 | 48 --- > > tools/libaio/man/io_queue_run.3 | 50 --- > > tools/libaio/man/io_queue_wait.3 | 56 ---- > > tools/libaio/man/io_set_callback.3 | 44 --- > > tools/libaio/man/io_setup.1 | 15 - > > tools/libaio/man/io_submit.1 | 109 ------- > > tools/libaio/man/io_submit.3 | 135 -------- > > tools/libaio/man/lio_listio.3 | 229 -------------- > > tools/libaio/man/lio_listio64.3 | 39 --- > > tools/libaio/src/Makefile | 67 ---- > > tools/libaio/src/compat-0_1.c | 62 ---- > > tools/libaio/src/io_cancel.c | 23 -- > > tools/libaio/src/io_destroy.c | 23 -- > > tools/libaio/src/io_getevents.c | 57 ---- > > tools/libaio/src/io_queue_init.c | 33 -- > > tools/libaio/src/io_queue_release.c | 27 -- > > tools/libaio/src/io_queue_run.c | 39 --- > > tools/libaio/src/io_queue_wait.c | 31 -- > > tools/libaio/src/io_setup.c | 23 -- > > tools/libaio/src/io_submit.c | 23 -- > > tools/libaio/src/libaio.h | 222 ------------- > > tools/libaio/src/libaio.map | 22 -- > > tools/libaio/src/raw_syscall.c | 19 -- > > tools/libaio/src/syscall-alpha.h | 209 ------------- > > tools/libaio/src/syscall-i386.h | 72 ----- > > tools/libaio/src/syscall-ppc.h | 98 ------ > > tools/libaio/src/syscall-s390.h | 131 -------- > > tools/libaio/src/syscall-x86_64.h | 63 ---- > > tools/libaio/src/syscall.h | 27 -- > > tools/libaio/src/vsys_def.h | 24 -- > > 93 files changed, 12 insertions(+), 6361 deletions(-) > > delete mode 100644 tools/libaio/COPYING > > delete mode 100644 tools/libaio/ChangeLog > > delete mode 100644 tools/libaio/INSTALL > > delete mode 100644 tools/libaio/Makefile > > delete mode 100644 tools/libaio/TODO > > delete mode 100644 tools/libaio/harness/Makefile > > delete mode 100644 tools/libaio/harness/README > > delete mode 100644 tools/libaio/harness/attic/0.t > > delete mode 100644 tools/libaio/harness/attic/1.t > > delete mode 100644 tools/libaio/harness/cases/10.t > > delete mode 100644 tools/libaio/harness/cases/11.t > > delete mode 100644 tools/libaio/harness/cases/12.t > > delete mode 100644 tools/libaio/harness/cases/13.t > > delete mode 100644 tools/libaio/harness/cases/14.t > > delete mode 100644 tools/libaio/harness/cases/2.t > > delete mode 100644 tools/libaio/harness/cases/3.t > > delete mode 100644 tools/libaio/harness/cases/4.t > > delete mode 100644 tools/libaio/harness/cases/5.t > > delete mode 100644 tools/libaio/harness/cases/6.t > > delete mode 100644 tools/libaio/harness/cases/7.t > > delete mode 100644 tools/libaio/harness/cases/8.t > > delete mode 100644 tools/libaio/harness/cases/aio_setup.h > > delete mode 100644 tools/libaio/harness/cases/common-7-8.h > > delete mode 100644 tools/libaio/harness/main.c > > delete mode 100644 tools/libaio/harness/runtests.sh > > delete mode 100644 tools/libaio/libaio.spec > > delete mode 100644 tools/libaio/man/aio.3 > > delete mode 100644 tools/libaio/man/aio_cancel.3 > > delete mode 100644 tools/libaio/man/aio_cancel64.3 > > delete mode 100644 tools/libaio/man/aio_error.3 > > delete mode 100644 tools/libaio/man/aio_error64.3 > > delete mode 100644 tools/libaio/man/aio_fsync.3 > > delete mode 100644 tools/libaio/man/aio_fsync64.3 > > delete mode 100644 tools/libaio/man/aio_init.3 > > delete mode 100644 tools/libaio/man/aio_read.3 > > delete mode 100644 tools/libaio/man/aio_read64.3 > > delete mode 100644 tools/libaio/man/aio_return.3 > > delete mode 100644 tools/libaio/man/aio_return64.3 > > delete mode 100644 tools/libaio/man/aio_suspend.3 > > delete mode 100644 tools/libaio/man/aio_suspend64.3 > > delete mode 100644 tools/libaio/man/aio_write.3 > > delete mode 100644 tools/libaio/man/aio_write64.3 > > delete mode 100644 tools/libaio/man/io.3 > > delete mode 100644 tools/libaio/man/io_cancel.1 > > delete mode 100644 tools/libaio/man/io_cancel.3 > > delete mode 100644 tools/libaio/man/io_destroy.1 > > delete mode 100644 tools/libaio/man/io_fsync.3 > > delete mode 100644 tools/libaio/man/io_getevents.1 > > delete mode 100644 tools/libaio/man/io_getevents.3 > > delete mode 100644 tools/libaio/man/io_prep_fsync.3 > > delete mode 100644 tools/libaio/man/io_prep_pread.3 > > delete mode 100644 tools/libaio/man/io_prep_pwrite.3 > > delete mode 100644 tools/libaio/man/io_queue_init.3 > > delete mode 100644 tools/libaio/man/io_queue_release.3 > > delete mode 100644 tools/libaio/man/io_queue_run.3 > > delete mode 100644 tools/libaio/man/io_queue_wait.3 > > delete mode 100644 tools/libaio/man/io_set_callback.3 > > delete mode 100644 tools/libaio/man/io_setup.1 > > delete mode 100644 tools/libaio/man/io_submit.1 > > delete mode 100644 tools/libaio/man/io_submit.3 > > delete mode 100644 tools/libaio/man/lio_listio.3 > > delete mode 100644 tools/libaio/man/lio_listio64.3 > > delete mode 100644 tools/libaio/src/Makefile > > delete mode 100644 tools/libaio/src/compat-0_1.c > > delete mode 100644 tools/libaio/src/io_cancel.c > > delete mode 100644 tools/libaio/src/io_destroy.c > > delete mode 100644 tools/libaio/src/io_getevents.c > > delete mode 100644 tools/libaio/src/io_queue_init.c > > delete mode 100644 tools/libaio/src/io_queue_release.c > > delete mode 100644 tools/libaio/src/io_queue_run.c > > delete mode 100644 tools/libaio/src/io_queue_wait.c > > delete mode 100644 tools/libaio/src/io_setup.c > > delete mode 100644 tools/libaio/src/io_submit.c > > delete mode 100644 tools/libaio/src/libaio.h > > delete mode 100644 tools/libaio/src/libaio.map > > delete mode 100644 tools/libaio/src/raw_syscall.c > > delete mode 100644 tools/libaio/src/syscall-alpha.h > > delete mode 100644 tools/libaio/src/syscall-i386.h > > delete mode 100644 tools/libaio/src/syscall-ppc.h > > delete mode 100644 tools/libaio/src/syscall-s390.h > > delete mode 100644 tools/libaio/src/syscall-x86_64.h > > delete mode 100644 tools/libaio/src/syscall.h > > delete mode 100644 tools/libaio/src/vsys_def.h > > > > diff --git a/.gitignore b/.gitignore > > index 960c29e..62462b4 100644 > > --- a/.gitignore > > +++ b/.gitignore > > @@ -208,8 +208,6 @@ tools/libxl/testenum.c > > tools/libxl/tmp.* > > tools/libxl/_libxl.api-for-check > > tools/libxl/*.api-ok > > -tools/libaio/src/*.ol > > -tools/libaio/src/*.os > > tools/misc/cpuperf/cpuperf-perfcntr > > tools/misc/cpuperf/cpuperf-xen > > tools/misc/lomount/lomount > > diff --git a/.hgignore b/.hgignore > > index f3877a9..9822a8d 100644 > > --- a/.hgignore > > +++ b/.hgignore > > @@ -201,8 +201,6 @@ > > ^tools/libxl/_libxl\.api-for-check > > ^tools/libxl/libxl\.api-ok > > ^tools/libvchan/vchan-node[12]$ > > -^tools/libaio/src/.*\.ol$ > > -^tools/libaio/src/.*\.os$ > > ^tools/misc/cpuperf/cpuperf-perfcntr$ > > ^tools/misc/cpuperf/cpuperf-xen$ > > ^tools/misc/lomount/lomount$ > > diff --git a/README b/README > > index 9f6c9f5..8689ce1 100644 > > --- a/README > > +++ b/README > > @@ -51,7 +51,7 @@ provided by your OS distributor: > > * Development install of uuid (e.g. uuid-dev) > > * Development install of yajl (e.g. libyajl-dev) > > * Development install of libaio (e.g. libaio-dev) version 0.3.107 or > > - greater. Set CONFIG_SYSTEM_LIBAIO in .config if this is not available. > > + greater. > > * Development install of GLib v2.0 (e.g. libglib2.0-dev) > > * Development install of Pixman (e.g. libpixman-1-dev) > > * pkg-config > > diff --git a/config/Tools.mk.in b/config/Tools.mk.in > > index ef41c2a..bb3acbd 100644 > > --- a/config/Tools.mk.in > > +++ b/config/Tools.mk.in > > @@ -55,7 +55,6 @@ CONFIG_SEABIOS := @seabios@ > > CONFIG_XEND := @xend@ > > > > #System options > > -CONFIG_SYSTEM_LIBAIO:= @system_aio@ > > ZLIB := @zlib@ > > CONFIG_LIBICONV := @libiconv@ > > CONFIG_GCRYPT := @libgcrypt@ > > diff --git a/tools/Makefile b/tools/Makefile > > index e44a3e9..51d2336 100644 > > --- a/tools/Makefile > > +++ b/tools/Makefile > > @@ -1,10 +1,6 @@ > > XEN_ROOT = $(CURDIR)/.. > > include $(XEN_ROOT)/tools/Rules.mk > > > > -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) > > -SUBDIRS-libaio := libaio > > -endif > > - > > SUBDIRS-y := > > SUBDIRS-y += include > > SUBDIRS-y += libxc > > @@ -19,13 +15,11 @@ SUBDIRS-$(CONFIG_X86) += firmware > > SUBDIRS-y += console > > SUBDIRS-y += xenmon > > SUBDIRS-y += xenstat > > -SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > > SUBDIRS-$(CONFIG_Linux) += memshr > > ifeq ($(CONFIG_X86),y) > > SUBDIRS-$(CONFIG_Linux) += blktap > > endif > > SUBDIRS-$(CONFIG_Linux) += blktap2 > > -SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) > > SUBDIRS-$(CONFIG_NetBSD) += blktap2 > > SUBDIRS-$(CONFIG_NetBSD) += xenbackendd > > SUBDIRS-y += libfsimage > > diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile > > index 941592e..7461a95 100644 > > --- a/tools/blktap/drivers/Makefile > > +++ b/tools/blktap/drivers/Makefile > > @@ -27,13 +27,7 @@ CFLAGS += -I $(MEMSHR_DIR) > > MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a > > endif > > > > -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) > > -LIBAIO_DIR = ../../libaio/src > > -CFLAGS += -I $(LIBAIO_DIR) > > -AIOLIBS := $(LIBAIO_DIR)/libaio.a > > -else > > AIOLIBS := -laio > > -endif > > > > CFLAGS += $(PTHREAD_CFLAGS) > > LDFLAGS += $(PTHREAD_LDFLAGS) > > diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile > > index f47abb3..5c6ab6a 100644 > > --- a/tools/blktap2/drivers/Makefile > > +++ b/tools/blktap2/drivers/Makefile > > @@ -28,14 +28,7 @@ REMUS-OBJS += hashtable.o > > REMUS-OBJS += hashtable_itr.o > > REMUS-OBJS += hashtable_utility.o > > > > -ifneq ($(CONFIG_SYSTEM_LIBAIO),y) > > -CFLAGS += -I $(LIBAIO_DIR) > > -LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src > > -tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := $(LIBAIO_DIR)/libaio.a > > -tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS += -I$(LIBAIO_DIR) > > -else > > tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := -laio > > -endif > > > > MEMSHRLIBS := > > ifeq ($(CONFIG_Linux), __fixme__) > > diff --git a/tools/config.h.in b/tools/config.h.in > > index a67910b..8bda0bd 100644 > > --- a/tools/config.h.in > > +++ b/tools/config.h.in > > @@ -3,6 +3,9 @@ > > /* Define to 1 if you have the <inttypes.h> header file. */ > > #undef HAVE_INTTYPES_H > > > > +/* Define to 1 if you have the `aio' library (-laio). */ > > +#undef HAVE_LIBAIO > > + > > /* Define to 1 if you have the `crypto' library (-lcrypto). */ > > #undef HAVE_LIBCRYPTO > > > > diff --git a/tools/configure b/tools/configure > > index 6e2f758..b52dd2a 100755 > > --- a/tools/configure > > +++ b/tools/configure > > @@ -7375,9 +7375,14 @@ fi > > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aio_io_setup" >&5 > > $as_echo "$ac_cv_lib_aio_io_setup" >&6; } > > if test "x$ac_cv_lib_aio_io_setup" = x""yes; then : > > - system_aio="y" > > + cat >>confdefs.h <<_ACEOF > > +#define HAVE_LIBAIO 1 > > +_ACEOF > > + > > + LIBS="-laio $LIBS" > > + > > else > > - system_aio="n" > > + as_fn_error $? "Could not find libaio" "$LINENO" 5 > > fi > > > > > > diff --git a/tools/configure.ac b/tools/configure.ac > > index d6eba44..f629318 100644 > > --- a/tools/configure.ac > > +++ b/tools/configure.ac > > @@ -155,7 +155,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ > > AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) > > ]) > > AC_SUBST(zlib) > > -AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) > > +AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) > > AC_SUBST(system_aio) > > AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) > > AX_CHECK_EXTFS > > diff --git a/tools/libaio/COPYING b/tools/libaio/COPYING > > deleted file mode 100644 > > index c4792dd..0000000 > > --- a/tools/libaio/COPYING > > +++ /dev/null > > @@ -1,515 +0,0 @@ > > - > > - GNU LESSER GENERAL PUBLIC LICENSE > > - Version 2.1, February 1999 > > - > > - Copyright (C) 1991, 1999 Free Software Foundation, Inc. > > - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - Everyone is permitted to copy and distribute verbatim copies > > - of this license document, but changing it is not allowed. > > - > > -[This is the first released version of the Lesser GPL. It also counts > > - as the successor of the GNU Library Public License, version 2, hence > > - the version number 2.1.] > > - > > - Preamble > > - > > - The licenses for most software are designed to take away your > > -freedom to share and change it. By contrast, the GNU General Public > > -Licenses are intended to guarantee your freedom to share and change > > -free software--to make sure the software is free for all its users. > > - > > - This license, the Lesser General Public License, applies to some > > -specially designated software packages--typically libraries--of the > > -Free Software Foundation and other authors who decide to use it. You > > -can use it too, but we suggest you first think carefully about whether > > -this license or the ordinary General Public License is the better > > -strategy to use in any particular case, based on the explanations > > -below. > > - > > - When we speak of free software, we are referring to freedom of use, > > -not price. Our General Public Licenses are designed to make sure that > > -you have the freedom to distribute copies of free software (and charge > > -for this service if you wish); that you receive source code or can get > > -it if you want it; that you can change the software and use pieces of > > -it in new free programs; and that you are informed that you can do > > -these things. > > - > > - To protect your rights, we need to make restrictions that forbid > > -distributors to deny you these rights or to ask you to surrender these > > -rights. These restrictions translate to certain responsibilities for > > -you if you distribute copies of the library or if you modify it. > > - > > - For example, if you distribute copies of the library, whether gratis > > -or for a fee, you must give the recipients all the rights that we gave > > -you. You must make sure that they, too, receive or can get the source > > -code. If you link other code with the library, you must provide > > -complete object files to the recipients, so that they can relink them > > -with the library after making changes to the library and recompiling > > -it. And you must show them these terms so they know their rights. > > - > > - We protect your rights with a two-step method: (1) we copyright the > > -library, and (2) we offer you this license, which gives you legal > > -permission to copy, distribute and/or modify the library. > > - > > - To protect each distributor, we want to make it very clear that > > -there is no warranty for the free library. Also, if the library is > > -modified by someone else and passed on, the recipients should know > > -that what they have is not the original version, so that the original > > -author's reputation will not be affected by problems that might be > > -introduced by others. > > -^L > > - Finally, software patents pose a constant threat to the existence of > > -any free program. We wish to make sure that a company cannot > > -effectively restrict the users of a free program by obtaining a > > -restrictive license from a patent holder. Therefore, we insist that > > -any patent license obtained for a version of the library must be > > -consistent with the full freedom of use specified in this license. > > - > > - Most GNU software, including some libraries, is covered by the > > -ordinary GNU General Public License. This license, the GNU Lesser > > -General Public License, applies to certain designated libraries, and > > -is quite different from the ordinary General Public License. We use > > -this license for certain libraries in order to permit linking those > > -libraries into non-free programs. > > - > > - When a program is linked with a library, whether statically or using > > -a shared library, the combination of the two is legally speaking a > > -combined work, a derivative of the original library. The ordinary > > -General Public License therefore permits such linking only if the > > -entire combination fits its criteria of freedom. The Lesser General > > -Public License permits more lax criteria for linking other code with > > -the library. > > - > > - We call this license the "Lesser" General Public License because it > > -does Less to protect the user's freedom than the ordinary General > > -Public License. It also provides other free software developers Less > > -of an advantage over competing non-free programs. These disadvantages > > -are the reason we use the ordinary General Public License for many > > -libraries. However, the Lesser license provides advantages in certain > > -special circumstances. > > - > > - For example, on rare occasions, there may be a special need to > > -encourage the widest possible use of a certain library, so that it > > -becomes > > -a de-facto standard. To achieve this, non-free programs must be > > -allowed to use the library. A more frequent case is that a free > > -library does the same job as widely used non-free libraries. In this > > -case, there is little to gain by limiting the free library to free > > -software only, so we use the Lesser General Public License. > > - > > - In other cases, permission to use a particular library in non-free > > -programs enables a greater number of people to use a large body of > > -free software. For example, permission to use the GNU C Library in > > -non-free programs enables many more people to use the whole GNU > > -operating system, as well as its variant, the GNU/Linux operating > > -system. > > - > > - Although the Lesser General Public License is Less protective of the > > -users' freedom, it does ensure that the user of a program that is > > -linked with the Library has the freedom and the wherewithal to run > > -that program using a modified version of the Library. > > - > > - The precise terms and conditions for copying, distribution and > > -modification follow. Pay close attention to the difference between a > > -"work based on the library" and a "work that uses the library". The > > -former contains code derived from the library, whereas the latter must > > -be combined with the library in order to run. > > -^L > > - GNU LESSER GENERAL PUBLIC LICENSE > > - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION > > - > > - 0. This License Agreement applies to any software library or other > > -program which contains a notice placed by the copyright holder or > > -other authorized party saying it may be distributed under the terms of > > -this Lesser General Public License (also called "this License"). > > -Each licensee is addressed as "you". > > - > > - A "library" means a collection of software functions and/or data > > -prepared so as to be conveniently linked with application programs > > -(which use some of those functions and data) to form executables. > > - > > - The "Library", below, refers to any such software library or work > > -which has been distributed under these terms. A "work based on the > > -Library" means either the Library or any derivative work under > > -copyright law: that is to say, a work containing the Library or a > > -portion of it, either verbatim or with modifications and/or translated > > -straightforwardly into another language. (Hereinafter, translation is > > -included without limitation in the term "modification".) > > - > > - "Source code" for a work means the preferred form of the work for > > -making modifications to it. For a library, complete source code means > > -all the source code for all modules it contains, plus any associated > > -interface definition files, plus the scripts used to control > > -compilation > > -and installation of the library. > > - > > - Activities other than copying, distribution and modification are not > > -covered by this License; they are outside its scope. The act of > > -running a program using the Library is not restricted, and output from > > -such a program is covered only if its contents constitute a work based > > -on the Library (independent of the use of the Library in a tool for > > -writing it). Whether that is true depends on what the Library does > > -and what the program that uses the Library does. > > - > > - 1. You may copy and distribute verbatim copies of the Library's > > -complete source code as you receive it, in any medium, provided that > > -you conspicuously and appropriately publish on each copy an > > -appropriate copyright notice and disclaimer of warranty; keep intact > > -all the notices that refer to this License and to the absence of any > > -warranty; and distribute a copy of this License along with the > > -Library. > > - > > - You may charge a fee for the physical act of transferring a copy, > > -and you may at your option offer warranty protection in exchange for a > > -fee. > > -\f > > - 2. You may modify your copy or copies of the Library or any portion > > -of it, thus forming a work based on the Library, and copy and > > -distribute such modifications or work under the terms of Section 1 > > -above, provided that you also meet all of these conditions: > > - > > - a) The modified work must itself be a software library. > > - > > - b) You must cause the files modified to carry prominent notices > > - stating that you changed the files and the date of any change. > > - > > - c) You must cause the whole of the work to be licensed at no > > - charge to all third parties under the terms of this License. > > - > > - d) If a facility in the modified Library refers to a function or a > > - table of data to be supplied by an application program that uses > > - the facility, other than as an argument passed when the facility > > - is invoked, then you must make a good faith effort to ensure that, > > - in the event an application does not supply such function or > > - table, the facility still operates, and performs whatever part of > > - its purpose remains meaningful. > > - > > - (For example, a function in a library to compute square roots has > > - a purpose that is entirely well-defined independent of the > > - application. Therefore, Subsection 2d requires that any > > - application-supplied function or table used by this function must > > - be optional: if the application does not supply it, the square > > - root function must still compute square roots.) > > - > > -These requirements apply to the modified work as a whole. If > > -identifiable sections of that work are not derived from the Library, > > -and can be reasonably considered independent and separate works in > > -themselves, then this License, and its terms, do not apply to those > > -sections when you distribute them as separate works. But when you > > -distribute the same sections as part of a whole which is a work based > > -on the Library, the distribution of the whole must be on the terms of > > -this License, whose permissions for other licensees extend to the > > -entire whole, and thus to each and every part regardless of who wrote > > -it. > > - > > -Thus, it is not the intent of this section to claim rights or contest > > -your rights to work written entirely by you; rather, the intent is to > > -exercise the right to control the distribution of derivative or > > -collective works based on the Library. > > - > > -In addition, mere aggregation of another work not based on the Library > > -with the Library (or with a work based on the Library) on a volume of > > -a storage or distribution medium does not bring the other work under > > -the scope of this License. > > - > > - 3. You may opt to apply the terms of the ordinary GNU General Public > > -License instead of this License to a given copy of the Library. To do > > -this, you must alter all the notices that refer to this License, so > > -that they refer to the ordinary GNU General Public License, version 2, > > -instead of to this License. (If a newer version than version 2 of the > > -ordinary GNU General Public License has appeared, then you can specify > > -that version instead if you wish.) Do not make any other change in > > -these notices. > > -^L > > - Once this change is made in a given copy, it is irreversible for > > -that copy, so the ordinary GNU General Public License applies to all > > -subsequent copies and derivative works made from that copy. > > - > > - This option is useful when you wish to copy part of the code of > > -the Library into a program that is not a library. > > - > > - 4. You may copy and distribute the Library (or a portion or > > -derivative of it, under Section 2) in object code or executable form > > -under the terms of Sections 1 and 2 above provided that you accompany > > -it with the complete corresponding machine-readable source code, which > > -must be distributed under the terms of Sections 1 and 2 above on a > > -medium customarily used for software interchange. > > - > > - If distribution of object code is made by offering access to copy > > -from a designated place, then offering equivalent access to copy the > > -source code from the same place satisfies the requirement to > > -distribute the source code, even though third parties are not > > -compelled to copy the source along with the object code. > > - > > - 5. A program that contains no derivative of any portion of the > > -Library, but is designed to work with the Library by being compiled or > > -linked with it, is called a "work that uses the Library". Such a > > -work, in isolation, is not a derivative work of the Library, and > > -therefore falls outside the scope of this License. > > - > > - However, linking a "work that uses the Library" with the Library > > -creates an executable that is a derivative of the Library (because it > > -contains portions of the Library), rather than a "work that uses the > > -library". The executable is therefore covered by this License. > > -Section 6 states terms for distribution of such executables. > > - > > - When a "work that uses the Library" uses material from a header file > > -that is part of the Library, the object code for the work may be a > > -derivative work of the Library even though the source code is not. > > -Whether this is true is especially significant if the work can be > > -linked without the Library, or if the work is itself a library. The > > -threshold for this to be true is not precisely defined by law. > > - > > - If such an object file uses only numerical parameters, data > > -structure layouts and accessors, and small macros and small inline > > -functions (ten lines or less in length), then the use of the object > > -file is unrestricted, regardless of whether it is legally a derivative > > -work. (Executables containing this object code plus portions of the > > -Library will still fall under Section 6.) > > - > > - Otherwise, if the work is a derivative of the Library, you may > > -distribute the object code for the work under the terms of Section 6. > > -Any executables containing that work also fall under Section 6, > > -whether or not they are linked directly with the Library itself. > > -^L > > - 6. As an exception to the Sections above, you may also combine or > > -link a "work that uses the Library" with the Library to produce a > > -work containing portions of the Library, and distribute that work > > -under terms of your choice, provided that the terms permit > > -modification of the work for the customer's own use and reverse > > -engineering for debugging such modifications. > > - > > - You must give prominent notice with each copy of the work that the > > -Library is used in it and that the Library and its use are covered by > > -this License. You must supply a copy of this License. If the work > > -during execution displays copyright notices, you must include the > > -copyright notice for the Library among them, as well as a reference > > -directing the user to the copy of this License. Also, you must do one > > -of these things: > > - > > - a) Accompany the work with the complete corresponding > > - machine-readable source code for the Library including whatever > > - changes were used in the work (which must be distributed under > > - Sections 1 and 2 above); and, if the work is an executable linked > > - with the Library, with the complete machine-readable "work that > > - uses the Library", as object code and/or source code, so that the > > - user can modify the Library and then relink to produce a modified > > - executable containing the modified Library. (It is understood > > - that the user who changes the contents of definitions files in the > > - Library will not necessarily be able to recompile the application > > - to use the modified definitions.) > > - > > - b) Use a suitable shared library mechanism for linking with the > > - Library. A suitable mechanism is one that (1) uses at run time a > > - copy of the library already present on the user's computer system, > > - rather than copying library functions into the executable, and (2) > > - will operate properly with a modified version of the library, if > > - the user installs one, as long as the modified version is > > - interface-compatible with the version that the work was made with. > > - > > - c) Accompany the work with a written offer, valid for at > > - least three years, to give the same user the materials > > - specified in Subsection 6a, above, for a charge no more > > - than the cost of performing this distribution. > > - > > - d) If distribution of the work is made by offering access to copy > > - from a designated place, offer equivalent access to copy the above > > - specified materials from the same place. > > - > > - e) Verify that the user has already received a copy of these > > - materials or that you have already sent this user a copy. > > - > > - For an executable, the required form of the "work that uses the > > -Library" must include any data and utility programs needed for > > -reproducing the executable from it. However, as a special exception, > > -the materials to be distributed need not include anything that is > > -normally distributed (in either source or binary form) with the major > > -components (compiler, kernel, and so on) of the operating system on > > -which the executable runs, unless that component itself accompanies > > -the executable. > > - > > - It may happen that this requirement contradicts the license > > -restrictions of other proprietary libraries that do not normally > > -accompany the operating system. Such a contradiction means you cannot > > -use both them and the Library together in an executable that you > > -distribute. > > -^L > > - 7. You may place library facilities that are a work based on the > > -Library side-by-side in a single library together with other library > > -facilities not covered by this License, and distribute such a combined > > -library, provided that the separate distribution of the work based on > > -the Library and of the other library facilities is otherwise > > -permitted, and provided that you do these two things: > > - > > - a) Accompany the combined library with a copy of the same work > > - based on the Library, uncombined with any other library > > - facilities. This must be distributed under the terms of the > > - Sections above. > > - > > - b) Give prominent notice with the combined library of the fact > > - that part of it is a work based on the Library, and explaining > > - where to find the accompanying uncombined form of the same work. > > - > > - 8. You may not copy, modify, sublicense, link with, or distribute > > -the Library except as expressly provided under this License. Any > > -attempt otherwise to copy, modify, sublicense, link with, or > > -distribute the Library is void, and will automatically terminate your > > -rights under this License. However, parties who have received copies, > > -or rights, from you under this License will not have their licenses > > -terminated so long as such parties remain in full compliance. > > - > > - 9. You are not required to accept this License, since you have not > > -signed it. However, nothing else grants you permission to modify or > > -distribute the Library or its derivative works. These actions are > > -prohibited by law if you do not accept this License. Therefore, by > > -modifying or distributing the Library (or any work based on the > > -Library), you indicate your acceptance of this License to do so, and > > -all its terms and conditions for copying, distributing or modifying > > -the Library or works based on it. > > - > > - 10. Each time you redistribute the Library (or any work based on the > > -Library), the recipient automatically receives a license from the > > -original licensor to copy, distribute, link with or modify the Library > > -subject to these terms and conditions. You may not impose any further > > -restrictions on the recipients' exercise of the rights granted herein. > > -You are not responsible for enforcing compliance by third parties with > > -this License. > > -^L > > - 11. If, as a consequence of a court judgment or allegation of patent > > -infringement or for any other reason (not limited to patent issues), > > -conditions are imposed on you (whether by court order, agreement or > > -otherwise) that contradict the conditions of this License, they do not > > -excuse you from the conditions of this License. If you cannot > > -distribute so as to satisfy simultaneously your obligations under this > > -License and any other pertinent obligations, then as a consequence you > > -may not distribute the Library at all. For example, if a patent > > -license would not permit royalty-free redistribution of the Library by > > -all those who receive copies directly or indirectly through you, then > > -the only way you could satisfy both it and this License would be to > > -refrain entirely from distribution of the Library. > > - > > -If any portion of this section is held invalid or unenforceable under > > -any particular circumstance, the balance of the section is intended to > > -apply, and the section as a whole is intended to apply in other > > -circumstances. > > - > > -It is not the purpose of this section to induce you to infringe any > > -patents or other property right claims or to contest validity of any > > -such claims; this section has the sole purpose of protecting the > > -integrity of the free software distribution system which is > > -implemented by public license practices. Many people have made > > -generous contributions to the wide range of software distributed > > -through that system in reliance on consistent application of that > > -system; it is up to the author/donor to decide if he or she is willing > > -to distribute software through any other system and a licensee cannot > > -impose that choice. > > - > > -This section is intended to make thoroughly clear what is believed to > > -be a consequence of the rest of this License. > > - > > - 12. If the distribution and/or use of the Library is restricted in > > -certain countries either by patents or by copyrighted interfaces, the > > -original copyright holder who places the Library under this License > > -may add an explicit geographical distribution limitation excluding those > > -countries, so that distribution is permitted only in or among > > -countries not thus excluded. In such case, this License incorporates > > -the limitation as if written in the body of this License. > > - > > - 13. The Free Software Foundation may publish revised and/or new > > -versions of the Lesser General Public License from time to time. > > -Such new versions will be similar in spirit to the present version, > > -but may differ in detail to address new problems or concerns. > > - > > -Each version is given a distinguishing version number. If the Library > > -specifies a version number of this License which applies to it and > > -"any later version", you have the option of following the terms and > > -conditions either of that version or of any later version published by > > -the Free Software Foundation. If the Library does not specify a > > -license version number, you may choose any version ever published by > > -the Free Software Foundation. > > -^L > > - 14. If you wish to incorporate parts of the Library into other free > > -programs whose distribution conditions are incompatible with these, > > -write to the author to ask for permission. For software which is > > -copyrighted by the Free Software Foundation, write to the Free > > -Software Foundation; we sometimes make exceptions for this. Our > > -decision will be guided by the two goals of preserving the free status > > -of all derivatives of our free software and of promoting the sharing > > -and reuse of software generally. > > - > > - NO WARRANTY > > - > > - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO > > -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. > > -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR > > -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY > > -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE > > -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > > -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE > > -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME > > -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. > > - > > - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN > > -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY > > -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU > > -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR > > -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE > > -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING > > -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A > > -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF > > -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH > > -DAMAGES. > > - > > - END OF TERMS AND CONDITIONS > > -^L > > - How to Apply These Terms to Your New Libraries > > - > > - If you develop a new library, and you want it to be of the greatest > > -possible use to the public, we recommend making it free software that > > -everyone can redistribute and change. You can do so by permitting > > -redistribution under these terms (or, alternatively, under the terms > > -of the ordinary General Public License). > > - > > - To apply these terms, attach the following notices to the library. > > -It is safest to attach them to the start of each source file to most > > -effectively convey the exclusion of warranty; and each file should > > -have at least the "copyright" line and a pointer to where the full > > -notice is found. > > - > > - > > - <one line to give the library's name and a brief idea of what it > > -does.> > > - Copyright (C) <year> <name of author> > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - > > -Also add information on how to contact you by electronic and paper > > -mail. > > - > > -You should also get your employer (if you work as a programmer) or > > -your > > -school, if any, to sign a "copyright disclaimer" for the library, if > > -necessary. Here is a sample; alter the names: > > - > > - Yoyodyne, Inc., hereby disclaims all copyright interest in the > > - library `Frob' (a library for tweaking knobs) written by James > > -Random Hacker. > > - > > - <signature of Ty Coon>, 1 April 1990 > > - Ty Coon, President of Vice > > - > > -That's all there is to it! > > - > > - > > diff --git a/tools/libaio/ChangeLog b/tools/libaio/ChangeLog > > deleted file mode 100644 > > index ddcf6e3..0000000 > > --- a/tools/libaio/ChangeLog > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > -0.4.0 > > - - remove libredhat-kernel > > - - add rough outline for man pages > > - - make the compiled io_getevents() add the extra parameter and > > - pass the timeout for updating as per 2.5 > > - - fixes for ia64, now works > > - - fixes for x86-64 > > - - powerpc support from Gianni Tedesco <gianni@ecsc.co.uk> > > - - disable the NULL check in harness/cases/4.t on ia64: ia64 > > - maps the 0 page and causes this check to fail. > > - > > -0.3.15 > > - - use real syscall interface, but don't break source compatibility > > - yet (that will happen with 0.4.0) > > - > > -0.3.13 > > - - add test cases > > - > > -0.3.11 > > - - use library versioning of libredhat-kernel to always provide a > > - fallback > > - > > -0.3.9 > > - - add io_queue_release function > > - > > -0.3.8 > > - - make clean deletes libredhat-kernel.so.1 > > - - const struct timespec * > > - - add make srpm target > > - > > -0.3.7 > > - - fix assembly function .types > > - - export io_getevents > > - - fix io_submit function prototype to match the kernel > > - - provide /usr/lib/libredhat-kernel.so link for compilation > > - (do NOT link against libredhat-kernel.so directly) > > - - fix soname to libaio.so.1 > > - - fix dummy libredhat-kernel's soname > > - - work around nfs bug > > - - provide and install libredhat-kernel.so.1 stub > > - - Makefile improvements > > - - make sure dummy libredhat-kernel.so only returns -ENOSYS > > - > > diff --git a/tools/libaio/INSTALL b/tools/libaio/INSTALL > > deleted file mode 100644 > > index 29b9077..0000000 > > --- a/tools/libaio/INSTALL > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -To install the library, execute the command: > > - > > - make prefix=`pwd`/usr install > > - > > -which will install the binaries and header files into the directory > > -usr. Set prefix=/usr to get them installed into the main system. > > - > > -Please note: Do not attempt to install on the system the > > -"libredhat-kernel.so" file. It is a dummy shared library > > -provided only for the purpose of being able to bootstrap > > -this facility while running on systems without the correct > > -libredhat-kernel.so built. The contents of the included > > -libredhat-kernel.so are only stubs; this library is NOT > > -functional for anything except the internal purpose of > > -linking libaio.so against the provided stubs. At runtime, > > -libaio.so requires a real libredhat-kernel.so library; this > > -is provided by the Red Hat kernel RPM packages with async > > -I/O functionality. > > diff --git a/tools/libaio/Makefile b/tools/libaio/Makefile > > deleted file mode 100644 > > index 7f5c344..0000000 > > --- a/tools/libaio/Makefile > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -NAME=libaio > > -SPECFILE=$(NAME).spec > > -VERSION=$(shell awk '/Version:/ { print $$2 }' $(SPECFILE)) > > -RELEASE=$(shell awk '/Release:/ { print $$2 }' $(SPECFILE)) > > -CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE)) > > -RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm") > > - > > -prefix=/usr > > -includedir=$(prefix)/include > > -libdir=$(prefix)/lib > > - > > -default: all > > - > > -all: > > - @$(MAKE) -C src > > - > > -install: all > > - > > -clean: > > - @$(MAKE) -C src clean > > - @$(MAKE) -C harness clean > > - > > -tag-archive: > > - @cvs -Q tag -F $(CVSTAG) > > - > > -create-archive: tag-archive > > - @rm -rf /tmp/$(NAME) > > - @cd /tmp && cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(NAME) || echo GRRRrrrrr -- ignore [export aborted] > > - @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) > > - @cd /tmp && tar czSpf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) > > - @rm -rf /tmp/$(NAME)-$(VERSION) > > - @cp /tmp/$(NAME)-$(VERSION).tar.gz . > > - @rm -f /tmp/$(NAME)-$(VERSION).tar.gz > > - @echo " " > > - @echo "The final archive is ./$(NAME)-$(VERSION).tar.gz." > > - > > -archive: clean tag-archive create-archive > > - > > -srpm: create-archive > > - $(RPMBUILD) --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" --nodeps -bs $(SPECFILE) > > diff --git a/tools/libaio/TODO b/tools/libaio/TODO > > deleted file mode 100644 > > index 0a9ac15..0000000 > > --- a/tools/libaio/TODO > > +++ /dev/null > > @@ -1,4 +0,0 @@ > > -- Write man pages. > > -- Make -static links against libaio work. > > -- Fallback on userspace if the kernel calls return -ENOSYS. > > - > > diff --git a/tools/libaio/harness/Makefile b/tools/libaio/harness/Makefile > > deleted file mode 100644 > > index d2483fd..0000000 > > --- a/tools/libaio/harness/Makefile > > +++ /dev/null > > @@ -1,37 +0,0 @@ > > -# foo. > > -TEST_SRCS:=$(shell find cases/ -name \*.t | sort -n -t/ -k2) > > -PROGS:=$(patsubst %.t,%.p,$(TEST_SRCS)) > > -HARNESS_SRCS:=main.c > > -# io_queue.c > > - > > -CFLAGS=-Wall -Werror -g -O -laio > > -#-lpthread -lrt > > - > > -all: $(PROGS) > > - > > -$(PROGS): %.p: %.t $(HARNESS_SRCS) > > - $(CC) $(CFLAGS) -DTEST_NAME=\"$<\" -o $@ main.c > > - > > -clean: > > - rm -f $(PROGS) *.o runtests.out rofile wofile rwfile > > - > > -.PHONY: > > - > > -testdir/rofile: .PHONY > > - rm -f $@ > > - echo "test" >$@ > > - chmod 400 $@ > > - > > -testdir/wofile: .PHONY > > - rm -f $@ > > - echo "test" >$@ > > - chmod 200 $@ > > - > > -testdir/rwfile: .PHONY > > - rm -f $@ > > - echo "test" >$@ > > - chmod 600 $@ > > - > > -check: $(PROGS) testdir/rofile testdir/rwfile testdir/wofile > > - ./runtests.sh $(PROGS) > > - > > diff --git a/tools/libaio/harness/README b/tools/libaio/harness/README > > deleted file mode 100644 > > index 5557370..0000000 > > --- a/tools/libaio/harness/README > > +++ /dev/null > > @@ -1,19 +0,0 @@ > > -Notes on running this test suite: > > - > > -To run the test suite, run "make check". All test cases should pass > > -and there should be 0 fails. > > - > > -Several of the test cases require a directory on the filesystem under > > -test for the creation of test files, as well as the generation of > > -error conditions. The test cases assume the directories (or symlinks > > -to directories) are as follows: > > - > > - testdir/ > > - - used for general read/write test cases. Must have at > > - least as much free space as the machine has RAM (up > > - to 768MB). > > - testdir.enospc/ > > - - a filesystem that has space for writing 8KB out, but > > - fails with -ENOSPC beyond 8KB. > > - testdir.ext2/ > > - - must be an ext2 filesystem. > > diff --git a/tools/libaio/harness/attic/0.t b/tools/libaio/harness/attic/0.t > > deleted file mode 100644 > > index 033e62c..0000000 > > --- a/tools/libaio/harness/attic/0.t > > +++ /dev/null > > @@ -1,9 +0,0 @@ > > -/* 0.t > > - Test harness check: okay. > > -*/ > > -int test_main(void) > > -{ > > - printf("test_main: okay\n"); > > - return 0; > > -} > > - > > diff --git a/tools/libaio/harness/attic/1.t b/tools/libaio/harness/attic/1.t > > deleted file mode 100644 > > index 799ffd1..0000000 > > --- a/tools/libaio/harness/attic/1.t > > +++ /dev/null > > @@ -1,9 +0,0 @@ > > -/* 1.t > > - Test harness check: fail. > > -*/ > > -int test_main(void) > > -{ > > - printf("test_main: fail\n"); > > - return 1; > > -} > > - > > diff --git a/tools/libaio/harness/cases/10.t b/tools/libaio/harness/cases/10.t > > deleted file mode 100644 > > index 9d3beb2..0000000 > > --- a/tools/libaio/harness/cases/10.t > > +++ /dev/null > > @@ -1,53 +0,0 @@ > > -/* 10.t - uses testdir.enospc/rwfile > > -- Check results on out-of-space and out-of-quota. (10.t) > > - - write that fills filesystem but does not go over should succeed > > - - write that fills filesystem and goes over should be partial > > - - write to full filesystem should return -ENOSPC > > - - read beyond end of file after ENOSPC should return 0 > > -*/ > > -#include "aio_setup.h" > > - > > -#include <sys/time.h> > > -#include <sys/resource.h> > > -#include <unistd.h> > > - > > -int test_main(void) > > -{ > > -/* Note: changing either of these requires updating the ext2-enospc.img > > - * filesystem image. Also, if SIZE is less than PAGE_SIZE, problems > > - * crop up due to ext2's preallocation. > > - */ > > -#define LIMIT 65536 > > -#define SIZE 65536 > > - char *buf; > > - int rwfd; > > - int status = 0, res; > > - > > - rwfd = open("testdir.enospc/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); > > - assert(rwfd != -1); > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - buf = malloc(SIZE); assert(buf != NULL); > > - memset(buf, 0, SIZE); > > - > > - > > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT-SIZE, WRITE, SIZE); > > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT-SIZE, READ, SIZE); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, WRITE, -ENOSPC); > > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); > > - > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE, WRITE, SIZE-1); > > - status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE, READ, SIZE-1); > > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, WRITE, -ENOSPC); > > - status |= attempt_rw(rwfd, buf, SIZE, LIMIT, READ, 0); > > - status |= attempt_rw(rwfd, buf, 0, LIMIT, WRITE, 0); > > - > > - res = close(rwfd); assert(res == 0); > > - res = unlink("testdir.enospc/rwfile"); assert(res == 0); > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/11.t b/tools/libaio/harness/cases/11.t > > deleted file mode 100644 > > index efcf6d4..0000000 > > --- a/tools/libaio/harness/cases/11.t > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -/* 11.t - uses testdir/rwfile > > -- repeated read / write of same page (to check accounting) (11.t) > > -*/ > > -#include "aio_setup.h" > > - > > -#include <sys/time.h> > > -#include <sys/resource.h> > > -#include <unistd.h> > > - > > -int test_main(void) > > -{ > > -#define COUNT 1000000 > > -#define SIZE 256 > > - char *buf; > > - int rwfd; > > - int status = 0; > > - int i; > > - > > - rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); > > - assert(rwfd != -1); > > - buf = malloc(SIZE); assert(buf != NULL); > > - memset(buf, 0, SIZE); > > - > > - for (i=0; i<COUNT; i++) { > > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE_SILENT, SIZE); > > - if (status) > > - break; > > - } > > - printf("completed %d out of %d writes\n", i, COUNT); > > - for (i=0; i<COUNT; i++) { > > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ_SILENT, SIZE); > > - if (status) > > - break; > > - } > > - printf("completed %d out of %d reads\n", i, COUNT); > > - > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/12.t b/tools/libaio/harness/cases/12.t > > deleted file mode 100644 > > index 3499204..0000000 > > --- a/tools/libaio/harness/cases/12.t > > +++ /dev/null > > @@ -1,49 +0,0 @@ > > -/* 12.t > > -- ioctx access across fork() (12.t) > > - */ > > -#include <sys/types.h> > > -#include <sys/wait.h> > > -#include <unistd.h> > > -#include <signal.h> > > - > > -#include "aio_setup.h" > > - > > -void test_child(void) > > -{ > > - int res; > > - res = attempt_io_submit(io_ctx, 0, NULL, -EINVAL); > > - fflush(stdout); > > - _exit(res); > > -} > > - > > -int test_main(void) > > -{ > > - int res, status; > > - pid_t pid; > > - > > - if (attempt_io_submit(io_ctx, 0, NULL, 0)) > > - return 1; > > - > > - sigblock(sigmask(SIGCHLD) | siggetmask()); > > - fflush(NULL); > > - pid = fork(); assert(pid != -1); > > - > > - if (pid == 0) > > - test_child(); > > - > > - res = waitpid(pid, &status, 0); > > - > > - if (WIFEXITED(status)) { > > - int failed = (WEXITSTATUS(status) != 0); > > - printf("child exited with status %d%s\n", WEXITSTATUS(status), > > - failed ? " -- FAILED" : ""); > > - return failed; > > - } > > - > > - /* anything else: failed */ > > - if (WIFSIGNALED(status)) > > - printf("child killed by signal %d -- FAILED.\n", > > - WTERMSIG(status)); > > - > > - return 1; > > -} > > diff --git a/tools/libaio/harness/cases/13.t b/tools/libaio/harness/cases/13.t > > deleted file mode 100644 > > index 5f18005..0000000 > > --- a/tools/libaio/harness/cases/13.t > > +++ /dev/null > > @@ -1,66 +0,0 @@ > > -/* 13.t - uses testdir/rwfile > > -- Submit multiple writes larger than aio-max-size (deadlocks on older > > - aio code) > > -*/ > > -#include "aio_setup.h" > > - > > -#include <sys/time.h> > > -#include <sys/resource.h> > > -#include <unistd.h> > > - > > -int test_main(void) > > -{ > > -#define SIZE (1024 * 1024) > > -#define IOS 8 > > - struct iocb iocbs[IOS]; > > - struct iocb *iocb_list[IOS]; > > - char *bufs[IOS]; > > - int rwfd; > > - int status = 0, res; > > - int i; > > - > > - rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600); > > - assert(rwfd != -1); > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - > > - for (i=0; i<IOS; i++) { > > - bufs[i] = malloc(SIZE); > > - assert(bufs[i] != NULL); > > - memset(bufs[i], 0, SIZE); > > - > > - io_prep_pwrite(&iocbs[i], rwfd, bufs[i], SIZE, i * SIZE); > > - iocb_list[i] = &iocbs[i]; > > - } > > - > > - status |= attempt_io_submit(io_ctx, IOS, iocb_list, IOS); > > - > > - for (i=0; i<IOS; i++) { > > - struct timespec ts = { tv_sec: 30, tv_nsec: 0 }; > > - struct io_event event; > > - struct iocb *iocb; > > - > > - res = io_getevents(io_ctx, 0, 1, &event, &ts); > > - if (res != 1) { > > - status |= 1; > > - printf("io_getevents failed [%d] with res=%d [%s]\n", > > - i, res, (res < 0) ? strerror(-res) : "okay"); > > - break; > > - } > > - > > - if (event.res != SIZE) > > - status |= 1; > > - > > - iocb = (void *)event.obj; > > - printf("event[%d]: write[%d] %s, returned: %ld [%s]\n", > > - i, (int)(iocb - &iocbs[0]), > > - (event.res != SIZE) ? "failed" : "okay", > > - (long)event.res, > > - (event.res < 0) ? strerror(-event.res) : "okay" > > - ); > > - } > > - > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - res = close(rwfd); assert(res == 0); > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/14.t b/tools/libaio/harness/cases/14.t > > deleted file mode 100644 > > index 514622b..0000000 > > --- a/tools/libaio/harness/cases/14.t > > +++ /dev/null > > @@ -1,90 +0,0 @@ > > -#include <sys/types.h> > > -#include <sys/wait.h> > > -#include <unistd.h> > > -#include <signal.h> > > - > > -#include "aio_setup.h" > > -#include <sys/mman.h> > > - > > -#define SIZE 768*1024*1024 > > - > > -//just submit an I/O > > - > > -int test_child(void) > > -{ > > - char *buf; > > - int rwfd; > > - int res; > > - long size; > > - struct iocb iocb; > > - struct iocb *iocbs[] = { &iocb }; > > - int loop = 10; > > - int i; > > - > > - aio_setup(1024); > > - > > - size = SIZE; > > - > > - printf("size = %ld\n", size); > > - > > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != > > --1); > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - buf = malloc(size); assert(buf != > > -NULL); > > - > > - for(i=0;i<loop;i++) { > > - > > - switch(i%2) { > > - case 0: > > - io_prep_pwrite(&iocb, rwfd, buf, size, 0); > > - break; > > - case 1: > > - io_prep_pread(&iocb, rwfd, buf, size, 0); > > - } > > - > > - res = io_submit(io_ctx, 1, iocbs); > > - if (res != 1) { > > - printf("child: submit: io_submit res=%d [%s]\n", res, > > -strerror(-res)); > > - _exit(1); > > - } > > - } > > - > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - > > - _exit(0); > > -} > > - > > -/* from 12.t */ > > -int test_main(void) > > -{ > > - int res, status; > > - pid_t pid; > > - > > - if (attempt_io_submit(io_ctx, 0, NULL, 0)) > > - return 1; > > - > > - sigblock(sigmask(SIGCHLD) | siggetmask()); > > - fflush(NULL); > > - pid = fork(); assert(pid != -1); > > - > > - if (pid == 0) > > - test_child(); > > - > > - res = waitpid(pid, &status, 0); > > - > > - if (WIFEXITED(status)) { > > - int failed = (WEXITSTATUS(status) != 0); > > - printf("child exited with status %d%s\n", WEXITSTATUS(status), > > - failed ? " -- FAILED" : ""); > > - return failed; > > - } > > - > > - /* anything else: failed */ > > - if (WIFSIGNALED(status)) > > - printf("child killed by signal %d -- FAILED.\n", > > - WTERMSIG(status)); > > - > > - return 1; > > -} > > diff --git a/tools/libaio/harness/cases/2.t b/tools/libaio/harness/cases/2.t > > deleted file mode 100644 > > index 3a0212d..0000000 > > --- a/tools/libaio/harness/cases/2.t > > +++ /dev/null > > @@ -1,41 +0,0 @@ > > -/* 2.t > > -- io_setup (#2) > > - - with invalid context pointer > > - - with maxevents <= 0 > > - - with an already initialized ctxp > > -*/ > > - > > -int attempt(int n, io_context_t *ctxp, int expect) > > -{ > > - int res; > > - > > - printf("expect %3d: io_setup(%5d, %p) = ", expect, n, ctxp); > > - fflush(stdout); > > - res = io_setup(n, ctxp); > > - printf("%3d [%s]%s\n", res, strerror(-res), > > - (res != expect) ? " -- FAILED" : ""); > > - if (res != expect) > > - return 1; > > - > > - return 0; > > -} > > - > > -int test_main(void) > > -{ > > - io_context_t ctx; > > - int status = 0; > > - > > - ctx = NULL; > > - status |= attempt(-1000, KERNEL_RW_POINTER, -EFAULT); > > - status |= attempt( 1000, KERNEL_RW_POINTER, -EFAULT); > > - status |= attempt( 0, KERNEL_RW_POINTER, -EFAULT); > > - status |= attempt(-1000, &ctx, -EINVAL); > > - status |= attempt( -1, &ctx, -EINVAL); > > - status |= attempt( 0, &ctx, -EINVAL); > > - assert(ctx == NULL); > > - status |= attempt( 1, &ctx, 0); > > - status |= attempt( 1, &ctx, -EINVAL); > > - > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/3.t b/tools/libaio/harness/cases/3.t > > deleted file mode 100644 > > index 7773d80..0000000 > > --- a/tools/libaio/harness/cases/3.t > > +++ /dev/null > > @@ -1,25 +0,0 @@ > > -/* 3.t > > -- io_submit/io_getevents with invalid addresses (3.t) > > - > > -*/ > > -#include "aio_setup.h" > > - > > -int test_main(void) > > -{ > > - struct iocb a, b; > > - struct iocb *good_ios[] = { &a, &b }; > > - struct iocb *bad1_ios[] = { NULL, &b }; > > - struct iocb *bad2_ios[] = { KERNEL_RW_POINTER, &a }; > > - int status = 0; > > - > > - status |= attempt_io_submit(BAD_CTX, 1, good_ios, -EINVAL); > > - status |= attempt_io_submit( io_ctx, 0, good_ios, 0); > > - status |= attempt_io_submit( io_ctx, 1, NULL, -EFAULT); > > - status |= attempt_io_submit( io_ctx, 1, (void *)-1, -EFAULT); > > - status |= attempt_io_submit( io_ctx, 2, bad1_ios, -EFAULT); > > - status |= attempt_io_submit( io_ctx, 2, bad2_ios, -EFAULT); > > - status |= attempt_io_submit( io_ctx, -1, good_ios, -EINVAL); > > - > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/4.t b/tools/libaio/harness/cases/4.t > > deleted file mode 100644 > > index 972b4f2..0000000 > > --- a/tools/libaio/harness/cases/4.t > > +++ /dev/null > > @@ -1,72 +0,0 @@ > > -/* 4.t > > -- read of descriptor without read permission (4.t) > > -- write to descriptor without write permission (4.t) > > -- check that O_APPEND writes actually append > > - > > -*/ > > -#include "aio_setup.h" > > - > > -#define SIZE 512 > > -#define READ 'r' > > -#define WRITE 'w' > > -int attempt(int fd, void *buf, int count, long long pos, int rw, int expect) > > -{ > > - struct iocb iocb; > > - int res; > > - > > - switch(rw) { > > - case READ: io_prep_pread (&iocb, fd, buf, count, pos); break; > > - case WRITE: io_prep_pwrite(&iocb, fd, buf, count, pos); break; > > - } > > - > > - printf("expect %3d: (%c), res = ", expect, rw); > > - fflush(stdout); > > - res = sync_submit(&iocb); > > - printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "Success", > > - (res != expect) ? " -- FAILED" : ""); > > - if (res != expect) > > - return 1; > > - > > - return 0; > > -} > > - > > -int test_main(void) > > -{ > > - char buf[SIZE]; > > - int rofd, wofd, rwfd; > > - int status = 0, res; > > - > > - memset(buf, 0, SIZE); > > - > > - rofd = open("testdir/rofile", O_RDONLY); assert(rofd != -1); > > - wofd = open("testdir/wofile", O_WRONLY); assert(wofd != -1); > > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); > > - > > - status |= attempt(rofd, buf, SIZE, 0, WRITE, -EBADF); > > - status |= attempt(wofd, buf, SIZE, 0, READ, -EBADF); > > - status |= attempt(rwfd, buf, SIZE, 0, WRITE, SIZE); > > - status |= attempt(rwfd, buf, SIZE, 0, READ, SIZE); > > - status |= attempt(rwfd, buf, SIZE, -1, READ, -EINVAL); > > - status |= attempt(rwfd, buf, SIZE, -1, WRITE, -EINVAL); > > - > > - rwfd = open("testdir/rwfile", O_RDWR|O_APPEND); assert(rwfd != -1); > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - status |= attempt(rwfd, buf, SIZE, 0, READ, 0); > > - status |= attempt(rwfd, "1234", 4, 0, WRITE, 4); > > - status |= attempt(rwfd, "5678", 4, 0, WRITE, 4); > > - memset(buf, 0, SIZE); > > - status |= attempt(rwfd, buf, SIZE, 0, READ, 8); > > - printf("read after append: [%s]\n", buf); > > - assert(memcmp(buf, "12345678", 8) == 0); > > - > > - status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, READ, -EFAULT); > > - status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, WRITE, -EFAULT); > > - > > - /* Some architectures map the 0 page. Ugh. */ > > -#if !defined(__ia64__) > > - status |= attempt(rwfd, NULL, SIZE, 0, WRITE, -EFAULT); > > -#endif > > - > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/5.t b/tools/libaio/harness/cases/5.t > > deleted file mode 100644 > > index 7669fd7..0000000 > > --- a/tools/libaio/harness/cases/5.t > > +++ /dev/null > > @@ -1,47 +0,0 @@ > > -/* 5.t > > -- Write from a mmap() of the same file. (5.t) > > -*/ > > -#include "aio_setup.h" > > -#include <sys/mman.h> > > - > > -int test_main(void) > > -{ > > - int page_size = getpagesize(); > > -#define SIZE 512 > > - char *buf; > > - int rwfd; > > - int status = 0, res; > > - > > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); > > - res = ftruncate(rwfd, 512); assert(res == 0); > > - > > - buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0); > > - assert(buf != (char *)-1); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); > > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); > > - > > - res = munmap(buf, page_size); assert(res == 0); > > - buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0); > > - assert(buf != (char *)-1); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); > > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); > > - > > - res = munmap(buf, page_size); assert(res == 0); > > - buf = mmap(0, page_size, PROT_READ, MAP_SHARED, rwfd, 0); > > - assert(buf != (char *)-1); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, SIZE); > > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, -EFAULT); > > - > > - res = munmap(buf, page_size); assert(res == 0); > > - buf = mmap(0, page_size, PROT_WRITE, MAP_SHARED, rwfd, 0); > > - assert(buf != (char *)-1); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE); > > - status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, -EFAULT); > > - > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/6.t b/tools/libaio/harness/cases/6.t > > deleted file mode 100644 > > index cea4b01..0000000 > > --- a/tools/libaio/harness/cases/6.t > > +++ /dev/null > > @@ -1,57 +0,0 @@ > > -/* 6.t > > -- huge reads (pinned pages) (6.t) > > -- huge writes (6.t) > > -*/ > > -#include "aio_setup.h" > > -#include <sys/mman.h> > > - > > -long getmemsize(void) > > -{ > > - FILE *f = fopen("/proc/meminfo", "r"); > > - long size; > > - int gotit = 0; > > - char str[256]; > > - > > - assert(f != NULL); > > - while (NULL != fgets(str, 255, f)) { > > - str[255] = 0; > > - if (0 == memcmp(str, "MemTotal:", 9)) { > > - if (1 == sscanf(str + 9, "%ld", &size)) { > > - gotit = 1; > > - break; > > - } > > - } > > - } > > - fclose(f); > > - > > - assert(gotit != 0); > > - return size; > > -} > > - > > -int test_main(void) > > -{ > > - char *buf; > > - int rwfd; > > - int status = 0, res; > > - long size; > > - > > - size = getmemsize(); > > - printf("size = %ld\n", size); > > - assert(size >= (16 * 1024)); > > - if (size > (768 * 1024)) > > - size = 768 * 1024; > > - size *= 1024; > > - > > - rwfd = open("testdir/rwfile", O_RDWR); assert(rwfd != -1); > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - buf = malloc(size); assert(buf != NULL); > > - > > - //memset(buf, 0, size); > > - status |= attempt_rw(rwfd, buf, size, 0, WRITE, size); > > - status |= attempt_rw(rwfd, buf, size, 0, READ, size); > > - > > - //res = ftruncate(rwfd, 0); assert(res == 0); > > - > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/cases/7.t b/tools/libaio/harness/cases/7.t > > deleted file mode 100644 > > index d2d6cbc..0000000 > > --- a/tools/libaio/harness/cases/7.t > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > -/* 7.t > > -- Write overlapping the file size rlimit boundary: should be a short > > - write. (7.t) > > -- Write at the file size rlimit boundary: should give EFBIG. (I think > > - the spec requires that you do NOT deliver SIGXFSZ in this case, where > > - you would do so for sync IO.) (7.t) > > -- Special case: a write of zero bytes at or beyond the file size rlimit > > - boundary must return success. (7.t) > > -*/ > > - > > -#include <sys/resource.h> > > - > > -void SET_RLIMIT(long long limit) > > -{ > > - struct rlimit rlim; > > - int res; > > - > > - rlim.rlim_cur = limit; assert(rlim.rlim_cur == limit); > > - rlim.rlim_max = limit; assert(rlim.rlim_max == limit); > > - > > - res = setrlimit(RLIMIT_FSIZE, &rlim); assert(res == 0); > > -} > > - > > -#define LIMIT 8192 > > -#define FILENAME "testdir/rwfile" > > - > > -#include "common-7-8.h" > > diff --git a/tools/libaio/harness/cases/8.t b/tools/libaio/harness/cases/8.t > > deleted file mode 100644 > > index 8a3d83e..0000000 > > --- a/tools/libaio/harness/cases/8.t > > +++ /dev/null > > @@ -1,49 +0,0 @@ > > -/* 8.t > > -- Ditto for the above three tests at the offset maximum (largest > > - possible ext2/3 file size.) (8.t) > > - */ > > -#include <sys/vfs.h> > > - > > -#define EXT2_OLD_SUPER_MAGIC 0xEF51 > > -#define EXT2_SUPER_MAGIC 0xEF53 > > - > > -long long get_fs_limit(int fd) > > -{ > > - struct statfs s; > > - int res; > > - long long lim = 0; > > - > > - res = fstatfs(fd, &s); assert(res == 0); > > - > > - switch(s.f_type) { > > - case EXT2_OLD_SUPER_MAGIC: > > - case EXT2_SUPER_MAGIC: > > -#if 0 > > - { > > - long long tmp; > > - tmp = s.f_bsize / 4; > > - /* 12 direct + indirect block + dind + tind */ > > - lim = 12 + tmp + tmp * tmp + tmp * tmp * tmp; > > - lim *= s.f_bsize; > > - printf("limit(%ld) = %Ld\n", (long)s.f_bsize, lim); > > - } > > -#endif > > - switch(s.f_bsize) { > > - case 4096: lim = 2199023251456; break; > > - default: > > - printf("unknown ext2 blocksize %ld\n", (long)s.f_bsize); > > - exit(3); > > - } > > - break; > > - default: > > - printf("unknown filesystem 0x%08lx\n", (long)s.f_type); > > - exit(3); > > - } > > - return lim; > > -} > > - > > -#define SET_RLIMIT(x) do ; while (0) > > -#define LIMIT get_fs_limit(rwfd) > > -#define FILENAME "testdir.ext2/rwfile" > > - > > -#include "common-7-8.h" > > diff --git a/tools/libaio/harness/cases/aio_setup.h b/tools/libaio/harness/cases/aio_setup.h > > deleted file mode 100644 > > index 37c9618..0000000 > > --- a/tools/libaio/harness/cases/aio_setup.h > > +++ /dev/null > > @@ -1,98 +0,0 @@ > > -io_context_t io_ctx; > > -#define BAD_CTX ((io_context_t)-1) > > - > > -void aio_setup(int n) > > -{ > > - int res = io_queue_init(n, &io_ctx); > > - if (res != 0) { > > - printf("io_queue_setup(%d) returned %d (%s)\n", > > - n, res, strerror(-res)); > > - exit(3); > > - } > > -} > > - > > -int attempt_io_submit(io_context_t ctx, long nr, struct iocb *ios[], int expect) > > -{ > > - int res; > > - > > - printf("expect %3d: io_submit(%10p, %3ld, %10p) = ", expect, ctx, nr, ios); > > - fflush(stdout); > > - res = io_submit(ctx, nr, ios); > > - printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "", > > - (res != expect) ? " -- FAILED" : ""); > > - if (res != expect) > > - return 1; > > - > > - return 0; > > -} > > - > > -int sync_submit(struct iocb *iocb) > > -{ > > - struct io_event event; > > - struct iocb *iocbs[] = { iocb }; > > - int res; > > - > > - /* 30 second timeout should be enough */ > > - struct timespec ts; > > - ts.tv_sec = 30; > > - ts.tv_nsec = 0; > > - > > - res = io_submit(io_ctx, 1, iocbs); > > - if (res != 1) { > > - printf("sync_submit: io_submit res=%d [%s]\n", res, strerror(-res)); > > - return res; > > - } > > - > > - res = io_getevents(io_ctx, 0, 1, &event, &ts); > > - if (res != 1) { > > - printf("sync_submit: io_getevents res=%d [%s]\n", res, strerror(-res)); > > - return res; > > - } > > - return event.res; > > -} > > - > > -#define SETUP aio_setup(1024) > > - > > - > > -#define READ 'r' > > -#define WRITE 'w' > > -#define READ_SILENT 'R' > > -#define WRITE_SILENT 'W' > > -int attempt_rw(int fd, void *buf, int count, long long pos, int rw, int expect) > > -{ > > - struct iocb iocb; > > - int res; > > - int silent = 0; > > - > > - switch(rw) { > > - case READ_SILENT: > > - silent = 1; > > - case READ: > > - io_prep_pread (&iocb, fd, buf, count, pos); > > - break; > > - case WRITE_SILENT: > > - silent = 1; > > - case WRITE: > > - io_prep_pwrite(&iocb, fd, buf, count, pos); > > - break; > > - } > > - > > - if (!silent) { > > - printf("expect %5d: (%c), res = ", expect, rw); > > - fflush(stdout); > > - } > > - res = sync_submit(&iocb); > > - if (!silent || res != expect) { > > - if (silent) > > - printf("expect %5d: (%c), res = ", expect, rw); > > - printf("%5d [%s]%s\n", res, > > - (res <= 0) ? strerror(-res) : "Success", > > - (res != expect) ? " -- FAILED" : ""); > > - } > > - > > - if (res != expect) > > - return 1; > > - > > - return 0; > > -} > > - > > diff --git a/tools/libaio/harness/cases/common-7-8.h b/tools/libaio/harness/cases/common-7-8.h > > deleted file mode 100644 > > index 3ec2bb4..0000000 > > --- a/tools/libaio/harness/cases/common-7-8.h > > +++ /dev/null > > @@ -1,37 +0,0 @@ > > -/* common-7-8.h > > -*/ > > -#include "aio_setup.h" > > - > > -#include <unistd.h> > > - > > -#define SIZE 512 > > - > > -int test_main(void) > > -{ > > - char *buf; > > - int rwfd; > > - int status = 0, res; > > - long long limit; > > - > > - rwfd = open(FILENAME, O_RDWR); assert(rwfd != -1); > > - res = ftruncate(rwfd, 0); assert(res == 0); > > - buf = malloc(SIZE); assert(buf != NULL); > > - memset(buf, 0, SIZE); > > - > > - limit = LIMIT; > > - > > - SET_RLIMIT(limit); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, limit-SIZE, WRITE, SIZE); > > - status |= attempt_rw(rwfd, buf, SIZE, limit-SIZE, READ, SIZE); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE, WRITE, SIZE-1); > > - status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE, READ, SIZE-1); > > - > > - status |= attempt_rw(rwfd, buf, SIZE, limit, WRITE, -EFBIG); > > - status |= attempt_rw(rwfd, buf, SIZE, limit, READ, 0); > > - status |= attempt_rw(rwfd, buf, 0, limit, WRITE, 0); > > - > > - return status; > > -} > > - > > diff --git a/tools/libaio/harness/main.c b/tools/libaio/harness/main.c > > deleted file mode 100644 > > index 74b2764..0000000 > > --- a/tools/libaio/harness/main.c > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -#include <stdio.h> > > -#include <errno.h> > > -#include <assert.h> > > -#include <stdlib.h> > > - > > -#include <sys/types.h> > > -#include <sys/stat.h> > > -#include <fcntl.h> > > -#include <unistd.h> > > - > > -#include <libaio.h> > > - > > -#if defined(__i386__) > > -#define KERNEL_RW_POINTER ((void *)0xc0010000) > > -#else > > -//#warning Not really sure where kernel memory is. Guessing. > > -#define KERNEL_RW_POINTER ((void *)0xffffffffc0010000) > > -#endif > > - > > - > > -char test_name[] = TEST_NAME; > > - > > -#include TEST_NAME > > - > > -int main(void) > > -{ > > - int res; > > - > > -#if defined(SETUP) > > - SETUP; > > -#endif > > - > > - res = test_main(); > > - printf("test %s completed %s.\n", test_name, > > - res ? "FAILED" : "PASSED" > > - ); > > - fflush(stdout); > > - return res ? 1 : 0; > > -} > > diff --git a/tools/libaio/harness/runtests.sh b/tools/libaio/harness/runtests.sh > > deleted file mode 100644 > > index d763d88..0000000 > > --- a/tools/libaio/harness/runtests.sh > > +++ /dev/null > > @@ -1,19 +0,0 @@ > > -#!/bin/sh > > - > > -passes=0 > > -fails=0 > > - > > -echo "Test run starting at" `date` > > - > > -while [ $# -ge 1 ] ; do > > - this_test=$1 > > - shift > > - echo "Starting $this_test" > > - $this_test 2>&1 > > - res=$? > > - if [ $res -eq 0 ] ; then str="" ; passes=$[passes + 1] ; else str=" -- FAILED" ; fails=$[fails + 1] ; fi > > - echo "Completed $this_test with $res$str". > > -done > > - > > -echo "Pass: $passes Fail: $fails" > > -echo "Test run complete at" `date` > > diff --git a/tools/libaio/libaio.spec b/tools/libaio/libaio.spec > > deleted file mode 100644 > > index bdcc5b2..0000000 > > --- a/tools/libaio/libaio.spec > > +++ /dev/null > > @@ -1,187 +0,0 @@ > > -Name: libaio > > -Version: 0.3.106 > > -Release: 1 > > -Summary: Linux-native asynchronous I/O access library > > -Copyright: LGPL > > -Group: System Environment/Libraries > > -Source: %{name}-%{version}.tar.gz > > -BuildRoot: %{_tmppath}/%{name}-root > > -# Fix ExclusiveArch as we implement this functionality on more architectures > > -ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6 > > - > > -%description > > -The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a > > -richer API and capability set than the simple POSIX async I/O facility. > > -This library, libaio, provides the Linux-native API for async I/O. > > -The POSIX async I/O facility requires this library in order to provide > > -kernel-accelerated async I/O capabilities, as do applications which > > -require the Linux-native async I/O API. > > - > > -%package devel > > -Summary: Development files for Linux-native asynchronous I/O access > > -Group: Development/System > > -Requires: libaio > > -Provides: libaio.so.1 > > - > > -%description devel > > -This package provides header files to include and libraries to link with > > -for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). > > - > > -%prep > > -%setup > > - > > -%build > > -make > > - > > -%install > > -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT > > - > > -make install prefix=$RPM_BUILD_ROOT/usr \ > > - libdir=$RPM_BUILD_ROOT/%{_libdir} \ > > - root=$RPM_BUILD_ROOT > > - > > -%clean > > -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT > > - > > -%post -p /sbin/ldconfig > > - > > -%postun -p /sbin/ldconfig > > - > > -%files > > -%defattr(-,root,root) > > -%attr(0755,root,root) %{_libdir}/libaio.so.* > > -%doc COPYING TODO > > - > > -%files devel > > -%defattr(-,root,root) > > -%attr(0644,root,root) %{_includedir}/* > > -%attr(0755,root,root) %{_libdir}/libaio.so > > -%attr(0644,root,root) %{_libdir}/libaio.a > > - > > -%changelog > > -* Tue Jan 3 2006 Jeff Moyer <jmoyer@redhat.com> - 0.3.106-1 > > -- Add a .proc directive for the ia64_aio_raw_syscall macro. This sounds a lot > > - like the previous entry, but that one fixed the __ia64_raw_syscall macro, > > - located in syscall-ia64.h. This macro is in raw_syscall.c, which pretty much > > - only exists for ia64. This bug prevented the package from building with > > - newer version of gcc. > > - > > -* Mon Aug 1 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.105-1 > > -- Add a .proc directive for the ia64 raw syscall macro. > > - > > -* Fri Apr 1 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.104-1 > > -- Add Alpha architecture support. (Sergey Tikhonov <tsv@solvo.ru>) > > - > > -* Tue Jan 25 2005 Jeff Moyer <jmoyer@redhat.com> - 0.3.103-1 > > -- Fix SONAME breakage. In changing file names around, I also changed the > > - SONAME, which is a no no. > > - > > -* Thu Oct 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.102-1 > > -- S390 asm had a bug; I forgot to update the clobber list. Lucky for me, > > - newer compilers complain about such things. > > -- Also update the s390 asm to look more like the new kernel variants. > > - > > -* Wed Oct 13 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.101-1 > > -- Revert syscall return values to be -ERRNO. This was an inadvertant bug > > - introduced when clobber lists changed. > > -- add ppc64pseries and ppc64iseries to exclusivearch > > - > > -* Tue Sep 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.100-1 > > -- Switch around the tests for _PPC_ and _powerpc64_ so that the ppc64 > > - platforms get the right padding. > > - > > -* Wed Jul 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-4 > > -- Ok, there was a race in moving the cvs module. Someone rebuild from > > - the old cvs into fc3. *sigh* bumping rev. > > - > > -* Wed Jul 14 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-3 > > -- Actually provide libaio.so.1. > > - > > -* Tue Mar 30 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-2 > > -- Apparently the 0.3.93 patch was not meant for 0.3.96. Backed it out. > > - > > -* Tue Mar 30 2004 Jeff Moyer <jmoyer@redhat.com> - 0.3.99-1 > > -- Fix compat calls. > > -- make library .so.1.0.0 and make symlinks properly. > > -- Fix header file for inclusion in c++ code. > > - > > -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.98-2 > > -- bah. fix version nr in changelog. > > - > > -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.98-1 > > -- fix compiler warnings. > > - > > -* Thu Feb 26 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.97-2 > > -- make srpm was using rpm to do a build. changed that to use rpmbuild if > > - it exists, and fallback to rpm if it doesn't. > > - > > -* Tue Feb 24 2004 Jeff Moyer <jmoyer@redhat.com> 0.3.97-1 > > -- Use libc syscall(2) instead of rolling our own calling mechanism. This > > - change is inspired due to a failure to build with newer gcc, since clobber > > - lists were wrong. > > -- Add -fpic to the CFLAGS for all architectures. Should address bz #109457. > > -- change a #include from <linux/types.h> to <sys/types.h>. Fixes a build > > - issue on s390. > > - > > -* Wed Jul 7 2003 Bill Nottingham <notting@redhat.com> 0.3.96-3 > > -- fix paths on lib64 arches > > - > > -* Wed Jun 18 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.96-2 > > -- optimization in io_getevents from Arjan van de Ven in 0.3.96-1 > > -- deal with ia64 in 0.3.96-2 > > - > > -* Wed May 28 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.95-1 > > -- ppc bugfix from Julie DeWandel > > - > > -* Tue May 20 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.94-1 > > -- symbol versioning fix from Ulrich Drepper > > - > > -* Mon Jan 27 2003 Benjamin LaHaise <bcrl@redhat.com> > > -- bump to 0.3.93-3 for rebuild. > > - > > -* Mon Dec 16 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- libaio 0.3.93 test release > > -- add powerpc support from Gianni Tedesco <gianni@ecsc.co.uk> > > -- add s/390 support from Arnd Bergmann <arnd@bergmann-dalldorf.de> > > - > > -* Fri Sep 12 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- libaio 0.3.92 test release > > -- build on x86-64 > > - > > -* Thu Sep 12 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- libaio 0.3.91 test release > > -- build on ia64 > > -- remove libredhat-kernel from the .spec file > > - > > -* Thu Sep 5 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- libaio 0.3.90 test release > > - > > -* Mon Apr 29 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- add requires initscripts >= 6.47-1 to get boot time libredhat-kernel > > - linkage correct. > > -- typo fix > > - > > -* Thu Apr 25 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- make /usr/lib/libredhat-kernel.so point to /lib/libredhat-kernel.so.1.0.0 > > - > > -* Mon Apr 15 2002 Tim Powers <timp@redhat.com> > > -- make the post scriptlet not use /bin/sh > > - > > -* Sat Apr 12 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- add /lib/libredhat-kernel* to %files. > > - > > -* Fri Apr 12 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- make the dummy install as /lib/libredhat-kernel.so.1.0.0 so > > - that ldconfig will link against it if no other is installed. > > - > > -* Tue Jan 22 2002 Benjamin LaHaise <bcrl@redhat.com> > > -- add io_getevents > > - > > -* Tue Jan 22 2002 Michael K. Johnson <johnsonm@redhat.com> > > -- Make linker happy with /usr/lib symlink for libredhat-kernel.so > > - > > -* Mon Jan 21 2002 Michael K. Johnson <johnsonm@redhat.com> > > -- Added stub library > > - > > -* Sun Jan 20 2002 Michael K. Johnson <johnsonm@redhat.com> > > -- Initial packaging > > diff --git a/tools/libaio/man/aio.3 b/tools/libaio/man/aio.3 > > deleted file mode 100644 > > index 6dc3c63..0000000 > > --- a/tools/libaio/man/aio.3 > > +++ /dev/null > > @@ -1,315 +0,0 @@ > > -.TH aio 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio \- Asynchronous IO > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.fi > > -.SH DESCRIPTION > > -The POSIX.1b standard defines a new set of I/O operations which can > > -significantly reduce the time an application spends waiting at I/O. The > > -new functions allow a program to initiate one or more I/O operations and > > -then immediately resume normal work while the I/O operations are > > -executed in parallel. This functionality is available if the > > -.IR "unistd.h" > > -file defines the symbol > > -.B "_POSIX_ASYNCHRONOUS_IO" > > -. > > - > > -These functions are part of the library with realtime functions named > > -.IR "librt" > > -. They are not actually part of the > > -.IR "libc" > > -binary. > > -The implementation of these functions can be done using support in the > > -kernel (if available) or using an implementation based on threads at > > -userlevel. In the latter case it might be necessary to link applications > > -with the thread library > > -.IR "libpthread" > > -in addition to > > -.IR "librt" > > -and > > -.IR "libaio" > > -. > > - > > -All AIO operations operate on files which were opened previously. There > > -might be arbitrarily many operations running for one file. The > > -asynchronous I/O operations are controlled using a data structure named > > -.IR "struct aiocb" > > -It is defined in > > -.IR "aio.h" > > - as follows. > > - > > -.nf > > -struct aiocb > > -{ > > - int aio_fildes; /* File desriptor. */ > > - int aio_lio_opcode; /* Operation to be performed. */ > > - int aio_reqprio; /* Request priority offset. */ > > - volatile void *aio_buf; /* Location of buffer. */ > > - size_t aio_nbytes; /* Length of transfer. */ > > - struct sigevent aio_sigevent; /* Signal number and value. */ > > - > > - /* Internal members. */ > > - struct aiocb *__next_prio; > > - int __abs_prio; > > - int __policy; > > - int __error_code; > > - __ssize_t __return_value; > > - > > -#ifndef __USE_FILE_OFFSET64 > > - __off_t aio_offset; /* File offset. */ > > - char __pad[sizeof (__off64_t) - sizeof (__off_t)]; > > -#else > > - __off64_t aio_offset; /* File offset. */ > > -#endif > > - char __unused[32]; > > -}; > > - > > -.fi > > -The POSIX.1b standard mandates that the > > -.IR "struct aiocb" > > -structure > > -contains at least the members described in the following table. There > > -might be more elements which are used by the implementation, but > > -depending upon these elements is not portable and is highly deprecated. > > - > > -.TP > > -.IR "int aio_fildes" > > -This element specifies the file descriptor to be used for the > > -operation. It must be a legal descriptor, otherwise the operation will > > -fail. > > - > > -The device on which the file is opened must allow the seek operation. > > -I.e., it is not possible to use any of the AIO operations on devices > > -like terminals where an > > -.IR "lseek" > > - call would lead to an error. > > -.TP > > -.IR "off_t aio_offset" > > -This element specifies the offset in the file at which the operation (input > > -or output) is performed. Since the operations are carried out in arbitrary > > -order and more than one operation for one file descriptor can be > > -started, one cannot expect a current read/write position of the file > > -descriptor. > > -.TP > > -.IR "volatile void *aio_buf" > > -This is a pointer to the buffer with the data to be written or the place > > -where the read data is stored. > > -.TP > > -.IR "size_t aio_nbytes" > > -This element specifies the length of the buffer pointed to by > > -.IR "aio_buf" > > -. > > -.TP > > -.IR "int aio_reqprio" > > -If the platform has defined > > -.B "_POSIX_PRIORITIZED_IO" > > -and > > -.B "_POSIX_PRIORITY_SCHEDULING" > > -, the AIO requests are > > -processed based on the current scheduling priority. The > > -.IR "aio_reqprio" > > -element can then be used to lower the priority of the > > -AIO operation. > > -.TP > > -.IR "struct sigevent aio_sigevent" > > -This element specifies how the calling process is notified once the > > -operation terminates. If the > > -.IR "sigev_notify" > > -element is > > -.B "SIGEV_NONE" > > -, no notification is sent. If it is > > -.B "SIGEV_SIGNAL" > > -, > > -the signal determined by > > -.IR "sigev_signo" > > -is sent. Otherwise, > > -.IR "sigev_notify" > > -must be > > -.B "SIGEV_THREAD" > > -. In this case, a thread > > -is created which starts executing the function pointed to by > > -.IR "sigev_notify_function" > > -. > > -.TP > > -.IR "int aio_lio_opcode" > > -This element is only used by the > > -.IR "lio_listio" > > - and > > -.IR "lio_listio64" > > - functions. Since these functions allow an > > -arbitrary number of operations to start at once, and each operation can be > > -input or output (or nothing), the information must be stored in the > > -control block. The possible values are: > > -.TP > > -.B "LIO_READ" > > -Start a read operation. Read from the file at position > > -.IR "aio_offset" > > - and store the next > > -.IR "aio_nbytes" > > - bytes in the > > -buffer pointed to by > > -.IR "aio_buf" > > -. > > -.TP > > -.B "LIO_WRITE" > > -Start a write operation. Write > > -.IR "aio_nbytes" > > -bytes starting at > > -.IR "aio_buf" > > -into the file starting at position > > -.IR "aio_offset" > > -. > > -.TP > > -.B "LIO_NOP" > > -Do nothing for this control block. This value is useful sometimes when > > -an array of > > -.IR "struct aiocb" > > -values contains holes, i.e., some of the > > -values must not be handled although the whole array is presented to the > > -.IR "lio_listio" > > -function. > > - > > -When the sources are compiled using > > -.B "_FILE_OFFSET_BITS == 64" > > -on a > > -32 bit machine, this type is in fact > > -.IR "struct aiocb64" > > -, since the LFS > > -interface transparently replaces the > > -.IR "struct aiocb" > > -definition. > > -.PP > > -For use with the AIO functions defined in the LFS, there is a similar type > > -defined which replaces the types of the appropriate members with larger > > -types but otherwise is equivalent to > > -.IR "struct aiocb" > > -. Particularly, > > -all member names are the same. > > - > > -.nf > > -/* The same for the 64bit offsets. Please note that the members aio_fildes > > - to __return_value have to be the same in aiocb and aiocb64. */ > > -#ifdef __USE_LARGEFILE64 > > -struct aiocb64 > > -{ > > - int aio_fildes; /* File desriptor. */ > > - int aio_lio_opcode; /* Operation to be performed. */ > > - int aio_reqprio; /* Request priority offset. */ > > - volatile void *aio_buf; /* Location of buffer. */ > > - size_t aio_nbytes; /* Length of transfer. */ > > - struct sigevent aio_sigevent; /* Signal number and value. */ > > - > > - /* Internal members. */ > > - struct aiocb *__next_prio; > > - int __abs_prio; > > - int __policy; > > - int __error_code; > > - __ssize_t __return_value; > > - > > - __off64_t aio_offset; /* File offset. */ > > - char __unused[32]; > > -}; > > - > > -.fi > > -.TP > > -.IR "int aio_fildes" > > -This element specifies the file descriptor which is used for the > > -operation. It must be a legal descriptor since otherwise the operation > > -fails for obvious reasons. > > -The device on which the file is opened must allow the seek operation. > > -I.e., it is not possible to use any of the AIO operations on devices > > -like terminals where an > > -.IR "lseek" > > - call would lead to an error. > > -.TP > > -.IR "off64_t aio_offset" > > -This element specifies at which offset in the file the operation (input > > -or output) is performed. Since the operation are carried in arbitrary > > -order and more than one operation for one file descriptor can be > > -started, one cannot expect a current read/write position of the file > > -descriptor. > > -.TP > > -.IR "volatile void *aio_buf" > > -This is a pointer to the buffer with the data to be written or the place > > -where the read data is stored. > > -.TP > > -.IR "size_t aio_nbytes" > > -This element specifies the length of the buffer pointed to by > > -.IR "aio_buf" > > -. > > -.TP > > -.IR "int aio_reqprio" > > -If for the platform > > -.B "_POSIX_PRIORITIZED_IO" > > -and > > -.B "_POSIX_PRIORITY_SCHEDULING" > > -are defined the AIO requests are > > -processed based on the current scheduling priority. The > > -.IR "aio_reqprio" > > -element can then be used to lower the priority of the > > -AIO operation. > > -.TP > > -.IR "struct sigevent aio_sigevent" > > -This element specifies how the calling process is notified once the > > -operation terminates. If the > > -.IR "sigev_notify" > > -, element is > > -.B "SIGEV_NONE" > > -no notification is sent. If it is > > -.B "SIGEV_SIGNAL" > > -, > > -the signal determined by > > -.IR "sigev_signo" > > -is sent. Otherwise, > > -.IR "sigev_notify" > > - must be > > -.B "SIGEV_THREAD" > > -in which case a thread > > -which starts executing the function pointed to by > > -.IR "sigev_notify_function" > > -. > > -.TP > > -.IR "int aio_lio_opcode" > > -This element is only used by the > > -.IR "lio_listio" > > -and > > -.IR "lio_listio64" > > -functions. Since these functions allow an > > -arbitrary number of operations to start at once, and since each operation can be > > -input or output (or nothing), the information must be stored in the > > -control block. See the description of > > -.IR "struct aiocb" > > -for a description > > -of the possible values. > > -.PP > > -When the sources are compiled using > > -.B "_FILE_OFFSET_BITS == 64" > > -on a > > -32 bit machine, this type is available under the name > > -.IR "struct aiocb64" > > -, since the LFS transparently replaces the old interface. > > -.SH "RETURN VALUES" > > -.SH ERRORS > > -.SH "SEE ALSO" > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_cancel.3 b/tools/libaio/man/aio_cancel.3 > > deleted file mode 100644 > > index 502c83c..0000000 > > --- a/tools/libaio/man/aio_cancel.3 > > +++ /dev/null > > @@ -1,137 +0,0 @@ > > -.TH aio_cancel 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_cancel - Cancel asynchronous I/O requests > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_cancel (int fildes " , struct aiocb *aiocbp " )" > > -.fi > > -.SH DESCRIPTION > > -When one or more requests are asynchronously processed, it might be > > -useful in some situations to cancel a selected operation, e.g., if it > > -becomes obvious that the written data is no longer accurate and would > > -have to be overwritten soon. As an example, assume an application, which > > -writes data in files in a situation where new incoming data would have > > -to be written in a file which will be updated by an enqueued request. > > -The POSIX AIO implementation provides such a function, but this function > > -is not capable of forcing the cancellation of the request. It is up to the > > -implementation to decide whether it is possible to cancel the operation > > -or not. Therefore using this function is merely a hint. > > -.B "The libaio implementation does not implement the cancel operation in the" > > -.B "POSIX libraries". > > -.PP > > -The > > -.IR aio_cancel > > -function can be used to cancel one or more > > -outstanding requests. If the > > -.IR aiocbp > > -parameter is > > -.IR NULL > > -, the > > -function tries to cancel all of the outstanding requests which would process > > -the file descriptor > > -.IR fildes > > -(i.e., whose > > -.IR aio_fildes > > -member > > -is > > -.IR fildes > > -). If > > -.IR aiocbp is not > > -.IR NULL > > -, > > -.IR aio_cancel > > -attempts to cancel the specific request pointed to by > > -.IR aiocbp. > > - > > -For requests which were successfully canceled, the normal notification > > -about the termination of the request should take place. I.e., depending > > -on the > > -.IR "struct sigevent" > > -object which controls this, nothing > > -happens, a signal is sent or a thread is started. If the request cannot > > -be canceled, it terminates the usual way after performing the operation. > > -After a request is successfully canceled, a call to > > -.IR aio_error > > -with > > -a reference to this request as the parameter will return > > -.B ECANCELED > > -and a call to > > -.IR aio_return > > -will return > > -.IR -1. > > -If the request wasn't canceled and is still running the error status is > > -still > > -.B EINPROGRESS. > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -, this > > -function is in fact > > -.IR aio_cancel64 > > -since the LFS interface > > -transparently replaces the normal implementation. > > - > > -.SH "RETURN VALUES" > > -.TP > > -.B AIO_CANCELED > > -If there were > > -requests which haven't terminated and which were successfully canceled. > > -.TP > > -.B AIO_NOTCANCELED > > -If there is one or more requests left which couldn't be canceled, > > -. In this case > > -.IR aio_error > > -must be used to find out which of the, perhaps multiple, requests (in > > -.IR aiocbp > > -is > > -.IR NULL > > -) weren't successfully canceled. > > -.TP > > -.B AIO_ALLDONE > > -If all > > -requests already terminated at the time > > -.IR aio_cancel > > -is called the > > -return value is > > -. > > -.SH ERRORS > > -If an error occurred during the execution of > > -.IR aio_cancel > > -the > > -function returns > > -.IR -1 > > -and sets > > -.IR errno > > -to one of the following > > -values. > > -.TP > > -.B EBADF > > -The file descriptor > > -.IR fildes > > -is not valid. > > -.TP > > -.B ENOSYS > > -.IR aio_cancel > > -is not implemented. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_cancel64.3 b/tools/libaio/man/aio_cancel64.3 > > deleted file mode 100644 > > index ede775b..0000000 > > --- a/tools/libaio/man/aio_cancel64.3 > > +++ /dev/null > > @@ -1,50 +0,0 @@ > > -.TH aio_cancel64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_cancel64 \- Cancel asynchronous I/O requests > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_cancel64 (int fildes, struct aiocb64 *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function is similar to > > -.IR aio_cancel > > -with the only difference > > -that the argument is a reference to a variable of type > > -.IR struct aiocb64 > > -. > > - > > -When the sources are compiled with > > -.IR _FILE_OFFSET_BITS == 64 > > -, this > > -function is available under the name > > -.IR aio_cancel > > -and so > > -transparently replaces the interface for small files on 32 bit > > -machines. > > -.SH "RETURN VALUES" > > -See aio_cancel(3). > > -.SH ERRORS > > -See aio_cancel(3). > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_error.3 b/tools/libaio/man/aio_error.3 > > deleted file mode 100644 > > index 12b82cf..0000000 > > --- a/tools/libaio/man/aio_error.3 > > +++ /dev/null > > @@ -1,81 +0,0 @@ > > -.TH aio_error 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_error \- Getting the Status of AIO Operations > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_error (const struct aiocb *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -The function > > -.IR aio_error > > -determines the error state of the request described by the > > -.IR "struct aiocb" > > -variable pointed to by > > -.I aiocbp > > -. > > - > > -When the operation is performed truly asynchronously (as with > > -.IR "aio_read" > > -and > > -.IR "aio_write" > > -and with > > -.IR "lio_listio" > > -when the mode is > > -.IR "LIO_NOWAIT" > > -), one sometimes needs to know whether a > > -specific request already terminated and if so, what the result was. > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -this function is in fact > > -.IR "aio_error64" > > -since the LFS interface transparently replaces the normal implementation. > > -.SH "RETURN VALUES" > > -If the request has not yet terminated the value returned is always > > -.IR "EINPROGRESS" > > -. Once the request has terminated the value > > -.IR "aio_error" > > -returns is either > > -.I 0 > > -if the request completed successfully or it returns the value which would be stored in the > > -.IR "errno" > > -variable if the request would have been done using > > -.IR "read" > > -, > > -.IR "write" > > -, or > > -.IR "fsync" > > -. > > -.SH ERRORS > > -.TP > > -.IR "ENOSYS" > > -if it is not implemented. It > > -could also return > > -.TP > > -.IR "EINVAL" > > -if the > > -.I aiocbp > > -parameter does not > > -refer to an asynchronous operation whose return status is not yet known. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_error64.3 b/tools/libaio/man/aio_error64.3 > > deleted file mode 100644 > > index 3333161..0000000 > > --- a/tools/libaio/man/aio_error64.3 > > +++ /dev/null > > @@ -1,64 +0,0 @@ > > -.TH aio_error64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_error64 \- Return errors > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_error64 (const struct aiocb64 *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function is similar to > > -.IR aio_error > > -with the only difference > > -that the argument is a reference to a variable of type > > -.IR "struct aiocb64". > > -.PP > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -this > > -function is available under the name > > -.IR aio_error > > -and so > > -transparently replaces the interface for small files on 32 bit > > -machines. > > -.SH "RETURN VALUES" > > -If the request has not yet terminated the value returned is always > > -.IR "EINPROGRESS" > > -. Once the request has terminated the value > > -.IR "aio_error" > > -returns is either > > -.I 0 > > -if the request completed successfully or it returns the value which would be stored in the > > -.IR "errno" > > -variable if the request would have been done using > > -.IR "read" > > -, > > -.IR "write" > > -, or > > -.IR "fsync" > > -. > > -.SH ERRORS > > -See > > -.IR aio_error(3). > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_fsync.3 b/tools/libaio/man/aio_fsync.3 > > deleted file mode 100644 > > index 637f0f6..0000000 > > --- a/tools/libaio/man/aio_fsync.3 > > +++ /dev/null > > @@ -1,139 +0,0 @@ > > -.TH aio_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_fsync \- Synchronize a file's complete in-core state with that on disk > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_fsync (int op, struct aiocb aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -.PP > > -When dealing with asynchronous operations it is sometimes necessary to > > -get into a consistent state. This would mean for AIO that one wants to > > -know whether a certain request or a group of request were processed. > > -This could be done by waiting for the notification sent by the system > > -after the operation terminated, but this sometimes would mean wasting > > -resources (mainly computation time). Instead POSIX.1b defines two > > -functions which will help with most kinds of consistency. > > -.PP > > -The > > -.IR aio_fsync > > -and > > -.IR "aio_fsync64" > > -functions are only available > > -if the symbol > > -.IR "_POSIX_SYNCHRONIZED_IO" > > -is defined in > > -.I unistd.h > > -. > > - > > -Calling this function forces all I/O operations operating queued at the > > -time of the function call operating on the file descriptor > > -.IR "aiocbp->aio_fildes" > > -into the synchronized I/O completion state . The > > -.IR "aio_fsync" > > -function returns > > -immediately but the notification through the method described in > > -.IR "aiocbp->aio_sigevent" > > -will happen only after all requests for this > > -file descriptor have terminated and the file is synchronized. This also > > -means that requests for this very same file descriptor which are queued > > -after the synchronization request are not affected. > > - > > -If > > -.IR "op" > > -is > > -.IR "O_DSYNC" > > -the synchronization happens as with a call > > -to > > -.IR "fdatasync" > > -. Otherwise > > -.IR "op" > > -should be > > -.IR "O_SYNC" > > -and > > -the synchronization happens as with > > -.IR "fsync" > > -. > > - > > -As long as the synchronization has not happened, a call to > > -.IR "aio_error" > > -with the reference to the object pointed to by > > -.IR "aiocbp" > > -returns > > -.IR "EINPROGRESS" > > -. Once the synchronization is > > -done > > -.IR "aio_error" > > -return > > -.IR 0 > > -if the synchronization was not > > -successful. Otherwise the value returned is the value to which the > > -.IR "fsync" > > -or > > -.IR "fdatasync" > > -function would have set the > > -.IR "errno" > > -variable. In this case nothing can be assumed about the > > -consistency for the data written to this file descriptor. > > - > > -.SH "RETURN VALUES" > > -The return value of this function is > > -.IR 0 > > -if the request was > > -successfully enqueued. Otherwise the return value is > > -.IR -1 > > -and > > -.IR "errno". > > -.SH ERRORS > > -.TP > > -.B EAGAIN > > -The request could not be enqueued due to temporary lack of resources. > > -.TP > > -.B EBADF > > -The file descriptor > > -.IR "aiocbp->aio_fildes" > > -is not valid or not open > > -for writing. > > -.TP > > -.B EINVAL > > -The implementation does not support I/O synchronization or the > > -.IR "op" > > -parameter is other than > > -.IR "O_DSYNC" > > -and > > -.IR "O_SYNC" > > -. > > -.TP > > -.B ENOSYS > > -This function is not implemented. > > -.PP > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > - this > > -function is in fact > > -.IR "aio_return64" > > -since the LFS interface > > -transparently replaces the normal implementation. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_fsync64.3 b/tools/libaio/man/aio_fsync64.3 > > deleted file mode 100644 > > index 5dce22d..0000000 > > --- a/tools/libaio/man/aio_fsync64.3 > > +++ /dev/null > > @@ -1,51 +0,0 @@ > > -.TH aio_fsync64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_fsync64 \- Synchronize a file's complete in-core state with that on disk > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_fsync64 (int op, struct aiocb64 *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function is similar to > > -.IR aio_fsync > > -with the only difference > > -that the argument is a reference to a variable of type > > -.IR "struct aiocb64". > > - > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -this > > -function is available under the name > > -.IR aio_fsync > > -and so > > -transparently replaces the interface for small files on 32 bit > > -machines. > > -.SH "RETURN VALUES" > > -See > > -.IR aio_fsync. > > -.SH ERRORS > > -See > > -.IR aio_fsync. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_init.3 b/tools/libaio/man/aio_init.3 > > deleted file mode 100644 > > index 3b0ec95..0000000 > > --- a/tools/libaio/man/aio_init.3 > > +++ /dev/null > > @@ -1,96 +0,0 @@ > > -.TH aio_init 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_init \- How to optimize the AIO implementation > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "void aio_init (const struct aioinit *init)" > > -.fi > > -.SH DESCRIPTION > > - > > -The POSIX standard does not specify how the AIO functions are > > -implemented. They could be system calls, but it is also possible to > > -emulate them at userlevel. > > - > > -At the point of this writing, the available implementation is a userlevel > > -implementation which uses threads for handling the enqueued requests. > > -While this implementation requires making some decisions about > > -limitations, hard limitations are something which is best avoided > > -in the GNU C library. Therefore, the GNU C library provides a means > > -for tuning the AIO implementation according to the individual use. > > - > > -.BI "struct aioinit" > > -.PP > > -This data type is used to pass the configuration or tunable parameters > > -to the implementation. The program has to initialize the members of > > -this struct and pass it to the implementation using the > > -.IR aio_init > > -function. > > -.TP > > -.B "int aio_threads" > > -This member specifies the maximal number of threads which may be used > > -at any one time. > > -.TP > > -.B "int aio_num" > > -This number provides an estimate on the maximal number of simultaneously > > -enqueued requests. > > -.TP > > -.B "int aio_locks" > > -Unused. > > -.TP > > -.B "int aio_usedba" > > -Unused. > > -.TP > > -.B "int aio_debug" > > -Unused. > > -.TP > > -.B "int aio_numusers" > > -Unused. > > -.TP > > -.B "int aio_reserved[2]" > > -Unused. > > -.PP > > -This function must be called before any other AIO function. Calling it > > -is completely voluntary, as it is only meant to help the AIO > > -implementation perform better. > > - > > -Before calling the > > -.IR aio_init > > -, function the members of a variable of > > -type > > -.IR "struct aioinit" > > -must be initialized. Then a reference to > > -this variable is passed as the parameter to > > -.IR aio_init > > -which itself > > -may or may not pay attention to the hints. > > - > > -It is a extension which follows a proposal from the SGI implementation in > > -.IR Irix 6 > > -. It is not covered by POSIX.1b or Unix98. > > -.SH "RETURN VALUES" > > -The function has no return value. > > -.SH ERRORS > > -The function has no error cases defined. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_read.3 b/tools/libaio/man/aio_read.3 > > deleted file mode 100644 > > index 5bcb6c8..0000000 > > --- a/tools/libaio/man/aio_read.3 > > +++ /dev/null > > @@ -1,146 +0,0 @@ > > -.TH aio_read 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_read \- Initiate an asynchronous read operation > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_read (struct aiocb *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function initiates an asynchronous read operation. It > > -immediately returns after the operation was enqueued or when an > > -error was encountered. > > - > > -The first > > -.IR "aiocbp->aio_nbytes" > > -bytes of the file for which > > -.IR "aiocbp->aio_fildes" > > -is a descriptor are written to the buffer > > -starting at > > -.IR "aiocbp->aio_buf" > > -. Reading starts at the absolute > > -position > > -.IR "aiocbp->aio_offset" > > -in the file. > > - > > -If prioritized I/O is supported by the platform the > > -.IR "aiocbp->aio_reqprio" > > -value is used to adjust the priority before > > -the request is actually enqueued. > > - > > -The calling process is notified about the termination of the read > > -request according to the > > -.IR "aiocbp->aio_sigevent" > > -value. > > - > > -.SH "RETURN VALUES" > > -When > > -.IR "aio_read" > > -returns, the return value is zero if no error > > -occurred that can be found before the process is enqueued. If such an > > -early error is found, the function returns > > -.IR -1 > > -and sets > > -.IR "errno". > > - > > -.PP > > -If > > -.IR "aio_read" > > -returns zero, the current status of the request > > -can be queried using > > -.IR "aio_error" > > -and > > -.IR "aio_return" > > -functions. > > -As long as the value returned by > > -.IR "aio_error" > > -is > > -.IR "EINPROGRESS" > > -the operation has not yet completed. If > > -.IR "aio_error" > > -returns zero, > > -the operation successfully terminated, otherwise the value is to be > > -interpreted as an error code. If the function terminated, the result of > > -the operation can be obtained using a call to > > -.IR "aio_return" > > -. The > > -returned value is the same as an equivalent call to > > -.IR "read" > > -would > > -have returned. > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -this > > -function is in fact > > -.IR "aio_read64" > > -since the LFS interface transparently > > -replaces the normal implementation. > > - > > -.SH ERRORS > > -In the case of an early error: > > -.TP > > -.B EAGAIN > > -The request was not enqueued due to (temporarily) exceeded resource > > -limitations. > > -.TP > > -.B ENOSYS > > -The > > -.IR "aio_read" > > -function is not implemented. > > -.TP > > -.B EBADF > > -The > > -.IR "aiocbp->aio_fildes" > > -descriptor is not valid. This condition > > -need not be recognized before enqueueing the request and so this error > > -might also be signaled asynchronously. > > -.TP > > -.B EINVAL > > -The > > -.IR "aiocbp->aio_offset" > > -or > > -.IR "aiocbp->aio_reqpiro" > > -value is > > -invalid. This condition need not be recognized before enqueueing the > > -request and so this error might also be signaled asynchronously. > > - > > -.PP > > -In the case of a normal return, possible error codes returned by > > -.IR "aio_error" > > -are: > > -.TP > > -.B EBADF > > -The > > -.IR "aiocbp->aio_fildes" > > -descriptor is not valid. > > -.TP > > -.B ECANCELED > > -The operation was canceled before the operation was finished > > -.TP > > -.B EINVAL > > -The > > -.IR "aiocbp->aio_offset" > > -value is invalid. > > -.PP > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_read64.3 b/tools/libaio/man/aio_read64.3 > > deleted file mode 100644 > > index 8e407a5..0000000 > > --- a/tools/libaio/man/aio_read64.3 > > +++ /dev/null > > @@ -1,60 +0,0 @@ > > -.TH aio_read64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_read64 \- Initiate an asynchronous read operation > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_read64 (struct aiocb *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function is similar to the > > -.IR "aio_read" > > -function. The only > > -difference is that on > > -.IR "32 bit" > > -machines, the file descriptor should > > -be opened in the large file mode. Internally, > > -.IR "aio_read64" > > -uses > > -functionality equivalent to > > -.IR "lseek64" > > -to position the file descriptor correctly for the reading, > > -as opposed to > > -.IR "lseek" > > -functionality used in > > -.IR "aio_read". > > - > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -, this > > -function is available under the name > > -.IR "aio_read" > > -and so transparently > > -replaces the interface for small files on 32 bit machines. > > -.SH "RETURN VALUES" > > -See > > -.IR aio_read. > > -.SH ERRORS > > -See > > -.IR aio_read. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_return.3 b/tools/libaio/man/aio_return.3 > > deleted file mode 100644 > > index 1e3335f..0000000 > > --- a/tools/libaio/man/aio_return.3 > > +++ /dev/null > > @@ -1,71 +0,0 @@ > > -.TH aio_return 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_return \- Retrieve status of asynchronous I/O operation > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "ssize_t aio_return (const struct aiocb *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function can be used to retrieve the return status of the operation > > -carried out by the request described in the variable pointed to by > > -.IR aiocbp > > -. As long as the error status of this request as returned > > -by > > -.IR aio_error > > -is > > -.IR EINPROGRESS > > -the return of this function is > > -undefined. > > - > > -Once the request is finished this function can be used exactly once to > > -retrieve the return value. Following calls might lead to undefined > > -behavior. > > -When the sources are compiled with > > -.B "_FILE_OFFSET_BITS == 64" > > -this function is in fact > > -.IR aio_return64 > > -since the LFS interface > > -transparently replaces the normal implementation. > > -.SH "RETURN VALUES" > > -The return value itself is the value which would have been > > -returned by the > > -.IR read > > -, > > -.IR write > > -, or > > -.IR fsync > > -call. > > -.SH ERRORS > > -The function can return > > -.TP > > -.B ENOSYS > > -if it is not implemented. > > -.TP > > -.B EINVAL > > -if the > > -.IR aiocbp > > -parameter does not > > -refer to an asynchronous operation whose return status is not yet known. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_return64.3 b/tools/libaio/man/aio_return64.3 > > deleted file mode 100644 > > index 7e78362..0000000 > > --- a/tools/libaio/man/aio_return64.3 > > +++ /dev/null > > @@ -1,51 +0,0 @@ > > -.TH aio_read64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_read64 \- Retrieve status of asynchronous I/O operation > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_return64 (const struct aiocb64 *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function is similar to > > -.IR "aio_return" > > -with the only difference > > -that the argument is a reference to a variable of type > > -.IR "struct aiocb64". > > - > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -this > > -function is available under the name > > -.IR "aio_return" > > -and so > > -transparently replaces the interface for small files on 32 bit > > -machines. > > -.SH "RETURN VALUES" > > -See > > -.IR aio_return. > > -.SH ERRORS > > -See > > -.IR aio_return. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_suspend.3 b/tools/libaio/man/aio_suspend.3 > > deleted file mode 100644 > > index cae1b65..0000000 > > --- a/tools/libaio/man/aio_suspend.3 > > +++ /dev/null > > @@ -1,123 +0,0 @@ > > -.TH aio_suspend 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_suspend \- Wait until one or more requests of a specific set terminates. > > -.SH SYNOPSYS > > -.nf > > -.B "#include <errno.h>" > > -.sp > > -.br > > -.B "#include <aio.h>" > > -.sp > > -.br > > -.BI "int aio_suspend (const struct aiocb *const list[], int nent, const struct timespec *timeout)" > > -.fi > > -.SH DESCRIPTION > > -Another method of synchronization is to wait until one or more requests of a > > -specific set terminated. This could be achieved by the > > -.IR "aio_*" > > -functions to notify the initiating process about the termination but in > > -some situations this is not the ideal solution. In a program which > > -constantly updates clients somehow connected to the server it is not > > -always the best solution to go round robin since some connections might > > -be slow. On the other hand letting the > > -.IR "aio_*" > > -function notify the > > -caller might also be not the best solution since whenever the process > > -works on preparing data for on client it makes no sense to be > > -interrupted by a notification since the new client will not be handled > > -before the current client is served. For situations like this > > -.IR "aio_suspend" > > -should be used. > > -.PP > > -When calling this function, the calling thread is suspended until at > > -least one of the requests pointed to by the > > -.IR "nent" > > -elements of the > > -array > > -.IR "list" > > -has completed. If any of the requests has already > > -completed at the time > > -.IR "aio_suspend" > > -is called, the function returns > > -immediately. Whether a request has terminated or not is determined by > > -comparing the error status of the request with > > -.IR "EINPROGRESS" > > -. If > > -an element of > > -.IR "list" > > -is > > -.IR "NULL" > > -, the entry is simply ignored. > > - > > -If no request has finished, the calling process is suspended. If > > -.IR "timeout" > > -is > > -.IR "NULL" > > -, the process is not woken until a request > > -has finished. If > > -.IR "timeout" > > -is not > > -.IR "NULL" > > -, the process remains > > -suspended at least as long as specified in > > -.IR "timeout" > > -. In this case, > > -.IR "aio_suspend" > > -returns with an error. > > -.PP > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -this > > -function is in fact > > -.IR "aio_suspend64" > > -since the LFS interface > > -transparently replaces the normal implementation. > > -.SH "RETURN VALUES" > > -The return value of the function is > > -.IR 0 > > -if one or more requests > > -from the > > -.IR "list" > > -have terminated. Otherwise the function returns > > -.IR -1 > > -and > > -.IR "errno" > > -is set. > > -.SH ERRORS > > -.TP > > -.B EAGAIN > > -None of the requests from the > > -.IR "list" > > -completed in the time specified > > -by > > -.IR "timeout" > > -. > > -.TP > > -.B EINTR > > -A signal interrupted the > > -.IR "aio_suspend" > > -function. This signal might > > -also be sent by the AIO implementation while signalling the termination > > -of one of the requests. > > -.TP > > -.B ENOSYS > > -The > > -.IR "aio_suspend" > > -function is not implemented. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_suspend64.3 b/tools/libaio/man/aio_suspend64.3 > > deleted file mode 100644 > > index 2f289ec..0000000 > > --- a/tools/libaio/man/aio_suspend64.3 > > +++ /dev/null > > @@ -1,51 +0,0 @@ > > -.TH aio_suspend64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_suspend64 \- Wait until one or more requests of a specific set terminates > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_suspend64 (const struct aiocb64 *const list[], int nent, const struct timespec *timeout)" > > -.fi > > -.SH DESCRIPTION > > -This function is similar to > > -.IR "aio_suspend" > > -with the only difference > > -that the argument is a reference to a variable of type > > -.IR "struct aiocb64". > > - > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -this > > -function is available under the name > > -.IR "aio_suspend" > > -and so > > -transparently replaces the interface for small files on 32 bit > > -machines. > > -.SH "RETURN VALUES" > > -See > > -.IR aio_suspend. > > -.SH ERRORS > > -See > > -.IR aio_suspend. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_write(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_write.3 b/tools/libaio/man/aio_write.3 > > deleted file mode 100644 > > index 7c0cfd0..0000000 > > --- a/tools/libaio/man/aio_write.3 > > +++ /dev/null > > @@ -1,176 +0,0 @@ > > -.TH aio_write 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_write \- Initiate an asynchronous write operation > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_write (struct aiocb * aiocbp);" > > -.fi > > -.SH DESCRIPTION > > -This function initiates an asynchronous write operation. The function > > -call immediately returns after the operation was enqueued or if before > > -this happens an error was encountered. > > - > > -The first > > -.IR "aiocbp->aio_nbytes" > > -bytes from the buffer starting at > > -.IR "aiocbp->aio_buf" > > -are written to the file for which > > -.IR "aiocbp->aio_fildes" > > -is an descriptor, starting at the absolute > > -position > > -.IR "aiocbp->aio_offset" > > -in the file. > > - > > -If prioritized I/O is supported by the platform, the > > -.IR "aiocbp->aio_reqprio " > > -value is used to adjust the priority before > > -the request is actually enqueued. > > - > > -The calling process is notified about the termination of the read > > -request according to the > > -.IR "aiocbp->aio_sigevent" > > -value. > > - > > -When > > -.IR "aio_write" > > -returns, the return value is zero if no error > > -occurred that can be found before the process is enqueued. If such an > > -early error is found the function returns > > -.IR -1 > > -and sets > > -.IR "errno" > > -to one of the following values. > > - > > -.TP > > -.B EAGAIN > > -The request was not enqueued due to (temporarily) exceeded resource > > -limitations. > > -.TP > > -.B ENOSYS > > -The > > -.IR "aio_write" > > -function is not implemented. > > -.TP > > -.B EBADF > > -The > > -.IR "aiocbp->aio_fildes" > > -descriptor is not valid. This condition > > -may not be recognized before enqueueing the request, and so this error > > -might also be signaled asynchronously. > > -.TP > > -.B EINVAL > > -The > > -.IR "aiocbp->aio_offset" > > -or > > -.IR "aiocbp->aio_reqprio" > > -value is > > -invalid. This condition may not be recognized before enqueueing the > > -request and so this error might also be signaled asynchronously. > > -.PP > > - > > -In the case > > -.IR "aio_write" > > -returns zero, the current status of the > > -request can be queried using > > -.IR "aio_error" > > -and > > -.IR "aio_return" > > -functions. As long as the value returned by > > -.IR "aio_error" > > -is > > -.IR "EINPROGRESS" > > -the operation has not yet completed. If > > -.IR "aio_error" > > -returns zero, the operation successfully terminated, > > -otherwise the value is to be interpreted as an error code. If the > > -function terminated, the result of the operation can be get using a call > > -to > > -.IR "aio_return" > > -. The returned value is the same as an equivalent > > -call to > > -.IR "read" > > -would have returned. Possible error codes returned > > -by > > -.IR "aio_error" > > -are: > > - > > -.TP > > -.B EBADF > > -The > > -.IR "aiocbp->aio_fildes" > > -descriptor is not valid. > > -.TP > > -.B ECANCELED > > -The operation was canceled before the operation was finished. > > -.TP > > -.B EINVAL > > -The > > -.IR "aiocbp->aio_offset" > > -value is invalid. > > -.PP > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -, this > > -function is in fact > > -.IR "aio_write64" > > -since the LFS interface transparently > > -replaces the normal implementation. > > -.SH "RETURN VALUES" > > -When > > -.IR "aio_write" > > -returns, the return value is zero if no error > > -occurred that can be found before the process is enqueued. If such an > > -early error is found the function returns > > -.IR -1 > > -and sets > > -.IR "errno" > > -to one of the following values. > > -.SH ERRORS > > -.TP > > -.B EAGAIN > > -The request was not enqueued due to (temporarily) exceeded resource > > -limitations. > > -.TP > > -.B ENOSYS > > -The > > -.IR "aio_write" > > -function is not implemented. > > -.TP > > -.B EBADF > > -The > > -.IR "aiocbp->aio_fildes" > > -descriptor is not valid. This condition > > -may not be recognized before enqueueing the request, and so this error > > -might also be signaled asynchronously. > > -.TP > > -.B EINVAL > > -The > > -.IR "aiocbp->aio_offset" > > -or > > -.IR "aiocbp->aio_reqprio" > > -value is > > -invalid. This condition may not be recognized before enqueueing the > > -request and so this error might also be signaled asynchronously. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write64(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/aio_write64.3 b/tools/libaio/man/aio_write64.3 > > deleted file mode 100644 > > index 1080903..0000000 > > --- a/tools/libaio/man/aio_write64.3 > > +++ /dev/null > > @@ -1,61 +0,0 @@ > > -.TH aio_write64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -aio_write64 \- Initiate an asynchronous write operation > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <aio.h> > > -.sp > > -.br > > -.BI "int aio_write64 (struct aiocb *aiocbp)" > > -.fi > > -.SH DESCRIPTION > > -This function is similar to the > > -.IR "aio_write" > > -function. The only > > -difference is that on > > -.IR "32 bit" > > -machines the file descriptor should > > -be opened in the large file mode. Internally > > -.IR "aio_write64" > > -uses > > -functionality equivalent to > > -.IR "lseek64" > > -to position the file descriptor correctly for the writing, > > -as opposed to > > -.IR "lseek" > > -functionality used in > > -.IR "aio_write". > > - > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -, this > > -function is available under the name > > -.IR "aio_write" > > -and so transparently > > -replaces the interface for small files on 32 bit machines. > > -.SH "RETURN VALUES" > > -See > > -.IR aio_write. > > -.SH ERRORS > > -See > > -.IR aio_write. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR errno(3), > > diff --git a/tools/libaio/man/io.3 b/tools/libaio/man/io.3 > > deleted file mode 100644 > > index d910a68..0000000 > > --- a/tools/libaio/man/io.3 > > +++ /dev/null > > @@ -1,351 +0,0 @@ > > -.TH io 3 2002-09-12 "Linux 2.4" Linux IO" > > -.SH NAME > > -io \- Asynchronous IO > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <libio.h> > > -.sp > > -.fi > > -.SH DESCRIPTION > > -The libaio library defines a new set of I/O operations which can > > -significantly reduce the time an application spends waiting at I/O. The > > -new functions allow a program to initiate one or more I/O operations and > > -then immediately resume normal work while the I/O operations are > > -executed in parallel. > > - > > -These functions are part of the library with realtime functions named > > -.IR "libaio" > > -. They are not actually part of the > > -.IR "libc" > > -binary. > > -The implementation of these functions can be done using support in the > > -kernel. > > - > > -All IO operations operate on files which were opened previously. There > > -might be arbitrarily many operations running for one file. The > > -asynchronous I/O operations are controlled using a data structure named > > -.IR "struct iocb" > > -It is defined in > > -.IR "libio.h" > > -as follows. > > - > > -.nf > > - > > -typedef struct io_context *io_context_t; > > - > > -typedef enum io_iocb_cmd { > > - IO_CMD_PREAD = 0, > > - IO_CMD_PWRITE = 1, > > - > > - IO_CMD_FSYNC = 2, > > - IO_CMD_FDSYNC = 3, > > - > > - IO_CMD_POLL = 5, > > - IO_CMD_NOOP = 6, > > -} io_iocb_cmd_t; > > - > > -struct io_iocb_common { > > - void *buf; > > - unsigned __pad1; > > - long nbytes; > > - unsigned __pad2; > > - long long offset; > > - long long __pad3, __pad4; > > -}; /* result code is the amount read or -'ve errno */ > > - > > - > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > - union { > > - struct io_iocb_common c; > > - struct io_iocb_vector v; > > - struct io_iocb_poll poll; > > - struct io_iocb_sockaddr saddr; > > - } u; > > -}; > > - > > - > > -.fi > > -.TP > > -.IR "int aio_fildes" > > -This element specifies the file descriptor to be used for the > > -operation. It must be a legal descriptor, otherwise the operation will > > -fail. > > - > > -The device on which the file is opened must allow the seek operation. > > -I.e., it is not possible to use any of the IO operations on devices > > -like terminals where an > > -.IR "lseek" > > -call would lead to an error. > > -.TP > > -.IR "long u.c.offset" > > -This element specifies the offset in the file at which the operation (input > > -or output) is performed. Since the operations are carried out in arbitrary > > -order and more than one operation for one file descriptor can be > > -started, one cannot expect a current read/write position of the file > > -descriptor. > > -.TP > > -.IR "void *buf" > > -This is a pointer to the buffer with the data to be written or the place > > -where the read data is stored. > > -.TP > > -.IR "long u.c.nbytes" > > -This element specifies the length of the buffer pointed to by > > -.IR "io_buf" > > -. > > -.TP > > -.IR "int aio_reqprio" > > -Is not currently used. > > -.TP > > -.B "IO_CMD_PREAD" > > -Start a read operation. Read from the file at position > > -.IR "u.c.offset" > > -and store the next > > -.IR "u.c.nbytes" > > -bytes in the > > -buffer pointed to by > > -.IR "buf" > > -. > > -.TP > > -.B "IO_CMD_PWRITE" > > -Start a write operation. Write > > -.IR "u.c.nbytes" > > -bytes starting at > > -.IR "buf" > > -into the file starting at position > > -.IR "u.c.offset" > > -. > > -.TP > > -.B "IO_CMD_NOP" > > -Do nothing for this control block. This value is useful sometimes when > > -an array of > > -.IR "struct iocb" > > -values contains holes, i.e., some of the > > -values must not be handled although the whole array is presented to the > > -.IR "io_submit" > > -function. > > -.TP > > -.B "IO_CMD_FSYNC" > > -.TP > > -.B "IO_CMD_POLL" > > -This is experimental. > > -.SH EXAMPLE > > -.nf > > -/* > > - * Simplistic version of copy command using async i/o > > - * > > - * From: Stephen Hemminger <shemminger@osdl.org> > > - * Copy file by using a async I/O state machine. > > - * 1. Start read request > > - * 2. When read completes turn it into a write request > > - * 3. When write completes decrement counter and free resources > > - * > > - * > > - * Usage: aiocp file(s) desination > > - */ > > - > > -#include <unistd.h> > > -#include <stdio.h> > > -#include <sys/types.h> > > -#include <sys/stat.h> > > -#include <sys/param.h> > > -#include <fcntl.h> > > -#include <errno.h> > > - > > -#include <libaio.h> > > - > > -#define AIO_BLKSIZE (64*1024) > > -#define AIO_MAXIO 32 > > - > > -static int busy = 0; // # of I/O's in flight > > -static int tocopy = 0; // # of blocks left to copy > > -static int dstfd = -1; // destination file descriptor > > -static const char *dstname = NULL; > > -static const char *srcname = NULL; > > - > > - > > -/* Fatal error handler */ > > -static void io_error(const char *func, int rc) > > -{ > > - if (rc == -ENOSYS) > > - fprintf(stderr, "AIO not in this kernel\n"); > > - else if (rc < 0 && -rc < sys_nerr) > > - fprintf(stderr, "%s: %s\n", func, sys_errlist[-rc]); > > - else > > - fprintf(stderr, "%s: error %d\n", func, rc); > > - > > - if (dstfd > 0) > > - close(dstfd); > > - if (dstname) > > - unlink(dstname); > > - exit(1); > > -} > > - > > -/* > > - * Write complete callback. > > - * Adjust counts and free resources > > - */ > > -static void wr_done(io_context_t ctx, struct iocb *iocb, long res, long res2) > > -{ > > - if (res2 != 0) { > > - io_error("aio write", res2); > > - } > > - if (res != iocb->u.c.nbytes) { > > - fprintf(stderr, "write missed bytes expect %d got %d\n", iocb->u.c.nbytes, res2); > > - exit(1); > > - } > > - --tocopy; > > - --busy; > > - free(iocb->u.c.buf); > > - > > - memset(iocb, 0xff, sizeof(iocb)); // paranoia > > - free(iocb); > > - write(2, "w", 1); > > -} > > - > > -/* > > - * Read complete callback. > > - * Change read iocb into a write iocb and start it. > > - */ > > -static void rd_done(io_context_t ctx, struct iocb *iocb, long res, long res2) > > -{ > > - /* library needs accessors to look at iocb? */ > > - int iosize = iocb->u.c.nbytes; > > - char *buf = iocb->u.c.buf; > > - off_t offset = iocb->u.c.offset; > > - > > - if (res2 != 0) > > - io_error("aio read", res2); > > - if (res != iosize) { > > - fprintf(stderr, "read missing bytes expect %d got %d\n", iocb->u.c.nbytes, res); > > - exit(1); > > - } > > - > > - > > - /* turn read into write */ > > - io_prep_pwrite(iocb, dstfd, buf, iosize, offset); > > - io_set_callback(iocb, wr_done); > > - if (1 != (res = io_submit(ctx, 1, &iocb))) > > - io_error("io_submit write", res); > > - write(2, "r", 1); > > -} > > - > > - > > -int main(int argc, char *const *argv) > > -{ > > - int srcfd; > > - struct stat st; > > - off_t length = 0, offset = 0; > > - io_context_t myctx; > > - > > - if (argc != 3 || argv[1][0] == '-') { > > - fprintf(stderr, "Usage: aiocp SOURCE DEST"); > > - exit(1); > > - } > > - if ((srcfd = open(srcname = argv[1], O_RDONLY)) < 0) { > > - perror(srcname); > > - exit(1); > > - } > > - if (fstat(srcfd, &st) < 0) { > > - perror("fstat"); > > - exit(1); > > - } > > - length = st.st_size; > > - > > - if ((dstfd = open(dstname = argv[2], O_WRONLY | O_CREAT, 0666)) < 0) { > > - close(srcfd); > > - perror(dstname); > > - exit(1); > > - } > > - > > - /* initialize state machine */ > > - memset(&myctx, 0, sizeof(myctx)); > > - io_queue_init(AIO_MAXIO, &myctx); > > - tocopy = howmany(length, AIO_BLKSIZE); > > - > > - while (tocopy > 0) { > > - int i, rc; > > - /* Submit as many reads as once as possible upto AIO_MAXIO */ > > - int n = MIN(MIN(AIO_MAXIO - busy, AIO_MAXIO / 2), > > - howmany(length - offset, AIO_BLKSIZE)); > > - if (n > 0) { > > - struct iocb *ioq[n]; > > - > > - for (i = 0; i < n; i++) { > > - struct iocb *io = (struct iocb *) malloc(sizeof(struct iocb)); > > - int iosize = MIN(length - offset, AIO_BLKSIZE); > > - char *buf = (char *) malloc(iosize); > > - > > - if (NULL == buf || NULL == io) { > > - fprintf(stderr, "out of memory\n"); > > - exit(1); > > - } > > - > > - io_prep_pread(io, srcfd, buf, iosize, offset); > > - io_set_callback(io, rd_done); > > - ioq[i] = io; > > - offset += iosize; > > - } > > - > > - rc = io_submit(myctx, n, ioq); > > - if (rc < 0) > > - io_error("io_submit", rc); > > - > > - busy += n; > > - } > > - > > - // Handle IO's that have completed > > - rc = io_queue_run(myctx); > > - if (rc < 0) > > - io_error("io_queue_run", rc); > > - > > - // if we have maximum number of i/o's in flight > > - // then wait for one to complete > > - if (busy == AIO_MAXIO) { > > - rc = io_queue_wait(myctx, NULL); > > - if (rc < 0) > > - io_error("io_queue_wait", rc); > > - } > > - > > - } > > - > > - close(srcfd); > > - close(dstfd); > > - exit(0); > > -} > > - > > -/* > > - * Results look like: > > - * [alanm@toolbox ~/MOT3]$ ../taio kernel-source-2.4.8-0.4g.ppc.rpm abc > > - * rrrrrrrrrrrrrrrwwwrwrrwwrrwrwwrrwrwrwwrrwrwrrrrwwrwwwrrwrrrwwwwwwwwwwwwwwwww > > - * rrrrrrrrrrrrrrwwwrrwrwrwrwrrwwwwwwwwwwwwwwrrrrrrrrrrrrrrrrrrwwwwrwrwwrwrwrwr > > - * wrrrrrrrwwwwwwwwwwwwwrrrwrrrwrrwrwwwwwwwwwwrrrrwwrwrrrrrrrrrrrwwwwwwwwwwwrww > > - * wwwrrrrrrrrwwrrrwwrwrwrwwwrrrrrrrwwwrrwwwrrwrwwwwwwwwrrrrrrrwwwrrrrrrrwwwwww > > - * wwwwwwwrwrrrrrrrrwrrwrrwrrwrwrrrwrrrwrrrwrwwwwwwwwwwwwwwwwwwrrrwwwrrrrrrrrrr > > - * rrwrrrrrrwrrwwwwwwwwwwwwwwwwrwwwrrwrwwrrrrrrrrrrrrrrrrrrrwwwwwwwwwwwwwwwwwww > > - * rrrrrwrrwrwrwrrwrrrwwwwwwwwrrrrwrrrwrwwrwrrrwrrwrrrrwwwwwwwrwrwwwwrwwrrrwrrr > > - * rrrwwwwwwwrrrrwwrrrrrrrrrrrrwrwrrrrwwwwwwwwwwwwwwrwrrrrwwwwrwrrrrwrwwwrrrwww > > - * rwwrrrrrrrwrrrrrrrrrrrrwwwwrrrwwwrwrrwwwwwwwwwwwwwwwwwwwwwrrrrrrrwwwwwwwrw > > - */ > > -.fi > > -.SH "SEE ALSO" > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_cancel.1 b/tools/libaio/man/io_cancel.1 > > deleted file mode 100644 > > index 16e898a..0000000 > > --- a/tools/libaio/man/io_cancel.1 > > +++ /dev/null > > @@ -1,21 +0,0 @@ > > -.\"/* sys_io_cancel: > > -.\" * Attempts to cancel an iocb previously passed to io_submit. If > > -.\" * the operation is successfully cancelled, the resulting event is > > -.\" * copied into the memory pointed to by result without being placed > > -.\" * into the completion queue and 0 is returned. May fail with > > -.\" * -EFAULT if any of the data structures pointed to are invalid. > > -.\" * May fail with -EINVAL if aio_context specified by ctx_id is > > -.\" * invalid. May fail with -EAGAIN if the iocb specified was not > > -.\" * cancelled. Will fail with -ENOSYS if not implemented. > > -.\" */ > > -.\" > > -.TH io_cancel 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_cancel \- cancel io requests > > -.SH SYNOPSIS > > -.B #include <errno.h> > > -.br > > -.B #include <libaio.h> > > -.LP > > -.BI "int io_submit(io_context_t " ctx ", struct iocb *" iocb ", struct io_event *" result ");" > > - > > diff --git a/tools/libaio/man/io_cancel.3 b/tools/libaio/man/io_cancel.3 > > deleted file mode 100644 > > index 9a16084..0000000 > > --- a/tools/libaio/man/io_cancel.3 > > +++ /dev/null > > @@ -1,65 +0,0 @@ > > -.TH io_cancel 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_cancel \- Cancel io requests > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <libaio.h> > > -.sp > > -.br > > -.BI "int io_cancel(io_context_t ctx, struct iocb *iocb)" > > -.br > > -.sp > > -struct iocb { > > - void *data; /* Return in the io completion event */ > > - unsigned key; /* For use in identifying io requests */ > > - short aio_lio_opcode; > > - short aio_reqprio; /* Not used */ > > - int aio_fildes; > > -}; > > -.fi > > -.SH DESCRIPTION > > -Attempts to cancel an iocb previously passed to io_submit. If > > -the operation is successfully cancelled, the resulting event is > > -copied into the memory pointed to by result without being placed > > -into the completion queue. > > -.PP > > -When one or more requests are asynchronously processed, it might be > > -useful in some situations to cancel a selected operation, e.g., if it > > -becomes obvious that the written data is no longer accurate and would > > -have to be overwritten soon. As an example, assume an application, which > > -writes data in files in a situation where new incoming data would have > > -to be written in a file which will be updated by an enqueued request. > > -.SH "RETURN VALUES" > > -0 is returned on success , otherwise returns Errno. > > -.SH ERRORS > > -.TP > > -.B EFAULT > > -If any of the data structures pointed to are invalid. > > -.TP > > -.B EINVAL > > -If aio_context specified by ctx_id is > > -invalid. > > -.TP > > -.B EAGAIN > > -If the iocb specified was not > > -cancelled. > > -.TP > > -.B ENOSYS > > -if not implemented. > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_destroy.1 b/tools/libaio/man/io_destroy.1 > > deleted file mode 100644 > > index 177683b..0000000 > > --- a/tools/libaio/man/io_destroy.1 > > +++ /dev/null > > @@ -1,17 +0,0 @@ > > -.\"/* sys_io_destroy: > > -.\" * Destroy the aio_context specified. May cancel any outstanding > > -.\" * AIOs and block on completion. Will fail with -ENOSYS if not > > -.\" * implemented. May fail with -EFAULT if the context pointed to > > -.\" * is invalid. > > -.\" */ > > -.\" libaio provides this as io_queue_release. > > -.TH io_destroy 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_destroy \- destroy an io context > > -.SH SYNOPSIS > > -.B #include <errno.h> > > -.br > > -.B #include <libaio.h> > > -.LP > > -.BI "int io_destroy(io_context_t " ctx ");" > > - > > diff --git a/tools/libaio/man/io_fsync.3 b/tools/libaio/man/io_fsync.3 > > deleted file mode 100644 > > index 53eb63d..0000000 > > --- a/tools/libaio/man/io_fsync.3 > > +++ /dev/null > > @@ -1,82 +0,0 @@ > > -./" static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) > > -./" { > > -./" io_prep_fsync(iocb, fd); > > -./" io_set_callback(iocb, cb); > > -./" return io_submit(ctx, 1, &iocb); > > -./" } > > -.TH io_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -io_fsync \- Synchronize a file's complete in-core state with that on disk > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <libaio.h> > > -.sp > > -.br > > -.BI "int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd)" > > -.sp > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.sp > > -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); > > -.sp > > -.fi > > -.SH DESCRIPTION > > -When dealing with asynchronous operations it is sometimes necessary to > > -get into a consistent state. This would mean for AIO that one wants to > > -know whether a certain request or a group of request were processed. > > -This could be done by waiting for the notification sent by the system > > -after the operation terminated, but this sometimes would mean wasting > > -resources (mainly computation time). > > -.PP > > -Calling this function forces all I/O operations operating queued at the > > -time of the function call operating on the file descriptor > > -.IR "iocb->io_fildes" > > -into the synchronized I/O completion state . The > > -.IR "io_fsync" > > -function returns > > -immediately but the notification through the method described in > > -.IR "io_callback" > > -will happen only after all requests for this > > -file descriptor have terminated and the file is synchronized. This also > > -means that requests for this very same file descriptor which are queued > > -after the synchronization request are not affected. > > -.SH "RETURN VALUES" > > -Returns 0, otherwise returns errno. > > -.SH ERRORS > > -.TP > > -.B EFAULT > > -.I iocbs > > -referenced data outside of the program's accessible address space. > > -.TP > > -.B EINVAL > > -.I ctx > > -refers to an unitialized aio context, the iocb pointed to by > > -.I iocbs > > -contains an improperly initialized iocb, > > -.TP > > -.B EBADF > > -The iocb contains a file descriptor that does not exist. > > -.TP > > -.B EINVAL > > -The file specified in the iocb does not support the given io operation. > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_getevents(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_getevents.1 b/tools/libaio/man/io_getevents.1 > > deleted file mode 100644 > > index 27730b9..0000000 > > --- a/tools/libaio/man/io_getevents.1 > > +++ /dev/null > > @@ -1,29 +0,0 @@ > > -./"/* io_getevents: > > -./" * Attempts to read at least min_nr events and up to nr events from > > -./" * the completion queue for the aio_context specified by ctx_id. May > > -./" * fail with -EINVAL if ctx_id is invalid, if min_nr is out of range, > > -./" * if nr is out of range, if when is out of range. May fail with > > -./" * -EFAULT if any of the memory specified to is invalid. May return > > -./" * 0 or < min_nr if no events are available and the timeout specified > > -./" * by when has elapsed, where when == NULL specifies an infinite > > -./" * timeout. Note that the timeout pointed to by when is relative and > > -./" * will be updated if not NULL and the operation blocks. Will fail > > -./" * with -ENOSYS if not implemented. > > -./" */ > > -./"asmlinkage long sys_io_getevents(io_context_t ctx_id, > > -./" long min_nr, > > -./" long nr, > > -./" struct io_event *events, > > -./" struct timespec *timeout) > > -./" > > -.TH io_getevents 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_getevents \- read resulting events from io requests > > -.SH SYNOPSIS > > -.B #include <errno.h> > > -.br > > -.B #include <libaio.h> > > -.sp > > -.BI "int io_getevents(io_context_t " ctx ", long " min_nr ", long " nr ", struct io_events *" events "[], struct timespec *" timeout ");" > > - > > - > > diff --git a/tools/libaio/man/io_getevents.3 b/tools/libaio/man/io_getevents.3 > > deleted file mode 100644 > > index 8e9ddc8..0000000 > > --- a/tools/libaio/man/io_getevents.3 > > +++ /dev/null > > @@ -1,79 +0,0 @@ > > -./"/* io_getevents: > > -./" * Attempts to read at least min_nr events and up to nr events from > > -./" * the completion queue for the aio_context specified by ctx_id. May > > -./" * fail with -EINVAL if ctx_id is invalid, if min_nr is out of range, > > -./" * if nr is out of range, if when is out of range. May fail with > > -./" * -EFAULT if any of the memory specified to is invalid. May return > > -./" * 0 or < min_nr if no events are available and the timeout specified > > -./" * by when has elapsed, where when == NULL specifies an infinite > > -./" * timeout. Note that the timeout pointed to by when is relative and > > -./" * will be updated if not NULL and the operation blocks. Will fail > > -./" * with -ENOSYS if not implemented. > > -./" */ > > -./"asmlinkage long sys_io_getevents(io_context_t ctx_id, > > -./" long min_nr, > > -./" long nr, > > -./" struct io_event *events, > > -./" struct timespec *timeout) > > -./" > > -.TH io_getevents 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_getevents \- Read resulting events from io requests > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <libaio.h> > > -.br > > -.sp > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.sp > > -struct io_event { > > - unsigned PADDED(data, __pad1); > > - unsigned PADDED(obj, __pad2); > > - unsigned PADDED(res, __pad3); > > - unsigned PADDED(res2, __pad4); > > -}; > > -.sp > > -.BI "int io_getevents(io_context_t " ctx ", long " nr ", struct io_event *" events "[], struct timespec *" timeout ");" > > - > > -.fi > > -.SH DESCRIPTION > > -Attempts to read up to nr events from > > -the completion queue for the aio_context specified by ctx. > > -.SH "RETURN VALUES" > > -May return > > -0 if no events are available and the timeout specified > > -by when has elapsed, where when == NULL specifies an infinite > > -timeout. Note that the timeout pointed to by when is relative and > > -will be updated if not NULL and the operation blocks. Will fail > > -with ENOSYS if not implemented. > > -.SH ERRORS > > -.TP > > -.B EINVAL > > -if ctx_id is invalid, if min_nr is out of range, > > -if nr is out of range, if when is out of range. > > -.TP > > -.B EFAULT > > -if any of the memory specified to is invalid. > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_prep_fsync.3 b/tools/libaio/man/io_prep_fsync.3 > > deleted file mode 100644 > > index 4cf935a..0000000 > > --- a/tools/libaio/man/io_prep_fsync.3 > > +++ /dev/null > > @@ -1,89 +0,0 @@ > > -./" static inline void io_prep_fsync(struct iocb *iocb, int fd) > > -./" { > > -./" memset(iocb, 0, sizeof(*iocb)); > > -./" iocb->aio_fildes = fd; > > -./" iocb->aio_lio_opcode = IO_CMD_FSYNC; > > -./" iocb->aio_reqprio = 0; > > -./" } > > -.TH io_prep_fsync 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -io_prep_fsync \- Synchronize a file's complete in-core state with that on disk > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.br > > -.sp > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "static inline void io_prep_fsync(struct iocb *iocb, int fd)" > > -.sp > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.sp > > -.fi > > -.SH DESCRIPTION > > -This is an inline convenience function for setting up an iocbv for a FSYNC request. > > -.br > > -The file for which > > -.TP > > -.IR "iocb->aio_fildes = fd" > > -is a descriptor is set up with > > -the command > > -.TP > > -.IR "iocb->aio_lio_opcode = IO_CMD_FSYNC: > > -. > > -.PP > > -The io_prep_fsync() function shall set up an IO_CMD_FSYNC operation > > -to asynchronously force all I/O > > -operations associated with the file indicated by the file > > -descriptor aio_fildes member of the iocb structure referenced by > > -the iocb argument and queued at the time of the call to > > -io_submit() to the synchronized I/O completion state. The function > > -call shall return when the synchronization request has been > > -initiated or queued to the file or device (even when the data > > -cannot be synchronized immediately). > > - > > -All currently queued I/O operations shall be completed as if by a call > > -to fsync(); that is, as defined for synchronized I/O file > > -integrity completion. If the > > -operation queued by io_prep_fsync() fails, then, as for fsync(), > > -outstanding I/O operations are not guaranteed to have > > -been completed. > > - > > -If io_prep_fsync() succeeds, then it is only the I/O that was queued > > -at the time of the call to io_submit() that is guaranteed to be > > -forced to the relevant completion state. The completion of > > -subsequent I/O on the file descriptor is not guaranteed to be > > -completed in a synchronized fashion. > > -.PP > > -This function returns immediately . To schedule the operation, the > > -function > > -.IR io_submit > > -must be called. > > -.PP > > -Simultaneous asynchronous operations using the same iocb produce > > -undefined results. > > -.SH "RETURN VALUES" > > -None > > -.SH ERRORS > > -None > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_prep_pread.3 b/tools/libaio/man/io_prep_pread.3 > > deleted file mode 100644 > > index 5938aec..0000000 > > --- a/tools/libaio/man/io_prep_pread.3 > > +++ /dev/null > > @@ -1,79 +0,0 @@ > > -./" static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > > -./" { > > -./" memset(iocb, 0, sizeof(*iocb)); > > -./" iocb->aio_fildes = fd; > > -./" iocb->aio_lio_opcode = IO_CMD_PREAD; > > -./" iocb->aio_reqprio = 0; > > -./" iocb->u.c.buf = buf; > > -./" iocb->u.c.nbytes = count; > > -./" iocb->u.c.offset = offset; > > -./" } > > -.TH io_prep_pread 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -io_prep_pread \- Set up asynchronous read > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.sp > > -.br > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > > -" > > -.sp > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.fi > > -.SH DESCRIPTION > > -.IR io_prep_pread > > -is an inline convenience function designed to facilitate the initialization of > > -the iocb for an asynchronous read operation. > > - > > -The first > > -.TP > > -.IR "iocb->u.c.nbytes = count" > > -bytes of the file for which > > -.TP > > -.IR "iocb->aio_fildes = fd" > > -is a descriptor are written to the buffer > > -starting at > > -.TP > > -.IR "iocb->u.c.buf = buf" > > -. > > -.br > > -Reading starts at the absolute position > > -.TP > > -.IR "ioc->u.c.offset = offset" > > -in the file. > > -.PP > > -This function returns immediately . To schedule the operation, the > > -function > > -.IR io_submit > > -must be called. > > -.PP > > -Simultaneous asynchronous operations using the same iocb produce > > -undefined results. > > -.SH "RETURN VALUES" > > -None > > -.SH ERRORS > > -None > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_prep_pwrite.3 b/tools/libaio/man/io_prep_pwrite.3 > > deleted file mode 100644 > > index 68b3500..0000000 > > --- a/tools/libaio/man/io_prep_pwrite.3 > > +++ /dev/null > > @@ -1,77 +0,0 @@ > > -./" static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > > -./" { > > -./" memset(iocb, 0, sizeof(*iocb)); > > -./" iocb->aio_fildes = fd; > > -./" iocb->aio_lio_opcode = IO_CMD_PWRITE; > > -./" iocb->aio_reqprio = 0; > > -./" iocb->u.c.buf = buf; > > -./" iocb->u.c.nbytes = count; > > -./" iocb->u.c.offset = offset; > > -./" } > > -.TH io_prep_pwrite 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -io_prep_pwrite \- Set up iocb for asynchronous writes > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.br > > -.sp > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > > -" > > -.sp > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.fi > > -.SH DESCRIPTION > > -io_prep_write is a convenicence function for setting up parallel writes. > > - > > -The first > > -.TP > > -.IR "iocb->u.c.nbytes = count" > > -bytes of the file for which > > -.TP > > -.IR "iocb->aio_fildes = fd" > > -is a descriptor are written from the buffer > > -starting at > > -.TP > > -.IR "iocb->u.c.buf = buf" > > -. > > -.br > > -Writing starts at the absolute position > > -.TP > > -.IR "ioc->u.c.offset = offset" > > -in the file. > > -.PP > > -This function returns immediately . To schedule the operation, the > > -function > > -.IR io_submit > > -must be called. > > -.PP > > -Simultaneous asynchronous operations using the same iocb produce > > -undefined results. > > -.SH "RETURN VALUES" > > -None > > -.SH ERRORS > > -None > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_queue_init.3 b/tools/libaio/man/io_queue_init.3 > > deleted file mode 100644 > > index 317f631..0000000 > > --- a/tools/libaio/man/io_queue_init.3 > > +++ /dev/null > > @@ -1,63 +0,0 @@ > > -.TH io_queue_init 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_queue_init \- Initialize asynchronous io state machine > > - > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.br > > -.sp > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "int io_queue_init(int maxevents, io_context_t *ctx );" > > -.sp > > -.fi > > -.SH DESCRIPTION > > -.B io_queue_init > > -Attempts to create an aio context capable of receiving at least > > -.IR maxevents > > -events. > > -.IR ctx > > -must point to an aio context that already exists and must be initialized > > -to > > -.IR 0 > > -before the call. > > -If the operation is successful, *cxtp is filled with the resulting handle. > > -.SH "RETURN VALUES" > > -On success, > > -.B io_queue_init > > -returns 0. Otherwise, -error is return, where > > -error is one of the Exxx values defined in the Errors section. > > -.SH ERRORS > > -.TP > > -.B EFAULT > > -.I iocbs > > -referenced data outside of the program's accessible address space. > > -.TP > > -.B EINVAL > > -.I maxevents > > -is <= 0 or > > -.IR ctx > > -is an invalid memory locattion. > > -.TP > > -.B ENOSYS > > -Not implemented > > -.TP > > -.B EAGAIN > > -.IR "maxevents > max_aio_reqs" > > -where max_aio_reqs is a tunable value. > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_queue_release.3 b/tools/libaio/man/io_queue_release.3 > > deleted file mode 100644 > > index 06b9ec0..0000000 > > --- a/tools/libaio/man/io_queue_release.3 > > +++ /dev/null > > @@ -1,48 +0,0 @@ > > -.TH io_queue_release 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_queue_release \- Release the context associated with the userspace handle > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.br > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "int io_queue_release(io_context_t ctx)" > > -.sp > > -.SH DESCRIPTION > > -.B io_queue_release > > -destroys the context associated with the userspace handle. May cancel any outstanding > > -AIOs and block on completion. > > - > > -.B cts. > > -.SH "RETURN VALUES" > > -On success, > > -.B io_queue_release > > -returns 0. Otherwise, -error is return, where > > -error is one of the Exxx values defined in the Errors section. > > -.SH ERRORS > > -.TP > > -.B EINVAL > > -.I ctx > > -refers to an unitialized aio context, the iocb pointed to by > > -.I iocbs > > -contains an improperly initialized iocb, > > -.TP > > -.B ENOSYS > > -Not implemented > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > - > > diff --git a/tools/libaio/man/io_queue_run.3 b/tools/libaio/man/io_queue_run.3 > > deleted file mode 100644 > > index 57dd417..0000000 > > --- a/tools/libaio/man/io_queue_run.3 > > +++ /dev/null > > @@ -1,50 +0,0 @@ > > -.TH io_queue_run 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_queue_run \- Handle completed io requests > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.br > > -.sp > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "int io_queue_run(io_context_t ctx );" > > -.sp > > -.fi > > -.SH DESCRIPTION > > -.B io_queue_run > > -Attempts to read all the events events from > > -the completion queue for the aio_context specified by ctx_id. > > -.SH "RETURN VALUES" > > -May return > > -0 if no events are available. > > -Will fail with -ENOSYS if not implemented. > > -.SH ERRORS > > -.TP > > -.B EFAULT > > -.I iocbs > > -referenced data outside of the program's accessible address space. > > -.TP > > -.B EINVAL > > -.I ctx > > -refers to an unitialized aio context, the iocb pointed to by > > -.I iocbs > > -contains an improperly initialized iocb, > > -.TP > > -.B ENOSYS > > -Not implemented > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_queue_wait.3 b/tools/libaio/man/io_queue_wait.3 > > deleted file mode 100644 > > index 2306663..0000000 > > --- a/tools/libaio/man/io_queue_wait.3 > > +++ /dev/null > > @@ -1,56 +0,0 @@ > > -.TH io_queue_wait 2 2002-09-03 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_queue_wait \- Wait for io requests to complete > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.br > > -.sp > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "int io_queue_wait(io_context_t ctx, const struct timespec *timeout);" > > -.fi > > -.SH DESCRIPTION > > -Attempts to read an event from > > -the completion queue for the aio_context specified by ctx_id. > > -.SH "RETURN VALUES" > > -May return > > -0 if no events are available and the timeout specified > > -by when has elapsed, where when == NULL specifies an infinite > > -timeout. Note that the timeout pointed to by when is relative and > > -will be updated if not NULL and the operation blocks. Will fail > > -with -ENOSYS if not implemented. > > -.SH "RETURN VALUES" > > -On success, > > -.B io_queue_wait > > -returns 0. Otherwise, -error is return, where > > -error is one of the Exxx values defined in the Errors section. > > -.SH ERRORS > > -.TP > > -.B EFAULT > > -.I iocbs > > -referenced data outside of the program's accessible address space. > > -.TP > > -.B EINVAL > > -.I ctx > > -refers to an unitialized aio context, the iocb pointed to by > > -.I iocbs > > -contains an improperly initialized iocb, > > -.TP > > -.B ENOSYS > > -Not implemented > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_set_callback(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_set_callback.3 b/tools/libaio/man/io_set_callback.3 > > deleted file mode 100644 > > index a8ca789..0000000 > > --- a/tools/libaio/man/io_set_callback.3 > > +++ /dev/null > > @@ -1,44 +0,0 @@ > > -./"\x03static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) > > -.TH io_set_callback 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -io_set_callback \- Set up io completion callback function > > -.SH SYNOPSYS > > -.nf > > -.B #include <errno.h> > > -.br > > -.sp > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "static inline void io_set_callback(struct iocb *iocb, io_callback_t cb)" > > -.sp > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.sp > > -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); > > -.sp > > -.fi > > -.SH DESCRIPTION > > -The callback is not done if the caller uses raw events from > > -io_getevents, only with the library helpers > > -.SH "RETURN VALUES" > > -.SH ERRORS > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_submit(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/io_setup.1 b/tools/libaio/man/io_setup.1 > > deleted file mode 100644 > > index 68690e1..0000000 > > --- a/tools/libaio/man/io_setup.1 > > +++ /dev/null > > @@ -1,15 +0,0 @@ > > -./"/* sys_io_setup: > > -./" * Create an aio_context capable of receiving at least nr_events. > > -./" * ctxp must not point to an aio_context that already exists, and > > -./" * must be initialized to 0 prior to the call. On successful > > -./" * creation of the aio_context, *ctxp is filled in with the resulting > > -./" * handle. May fail with -EINVAL if *ctxp is not initialized, > > -./" * if the specified nr_events exceeds internal limits. May fail > > -./" * with -EAGAIN if the specified nr_events exceeds the user's limit > > -./" * of available events. May fail with -ENOMEM if insufficient kernel > > -./" * resources are available. May fail with -EFAULT if an invalid > > -./" * pointer is passed for ctxp. Will fail with -ENOSYS if not > > -./" * implemented. > > -./" */ > > -./" -- note: libaio is actually providing io_queue_init and io_queue_grow > > -./" as separate functions. For now io_setup is the same as io_queue_grow. > > diff --git a/tools/libaio/man/io_submit.1 b/tools/libaio/man/io_submit.1 > > deleted file mode 100644 > > index f66e80f..0000000 > > --- a/tools/libaio/man/io_submit.1 > > +++ /dev/null > > @@ -1,109 +0,0 @@ > > -.TH io_submit 2 2002-09-02 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_submit \- submit io requests > > -.SH SYNOPSIS > > -.B #include <errno.h> > > -.br > > -.B #include <libaio.h> > > -.LP > > -.BI "int io_submit(io_context_t " ctx ", long " nr ", struct iocb *" iocbs "[]);" > > -.SH DESCRIPTION > > -.B io_submit > > -submits to the io_context > > -.I ctx > > -up to > > -.I nr > > -I/O requests pointed to by the vector > > -.IR iocbs . > > - > > -The > > -.B iocb > > -structure is defined as something like > > -.sp > > -.RS > > -.nf > > -struct iocb { > > - void *data; > > -.\" unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.fi > > -.RE > > -.sp > > -.I data > > -is a an opaque pointer which will upon completion be returned in the > > -.B io_event > > -structure by > > -.BR io_getevents (2). > > -.\" and io_wait(2) > > -Callers will typically use this to point directly or indirectly to a > > -callback function. > > -.sp > > -.I aio_lio_opcode > > -is the I/O operation requested. Callers will typically set this and the > > -arguments to the I/O operation calling the > > -.BR io_prep_ (3) > > -function corresponding to the operation. > > -.sp > > -.I aio_reqprio > > -is the priority of the request. Higher values have more priority; the > > -normal priority is 0. > > -.sp > > -.I aio_fildes > > -is the file descriptor for the I/O operation. > > -Callers will typically set this and the > > -arguments to the I/O operation calling the > > -.BR io_prep_ *(3) > > -function corresponding to the operation. > > -.sp > > -The caller may not modify the contents or resubmit a submitted > > -.B iocb > > -structure until after the operation completes or is canceled. > > -The implementation of > > -.BR io_submit (2) > > -is permitted to modify reserved fields of the > > -.B iocb > > -structure. > > -.SH "RETURN VALUES" > > -If able to submit at least one iocb, > > -.B io_submit > > -returns the number of iocbs submitted successfully. Otherwise, > > -.RI - error > > -is returned, where > > -.I error > > -is one of the Exxx values defined in the Errors section. > > -.SH ERRORS > > -.TP > > -.B EFAULT > > -.I iocbs > > -referenced data outside of the program's accessible address space. > > -.TP > > -.B EINVAL > > -.I nr > > -is negative, > > -.I ctx > > -refers to an uninitialized aio context, the iocb pointed to by > > -.IR iocbs [0] > > -is improperly initialized or specifies an unsupported operation. > > -.TP > > -.B EBADF > > -The iocb pointed to by > > -.IR iocbs [0] > > -contains a file descriptor that does not exist. > > -.TP > > -.B EAGAIN > > -Insufficient resources were available to queue any operations. > > -.SH "SEE ALSO" > > -.BR io_setup (2), > > -.BR io_destroy (2), > > -.BR io_getevents (2), > > -.\".BR io_wait (2), > > -.BR io_prep_pread (3), > > -.BR io_prep_pwrite (3), > > -.BR io_prep_fsync (3), > > -.BR io_prep_fdsync (3), > > -.BR io_prep_noop (3), > > -.BR io_cancel (2), > > -.BR errno (3) > > diff --git a/tools/libaio/man/io_submit.3 b/tools/libaio/man/io_submit.3 > > deleted file mode 100644 > > index b6966ef..0000000 > > --- a/tools/libaio/man/io_submit.3 > > +++ /dev/null > > @@ -1,135 +0,0 @@ > > -./"/* sys_io_submit: > > -./" * Queue the nr iocbs pointed to by iocbpp for processing. Returns > > -./" * the number of iocbs queued. May return -EINVAL if the aio_context > > -./" * specified by ctx_id is invalid, if nr is < 0, if the iocb at > > -./" * *iocbpp[0] is not properly initialized, if the operation specified > > -./" * is invalid for the file descriptor in the iocb. May fail with > > -./" * -EFAULT if any of the data structures point to invalid data. May > > -./" * fail with -EBADF if the file descriptor specified in the first > > -./" * iocb is invalid. May fail with -EAGAIN if insufficient resources > > -./" * are available to queue any iocbs. Will return 0 if nr is 0. Will > > -./" * fail with -ENOSYS if not implemented. > > -./" */ > > -.TH io_submit 2 2002-09-02 "Linux 2.4" "Linux AIO" > > -.SH NAME > > -io_submit \- Submit io requests > > -.SH SYNOPSIS > > -.nf > > -.B #include <errno.h> > > -.br > > -.sp > > -.B #include <libaio.h> > > -.br > > -.sp > > -.BI "int io_submit(io_context_t " ctx ", long " nr ", struct iocb *" iocbs "[]);" > > -.sp > > -struct iocb { > > - void *data; > > - unsigned key; > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > -}; > > -.fi > > -.SH DESCRIPTION > > -.B io_submit > > -submits > > -.I nr > > -iocbs for processing for a given io context ctx. > > - > > -The > > -.IR "io_submit" > > -function can be used to enqueue an arbitrary > > -number of read and write requests at one time. The requests can all be > > -meant for the same file, all for different files or every solution in > > -between. > > - > > -.IR "io_submit" > > -gets the > > -.IR "nr" > > -requests from the array pointed to > > -by > > -.IR "iocbs" > > -. The operation to be performed is determined by the > > -.IR "aio_lio_opcode" > > -member in each element of > > -.IR "iocbs" > > -. If this > > -field is > > -.B "IO_CMD_PREAD" > > -a read operation is enqueued, similar to a call > > -of > > -.IR "io_prep_pread" > > -for this element of the array (except that the way > > -the termination is signalled is different, as we will see below). If > > -the > > -.IR "aio_lio_opcode" > > -member is > > -.B "IO_CMD_PWRITE" > > -a write operation > > -is enqueued. Otherwise the > > -.IR "aio_lio_opcode" > > -must be > > -.B "IO_CMD_NOP" > > -in which case this element of > > -.IR "iocbs" > > -is simply ignored. This > > -``operation'' is useful in situations where one has a fixed array of > > -.IR "struct iocb" > > -elements from which only a few need to be handled at > > -a time. Another situation is where the > > -.IR "io_submit" > > -call was > > -canceled before all requests are processed and the remaining requests have to be reissued. > > - > > -The other members of each element of the array pointed to by > > -.IR "iocbs" > > -must have values suitable for the operation as described in > > -the documentation for > > -.IR "io_prep_pread" > > -and > > -.IR "io_prep_pwrite" > > -above. > > - > > -The function returns immediately after > > -having enqueued all the requests. > > -On success, > > -.B io_submit > > -returns the number of iocbs submitted successfully. Otherwise, -error is return, where > > -error is one of the Exxx values defined in the Errors section. > > -.PP > > -If an error is detected, then the behavior is undefined. > > -.PP > > -Simultaneous asynchronous operations using the same iocb produce > > -undefined results. > > -.SH ERRORS > > -.TP > > -.B EFAULT > > -.I iocbs > > -referenced data outside of the program's accessible address space. > > -.TP > > -.B EINVAL > > -.I ctx > > -refers to an unitialized aio context, the iocb pointed to by > > -.I iocbs > > -contains an improperly initialized iocb, > > -.TP > > -.B EBADF > > -The iocb contains a file descriptor that does not exist. > > -.TP > > -.B EINVAL > > -The file specified in the iocb does not support the given io operation. > > -.SH "SEE ALSO" > > -.BR io(3), > > -.BR io_cancel(3), > > -.BR io_fsync(3), > > -.BR io_getevents(3), > > -.BR io_prep_fsync(3), > > -.BR io_prep_pread(3), > > -.BR io_prep_pwrite(3), > > -.BR io_queue_init(3), > > -.BR io_queue_release(3), > > -.BR io_queue_run(3), > > -.BR io_queue_wait(3), > > -.BR io_set_callback(3), > > -.BR errno(3) > > diff --git a/tools/libaio/man/lio_listio.3 b/tools/libaio/man/lio_listio.3 > > deleted file mode 100644 > > index 9b5b5e4..0000000 > > --- a/tools/libaio/man/lio_listio.3 > > +++ /dev/null > > @@ -1,229 +0,0 @@ > > -.TH lio_listio 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -lio_listio - List directed I/O > > -.SH SYNOPSYS > > -.B #include <errno.h> > > -.br > > -.B #include <libaio.h> > > -.LP > > -.BI "int lio_listio (int mode, struct aiocb *const list[], int nent, struct sigevent *sig)" > > -.nf > > -.SH DESCRIPTION > > - > > -Besides these functions with the more or less traditional interface, > > -POSIX.1b also defines a function which can initiate more than one > > -operation at a time, and which can handle freely mixed read and write > > -operations. It is therefore similar to a combination of > > -.IR readv > > -and > > -.IR "writev" > > -. > > - > > -The > > -.IR "lio_listio" > > -function can be used to enqueue an arbitrary > > -number of read and write requests at one time. The requests can all be > > -meant for the same file, all for different files or every solution in > > -between. > > - > > -.IR "lio_listio" > > -gets the > > -.IR "nent" > > -requests from the array pointed to > > -by > > -.IR "list" > > -. The operation to be performed is determined by the > > -.IR "aio_lio_opcode" > > -member in each element of > > -.IR "list" > > -. If this > > -field is > > -.B "LIO_READ" > > -a read operation is enqueued, similar to a call > > -of > > -.IR "aio_read" > > -for this element of the array (except that the way > > -the termination is signalled is different, as we will see below). If > > -the > > -.IR "aio_lio_opcode" > > -member is > > -.B "LIO_WRITE" > > -a write operation > > -is enqueued. Otherwise the > > -.IR "aio_lio_opcode" > > -must be > > -.B "LIO_NOP" > > -in which case this element of > > -.IR "list" > > -is simply ignored. This > > -``operation'' is useful in situations where one has a fixed array of > > -.IR "struct aiocb" > > -elements from which only a few need to be handled at > > -a time. Another situation is where the > > -.IR "lio_listio" > > -call was > > -canceled before all requests are processed and the remaining requests have to be reissued. > > - > > -The other members of each element of the array pointed to by > > -.IR "list" > > -must have values suitable for the operation as described in > > -the documentation for > > -.IR "aio_read" > > -and > > -.IR "aio_write" > > -above. > > - > > -The > > -.IR "mode" > > -argument determines how > > -.IR "lio_listio" > > -behaves after > > -having enqueued all the requests. If > > -.IR "mode" > > -is > > -.B "LIO_WAIT" > > -it > > -waits until all requests terminated. Otherwise > > -.IR "mode" > > -must be > > -.B "LIO_NOWAIT" > > -and in this case the function returns immediately after > > -having enqueued all the requests. In this case the caller gets a > > -notification of the termination of all requests according to the > > -.IR "sig" > > -parameter. If > > -.IR "sig" > > -is > > -.B "NULL" > > -no notification is > > -send. Otherwise a signal is sent or a thread is started, just as > > -described in the description for > > -.IR "aio_read" > > -or > > -.IR "aio_write" > > -. > > - > > -When the sources are compiled with > > -.B "_FILE_OFFSET_BITS == 64" > > -, this > > -function is in fact > > -.IR "lio_listio64" > > -since the LFS interface > > -transparently replaces the normal implementation. > > -.SH "RETURN VALUES" > > -If > > -.IR "mode" > > -is > > -.B "LIO_WAIT" > > -, the return value of > > -.IR "lio_listio" > > -is > > -.IR 0 > > -when all requests completed successfully. Otherwise the > > -function return > > -.IR 1 > > -and > > -.IR "errno" > > -is set accordingly. To find > > -out which request or requests failed one has to use the > > -.IR "aio_error" > > -function on all the elements of the array > > -.IR "list" > > -. > > - > > -In case > > -.IR "mode" > > -is > > -.B "LIO_NOWAIT" > > -, the function returns > > -.IR 0 > > -if > > -all requests were enqueued correctly. The current state of the requests > > -can be found using > > -.IR "aio_error" > > -and > > -.IR "aio_return" > > -as described > > -above. If > > -.IR "lio_listio" > > -returns > > -.IR -1 > > -in this mode, the > > -global variable > > -.IR "errno" > > -is set accordingly. If a request did not > > -yet terminate, a call to > > -.IR "aio_error" > > -returns > > -.B "EINPROGRESS" > > -. If > > -the value is different, the request is finished and the error value (or > > - > > -.IR 0 > > -) is returned and the result of the operation can be retrieved > > -using > > -.IR "aio_return" > > -. > > -.SH ERRORS > > -Possible values for > > -.IR "errno" > > -are: > > - > > -.TP > > -.B EAGAIN > > -The resources necessary to queue all the requests are not available at > > -the moment. The error status for each element of > > -.IR "list" > > -must be > > -checked to determine which request failed. > > - > > -Another reason could be that the system wide limit of AIO requests is > > -exceeded. This cannot be the case for the implementation on GNU systems > > -since no arbitrary limits exist. > > -.TP > > -.B EINVAL > > -The > > -.IR "mode" > > -parameter is invalid or > > -.IR "nent" > > -is larger than > > -.B "AIO_LISTIO_MAX" > > -. > > -.TP > > -.B EIO > > -One or more of the request's I/O operations failed. The error status of > > -each request should be checked to determine which one failed. > > -.TP > > -.B ENOSYS > > -The > > -.IR "lio_listio" > > -function is not supported. > > -.PP > > - > > -If the > > -.IR "mode" > > -parameter is > > -.B "LIO_NOWAIT" > > -and the caller cancels > > -a request, the error status for this request returned by > > -.IR "aio_error" > > -is > > -.B "ECANCELED" > > -. > > -.SH "SEE ALSO" > > -.BR aio(3), > > -.BR aio_cancel(3), > > -.BR aio_cancel64(3), > > -.BR aio_error(3), > > -.BR aio_error64(3), > > -.BR aio_fsync(3), > > -.BR aio_fsync64(3), > > -.BR aio_init(3), > > -.BR aio_read(3), > > -.BR aio_read64(3), > > -.BR aio_return(3), > > -.BR aio_return64(3), > > -.BR aio_suspend(3), > > -.BR aio_suspend64(3), > > -.BR aio_write(3), > > -.BR aio_write64(3) > > diff --git a/tools/libaio/man/lio_listio64.3 b/tools/libaio/man/lio_listio64.3 > > deleted file mode 100644 > > index 97f6955..0000000 > > --- a/tools/libaio/man/lio_listio64.3 > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -.TH lio_listio64 3 2002-09-12 "Linux 2.4" Linux AIO" > > -.SH NAME > > -lio_listio64 \- List directed I/O > > -.SH SYNOPSYS > > -.B #include <errno.h> > > -.br > > -.B #include <libaio.h> > > -.LP > > -.BI "int lio_listio64 (int mode, struct aiocb *const list[], int nent, struct sigevent *sig)" > > -.nf > > -.SH DESCRIPTION > > -This function is similar to the > > -.IR "code{lio_listio" > > -function. The only > > -difference is that on > > -.IR "32 bit" > > -machines, the file descriptor should > > -be opened in the large file mode. Internally, > > -.IR "lio_listio64" > > -uses > > -functionality equivalent to > > -.IR lseek64" > > -to position the file descriptor correctly for the reading or > > -writing, as opposed to > > -.IR "lseek" > > -functionality used in > > -.IR "lio_listio". > > - > > -When the sources are compiled with > > -.IR "_FILE_OFFSET_BITS == 64" > > -, this > > -function is available under the name > > -.IR "lio_listio" > > -and so > > -transparently replaces the interface for small files on 32 bit > > -machines. > > -.SH "RETURN VALUES" > > -.SH ERRORS > > -.SH "SEE ALSO" > > diff --git a/tools/libaio/src/Makefile b/tools/libaio/src/Makefile > > deleted file mode 100644 > > index 575ad61..0000000 > > --- a/tools/libaio/src/Makefile > > +++ /dev/null > > @@ -1,67 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/Rules.mk > > - > > -prefix=$(PREFIX) > > -includedir=$(prefix)/include > > -libdir=$(prefix)/lib > > - > > -ARCH := $(shell uname -m | sed -e s/i.86/i386/) > > -CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC > > -SO_CFLAGS=-shared $(CFLAGS) > > -L_CFLAGS=$(CFLAGS) > > -LINK_FLAGS= > > - > > -soname=libaio.so.1 > > -minor=0 > > -micro=1 > > -libname=$(soname).$(minor).$(micro) > > -all_targets += libaio.a $(libname) > > - > > -all: $(all_targets) > > - > > -# libaio provided functions > > -libaio_srcs := io_queue_init.c io_queue_release.c > > -libaio_srcs += io_queue_wait.c io_queue_run.c > > - > > -# real syscalls > > -libaio_srcs += io_getevents.c io_submit.c io_cancel.c > > -libaio_srcs += io_setup.c io_destroy.c > > - > > -# internal functions > > -libaio_srcs += raw_syscall.c > > - > > -# old symbols > > -libaio_srcs += compat-0_1.c > > - > > -libaio_objs := $(patsubst %.c,%.ol,$(libaio_srcs)) > > -libaio_sobjs := $(patsubst %.c,%.os,$(libaio_srcs)) > > - > > -$(libaio_objs) $(libaio_sobjs): libaio.h vsys_def.h > > - > > -%.os: %.c > > - $(CC) $(SO_CFLAGS) -c -o $@ $< > > - > > -%.ol: %.c > > - $(CC) $(L_CFLAGS) -c -o $@ $< > > - > > - > > -libaio.a: $(libaio_objs) > > - rm -f libaio.a > > - $(AR) r libaio.a $^ > > - $(RANLIB) libaio.a > > - > > -$(libname): $(libaio_sobjs) libaio.map > > - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) > > - > > -install: $(all_targets) > > - install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h > > - install -D -m 644 libaio.a $(DESTDIR)$(libdir)/libaio.a > > - install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) > > - ln -sf $(libname) $(DESTDIR)$(libdir)/$(soname) > > - ln -sf $(libname) $(DESTDIR)$(libdir)/libaio.so > > - > > -$(libaio_objs): libaio.h > > - > > -clean: > > - rm -f $(all_targets) $(libaio_objs) $(libaio_sobjs) $(soname).new > > - rm -f *.so* *.a *.o > > diff --git a/tools/libaio/src/compat-0_1.c b/tools/libaio/src/compat-0_1.c > > deleted file mode 100644 > > index 53d520b..0000000 > > --- a/tools/libaio/src/compat-0_1.c > > +++ /dev/null > > @@ -1,62 +0,0 @@ > > -/* libaio Linux async I/O interface > > - > > - compat-0_1.c : compatibility symbols for libaio 0.1.x-0.3.x > > - > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <stdlib.h> > > -#include <sys/time.h> > > - > > -#include "libaio.h" > > -#include "vsys_def.h" > > - > > -#include "syscall.h" > > - > > - > > -/* ABI change. Provide partial compatibility on this one for now. */ > > -SYMVER(compat0_1_io_cancel, io_cancel, 0.1); > > -int compat0_1_io_cancel(io_context_t ctx, struct iocb *iocb) > > -{ > > - struct io_event event; > > - > > - /* FIXME: the old ABI would return the event on the completion queue */ > > - return io_cancel(ctx, iocb, &event); > > -} > > - > > -SYMVER(compat0_1_io_queue_wait, io_queue_wait, 0.1); > > -int compat0_1_io_queue_wait(io_context_t ctx, struct timespec *when) > > -{ > > - struct timespec timeout; > > - if (when) > > - timeout = *when; > > - return io_getevents(ctx, 0, 0, NULL, when ? &timeout : NULL); > > -} > > - > > - > > -/* ABI change. Provide backwards compatibility for this one. */ > > -SYMVER(compat0_1_io_getevents, io_getevents, 0.1); > > -int compat0_1_io_getevents(io_context_t ctx_id, long nr, > > - struct io_event *events, > > - const struct timespec *const_timeout) > > -{ > > - struct timespec timeout; > > - if (const_timeout) > > - timeout = *const_timeout; > > - return io_getevents(ctx_id, 1, nr, events, > > - const_timeout ? &timeout : NULL); > > -} > > - > > diff --git a/tools/libaio/src/io_cancel.c b/tools/libaio/src/io_cancel.c > > deleted file mode 100644 > > index 2f0f5f4..0000000 > > --- a/tools/libaio/src/io_cancel.c > > +++ /dev/null > > @@ -1,23 +0,0 @@ > > -/* io_cancel.c > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <libaio.h> > > -#include "syscall.h" > > - > > -io_syscall3(int, io_cancel_0_4, io_cancel, io_context_t, ctx, struct iocb *, iocb, struct io_event *, event) > > -DEFSYMVER(io_cancel_0_4, io_cancel, 0.4) > > diff --git a/tools/libaio/src/io_destroy.c b/tools/libaio/src/io_destroy.c > > deleted file mode 100644 > > index 0ab6bd1..0000000 > > --- a/tools/libaio/src/io_destroy.c > > +++ /dev/null > > @@ -1,23 +0,0 @@ > > -/* io_destroy > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <errno.h> > > -#include <libaio.h> > > -#include "syscall.h" > > - > > -io_syscall1(int, io_destroy, io_destroy, io_context_t, ctx) > > diff --git a/tools/libaio/src/io_getevents.c b/tools/libaio/src/io_getevents.c > > deleted file mode 100644 > > index 5a05174..0000000 > > --- a/tools/libaio/src/io_getevents.c > > +++ /dev/null > > @@ -1,57 +0,0 @@ > > -/* io_getevents.c > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <libaio.h> > > -#include <errno.h> > > -#include <stdlib.h> > > -#include <time.h> > > -#include "syscall.h" > > - > > -io_syscall5(int, __io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout) > > - > > -#define AIO_RING_MAGIC 0xa10a10a1 > > - > > -/* Ben will hate me for this */ > > -struct aio_ring { > > - unsigned id; /* kernel internal index number */ > > - unsigned nr; /* number of io_events */ > > - unsigned head; > > - unsigned tail; > > - > > - unsigned magic; > > - unsigned compat_features; > > - unsigned incompat_features; > > - unsigned header_length; /* size of aio_ring */ > > -}; > > - > > -int io_getevents_0_4(io_context_t ctx, long min_nr, long nr, struct io_event * events, struct timespec * timeout) > > -{ > > - struct aio_ring *ring; > > - ring = (struct aio_ring*)ctx; > > - if (ring==NULL || ring->magic != AIO_RING_MAGIC) > > - goto do_syscall; > > - if (timeout!=NULL && timeout->tv_sec == 0 && timeout->tv_nsec == 0) { > > - if (ring->head == ring->tail) > > - return 0; > > - } > > - > > -do_syscall: > > - return __io_getevents_0_4(ctx, min_nr, nr, events, timeout); > > -} > > - > > -DEFSYMVER(io_getevents_0_4, io_getevents, 0.4) > > diff --git a/tools/libaio/src/io_queue_init.c b/tools/libaio/src/io_queue_init.c > > deleted file mode 100644 > > index 563d137..0000000 > > --- a/tools/libaio/src/io_queue_init.c > > +++ /dev/null > > @@ -1,33 +0,0 @@ > > -/* io_queue_init.c > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <libaio.h> > > -#include <sys/types.h> > > -#include <sys/stat.h> > > -#include <errno.h> > > - > > -#include "syscall.h" > > - > > -int io_queue_init(int maxevents, io_context_t *ctxp) > > -{ > > - if (maxevents > 0) { > > - *ctxp = NULL; > > - return io_setup(maxevents, ctxp); > > - } > > - return -EINVAL; > > -} > > diff --git a/tools/libaio/src/io_queue_release.c b/tools/libaio/src/io_queue_release.c > > deleted file mode 100644 > > index 94bbb86..0000000 > > --- a/tools/libaio/src/io_queue_release.c > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > -/* io_queue_release.c > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <libaio.h> > > -#include <sys/types.h> > > -#include <sys/stat.h> > > -#include <errno.h> > > - > > -int io_queue_release(io_context_t ctx) > > -{ > > - return io_destroy(ctx); > > -} > > diff --git a/tools/libaio/src/io_queue_run.c b/tools/libaio/src/io_queue_run.c > > deleted file mode 100644 > > index e0132f4..0000000 > > --- a/tools/libaio/src/io_queue_run.c > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -/* io_submit > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <libaio.h> > > -#include <errno.h> > > -#include <stdlib.h> > > -#include <time.h> > > - > > -int io_queue_run(io_context_t ctx) > > -{ > > - static struct timespec timeout = { 0, 0 }; > > - struct io_event event; > > - int ret; > > - > > - /* FIXME: batch requests? */ > > - while (1 == (ret = io_getevents(ctx, 0, 1, &event, &timeout))) { > > - io_callback_t cb = (io_callback_t)event.data; > > - struct iocb *iocb = event.obj; > > - > > - cb(ctx, iocb, event.res, event.res2); > > - } > > - > > - return ret; > > -} > > diff --git a/tools/libaio/src/io_queue_wait.c b/tools/libaio/src/io_queue_wait.c > > deleted file mode 100644 > > index 538d2f3..0000000 > > --- a/tools/libaio/src/io_queue_wait.c > > +++ /dev/null > > @@ -1,31 +0,0 @@ > > -/* io_submit > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#define NO_SYSCALL_ERRNO > > -#include <sys/types.h> > > -#include <libaio.h> > > -#include <errno.h> > > -#include "syscall.h" > > - > > -struct timespec; > > - > > -int io_queue_wait_0_4(io_context_t ctx, struct timespec *timeout) > > -{ > > - return io_getevents(ctx, 0, 0, NULL, timeout); > > -} > > -DEFSYMVER(io_queue_wait_0_4, io_queue_wait, 0.4) > > diff --git a/tools/libaio/src/io_setup.c b/tools/libaio/src/io_setup.c > > deleted file mode 100644 > > index 4ba1afc..0000000 > > --- a/tools/libaio/src/io_setup.c > > +++ /dev/null > > @@ -1,23 +0,0 @@ > > -/* io_setup > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <errno.h> > > -#include <libaio.h> > > -#include "syscall.h" > > - > > -io_syscall2(int, io_setup, io_setup, int, maxevents, io_context_t *, ctxp) > > diff --git a/tools/libaio/src/io_submit.c b/tools/libaio/src/io_submit.c > > deleted file mode 100644 > > index e22ba54..0000000 > > --- a/tools/libaio/src/io_submit.c > > +++ /dev/null > > @@ -1,23 +0,0 @@ > > -/* io_submit > > - libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#include <errno.h> > > -#include <libaio.h> > > -#include "syscall.h" > > - > > -io_syscall3(int, io_submit, io_submit, io_context_t, ctx, long, nr, struct iocb **, iocbs) > > diff --git a/tools/libaio/src/libaio.h b/tools/libaio/src/libaio.h > > deleted file mode 100644 > > index 6574601..0000000 > > --- a/tools/libaio/src/libaio.h > > +++ /dev/null > > @@ -1,222 +0,0 @@ > > -/* /usr/include/libaio.h > > - * > > - * Copyright 2000,2001,2002 Red Hat, Inc. > > - * > > - * Written by Benjamin LaHaise <bcrl@redhat.com> > > - * > > - * libaio Linux async I/O interface > > - * > > - * This library is free software; you can redistribute it and/or > > - * modify it under the terms of the GNU Lesser General Public > > - * License as published by the Free Software Foundation; either > > - * version 2 of the License, or (at your option) any later version. > > - * > > - * This library 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 > > - * Lesser General Public License for more details. > > - * > > - * You should have received a copy of the GNU Lesser General Public > > - * License along with this library; if not, write to the Free Software > > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -#ifndef __LIBAIO_H > > -#define __LIBAIO_H > > - > > -#ifdef __cplusplus > > -extern "C" { > > -#endif > > - > > -#include <sys/types.h> > > -#include <string.h> > > - > > -struct timespec; > > -struct sockaddr; > > -struct iovec; > > -struct iocb; > > - > > -typedef struct io_context *io_context_t; > > - > > -typedef enum io_iocb_cmd { > > - IO_CMD_PREAD = 0, > > - IO_CMD_PWRITE = 1, > > - > > - IO_CMD_FSYNC = 2, > > - IO_CMD_FDSYNC = 3, > > - > > - IO_CMD_POLL = 5, > > - IO_CMD_NOOP = 6, > > -} io_iocb_cmd_t; > > - > > -#if defined(__i386__) /* little endian, 32 bits */ > > -#define PADDED(x, y) x; unsigned y > > -#define PADDEDptr(x, y) x; unsigned y > > -#define PADDEDul(x, y) unsigned long x; unsigned y > > -#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) > > -#define PADDED(x, y) x, y > > -#define PADDEDptr(x, y) x > > -#define PADDEDul(x, y) unsigned long x > > -#elif defined(__powerpc64__) /* big endian, 64 bits */ > > -#define PADDED(x, y) unsigned y; x > > -#define PADDEDptr(x,y) x > > -#define PADDEDul(x, y) unsigned long x > > -#elif defined(__PPC__) /* big endian, 32 bits */ > > -#define PADDED(x, y) unsigned y; x > > -#define PADDEDptr(x, y) unsigned y; x > > -#define PADDEDul(x, y) unsigned y; unsigned long x > > -#elif defined(__s390x__) /* big endian, 64 bits */ > > -#define PADDED(x, y) unsigned y; x > > -#define PADDEDptr(x,y) x > > -#define PADDEDul(x, y) unsigned long x > > -#elif defined(__s390__) /* big endian, 32 bits */ > > -#define PADDED(x, y) unsigned y; x > > -#define PADDEDptr(x, y) unsigned y; x > > -#define PADDEDul(x, y) unsigned y; unsigned long x > > -#else > > -#error endian? > > -#endif > > - > > -struct io_iocb_poll { > > - PADDED(int events, __pad1); > > -}; /* result code is the set of result flags or -'ve errno */ > > - > > -struct io_iocb_sockaddr { > > - struct sockaddr *addr; > > - int len; > > -}; /* result code is the length of the sockaddr, or -'ve errno */ > > - > > -struct io_iocb_common { > > - PADDEDptr(void *buf, __pad1); > > - PADDEDul(nbytes, __pad2); > > - long long offset; > > - long long __pad3, __pad4; > > -}; /* result code is the amount read or -'ve errno */ > > - > > -struct io_iocb_vector { > > - const struct iovec *vec; > > - int nr; > > - long long offset; > > -}; /* result code is the amount read or -'ve errno */ > > - > > -struct iocb { > > - PADDEDptr(void *data, __pad1); /* Return in the io completion event */ > > - PADDED(unsigned key, __pad2); /* For use in identifying io requests */ > > - > > - short aio_lio_opcode; > > - short aio_reqprio; > > - int aio_fildes; > > - > > - union { > > - struct io_iocb_common c; > > - struct io_iocb_vector v; > > - struct io_iocb_poll poll; > > - struct io_iocb_sockaddr saddr; > > - } u; > > -}; > > - > > -struct io_event { > > - PADDEDptr(void *data, __pad1); > > - PADDEDptr(struct iocb *obj, __pad2); > > - PADDEDul(res, __pad3); > > - PADDEDul(res2, __pad4); > > -}; > > - > > -#undef PADDED > > -#undef PADDEDptr > > -#undef PADDEDul > > - > > -typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); > > - > > -/* library wrappers */ > > -extern int io_queue_init(int maxevents, io_context_t *ctxp); > > -/*extern int io_queue_grow(io_context_t ctx, int new_maxevents);*/ > > -extern int io_queue_release(io_context_t ctx); > > -/*extern int io_queue_wait(io_context_t ctx, struct timespec *timeout);*/ > > -extern int io_queue_run(io_context_t ctx); > > - > > -/* Actual syscalls */ > > -extern int io_setup(int maxevents, io_context_t *ctxp); > > -extern int io_destroy(io_context_t ctx); > > -extern int io_submit(io_context_t ctx, long nr, struct iocb *ios[]); > > -extern int io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt); > > -extern int io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout); > > - > > - > > -static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) > > -{ > > - iocb->data = (void *)cb; > > -} > > - > > -static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > > -{ > > - memset(iocb, 0, sizeof(*iocb)); > > - iocb->aio_fildes = fd; > > - iocb->aio_lio_opcode = IO_CMD_PREAD; > > - iocb->aio_reqprio = 0; > > - iocb->u.c.buf = buf; > > - iocb->u.c.nbytes = count; > > - iocb->u.c.offset = offset; > > -} > > - > > -static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) > > -{ > > - memset(iocb, 0, sizeof(*iocb)); > > - iocb->aio_fildes = fd; > > - iocb->aio_lio_opcode = IO_CMD_PWRITE; > > - iocb->aio_reqprio = 0; > > - iocb->u.c.buf = buf; > > - iocb->u.c.nbytes = count; > > - iocb->u.c.offset = offset; > > -} > > - > > -static inline void io_prep_poll(struct iocb *iocb, int fd, int events) > > -{ > > - memset(iocb, 0, sizeof(*iocb)); > > - iocb->aio_fildes = fd; > > - iocb->aio_lio_opcode = IO_CMD_POLL; > > - iocb->aio_reqprio = 0; > > - iocb->u.poll.events = events; > > -} > > - > > -static inline int io_poll(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd, int events) > > -{ > > - io_prep_poll(iocb, fd, events); > > - io_set_callback(iocb, cb); > > - return io_submit(ctx, 1, &iocb); > > -} > > - > > -static inline void io_prep_fsync(struct iocb *iocb, int fd) > > -{ > > - memset(iocb, 0, sizeof(*iocb)); > > - iocb->aio_fildes = fd; > > - iocb->aio_lio_opcode = IO_CMD_FSYNC; > > - iocb->aio_reqprio = 0; > > -} > > - > > -static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) > > -{ > > - io_prep_fsync(iocb, fd); > > - io_set_callback(iocb, cb); > > - return io_submit(ctx, 1, &iocb); > > -} > > - > > -static inline void io_prep_fdsync(struct iocb *iocb, int fd) > > -{ > > - memset(iocb, 0, sizeof(*iocb)); > > - iocb->aio_fildes = fd; > > - iocb->aio_lio_opcode = IO_CMD_FDSYNC; > > - iocb->aio_reqprio = 0; > > -} > > - > > -static inline int io_fdsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) > > -{ > > - io_prep_fdsync(iocb, fd); > > - io_set_callback(iocb, cb); > > - return io_submit(ctx, 1, &iocb); > > -} > > - > > -#ifdef __cplusplus > > -} > > -#endif > > - > > -#endif /* __LIBAIO_H */ > > diff --git a/tools/libaio/src/libaio.map b/tools/libaio/src/libaio.map > > deleted file mode 100644 > > index dc37725..0000000 > > --- a/tools/libaio/src/libaio.map > > +++ /dev/null > > @@ -1,22 +0,0 @@ > > -LIBAIO_0.1 { > > - global: > > - io_queue_init; > > - io_queue_run; > > - io_queue_wait; > > - io_queue_release; > > - io_cancel; > > - io_submit; > > - io_getevents; > > - local: > > - *; > > - > > -}; > > - > > -LIBAIO_0.4 { > > - global: > > - io_setup; > > - io_destroy; > > - io_cancel; > > - io_getevents; > > - io_queue_wait; > > -} LIBAIO_0.1; > > diff --git a/tools/libaio/src/raw_syscall.c b/tools/libaio/src/raw_syscall.c > > deleted file mode 100644 > > index c3fe4b8..0000000 > > --- a/tools/libaio/src/raw_syscall.c > > +++ /dev/null > > @@ -1,19 +0,0 @@ > > -#include "syscall.h" > > - > > -#if defined(__ia64__) > > -/* based on code from glibc by Jes Sorensen */ > > -__asm__(".text\n" > > - ".globl __ia64_aio_raw_syscall\n" > > - ".proc __ia64_aio_raw_syscall\n" > > - "__ia64_aio_raw_syscall:\n" > > - "alloc r2=ar.pfs,1,0,8,0\n" > > - "mov r15=r32\n" > > - "break 0x100000\n" > > - ";;" > > - "br.ret.sptk.few b0\n" > > - ".size __ia64_aio_raw_syscall, . - __ia64_aio_raw_syscall\n" > > - ".endp __ia64_aio_raw_syscall" > > -); > > -#endif > > - > > -; > > diff --git a/tools/libaio/src/syscall-alpha.h b/tools/libaio/src/syscall-alpha.h > > deleted file mode 100644 > > index 467b74f..0000000 > > --- a/tools/libaio/src/syscall-alpha.h > > +++ /dev/null > > @@ -1,209 +0,0 @@ > > -#define __NR_io_setup 398 > > -#define __NR_io_destroy 399 > > -#define __NR_io_getevents 400 > > -#define __NR_io_submit 401 > > -#define __NR_io_cancel 402 > > - > > -#define inline_syscall_r0_asm > > -#define inline_syscall_r0_out_constraint "=v" > > - > > -#define inline_syscall_clobbers \ > > - "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", \ > > - "$22", "$23", "$24", "$25", "$27", "$28", "memory" > > - > > -#define inline_syscall0(name, args...) \ > > -{ \ > > - register long _sc_0 inline_syscall_r0_asm; \ > > - register long _sc_19 __asm__("$19"); \ > > - \ > > - _sc_0 = name; \ > > - __asm__ __volatile__ \ > > - ("callsys # %0 %1 <= %2" \ > > - : inline_syscall_r0_out_constraint (_sc_0), \ > > - "=r"(_sc_19) \ > > - : "0"(_sc_0) \ > > - : inline_syscall_clobbers, \ > > - "$16", "$17", "$18", "$20", "$21"); \ > > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > > -} > > - > > -#define inline_syscall1(name,arg1) \ > > -{ \ > > - register long _sc_0 inline_syscall_r0_asm; \ > > - register long _sc_16 __asm__("$16"); \ > > - register long _sc_19 __asm__("$19"); \ > > - \ > > - _sc_0 = name; \ > > - _sc_16 = (long) (arg1); \ > > - __asm__ __volatile__ \ > > - ("callsys # %0 %1 <= %2 %3" \ > > - : inline_syscall_r0_out_constraint (_sc_0), \ > > - "=r"(_sc_19), "=r"(_sc_16) \ > > - : "0"(_sc_0), "2"(_sc_16) \ > > - : inline_syscall_clobbers, \ > > - "$17", "$18", "$20", "$21"); \ > > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > > -} > > - > > -#define inline_syscall2(name,arg1,arg2) \ > > -{ \ > > - register long _sc_0 inline_syscall_r0_asm; \ > > - register long _sc_16 __asm__("$16"); \ > > - register long _sc_17 __asm__("$17"); \ > > - register long _sc_19 __asm__("$19"); \ > > - \ > > - _sc_0 = name; \ > > - _sc_16 = (long) (arg1); \ > > - _sc_17 = (long) (arg2); \ > > - __asm__ __volatile__ \ > > - ("callsys # %0 %1 <= %2 %3 %4" \ > > - : inline_syscall_r0_out_constraint (_sc_0), \ > > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17) \ > > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17) \ > > - : inline_syscall_clobbers, \ > > - "$18", "$20", "$21"); \ > > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > > -} > > - > > -#define inline_syscall3(name,arg1,arg2,arg3) \ > > -{ \ > > - register long _sc_0 inline_syscall_r0_asm; \ > > - register long _sc_16 __asm__("$16"); \ > > - register long _sc_17 __asm__("$17"); \ > > - register long _sc_18 __asm__("$18"); \ > > - register long _sc_19 __asm__("$19"); \ > > - \ > > - _sc_0 = name; \ > > - _sc_16 = (long) (arg1); \ > > - _sc_17 = (long) (arg2); \ > > - _sc_18 = (long) (arg3); \ > > - __asm__ __volatile__ \ > > - ("callsys # %0 %1 <= %2 %3 %4 %5" \ > > - : inline_syscall_r0_out_constraint (_sc_0), \ > > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > > - "=r"(_sc_18) \ > > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ > > - "4"(_sc_18) \ > > - : inline_syscall_clobbers, "$20", "$21"); \ > > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > > -} > > - > > -#define inline_syscall4(name,arg1,arg2,arg3,arg4) \ > > -{ \ > > - register long _sc_0 inline_syscall_r0_asm; \ > > - register long _sc_16 __asm__("$16"); \ > > - register long _sc_17 __asm__("$17"); \ > > - register long _sc_18 __asm__("$18"); \ > > - register long _sc_19 __asm__("$19"); \ > > - \ > > - _sc_0 = name; \ > > - _sc_16 = (long) (arg1); \ > > - _sc_17 = (long) (arg2); \ > > - _sc_18 = (long) (arg3); \ > > - _sc_19 = (long) (arg4); \ > > - __asm__ __volatile__ \ > > - ("callsys # %0 %1 <= %2 %3 %4 %5 %6" \ > > - : inline_syscall_r0_out_constraint (_sc_0), \ > > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > > - "=r"(_sc_18) \ > > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ > > - "4"(_sc_18), "1"(_sc_19) \ > > - : inline_syscall_clobbers, "$20", "$21"); \ > > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > > -} > > - > > -#define inline_syscall5(name,arg1,arg2,arg3,arg4,arg5) \ > > -{ \ > > - register long _sc_0 inline_syscall_r0_asm; \ > > - register long _sc_16 __asm__("$16"); \ > > - register long _sc_17 __asm__("$17"); \ > > - register long _sc_18 __asm__("$18"); \ > > - register long _sc_19 __asm__("$19"); \ > > - register long _sc_20 __asm__("$20"); \ > > - \ > > - _sc_0 = name; \ > > - _sc_16 = (long) (arg1); \ > > - _sc_17 = (long) (arg2); \ > > - _sc_18 = (long) (arg3); \ > > - _sc_19 = (long) (arg4); \ > > - _sc_20 = (long) (arg5); \ > > - __asm__ __volatile__ \ > > - ("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7" \ > > - : inline_syscall_r0_out_constraint (_sc_0), \ > > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > > - "=r"(_sc_18), "=r"(_sc_20) \ > > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ > > - "4"(_sc_18), "1"(_sc_19), "5"(_sc_20) \ > > - : inline_syscall_clobbers, "$21"); \ > > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > > -} > > - > > -#define inline_syscall6(name,arg1,arg2,arg3,arg4,arg5,arg6) \ > > -{ \ > > - register long _sc_0 inline_syscall_r0_asm; \ > > - register long _sc_16 __asm__("$16"); \ > > - register long _sc_17 __asm__("$17"); \ > > - register long _sc_18 __asm__("$18"); \ > > - register long _sc_19 __asm__("$19"); \ > > - register long _sc_20 __asm__("$20"); \ > > - register long _sc_21 __asm__("$21"); \ > > - \ > > - _sc_0 = name; \ > > - _sc_16 = (long) (arg1); \ > > - _sc_17 = (long) (arg2); \ > > - _sc_18 = (long) (arg3); \ > > - _sc_19 = (long) (arg4); \ > > - _sc_20 = (long) (arg5); \ > > - _sc_21 = (long) (arg6); \ > > - __asm__ __volatile__ \ > > - ("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7 %8" \ > > - : inline_syscall_r0_out_constraint (_sc_0), \ > > - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ > > - "=r"(_sc_18), "=r"(_sc_20), "=r"(_sc_21) \ > > - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), "4"(_sc_18), \ > > - "1"(_sc_19), "5"(_sc_20), "6"(_sc_21) \ > > - : inline_syscall_clobbers); \ > > - _sc_ret = _sc_0, _sc_err = _sc_19; \ > > -} > > - > > -#define INLINE_SYSCALL1(name, nr, args...) \ > > -({ \ > > - long _sc_ret, _sc_err; \ > > - inline_syscall##nr(__NR_##name, args); \ > > - if (_sc_err != 0) \ > > - { \ > > - _sc_ret = -(_sc_ret); \ > > - } \ > > - _sc_ret; \ > > -}) > > - > > -#define io_syscall1(type,fname,sname,type1,arg1) \ > > -type fname(type1 arg1) \ > > -{ \ > > - return (type)INLINE_SYSCALL1(sname, 1, arg1); \ > > -} > > - > > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > > -type fname(type1 arg1,type2 arg2) \ > > -{ \ > > - return (type)INLINE_SYSCALL1(sname, 2, arg1, arg2); \ > > -} > > - > > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > > -type fname(type1 arg1,type2 arg2,type3 arg3) \ > > -{ \ > > - return (type)INLINE_SYSCALL1(sname, 3, arg1, arg2, arg3); \ > > -} > > - > > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > > -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > > -{ \ > > - return (type)INLINE_SYSCALL1(sname, 4, arg1, arg2, arg3, arg4); \ > > -} > > - > > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ > > - type5,arg5) \ > > -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ > > -{ \ > > - return (type)INLINE_SYSCALL1(sname, 5, arg1, arg2, arg3, arg4, arg5);\ > > -} > > diff --git a/tools/libaio/src/syscall-i386.h b/tools/libaio/src/syscall-i386.h > > deleted file mode 100644 > > index 9576975..0000000 > > --- a/tools/libaio/src/syscall-i386.h > > +++ /dev/null > > @@ -1,72 +0,0 @@ > > -#define __NR_io_setup 245 > > -#define __NR_io_destroy 246 > > -#define __NR_io_getevents 247 > > -#define __NR_io_submit 248 > > -#define __NR_io_cancel 249 > > - > > -#define io_syscall1(type,fname,sname,type1,arg1) \ > > -type fname(type1 arg1) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > > - "int $0x80\n" \ > > - "xchgl %%edi,%%ebx" \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1))); \ > > -return __res; \ > > -} > > - > > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > > -type fname(type1 arg1,type2 arg2) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > > - "int $0x80\n" \ > > - "xchgl %%edi,%%ebx" \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2))); \ > > -return __res; \ > > -} > > - > > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > > -type fname(type1 arg1,type2 arg2,type3 arg3) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > > - "int $0x80\n" \ > > - "xchgl %%edi,%%ebx" \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2)), \ > > - "d" ((long)(arg3))); \ > > -return __res; \ > > -} > > - > > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > > -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile ("xchgl %%edi,%%ebx\n" \ > > - "int $0x80\n" \ > > - "xchgl %%edi,%%ebx" \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)),"c" ((long)(arg2)), \ > > - "d" ((long)(arg3)),"S" ((long)(arg4))); \ > > -return __res; \ > > -} > > - > > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ > > - type5,arg5) \ > > -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ > > -{ \ > > -long __res; \ > > -long tmp; \ > > -__asm__ volatile ("movl %%ebx,%7\n" \ > > - "movl %2,%%ebx\n" \ > > - "int $0x80\n" \ > > - "movl %7,%%ebx" \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"rm" ((long)(arg1)),"c" ((long)(arg2)), \ > > - "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)), \ > > - "m" (tmp)); \ > > -return __res; \ > > -} > > diff --git a/tools/libaio/src/syscall-ppc.h b/tools/libaio/src/syscall-ppc.h > > deleted file mode 100644 > > index 435513e..0000000 > > --- a/tools/libaio/src/syscall-ppc.h > > +++ /dev/null > > @@ -1,98 +0,0 @@ > > -#include <asm/unistd.h> > > -#include <errno.h> > > - > > -#define __NR_io_setup 227 > > -#define __NR_io_destroy 228 > > -#define __NR_io_getevents 229 > > -#define __NR_io_submit 230 > > -#define __NR_io_cancel 231 > > - > > -/* On powerpc a system call basically clobbers the same registers like a > > - * function call, with the exception of LR (which is needed for the > > - * "sc; bnslr" sequence) and CR (where only CR0.SO is clobbered to signal > > - * an error return status). > > - */ > > -#ifndef __syscall_nr > > -#define __syscall_nr(nr, type, name, args...) \ > > - unsigned long __sc_ret, __sc_err; \ > > - { \ > > - register unsigned long __sc_0 __asm__ ("r0"); \ > > - register unsigned long __sc_3 __asm__ ("r3"); \ > > - register unsigned long __sc_4 __asm__ ("r4"); \ > > - register unsigned long __sc_5 __asm__ ("r5"); \ > > - register unsigned long __sc_6 __asm__ ("r6"); \ > > - register unsigned long __sc_7 __asm__ ("r7"); \ > > - register unsigned long __sc_8 __asm__ ("r8"); \ > > - \ > > - __sc_loadargs_##nr(name, args); \ > > - __asm__ __volatile__ \ > > - ("sc \n\t" \ > > - "mfcr %0 " \ > > - : "=&r" (__sc_0), \ > > - "=&r" (__sc_3), "=&r" (__sc_4), \ > > - "=&r" (__sc_5), "=&r" (__sc_6), \ > > - "=&r" (__sc_7), "=&r" (__sc_8) \ > > - : __sc_asm_input_##nr \ > > - : "cr0", "ctr", "memory", \ > > - "r9", "r10","r11", "r12"); \ > > - __sc_ret = __sc_3; \ > > - __sc_err = __sc_0; \ > > - } \ > > - if (__sc_err & 0x10000000) return -((int)__sc_ret); \ > > - return (type) __sc_ret > > -#endif > > - > > -#define __sc_loadargs_0(name, dummy...) \ > > - __sc_0 = __NR_##name > > -#define __sc_loadargs_1(name, arg1) \ > > - __sc_loadargs_0(name); \ > > - __sc_3 = (unsigned long) (arg1) > > -#define __sc_loadargs_2(name, arg1, arg2) \ > > - __sc_loadargs_1(name, arg1); \ > > - __sc_4 = (unsigned long) (arg2) > > -#define __sc_loadargs_3(name, arg1, arg2, arg3) \ > > - __sc_loadargs_2(name, arg1, arg2); \ > > - __sc_5 = (unsigned long) (arg3) > > -#define __sc_loadargs_4(name, arg1, arg2, arg3, arg4) \ > > - __sc_loadargs_3(name, arg1, arg2, arg3); \ > > - __sc_6 = (unsigned long) (arg4) > > -#define __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5) \ > > - __sc_loadargs_4(name, arg1, arg2, arg3, arg4); \ > > - __sc_7 = (unsigned long) (arg5) > > - > > -#define __sc_asm_input_0 "0" (__sc_0) > > -#define __sc_asm_input_1 __sc_asm_input_0, "1" (__sc_3) > > -#define __sc_asm_input_2 __sc_asm_input_1, "2" (__sc_4) > > -#define __sc_asm_input_3 __sc_asm_input_2, "3" (__sc_5) > > -#define __sc_asm_input_4 __sc_asm_input_3, "4" (__sc_6) > > -#define __sc_asm_input_5 __sc_asm_input_4, "5" (__sc_7) > > - > > -#define io_syscall1(type,fname,sname,type1,arg1) \ > > -type fname(type1 arg1) \ > > -{ \ > > - __syscall_nr(1, type, sname, arg1); \ > > -} > > - > > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > > -type fname(type1 arg1, type2 arg2) \ > > -{ \ > > - __syscall_nr(2, type, sname, arg1, arg2); \ > > -} > > - > > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > > -type fname(type1 arg1, type2 arg2, type3 arg3) \ > > -{ \ > > - __syscall_nr(3, type, sname, arg1, arg2, arg3); \ > > -} > > - > > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > > -{ \ > > - __syscall_nr(4, type, sname, arg1, arg2, arg3, arg4); \ > > -} > > - > > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ > > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ > > -{ \ > > - __syscall_nr(5, type, sname, arg1, arg2, arg3, arg4, arg5); \ > > -} > > diff --git a/tools/libaio/src/syscall-s390.h b/tools/libaio/src/syscall-s390.h > > deleted file mode 100644 > > index 3ec5ee3..0000000 > > --- a/tools/libaio/src/syscall-s390.h > > +++ /dev/null > > @@ -1,131 +0,0 @@ > > -#define __NR_io_setup 243 > > -#define __NR_io_destroy 244 > > -#define __NR_io_getevents 245 > > -#define __NR_io_submit 246 > > -#define __NR_io_cancel 247 > > - > > -#define io_svc_clobber "1", "cc", "memory" > > - > > -#define io_syscall1(type,fname,sname,type1,arg1) \ > > -type fname(type1 arg1) { \ > > - register type1 __arg1 asm("2") = arg1; \ > > - register long __svcres asm("2"); \ > > - long __res; \ > > - __asm__ __volatile__ ( \ > > - " .if %1 < 256\n" \ > > - " svc %b1\n" \ > > - " .else\n" \ > > - " la %%r1,%1\n" \ > > - " .svc 0\n" \ > > - " .endif" \ > > - : "=d" (__svcres) \ > > - : "i" (__NR_##sname), \ > > - "0" (__arg1) \ > > - : io_svc_clobber ); \ > > - __res = __svcres; \ > > - return (type) __res; \ > > -} > > - > > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > > -type fname(type1 arg1, type2 arg2) { \ > > - register type1 __arg1 asm("2") = arg1; \ > > - register type2 __arg2 asm("3") = arg2; \ > > - register long __svcres asm("2"); \ > > - long __res; \ > > - __asm__ __volatile__ ( \ > > - " .if %1 < 256\n" \ > > - " svc %b1\n" \ > > - " .else\n" \ > > - " la %%r1,%1\n" \ > > - " svc 0\n" \ > > - " .endif" \ > > - : "=d" (__svcres) \ > > - : "i" (__NR_##sname), \ > > - "0" (__arg1), \ > > - "d" (__arg2) \ > > - : io_svc_clobber ); \ > > - __res = __svcres; \ > > - return (type) __res; \ > > -} > > - > > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2, \ > > - type3,arg3) \ > > -type fname(type1 arg1, type2 arg2, type3 arg3) { \ > > - register type1 __arg1 asm("2") = arg1; \ > > - register type2 __arg2 asm("3") = arg2; \ > > - register type3 __arg3 asm("4") = arg3; \ > > - register long __svcres asm("2"); \ > > - long __res; \ > > - __asm__ __volatile__ ( \ > > - " .if %1 < 256\n" \ > > - " svc %b1\n" \ > > - " .else\n" \ > > - " la %%r1,%1\n" \ > > - " svc 0\n" \ > > - " .endif" \ > > - : "=d" (__svcres) \ > > - : "i" (__NR_##sname), \ > > - "0" (__arg1), \ > > - "d" (__arg2), \ > > - "d" (__arg3) \ > > - : io_svc_clobber ); \ > > - __res = __svcres; \ > > - return (type) __res; \ > > -} > > - > > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2, \ > > - type3,arg3,type4,arg4) \ > > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ > > - register type1 __arg1 asm("2") = arg1; \ > > - register type2 __arg2 asm("3") = arg2; \ > > - register type3 __arg3 asm("4") = arg3; \ > > - register type4 __arg4 asm("5") = arg4; \ > > - register long __svcres asm("2"); \ > > - long __res; \ > > - __asm__ __volatile__ ( \ > > - " .if %1 < 256\n" \ > > - " svc %b1\n" \ > > - " .else\n" \ > > - " la %%r1,%1\n" \ > > - " svc 0\n" \ > > - " .endif" \ > > - : "=d" (__svcres) \ > > - : "i" (__NR_##sname), \ > > - "0" (__arg1), \ > > - "d" (__arg2), \ > > - "d" (__arg3), \ > > - "d" (__arg4) \ > > - : io_svc_clobber ); \ > > - __res = __svcres; \ > > - return (type) __res; \ > > -} > > - > > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2, \ > > - type3,arg3,type4,arg4,type5,arg5) \ > > -type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \ > > - type5 arg5) { \ > > - register type1 __arg1 asm("2") = arg1; \ > > - register type2 __arg2 asm("3") = arg2; \ > > - register type3 __arg3 asm("4") = arg3; \ > > - register type4 __arg4 asm("5") = arg4; \ > > - register type5 __arg5 asm("6") = arg5; \ > > - register long __svcres asm("2"); \ > > - long __res; \ > > - __asm__ __volatile__ ( \ > > - " .if %1 < 256\n" \ > > - " svc %b1\n" \ > > - " .else\n" \ > > - " la %%r1,%1\n" \ > > - " svc 0\n" \ > > - " .endif" \ > > - : "=d" (__svcres) \ > > - : "i" (__NR_##sname), \ > > - "0" (__arg1), \ > > - "d" (__arg2), \ > > - "d" (__arg3), \ > > - "d" (__arg4), \ > > - "d" (__arg5) \ > > - : io_svc_clobber ); \ > > - __res = __svcres; \ > > - return (type) __res; \ > > -} > > diff --git a/tools/libaio/src/syscall-x86_64.h b/tools/libaio/src/syscall-x86_64.h > > deleted file mode 100644 > > index 9361856..0000000 > > --- a/tools/libaio/src/syscall-x86_64.h > > +++ /dev/null > > @@ -1,63 +0,0 @@ > > -#define __NR_io_setup 206 > > -#define __NR_io_destroy 207 > > -#define __NR_io_getevents 208 > > -#define __NR_io_submit 209 > > -#define __NR_io_cancel 210 > > - > > -#define __syscall_clobber "r11","rcx","memory" > > -#define __syscall "syscall" > > - > > -#define io_syscall1(type,fname,sname,type1,arg1) \ > > -type fname(type1 arg1) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile (__syscall \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)) : __syscall_clobber ); \ > > -return __res; \ > > -} > > - > > -#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ > > -type fname(type1 arg1,type2 arg2) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile (__syscall \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \ > > -return __res; \ > > -} > > - > > -#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ > > -type fname(type1 arg1,type2 arg2,type3 arg3) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile (__syscall \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ > > - "d" ((long)(arg3)) : __syscall_clobber); \ > > -return __res; \ > > -} > > - > > -#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ > > -type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile ("movq %5,%%r10 ;" __syscall \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ > > - "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \ > > -return __res; \ > > -} > > - > > -#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ > > - type5,arg5) \ > > -type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ > > -{ \ > > -long __res; \ > > -__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \ > > - : "=a" (__res) \ > > - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ > > - "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \ > > - __syscall_clobber,"r8","r10" ); \ > > -return __res; \ > > -} > > diff --git a/tools/libaio/src/syscall.h b/tools/libaio/src/syscall.h > > deleted file mode 100644 > > index 0283825..0000000 > > --- a/tools/libaio/src/syscall.h > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > -#include <sys/syscall.h> > > -#include <unistd.h> > > - > > -#define _SYMSTR(str) #str > > -#define SYMSTR(str) _SYMSTR(str) > > - > > -#define SYMVER(compat_sym, orig_sym, ver_sym) \ > > - __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@LIBAIO_" SYMSTR(ver_sym)); > > - > > -#define DEFSYMVER(compat_sym, orig_sym, ver_sym) \ > > - __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@@LIBAIO_" SYMSTR(ver_sym)); > > - > > -#if defined(__i386__) > > -#include "syscall-i386.h" > > -#elif defined(__x86_64__) > > -#include "syscall-x86_64.h" > > -#elif defined(__ia64__) > > -#include "syscall-ia64.h" > > -#elif defined(__PPC__) > > -#include "syscall-ppc.h" > > -#elif defined(__s390__) > > -#include "syscall-s390.h" > > -#elif defined(__alpha__) > > -#include "syscall-alpha.h" > > -#else > > -#error "add syscall-arch.h" > > -#endif > > diff --git a/tools/libaio/src/vsys_def.h b/tools/libaio/src/vsys_def.h > > deleted file mode 100644 > > index 13d032e..0000000 > > --- a/tools/libaio/src/vsys_def.h > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -/* libaio Linux async I/O interface > > - Copyright 2002 Red Hat, Inc. > > - > > - This library is free software; you can redistribute it and/or > > - modify it under the terms of the GNU Lesser General Public > > - License as published by the Free Software Foundation; either > > - version 2 of the License, or (at your option) any later version. > > - > > - This library 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 > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > > - License along with this library; if not, write to the Free Software > > - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > - */ > > -extern int vsys_io_setup(unsigned nr_reqs, io_context_t *ctxp); > > -extern int vsys_io_destroy(io_context_t ctx); > > -extern int vsys_io_submit(io_context_t ctx, long nr, struct iocb *iocbs[]); > > -extern int vsys_io_cancel(io_context_t ctx, struct iocb *iocb); > > -extern int vsys_io_wait(io_context_t ctx, struct iocb *iocb, const struct timespec *when); > > -extern int vsys_io_getevents(io_context_t ctx_id, long nr, struct io_event *events, const struct timespec *timeout); > > - > > > ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 3/9] tools: remove in tree libaio 2013-07-31 15:15 ` [PATCH 3/9] tools: remove in tree libaio Ian Campbell 2013-08-01 8:38 ` Egger, Christoph @ 2013-08-07 15:06 ` Ian Jackson 2013-08-08 9:07 ` Ian Campbell 1 sibling, 1 reply; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:06 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 3/9] tools: remove in tree libaio"): > We have defaulted to using the system libaio for a while now and I din't think > there are any relevant distros which don't have it that running Xen 4.4 would > be reasonable on. > > Also it has caused confusion because it is not ever wanted on ARM, but the > build system doesn't express that (could be fixed, but deleting is the right > thing to do anyway). Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Ideally I would like to see an answer about Christoph Egger's question about BSD. Ian. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 3/9] tools: remove in tree libaio 2013-08-07 15:06 ` Ian Jackson @ 2013-08-08 9:07 ` Ian Campbell 2013-08-20 14:28 ` Ian Campbell 0 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-08-08 9:07 UTC (permalink / raw) To: Ian Jackson; +Cc: Egger, Christoph, keir, xen-devel On Wed, 2013-08-07 at 16:06 +0100, Ian Jackson wrote: > Ian Campbell writes ("[PATCH 3/9] tools: remove in tree libaio"): > > We have defaulted to using the system libaio for a while now and I din't think > > there are any relevant distros which don't have it that running Xen 4.4 would > > be reasonable on. > > > > Also it has caused confusion because it is not ever wanted on ARM, but the > > build system doesn't express that (could be fixed, but deleting is the right > > thing to do anyway). > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Thanks. > Ideally I would like to see an answer about Christoph Egger's > question about BSD. I replied in <1375367947.7382.123.camel@kazak.uk.xensource.com> but TBH I'm not entirely sure what he was asking/stating. If anything other than blktap* (which are Linux only) in our tree is using libaio then I don't know about it. >From current staging: $ git grep -l laio tools/blktap/drivers/Makefile tools/blktap2/drivers/Makefile tools/configure tools/libaio/harness/Makefile $ git grep -l libaio | grep -v ^tools/libaio .gitignore .hgignore README tools/Makefile tools/blktap/README tools/blktap/drivers/Makefile tools/blktap/drivers/block-aio.c tools/blktap/drivers/block-qcow.c tools/blktap/drivers/tapaio.h tools/blktap/drivers/tapdisk.h tools/blktap2/README tools/blktap2/drivers/Makefile tools/blktap2/drivers/block-qcow.c tools/blktap2/drivers/block-vhd.c tools/blktap2/drivers/img2qcow.c tools/blktap2/drivers/io-optimize.h tools/blktap2/drivers/libaio-compat.h tools/blktap2/drivers/qcow.h tools/blktap2/drivers/tapdisk-filter.c tools/blktap2/drivers/tapdisk-filter.h tools/blktap2/drivers/tapdisk-queue.c tools/blktap2/drivers/tapdisk-queue.h Ian. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 3/9] tools: remove in tree libaio 2013-08-08 9:07 ` Ian Campbell @ 2013-08-20 14:28 ` Ian Campbell 0 siblings, 0 replies; 30+ messages in thread From: Ian Campbell @ 2013-08-20 14:28 UTC (permalink / raw) To: Ian Jackson; +Cc: Egger, Christoph, keir, xen-devel On Thu, 2013-08-08 at 10:07 +0100, Ian Campbell wrote: > On Wed, 2013-08-07 at 16:06 +0100, Ian Jackson wrote: > > Ian Campbell writes ("[PATCH 3/9] tools: remove in tree libaio"): > > > We have defaulted to using the system libaio for a while now and I din't think > > > there are any relevant distros which don't have it that running Xen 4.4 would > > > be reasonable on. > > > > > > Also it has caused confusion because it is not ever wanted on ARM, but the > > > build system doesn't express that (could be fixed, but deleting is the right > > > thing to do anyway). > > > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > > Thanks. > > > Ideally I would like to see an answer about Christoph Egger's > > question about BSD. > > I replied in <1375367947.7382.123.camel@kazak.uk.xensource.com> but TBH > I'm not entirely sure what he was asking/stating. I think he's had long enough to respond/clarify what he meant. I'm in the process of applying this series, last chance to speak up. Ian. ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 4/9] tools: delete xsview 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (2 preceding siblings ...) 2013-07-31 15:15 ` [PATCH 3/9] tools: remove in tree libaio Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:06 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 5/9] tools: remove miniterm Ian Campbell ` (7 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell This was apparently a Qt xenstore viewer. It hasn't been touched since it was first committed in 2007 and I can't beleive anyone is actually using even if it still happens to work. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- tools/misc/Makefile | 2 +- tools/misc/xsview | 9 -- tools/python/setup.py | 1 - tools/python/xen/xsview/main.py | 10 -- tools/python/xen/xsview/xsviewer.py | 168 ----------------------------------- 5 files changed, 1 insertions(+), 189 deletions(-) delete mode 100644 tools/misc/xsview delete mode 100644 tools/python/xen/xsview/__init__.py delete mode 100644 tools/python/xen/xsview/main.py delete mode 100644 tools/python/xen/xsview/xsviewer.py diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 73b55dd..9c69e0d 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,7 +22,7 @@ INSTALL_BIN-y := xencons xencov_split INSTALL_BIN-$(CONFIG_X86) += xen-detect INSTALL_BIN := $(INSTALL_BIN-y) -INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xsview xenpm xen-tmem-list-parse gtraceview \ +INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xenpm xen-tmem-list-parse gtraceview \ gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool diff --git a/tools/misc/xsview b/tools/misc/xsview deleted file mode 100644 index f926fe4..0000000 --- a/tools/misc/xsview +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python - -import sys - -from xen.xsview import main - -main.main(sys.argv) - - diff --git a/tools/python/setup.py b/tools/python/setup.py index 4f66564..8e584e6 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -133,7 +133,6 @@ setup(name = 'xen', packages = ['xen', 'xen.lowlevel', 'xen.sv', - 'xen.xsview', ] + xend_packages, ext_package = "xen.lowlevel", ext_modules = modules diff --git a/tools/python/xen/xsview/__init__.py b/tools/python/xen/xsview/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tools/python/xen/xsview/main.py b/tools/python/xen/xsview/main.py deleted file mode 100644 index b8d3b41..0000000 --- a/tools/python/xen/xsview/main.py +++ /dev/null @@ -1,10 +0,0 @@ -from xsviewer import * -from qt import * - -def main(args): - app = QApplication(args) - mainwin = XSViewer(app) - mainwin.show() - app.connect(app, SIGNAL("lastWindowClosed()"), - app, SLOT("quit()")) - app.exec_loop() diff --git a/tools/python/xen/xsview/xsviewer.py b/tools/python/xen/xsview/xsviewer.py deleted file mode 100644 index 4dbaf98..0000000 --- a/tools/python/xen/xsview/xsviewer.py +++ /dev/null @@ -1,168 +0,0 @@ -from qt import * - -import xen.lowlevel.xs - -class XSViewer(QMainWindow): - - def __init__(self, app): - apply(QMainWindow.__init__, (self,)) - - self.setCaption('XenStore Viewer') - - self.new_node = QAction(self, 'New Node') - self.new_node.setText('New Node...') - self.connect(self.new_node, SIGNAL('activated()'), - self.do_new_node) - - self.rm_node = QAction(self, 'Remove Node') - self.rm_node.setText('Remove Node') - self.connect(self.rm_node, SIGNAL('activated()'), - self.do_rm_node) - - self.refresh = QAction(self, 'Refresh') - self.refresh.setText('Refresh') - self.connect(self.refresh, SIGNAL('activated()'), - self.do_refresh) - - self.file_menu = QPopupMenu(self) - self.new_node.addTo(self.file_menu) - self.rm_node.addTo(self.file_menu) - self.refresh.addTo(self.file_menu) - - - self.about = QAction(self, 'About') - self.about.setText('About...') - self.connect(self.about, SIGNAL('activated()'), - self.do_about) - - self.help_menu = QPopupMenu(self) - self.about.addTo(self.help_menu) - - self.menubar = QMenuBar(self) - self.menubar.insertItem('&File', self.file_menu) - self.menubar.insertItem('&Help', self.help_menu) - - self.vbox = QVBox(self) - self.setCentralWidget(self.vbox) - - self.xs_tree = QListView(self.vbox) - self.xs_tree.addColumn('Key') - self.xs_tree.setRootIsDecorated(1) - self.xs_tree.connect(self.xs_tree, SIGNAL('selectionChanged(QListViewItem*)'), self.showValue) - - self.info_box = QHBox(self.vbox) - self.info_box.setMargin(2) - self.info_box.setSpacing(2) - self.info_label = QLabel(self.info_box) - self.info_label.setText('Value') - self.info = QLineEdit(self.info_box) - self.setval = QPushButton(self.info_box) - self.setval.setText('Set') - self.setval.connect(self.setval, SIGNAL('clicked()'), self.setValue) - - self.xs_handle = xen.lowlevel.xs.xs() - - self.showtree() - - - def showtree(self): - xstransact = self.xs_handle.transaction_start() - self.walktree(xstransact, '/', '/', self.xs_tree) - self.xs_handle.transaction_end(xstransact) - - def walktree(self, trans, node, subdir_prepend, parent_widget): - - ents = self.xs_handle.ls(trans, node) - if ents == None: - return - - for e in ents: - i = QListViewItem(parent_widget, e) - i.full_path = subdir_prepend + e - self.walktree(trans, i.full_path, i.full_path + '/', i) - - - def showValue(self, item): - trans = self.xs_handle.transaction_start() - val = self.xs_handle.read(trans, item.full_path) - self.info.setText(val) - self.xs_handle.transaction_end(trans) - - - def setValue(self): - trans = self.xs_handle.transaction_start() - item = self.xs_tree.currentItem() - newval = str(self.info.text()) - - self.xs_handle.write(trans, item.full_path, newval) - - self.xs_handle.transaction_end(trans) - - - def do_refresh(self): - self.xs_tree.clear() - self.info.clear() - self.showtree() - - def do_new_node(self): - dia = QDialog(self) - dia.setCaption('Create new node') - - vbox = QVBox(dia) - - setting_hbox = QHBox(vbox) - - path_label = QLabel(setting_hbox) - path_label.setText('Node path') - path = QLineEdit(setting_hbox) - - value_label = QLabel(setting_hbox) - value_label.setText('Node value') - val = QLineEdit(setting_hbox) - - button_hbox = QHBox(vbox) - - set = QPushButton(button_hbox) - set.setText('Set') - self.connect(set, SIGNAL('clicked()'), dia, SLOT('accept()')) - - cancel = QPushButton(button_hbox) - cancel.setText('Cancel') - self.connect(cancel, SIGNAL('clicked()'), dia, SLOT('reject()')) - - setting_hbox.adjustSize() - button_hbox.adjustSize() - vbox.adjustSize() - - if dia.exec_loop() == QDialog.Accepted: - trans = self.xs_handle.transaction_start() - self.xs_handle.write(trans, str(path.text()), str(val.text())) - - self.xs_handle.transaction_end(trans) - - self.do_refresh() - - # nothing to set. - - def do_rm_node(self): - trans = self.xs_handle.transaction_start() - item = self.xs_tree.currentItem() - newval = str(self.info.text()) - - self.xs_handle.rm(trans, item.full_path) - - self.xs_handle.transaction_end(trans) - - self.do_refresh() - - def do_about(self): - about_dia = QMessageBox(self) - about_dia.setIcon(QMessageBox.Information) - - about_dia.setCaption('About XenStore Viewer') - about_dia.setText('XenStore Viewer\n' - 'by Mark Williamson <mark.williamson@cl.cam.ac.uk>') - - about_dia.exec_loop() - - -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 4/9] tools: delete xsview 2013-07-31 15:15 ` [PATCH 4/9] tools: delete xsview Ian Campbell @ 2013-08-07 15:06 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:06 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 4/9] tools: delete xsview"): > This was apparently a Qt xenstore viewer. It hasn't been touched since it was > first committed in 2007 and I can't beleive anyone is actually using even if > it still happens to work. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 5/9] tools: remove miniterm 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (3 preceding siblings ...) 2013-07-31 15:15 ` [PATCH 4/9] tools: delete xsview Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:07 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 6/9] tools: remove lomount Ian Campbell ` (6 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell It has been disabled by default since 2008 (9bb7f7e2aca4). Back then Ian J asserted it was useful to keep them in the tree in source form. I don't think this is true anymore. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- .gitignore | 1 - .hgignore | 1 - config/Tools.mk.in | 1 - tools/configure | 26 ------ tools/configure.ac | 1 - tools/misc/Makefile | 1 - tools/misc/miniterm/Makefile | 22 ----- tools/misc/miniterm/README | 13 --- tools/misc/miniterm/miniterm.c | 195 ---------------------------------------- 9 files changed, 0 insertions(+), 261 deletions(-) delete mode 100644 tools/misc/miniterm/Makefile delete mode 100644 tools/misc/miniterm/README delete mode 100644 tools/misc/miniterm/miniterm.c diff --git a/.gitignore b/.gitignore index 62462b4..0828f6b 100644 --- a/.gitignore +++ b/.gitignore @@ -216,7 +216,6 @@ tools/misc/mbootpack/bootsect tools/misc/mbootpack/bzimage_header.c tools/misc/mbootpack/mbootpack tools/misc/mbootpack/setup -tools/misc/miniterm/miniterm tools/misc/xc_shadow tools/misc/xen_cpuperf tools/misc/xen-detect diff --git a/.hgignore b/.hgignore index 9822a8d..2abf398 100644 --- a/.hgignore +++ b/.hgignore @@ -209,7 +209,6 @@ ^tools/misc/mbootpack/bzimage_header\.c$ ^tools/misc/mbootpack/mbootpack$ ^tools/misc/mbootpack/setup$ -^tools/misc/miniterm/miniterm$ ^tools/misc/xc_shadow$ ^tools/misc/xen_cpuperf$ ^tools/misc/xen-detect$ diff --git a/config/Tools.mk.in b/config/Tools.mk.in index bb3acbd..7a0845a 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -47,7 +47,6 @@ XENSTAT_XENTOP := @monitors@ LIBXENAPI_BINDINGS := @xenapi@ OCAML_TOOLS := @ocamltools@ FLASK_POLICY := @xsmpolicy@ -CONFIG_MINITERM := @miniterm@ CONFIG_LOMOUNT := @lomount@ CONFIG_OVMF := @ovmf@ CONFIG_ROMBIOS := @rombios@ diff --git a/tools/configure b/tools/configure index b52dd2a..9d66568 100755 --- a/tools/configure +++ b/tools/configure @@ -660,7 +660,6 @@ seabios rombios ovmf lomount -miniterm xsmpolicy ocamltools xenapi @@ -729,7 +728,6 @@ enable_monitors enable_xenapi enable_ocamltools enable_xsmpolicy -enable_miniterm enable_lomount enable_ovmf enable_rombios @@ -1390,7 +1388,6 @@ Optional Features: --enable-xenapi Enable Xen API Bindings (default is DISABLED) --disable-ocamltools Disable Ocaml tools (default is ENABLED) --disable-xsmpolicy Disable XSM policy compilation (default is ENABLED) - --enable-miniterm Enable miniterm (default is DISABLED) --enable-lomount Enable lomount (default is DISABLED) --enable-ovmf Enable OVMF (default is DISABLED) --disable-rombios Disable ROM BIOS (default is ENABLED) @@ -3519,29 +3516,6 @@ xsmpolicy=$ax_cv_xsmpolicy -# Check whether --enable-miniterm was given. -if test "${enable_miniterm+set}" = set; then : - enableval=$enable_miniterm; -fi - - -if test "x$enable_miniterm" = "xno"; then : - - ax_cv_miniterm="n" - -elif test "x$enable_miniterm" = "xyes"; then : - - ax_cv_miniterm="y" - -elif test -z $ax_cv_miniterm; then : - - ax_cv_miniterm="n" - -fi -miniterm=$ax_cv_miniterm - - - # Check whether --enable-lomount was given. if test "${enable_lomount+set}" = set; then : enableval=$enable_lomount; diff --git a/tools/configure.ac b/tools/configure.ac index f629318..5425740 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -53,7 +53,6 @@ AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation]) -AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount]) AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 9c69e0d..2bb3710 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -15,7 +15,6 @@ TARGETS-$(CONFIG_MIGRATE) += xen-hptool TARGETS := $(TARGETS-y) SUBDIRS-$(CONFIG_LOMOUNT) += lomount -SUBDIRS-$(CONFIG_MINITERM) += miniterm SUBDIRS := $(SUBDIRS-y) INSTALL_BIN-y := xencons xencov_split diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile deleted file mode 100644 index 5c5f561..0000000 --- a/tools/misc/miniterm/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -XEN_ROOT:=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -TARGET = miniterm - -.PHONY: all -all: $(TARGET) - -.PHONY: install -install: all - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(BINDIR) - -.PHONY: install-recurse - : No sense in installing miniterm on the Xen box. - -.PHONY: clean -clean: - $(RM) *.o $(TARGET) *~ - -$(TARGET): $(TARGET).c - $(HOSTCC) $(HOSTCFLAGS) -o $@ $< diff --git a/tools/misc/miniterm/README b/tools/misc/miniterm/README deleted file mode 100644 index 2ca4501..0000000 --- a/tools/misc/miniterm/README +++ /dev/null @@ -1,13 +0,0 @@ -This is a modified version of the miniterm program distributed as part -of the Linux Programmer's Guide (LPG) by Sven Goldt. - -It is intended to be used as a dumb raw terminal for debugging Xen -machines over the serial line. - -By default it will connect to COM1 (/dev/ttyS0) at 115200 baud. -These options can be modified as follows: - miniterm [-b<baudrate>] [-d<devicename>] - -'ctrl-b' quits miniterm. - - -- Keir Fraser (21/9/2003) \ No newline at end of file diff --git a/tools/misc/miniterm/miniterm.c b/tools/misc/miniterm/miniterm.c deleted file mode 100644 index 3f8043d..0000000 --- a/tools/misc/miniterm/miniterm.c +++ /dev/null @@ -1,195 +0,0 @@ -/****************************************************************************** - * miniterm.c - * - * Adapted from the example program distributed with the Linux Programmer's - * Guide (LPG). This has been robustified and tweaked to work as a debugging - * terminal for Xen-based machines. - * - * Modifications are released under GPL and copyright (c) 2003, K A Fraser - * The original copyright message and license is fully intact below. - */ - -/* - * AUTHOR: Sven Goldt (goldt@math.tu-berlin.de) - * - * 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. - * - */ - -#include <termios.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <fcntl.h> -#include <signal.h> -#include <sys/types.h> -#include <sys/wait.h> -#include <string.h> - -#define DEFAULT_BAUDRATE 115200 -#define DEFAULT_SERDEVICE "/dev/ttyS0" -#define ENDMINITERM 0x1d - -volatile int stop = 0; - -void child_handler(int s) -{ - stop = 1; -} - -int cook_baud(int baud) -{ - int cooked_baud = 0; - switch ( baud ) - { - case 50: cooked_baud = B50; break; - case 75: cooked_baud = B75; break; - case 110: cooked_baud = B110; break; - case 134: cooked_baud = B134; break; - case 150: cooked_baud = B150; break; - case 200: cooked_baud = B200; break; - case 300: cooked_baud = B300; break; - case 600: cooked_baud = B600; break; - case 1200: cooked_baud = B1200; break; - case 1800: cooked_baud = B1800; break; - case 2400: cooked_baud = B2400; break; - case 4800: cooked_baud = B4800; break; - case 9600: cooked_baud = B9600; break; - case 19200: cooked_baud = B19200; break; - case 38400: cooked_baud = B38400; break; - case 57600: cooked_baud = B57600; break; - case 115200: cooked_baud = B115200; break; - } - return cooked_baud; -} - -int main(int argc, char **argv) -{ - int fd, c, cooked_baud = cook_baud(DEFAULT_BAUDRATE); - char *sername = DEFAULT_SERDEVICE; - struct termios oldsertio, newsertio, oldstdtio, newstdtio; - struct sigaction sa; - static char start_str[] = - "************ REMOTE CONSOLE: CTRL-] TO QUIT ********\r\n"; - static char end_str[] = - "\n************ REMOTE CONSOLE EXITED *****************\n"; - - while ( --argc != 0 ) - { - char *p = argv[argc]; - if ( *p++ != '-' ) - goto usage; - if ( *p == 'b' ) - { - p++; - if ( (cooked_baud = cook_baud(atoi(p))) == 0 ) - { - fprintf(stderr, "Bad baud rate '%d'\n", atoi(p)); - goto usage; - } - } - else if ( *p == 'd' ) - { - sername = ++p; - if ( *sername == '\0' ) - goto usage; - } - else - goto usage; - } - - /* Not a controlling tty: CTRL-C shouldn't kill us. */ - fd = open(sername, O_RDWR | O_NOCTTY); - if ( fd < 0 ) - { - perror(sername); - exit(-1); - } - - tcgetattr(fd, &oldsertio); /* save current modem settings */ - - /* - * 8 data, no parity, 1 stop bit. Ignore modem control lines. Enable - * receive. Set appropriate baud rate. NO HARDWARE FLOW CONTROL! - */ - newsertio.c_cflag = cooked_baud | CS8 | CLOCAL | CREAD; - - /* Raw input. Ignore errors and breaks. */ - newsertio.c_iflag = IGNBRK | IGNPAR; - - /* Raw output. */ - newsertio.c_oflag = OPOST; - - /* No echo and no signals. */ - newsertio.c_lflag = 0; - - /* blocking read until 1 char arrives */ - newsertio.c_cc[VMIN]=1; - newsertio.c_cc[VTIME]=0; - - /* now clean the modem line and activate the settings for modem */ - tcflush(fd, TCIFLUSH); - tcsetattr(fd,TCSANOW,&newsertio); - - /* next stop echo and buffering for stdin */ - tcgetattr(0,&oldstdtio); - tcgetattr(0,&newstdtio); /* get working stdtio */ - newstdtio.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); - newstdtio.c_oflag &= ~OPOST; - newstdtio.c_cflag &= ~(CSIZE | PARENB); - newstdtio.c_cflag |= CS8; - newstdtio.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); - newstdtio.c_cc[VMIN]=1; - newstdtio.c_cc[VTIME]=0; - tcsetattr(0,TCSANOW,&newstdtio); - - /* Terminal settings done: now enter the main I/O loops. */ - switch ( fork() ) - { - case 0: - close(1); /* stdout not needed */ - for ( c = (char)getchar(); c != ENDMINITERM; c = (char)getchar() ) - write(fd,&c,1); - tcsetattr(fd,TCSANOW,&oldsertio); - tcsetattr(0,TCSANOW,&oldstdtio); - close(fd); - exit(0); /* will send a SIGCHLD to the parent */ - break; - case -1: - perror("fork"); - tcsetattr(fd,TCSANOW,&oldsertio); - close(fd); - exit(-1); - default: - write(1, start_str, strlen(start_str)); - close(0); /* stdin not needed */ - sa.sa_handler = child_handler; - sa.sa_flags = 0; - sigaction(SIGCHLD,&sa,NULL); /* handle dying child */ - while ( !stop ) - { - read(fd,&c,1); /* modem */ - c = (char)c; - write(1,&c,1); /* stdout */ - } - wait(NULL); /* wait for child to die or it will become a zombie */ - write(1, end_str, strlen(end_str)); - break; - } - - return 0; - - usage: - printf("miniterm [-b<baudrate>] [-d<devicename>]\n"); - printf("Default baud rate: %d\n", DEFAULT_BAUDRATE); - printf("Default device: %s\n", DEFAULT_SERDEVICE); - return 1; -} -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 5/9] tools: remove miniterm 2013-07-31 15:15 ` [PATCH 5/9] tools: remove miniterm Ian Campbell @ 2013-08-07 15:07 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:07 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 5/9] tools: remove miniterm"): > It has been disabled by default since 2008 (9bb7f7e2aca4). Back then Ian J > asserted it was useful to keep them in the tree in source form. I don't think > this is true anymore. I agree. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 6/9] tools: remove lomount 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (4 preceding siblings ...) 2013-07-31 15:15 ` [PATCH 5/9] tools: remove miniterm Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:08 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 7/9] .*ignore: remove some cruft Ian Campbell ` (5 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell Build was disabled by default in 2008 (9bb7f7e2aca49). As noted at the time people should be using kpartx these days instead. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- .gitignore | 1 - .hgignore | 1 - config/Tools.mk.in | 1 - tools/Makefile | 1 - tools/configure | 26 --- tools/configure.ac | 1 - tools/misc/Makefile | 1 - tools/misc/lomount/Makefile | 23 --- tools/misc/lomount/lomount.c | 435 ------------------------------------------ 9 files changed, 0 insertions(+), 490 deletions(-) delete mode 100644 tools/misc/lomount/Makefile delete mode 100644 tools/misc/lomount/lomount.c diff --git a/.gitignore b/.gitignore index 0828f6b..2feac20 100644 --- a/.gitignore +++ b/.gitignore @@ -210,7 +210,6 @@ tools/libxl/_libxl.api-for-check tools/libxl/*.api-ok tools/misc/cpuperf/cpuperf-perfcntr tools/misc/cpuperf/cpuperf-xen -tools/misc/lomount/lomount tools/misc/mbootpack/bin2c tools/misc/mbootpack/bootsect tools/misc/mbootpack/bzimage_header.c diff --git a/.hgignore b/.hgignore index 2abf398..87ab478 100644 --- a/.hgignore +++ b/.hgignore @@ -203,7 +203,6 @@ ^tools/libvchan/vchan-node[12]$ ^tools/misc/cpuperf/cpuperf-perfcntr$ ^tools/misc/cpuperf/cpuperf-xen$ -^tools/misc/lomount/lomount$ ^tools/misc/mbootpack/bin2c$ ^tools/misc/mbootpack/bootsect$ ^tools/misc/mbootpack/bzimage_header\.c$ diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 7a0845a..7ee1581 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -47,7 +47,6 @@ XENSTAT_XENTOP := @monitors@ LIBXENAPI_BINDINGS := @xenapi@ OCAML_TOOLS := @ocamltools@ FLASK_POLICY := @xsmpolicy@ -CONFIG_LOMOUNT := @lomount@ CONFIG_OVMF := @ovmf@ CONFIG_ROMBIOS := @rombios@ CONFIG_SEABIOS := @seabios@ diff --git a/tools/Makefile b/tools/Makefile index 51d2336..5d4fe10 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -68,7 +68,6 @@ install: subdirs-install .PHONY: uninstall uninstall: D=$(DESTDIR) uninstall: - rm -rf $(D)$(LIBDIR)/xen* $(D)$(BINDIR)/lomount rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen rm -rf $(D)$(BINDIR)/xc_shadow rm -rf $(D)$(BINDIR)/pygrub diff --git a/tools/configure b/tools/configure index 9d66568..8df24e6 100755 --- a/tools/configure +++ b/tools/configure @@ -659,7 +659,6 @@ debug seabios rombios ovmf -lomount xsmpolicy ocamltools xenapi @@ -728,7 +727,6 @@ enable_monitors enable_xenapi enable_ocamltools enable_xsmpolicy -enable_lomount enable_ovmf enable_rombios enable_seabios @@ -1388,7 +1386,6 @@ Optional Features: --enable-xenapi Enable Xen API Bindings (default is DISABLED) --disable-ocamltools Disable Ocaml tools (default is ENABLED) --disable-xsmpolicy Disable XSM policy compilation (default is ENABLED) - --enable-lomount Enable lomount (default is DISABLED) --enable-ovmf Enable OVMF (default is DISABLED) --disable-rombios Disable ROM BIOS (default is ENABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) @@ -3516,29 +3513,6 @@ xsmpolicy=$ax_cv_xsmpolicy -# Check whether --enable-lomount was given. -if test "${enable_lomount+set}" = set; then : - enableval=$enable_lomount; -fi - - -if test "x$enable_lomount" = "xno"; then : - - ax_cv_lomount="n" - -elif test "x$enable_lomount" = "xyes"; then : - - ax_cv_lomount="y" - -elif test -z $ax_cv_lomount; then : - - ax_cv_lomount="n" - -fi -lomount=$ax_cv_lomount - - - # Check whether --enable-ovmf was given. if test "${enable_ovmf+set}" = set; then : enableval=$enable_ovmf; diff --git a/tools/configure.ac b/tools/configure.ac index 5425740..2a72d02 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -53,7 +53,6 @@ AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation]) -AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount]) AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 2bb3710..59def7a 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -14,7 +14,6 @@ TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash xen-lowmemd TARGETS-$(CONFIG_MIGRATE) += xen-hptool TARGETS := $(TARGETS-y) -SUBDIRS-$(CONFIG_LOMOUNT) += lomount SUBDIRS := $(SUBDIRS-y) INSTALL_BIN-y := xencons xencov_split diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile deleted file mode 100644 index b0afe66..0000000 --- a/tools/misc/lomount/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -XEN_ROOT=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Werror - -.PHONY: all -all: build - -.PHONY: build -build: lomount - -.PHONY: install -install install-recurse: build - $(INSTALL_PROG) lomount $(SCRIPTS) $(DESTDIR)$(BINDIR) - -.PHONY: clean -clean: - $(RM) *.o lomount - -lomount: lomount.o - $(CC) $(CFLAGS) -o $@ $< - --include $(DEPS) \ No newline at end of file diff --git a/tools/misc/lomount/lomount.c b/tools/misc/lomount/lomount.c deleted file mode 100644 index 74859e6..0000000 --- a/tools/misc/lomount/lomount.c +++ /dev/null @@ -1,435 +0,0 @@ -/* - * lomount - utility to mount partitions in a hard disk image - * - * Copyright (c) 2004 Jim Brown - * Copyright (c) 2004 Brad Watson - * Copyright (c) 2004 Mulyadi Santosa - * Major rewrite by Tristan Gingold: - * - Handle GPT partitions - * - Handle large files - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Return code: - * - * bit 7 set: lomount wrapper failed - * bit 7 clear: lomount wrapper ok; mount's return code in low 7 bits - * 0 success - */ - -enum -{ - ERR_USAGE = 0x80, // Incorrect usage - ERR_PART_PARSE, // Failed to parse partition table - ERR_NO_PART, // No such partition - ERR_NO_EPART, // No such extended partition - ERR_MOUNT // Other failure of mount command -}; - -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <strings.h> -#include <sys/wait.h> -#include <errno.h> - -#define BUF 4096 - -#define SECSIZE 512 - -struct pentry -{ - unsigned char bootable; - unsigned char start_head; - unsigned int start_cylinder; - unsigned char start_sector; - unsigned char system; - unsigned char end_head; - unsigned int end_cylinder; - unsigned char end_sector; - unsigned long long start_sector_abs; - unsigned long long no_of_sectors_abs; -}; - -static void -disp_entry (struct pentry *p) -{ - printf ("%10llu - %10llu: %02x %x\n", - SECSIZE * p->start_sector_abs, - SECSIZE * (p->start_sector_abs + p->no_of_sectors_abs - 1), - p->system, - p->bootable); -} - -static unsigned long -read_le4 (unsigned char *p) -{ - return (unsigned long) p[0] - | ((unsigned long) p[1] << 8) - | ((unsigned long) p[2] << 16) - | ((unsigned long) p[3] << 24); -} - -static unsigned long long -read_le8 (unsigned char *p) -{ - return (unsigned long long) p[0] - | ((unsigned long long) p[1] << 8) - | ((unsigned long long) p[2] << 16) - | ((unsigned long long) p[3] << 24) - | ((unsigned long long) p[4] << 32) - | ((unsigned long long) p[5] << 40) - | ((unsigned long long) p[6] << 48) - | ((unsigned long long) p[7] << 56); -} - -/* Return true if the partition table is a GPT protective MBR. */ -static int -check_gpt (struct pentry *part, int nbr_part) -{ - if (nbr_part != 4) - return 0; - if (part[0].system == 0xee - && part[1].no_of_sectors_abs == 0 - && part[2].no_of_sectors_abs == 0 - && part[3].no_of_sectors_abs == 0) - return 1; - return 0; -} - -static int -load_gpt (const char *diskimage, struct pentry *parttbl[]) -{ - FILE *fd; - size_t size; - int fail = -1; - unsigned char data[SECSIZE]; - unsigned long long entries_lba; - unsigned long entry_size; - struct pentry *part; - int nbr_part; - unsigned long long off; - int i; - - fd = fopen(diskimage, "r"); - if (fd == NULL) - { - perror(diskimage); - goto done; - } - fseeko (fd, SECSIZE, SEEK_SET); - size = fread (&data, 1, sizeof(data), fd); - if (size < (size_t)sizeof(data)) - { - fprintf(stderr, "Could not read the GPT header of %s.\n", - diskimage); - goto done; - } - - if (memcmp (data, "EFI PART", 8) != 0) - { - fprintf (stderr, "Bad GPT signature\n"); - goto done; - } - - entries_lba = read_le8 (&data[72]); - nbr_part = read_le4 (&data[80]); - entry_size = read_le4 (&data[84]); - -#ifdef DEBUG - fprintf(stderr, "lba entries: %llu, nbr_part: %u, entry_size: %lu\n", - entries_lba, nbr_part, entry_size); -#endif - part = malloc (nbr_part * sizeof (struct pentry)); - if (part == NULL) - { - fprintf(stderr,"Cannot allocate memory\n"); - goto done; - } - memset (part, 0, nbr_part * sizeof (struct pentry)); - *parttbl = part; - - off = entries_lba * SECSIZE; - for (i = 0; i < nbr_part; i++) - { - static const char unused_guid[16] = {0}; - fseeko (fd, off, SEEK_SET); - size = fread (&data, 1, 128, fd); - if (size < 128) - { - fprintf(stderr, "Could not read a GPT entry of %s.\n", - diskimage); - goto done; - } - if (memcmp (&data[0], unused_guid, 16) == 0) - { - part[i].start_sector_abs = 0; - part[i].no_of_sectors_abs = 0; - } - else - { - part[i].start_sector_abs = read_le8 (&data[32]); - part[i].no_of_sectors_abs = read_le8 (&data[40]); -#ifdef DEBUG - fprintf (stderr, "%d: %llu - %llu\n", i, - part[i].start_sector_abs, - part[i].no_of_sectors_abs); -#endif - /* Convert end to a number. */ - part[i].no_of_sectors_abs -= - part[i].start_sector_abs - 1; - } - off += entry_size; - } - - fail = nbr_part; - -done: - if (fd) - fclose(fd); - return fail; -} - -/* Read an MBR entry. */ -static void -read_mbr_record (unsigned char pi[16], struct pentry *res) -{ - res->bootable = *pi; - res->start_head = *(pi + 1); - res->start_cylinder = *(pi + 3) | ((*(pi + 2) << 2) & 0x300); - res->start_sector = *(pi + 2) & 0x3f; - res->system = *(pi + 4); - res->end_head = *(pi + 5); - res->end_cylinder = *(pi + 7) | ((*(pi + 6) << 2) & 0x300); - res->end_sector = *(pi + 6) & 0x3f; - res->start_sector_abs = read_le4 (&pi[8]); - res->no_of_sectors_abs = read_le4 (&pi[12]); -} - -/* Returns the number of partitions, -1 in case of failure. */ -int load_mbr(const char *diskimage, struct pentry *parttbl[]) -{ - FILE *fd; - size_t size; - int fail = -1; - int nbr_part; - int i; - unsigned char *pi; - unsigned char data [SECSIZE]; - unsigned long long extent; - struct pentry *part; - - nbr_part = 0; - - fd = fopen(diskimage, "r"); - if (fd == NULL) - { - perror(diskimage); - goto done; - } - size = fread (&data, 1, sizeof(data), fd); - if (size < (size_t)sizeof(data)) - { - fprintf(stderr, "Could not read the entire first sector of %s.\n", diskimage); - goto done; - } - - if (data [510] != 0x55 || data [511] != 0xaa) - { - fprintf(stderr,"MBR signature mismatch (invalid partition table?)\n"); - goto done; - } - - /* There is at most 4*4 + 4 = 20 entries, also there should be only - one extended partition. */ - part = malloc (20 * sizeof (struct pentry)); - if (part == NULL) - { - fprintf(stderr,"Cannot allocate memory\n"); - goto done; - } - *parttbl = part; - - /* Read MBR. */ - nbr_part = 4; - for (i = 0; i < 4; i++) - { - pi = &data [446 + 16 * i]; - read_mbr_record (pi, &part[i]); - } - - /* Read extended partitions. */ - for (i = 0; i < 4; i++) - { - if (part[i].system == 0xF || part[i].system == 0x5) - { - int j; - - extent = part[i].start_sector_abs * SECSIZE; - - fseeko (fd, extent, SEEK_SET); - size = fread (&data, 1, sizeof(data), fd); - if (size < (size_t)sizeof(data)) - { - fprintf(stderr, "Could not read extended partition of %s.", diskimage); - goto done; - } - - for (j = 0; j < 4; j++) - { - int n; - pi = &data [446 + 16 * j]; - n = nbr_part + j; - read_mbr_record (pi, &part[n]); - } - - nbr_part += 4; - } - } - - fail = nbr_part; - -done: - if (fd) - fclose(fd); - return fail; -} - -void usage(void) -{ - fprintf(stderr, "Usage: lomount [-verbose] [OPTIONS] -diskimage FILE -partition NUM [OPTIONS]\n"); - fprintf(stderr, "All OPTIONS are passed through to 'mount'.\n"); - fprintf(stderr, "ex. lomount -t fs-type -diskimage hda.img -partition 1 /mnt\n"); - exit(ERR_USAGE); -} - -int main(int argc, char ** argv) -{ - int status; - int nbr_part; - struct pentry *parttbl; - char buf[BUF], argv2[BUF]; - const char * diskimage = NULL; - int partition = 0; - unsigned long long sec, num, pnum; - int i; - size_t argv2_len = sizeof(argv2); - int verbose = 0; - - argv2[0] = '\0'; - - for (i = 1; i < argc; i ++) - { - if (strcmp(argv[i], "-diskimage")==0) - { - if (i == argc-1) - usage(); - i++; - diskimage = argv[i]; - } - else if (strcmp(argv[i], "-partition")==0) - { - if (i == argc-1) - usage(); - i++; - partition = atoi(argv[i]); - } - else if (strcmp(argv[i], "-verbose")==0) - { - verbose++; - } - else - { - size_t len = strlen(argv[i]); - if (len >= argv2_len-1) - usage(); - strcat(argv2, argv[i]); - strcat(argv2, " "); - len -= (len+1); - } - } - if (! diskimage || partition < 0) - usage(); - - nbr_part = load_mbr(diskimage, &parttbl); - if (check_gpt (parttbl, nbr_part)) { - free (parttbl); - nbr_part = load_gpt (diskimage, &parttbl); - } - if (nbr_part < 0) - return ERR_PART_PARSE; - if (partition == 0) - { - printf("Please specify a partition number. Table is:\n"); - printf("Num Start - End OS Bootable\n"); - for (i = 0; i < nbr_part; i++) - { - if (parttbl[i].no_of_sectors_abs != 0) - { - printf ("%2d: ", i + 1); - disp_entry (&parttbl[i]); - } - } - if (partition == 0) - return 0; - } - /* NOTE: need to make sure this always rounds down */ - //sec = total_known_sectors / sizeof_diskimage; - /* The above doesn't work unless the disk image is completely - filled by partitions ... unused space will thrown off the - sector size. The calculation assumes the disk image is - completely filled, and that the few sectors used to store - the partition table/MBR are few enough that the calculated - value is off by (larger than) a value less than one. */ - sec = 512; /* TODO: calculate real sector size */ -#ifdef DEBUG - printf("sec: %llu\n", sec); -#endif - if (partition > nbr_part) - { - fprintf(stderr, "Bad partition number\n"); - return ERR_NO_EPART; - } - num = parttbl[partition-1].start_sector_abs; - if (num == 0) - { - fprintf(stderr, "Partition %d was not found in %s.\n", - partition, diskimage); - return ERR_NO_PART; - } - - pnum = sec * num; -#ifdef DEBUG - printf("offset = %llu\n", pnum); -#endif - snprintf(buf, sizeof(buf), "mount -oloop,offset=%lld %s %s", - pnum, diskimage, argv2); - if (verbose) - printf("%s\n", buf); - - status = system(buf); - if (WIFEXITED(status)) - status = WEXITSTATUS(status); - else - status = ERR_MOUNT; - return status; -} -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 6/9] tools: remove lomount 2013-07-31 15:15 ` [PATCH 6/9] tools: remove lomount Ian Campbell @ 2013-08-07 15:08 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:08 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 6/9] tools: remove lomount"): > Build was disabled by default in 2008 (9bb7f7e2aca49). As noted at the time > people should be using kpartx these days instead. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 7/9] .*ignore: remove some cruft 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (5 preceding siblings ...) 2013-07-31 15:15 ` [PATCH 6/9] tools: remove lomount Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:09 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 8/9] tools: disable blktap1 build by default Ian Campbell ` (4 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell Just a few things which I noticed which I'm sure aren't relevant now. I'm sure there is plent of other cruft but I didn't do any sort of audit. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- .gitignore | 15 --------------- .hgignore | 15 --------------- 2 files changed, 0 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 2feac20..c82a372 100644 --- a/.gitignore +++ b/.gitignore @@ -210,11 +210,6 @@ tools/libxl/_libxl.api-for-check tools/libxl/*.api-ok tools/misc/cpuperf/cpuperf-perfcntr tools/misc/cpuperf/cpuperf-xen -tools/misc/mbootpack/bin2c -tools/misc/mbootpack/bootsect -tools/misc/mbootpack/bzimage_header.c -tools/misc/mbootpack/mbootpack -tools/misc/mbootpack/setup tools/misc/xc_shadow tools/misc/xen_cpuperf tools/misc/xen-detect @@ -244,15 +239,6 @@ tools/tests/regression/build/* tools/tests/regression/downloads/* tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj -tools/vnet/Make.local -tools/vnet/build/* -tools/vnet/gc -tools/vnet/gc*/* -tools/vnet/vnet-module/*.ko -tools/vnet/vnet-module/.*.cmd -tools/vnet/vnet-module/.tmp_versions/* -tools/vnet/vnet-module/vnet_module.mod.* -tools/vnet/vnetd/vnetd tools/vtpm/tpm_emulator-*.tar.gz tools/vtpm/tpm_emulator/* tools/vtpm/vtpm/* @@ -306,7 +292,6 @@ tools/xm-test/lib/XmTestReport/xmtest.py tools/xm-test/tests/*.test tools/ocaml-xenstored* xen/.banner* -xen/BLOG xen/System.map xen/arch/arm/asm-offsets.s xen/arch/arm/xen.lds diff --git a/.hgignore b/.hgignore index 87ab478..05cb0de 100644 --- a/.hgignore +++ b/.hgignore @@ -203,11 +203,6 @@ ^tools/libvchan/vchan-node[12]$ ^tools/misc/cpuperf/cpuperf-perfcntr$ ^tools/misc/cpuperf/cpuperf-xen$ -^tools/misc/mbootpack/bin2c$ -^tools/misc/mbootpack/bootsect$ -^tools/misc/mbootpack/bzimage_header\.c$ -^tools/misc/mbootpack/mbootpack$ -^tools/misc/mbootpack/setup$ ^tools/misc/xc_shadow$ ^tools/misc/xen_cpuperf$ ^tools/misc/xen-detect$ @@ -242,15 +237,6 @@ ^tools/tests/xen-access/xen-access$ ^tools/tests/mem-sharing/memshrtool$ ^tools/tests/mce-test/tools/xen-mceinj$ -^tools/vnet/Make.local$ -^tools/vnet/build/.*$ -^tools/vnet/gc$ -^tools/vnet/gc.*/.*$ -^tools/vnet/vnet-module/.*\.ko$ -^tools/vnet/vnet-module/\..*\.cmd$ -^tools/vnet/vnet-module/\.tmp_versions/.*$ -^tools/vnet/vnet-module/vnet_module\.mod\..*$ -^tools/vnet/vnetd/vnetd$ ^tools/vtpm/tpm_emulator-.*\.tar\.gz$ ^tools/vtpm/tpm_emulator/.*$ ^tools/vtpm/vtpm/.*$ @@ -331,7 +317,6 @@ ^config/Stubdom\.mk$ ^config/Docs\.mk$ ^xen/\.banner.*$ -^xen/BLOG$ ^xen/System.map$ ^xen/arch/arm/asm-offsets\.s$ ^xen/arch/arm/xen\.lds$ -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH 7/9] .*ignore: remove some cruft 2013-07-31 15:15 ` [PATCH 7/9] .*ignore: remove some cruft Ian Campbell @ 2013-08-07 15:09 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:09 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 7/9] .*ignore: remove some cruft"): > Just a few things which I noticed which I'm sure aren't relevant > now. I'm sure there is plent of other cruft but I didn't do any sort > of audit. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> I haven't reviewed this at all. If any of it turns out to have been removed by mistake we can put it back easily enough. Ian. ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 8/9] tools: disable blktap1 build by default 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (6 preceding siblings ...) 2013-07-31 15:15 ` [PATCH 7/9] .*ignore: remove some cruft Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:13 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 9/9] tools: drop 'sv' Ian Campbell ` (3 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell I don't think there are any dom0's around whose kernels support only blktap1 and not something newer like blktap2 or qdisk. Certainly not that you would want to run Xen 4.4 on. libxl will never use blktap1. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- XXX Needs a QEMU TAG update to pull in "qemu-xen-traditional: allow build without blktap1" once that change is applied. --- config/Tools.mk.in | 1 + tools/Makefile | 4 ++-- tools/configure | 26 ++++++++++++++++++++++++++ tools/configure.ac | 1 + tools/hotplug/Linux/Makefile | 4 +++- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 7ee1581..1915295 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -51,6 +51,7 @@ CONFIG_OVMF := @ovmf@ CONFIG_ROMBIOS := @rombios@ CONFIG_SEABIOS := @seabios@ CONFIG_XEND := @xend@ +CONFIG_BLKTAP1 := @blktap1@ #System options ZLIB := @zlib@ diff --git a/tools/Makefile b/tools/Makefile index 5d4fe10..65cc256 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -16,8 +16,8 @@ SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xenstat SUBDIRS-$(CONFIG_Linux) += memshr -ifeq ($(CONFIG_X86),y) -SUBDIRS-$(CONFIG_Linux) += blktap +ifeq ($(CONFIG_X86)$(CONFIG_Linux),yy) +SUBDIRS-$(CONFIG_BLKTAP1) += blktap endif SUBDIRS-$(CONFIG_Linux) += blktap2 SUBDIRS-$(CONFIG_NetBSD) += blktap2 diff --git a/tools/configure b/tools/configure index 8df24e6..ad4b5fe 100755 --- a/tools/configure +++ b/tools/configure @@ -654,6 +654,7 @@ APPEND_LIB APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES +blktap1 xend debug seabios @@ -732,6 +733,7 @@ enable_rombios enable_seabios enable_debug enable_xend +enable_blktap1 ' ac_precious_vars='build_alias host_alias @@ -1391,6 +1393,7 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) --disable-xend Disable xend toolstack (default is ENABLED) + --enable-blktap1 Disable blktap1 tools (default is DISABLED) Some influential environment variables: CC C compiler command @@ -3628,6 +3631,29 @@ xend=$ax_cv_xend +# Check whether --enable-blktap1 was given. +if test "${enable_blktap1+set}" = set; then : + enableval=$enable_blktap1; +fi + + +if test "x$enable_blktap1" = "xno"; then : + + ax_cv_blktap1="n" + +elif test "x$enable_blktap1" = "xyes"; then : + + ax_cv_blktap1="y" + +elif test -z $ax_cv_blktap1; then : + + ax_cv_blktap1="n" + +fi +blktap1=$ax_cv_blktap1 + + + diff --git a/tools/configure.ac b/tools/configure.ac index 2a72d02..1b4625a 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -58,6 +58,7 @@ AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AX_ARG_DEFAULT_ENABLE([xend], [Disable xend toolstack]) +AX_ARG_DEFAULT_DISABLE([blktap1], [Disable blktap1 tools]) AC_ARG_VAR([PREPEND_INCLUDES], [List of include folders to prepend to CFLAGS (without -I)]) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index b7737ab..47655f6 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -18,11 +18,13 @@ XEN_SCRIPTS += vif2 XEN_SCRIPTS += vif-setup XEN_SCRIPTS += block XEN_SCRIPTS += block-enbd block-nbd -XEN_SCRIPTS += blktap +XEN_SCRIPTS-$(CONFIG_BLKTAP1) += blktap XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += vscsi XEN_SCRIPTS += block-iscsi +XEN_SCRIPTS += $(XEN_SCRIPTS-y) + XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA += block-common.sh -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 8/9] tools: disable blktap1 build by default 2013-07-31 15:15 ` [PATCH 8/9] tools: disable blktap1 build by default Ian Campbell @ 2013-08-07 15:13 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:13 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 8/9] tools: disable blktap1 build by default"): > I don't think there are any dom0's around whose kernels support only blktap1 > and not something newer like blktap2 or qdisk. Certainly not that you would > want to run Xen 4.4 on. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > XXX Needs a QEMU TAG update to pull in "qemu-xen-traditional: allow build > without blktap1" once that change is applied. Presumably if this patch had gone in first, it would have broken the build. Anyway, I have pushed the qemu change. Thanks, Ian. ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 9/9] tools: drop 'sv' 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (7 preceding siblings ...) 2013-07-31 15:15 ` [PATCH 8/9] tools: disable blktap1 build by default Ian Campbell @ 2013-07-31 15:15 ` Ian Campbell 2013-08-07 15:13 ` Ian Jackson 2013-07-31 15:29 ` [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Andrew Cooper ` (2 subsequent siblings) 11 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:15 UTC (permalink / raw) To: xen-devel; +Cc: keir, ian.jackson, Ian Campbell I'm not even sure what this thing is. Looks like some sort of Twisted Python based frontend to xend. Whatever it is I am perfectly sure no one can be using it. Apart from drive by build fixes caused by updates elsewhere it has seen no real development since 2005. I suspect it was never even finished/usable. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- tools/python/setup.py | 1 - tools/python/xen/sv/CreateDomain.py | 205 -------------------------- tools/python/xen/sv/DomInfo.py | 268 ---------------------------------- tools/python/xen/sv/GenTabbed.py | 147 ------------------- tools/python/xen/sv/HTMLBase.py | 53 ------- tools/python/xen/sv/Main.py | 82 ----------- tools/python/xen/sv/NodeInfo.py | 73 --------- tools/python/xen/sv/RestoreDomain.py | 50 ------- tools/python/xen/sv/Wizard.py | 245 ------------------------------- tools/python/xen/sv/__init__.py | 1 - tools/python/xen/sv/util.py | 126 ---------------- tools/sv/Makefile | 3 - tools/sv/images/destroy.png | Bin 2408 -> 0 bytes tools/sv/images/finish.png | Bin 1189 -> 0 bytes tools/sv/images/next.png | Bin 1270 -> 0 bytes tools/sv/images/pause.png | Bin 1662 -> 0 bytes tools/sv/images/previous.png | Bin 1285 -> 0 bytes tools/sv/images/reboot.png | Bin 3132 -> 0 bytes tools/sv/images/shutdown.png | Bin 2901 -> 0 bytes tools/sv/images/small-destroy.png | Bin 483 -> 0 bytes tools/sv/images/small-pause.png | Bin 434 -> 0 bytes tools/sv/images/small-unpause.png | Bin 500 -> 0 bytes tools/sv/images/unpause.png | Bin 1890 -> 0 bytes tools/sv/images/xen.png | Bin 10575 -> 0 bytes tools/sv/inc/script.js | 31 ---- tools/sv/inc/style.css | 95 ------------ tools/sv/index.psp | 34 ----- 27 files changed, 0 insertions(+), 1414 deletions(-) delete mode 100755 tools/python/xen/sv/CreateDomain.py delete mode 100755 tools/python/xen/sv/DomInfo.py delete mode 100755 tools/python/xen/sv/GenTabbed.py delete mode 100755 tools/python/xen/sv/HTMLBase.py delete mode 100755 tools/python/xen/sv/Main.py delete mode 100755 tools/python/xen/sv/NodeInfo.py delete mode 100755 tools/python/xen/sv/RestoreDomain.py delete mode 100755 tools/python/xen/sv/Wizard.py delete mode 100755 tools/python/xen/sv/__init__.py delete mode 100755 tools/python/xen/sv/util.py delete mode 100644 tools/sv/Makefile delete mode 100755 tools/sv/images/destroy.png delete mode 100755 tools/sv/images/finish.png delete mode 100755 tools/sv/images/next.png delete mode 100755 tools/sv/images/pause.png delete mode 100755 tools/sv/images/previous.png delete mode 100755 tools/sv/images/reboot.png delete mode 100755 tools/sv/images/shutdown.png delete mode 100755 tools/sv/images/small-destroy.png delete mode 100755 tools/sv/images/small-pause.png delete mode 100755 tools/sv/images/small-unpause.png delete mode 100755 tools/sv/images/unpause.png delete mode 100755 tools/sv/images/xen.png delete mode 100755 tools/sv/inc/script.js delete mode 100755 tools/sv/inc/style.css delete mode 100755 tools/sv/index.psp diff --git a/tools/python/setup.py b/tools/python/setup.py index 8e584e6..8127b21 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -132,7 +132,6 @@ setup(name = 'xen', description = 'Xen', packages = ['xen', 'xen.lowlevel', - 'xen.sv', ] + xend_packages, ext_package = "xen.lowlevel", ext_modules = modules diff --git a/tools/python/xen/sv/CreateDomain.py b/tools/python/xen/sv/CreateDomain.py deleted file mode 100755 index 748d99b..0000000 --- a/tools/python/xen/sv/CreateDomain.py +++ /dev/null @@ -1,205 +0,0 @@ -from xen.sv.Wizard import * -from xen.sv.util import * -from xen.sv.GenTabbed import PreTab - -from xen.xm.create import make_config, OptVals - -from xen.xend.XendClient import server - -class CreateDomain( Wizard ): - def __init__( self, urlWriter ): - - sheets = [ CreatePage0, - CreatePage1, - CreatePage2, - CreatePage3, - CreatePage4, - CreateFinish ] - - Wizard.__init__( self, urlWriter, "Create Domain", sheets ) - - def op_finish( self, request ): - pass - -class CreatePage0( Sheet ): - - title = "General" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "General", 0 ) - self.addControl( InputControl( 'name', 'VM Name', 'VM Name:', "[\\w|\\S]+", "You must enter a name in this field" ) ) - self.addControl( InputControl( 'memory', '64', 'Memory (Mb):', "[\\d]+", "You must enter a number in this field" ) ) - self.addControl( InputControl( 'cpu', '0', 'CPU:', "[\\d]+", "You must enter a number in this feild" ) ) - self.addControl( InputControl( 'cpu_weight', '1', 'CPU Weight:', "[\\d]+", "You must enter a number in this feild" ) ) - self.addControl( InputControl( 'vcpus', '1', 'Virtual CPUs:', '[\\d]+', "You must enter a number in this feild") ) - -class CreatePage1( Sheet ): - - title = "Setup Kernel Image" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "Setup Kernel Image", 1 ) - self.addControl( ListControl( 'builder', [('linux', 'Linux'), ('netbsd', 'NetBSD')], 'Domain Builder:' ) ) - self.addControl( FileControl( 'kernel', '/boot/vmlinuz-2.6.12-xenU', 'Kernel Image:' ) ) - self.addControl( InputControl( 'extra', '', 'Kernel Command Line Parameters:' ) ) - self.addControl( ListControl( 'use-initrd', [('yes', 'Yes'), ('no', 'No')], 'Use an Initial Ram Disk?:' ) ) - self.addControl( FileControl( 'initrd', '/boot/initrd-2.6.12-xenU.img', 'Initial Ram Disk:' ) ) - - def validate( self, request ): - if not self.passback: self.parseForm( request ) - check = True - request.write( previous_values.get( '>>>>>use-initrd' ) ) - previous_values = ssxp2hash( string2sxp( self.passback ) ) #get the map for quick reference - if DEBUG: print previous_values - for (feild, control) in self.feilds: - if feild == 'initrd' and previous_values.get( 'use-initrd' ) != 'no': - request.write( previous_values.get( '>>>>>use-initrd' ) ) - if control.validate( previous_values.get( feild ) ): - check = False - elif not control.validate( previous_values.get( feild ) ): - check = False - - if DEBUG: print "> %s = %s" % (feild, previous_values.get( feild )) - - return check - - -class CreatePage2( Sheet ): - - title = "Choose number of VBDS" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "Setup Virtual Block Device", 2 ) - self.addControl( InputControl( 'num_vbds', '1', 'Number of VBDs:', '[\\d]+', "You must enter a number in this field" ) ) - -class CreatePage3( Sheet ): - - title = "Setup VBDS" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "Setup Virtual Block Device", 3 ) - - def write_BODY( self, request ): - if not self.passback: self.parseForm( request ) - - previous_values = sxp2hash( string2sxp( self.passback ) ) #get the hash for quick reference - - num_vbds = previous_values.get( 'num_vbds' ) - - for i in range( int( num_vbds ) ): - self.addControl( InputControl( 'vbd%s_dom0' % i, 'phy:sda%s' % str(i + 1), 'Device %s name:' % i ) ) - self.addControl( InputControl( 'vbd%s_domU' % i, 'sda%s' % str(i + 1), 'Virtualized device %s:' % i ) ) - self.addControl( ListControl( 'vbd%s_mode' % i, [('w', 'Read + Write'), ('r', 'Read Only')], 'Device %s mode:' % i ) ) - - self.addControl( InputControl( 'root', '/dev/sda1', 'Root device (in VM):' ) ) - - Sheet.write_BODY( self, request ) - -class CreatePage4( Sheet ): - - title = "Network Setting" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "Network settings", 4 ) - self.addControl( ListControl( 'dhcp', [('off', 'No'), ('dhcp', 'Yes')], 'Use DHCP:' ) ) - self.addControl( InputControl( 'hostname', 'hostname', 'VM Hostname:' ) ) - self.addControl( InputControl( 'ip_addr', '192.168.1.1', 'VM IP Address:' ) ) - self.addControl( InputControl( 'ip_subnet', '255.255.255.0', 'VM Subnet Mask:' ) ) - self.addControl( InputControl( 'ip_gateway', '192.168.1.1', 'VM Gateway:' ) ) - self.addControl( InputControl( 'ip_nfs', '192.168.1.1', 'NFS Server:' ) ) - -class CreateFinish( Sheet ): - - title = "Finish" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "All Done", 5 ) - - def write_BODY( self, request ): - - if not self.passback: self.parseForm( request ) - - xend_sxp = self.translate_sxp( string2sxp( self.passback ) ) - - request.write( "<pre>%s</pre>" % sxp2prettystring( xend_sxp ) ) - - try: - server.xend_domain_create( xend_sxp ) - request.write( "<p>You domain had been successfully created.</p>" ) - except Exception, e: - request.write( "<p>There was an error creating your domain.<br/>The configuration used is as follows:\n</p>" ) - request.write( "<pre>%s</pre>" % sxp2prettystring( xend_sxp ) ) - request.write( "<p>The error was:</p>" ) - request.write( "<pre>%s</pre>" % str( e ) ) - - request.write( "<input type='hidden' name='passback' value=\"%s\"></p>" % self.passback ) - request.write( "<input type='hidden' name='sheet' value='%s'></p>" % self.location ) - - def translate_sxp( self, fin_sxp ): - fin_hash = ssxp2hash( fin_sxp ) - - def get( key ): - ret = fin_hash.get( key ) - if ret: - return ret - else: - return "" - - vals = OptVals() - - vals.name = get( 'name' ) - vals.memory = get( 'memory' ) - vals.maxmem = get( 'maxmem' ) - vals.cpu = get( 'cpu' ) - vals.cpu_weight = get( 'cpu_weight' ) - vals.vcpus = get( 'vcpus' ) - - vals.builder = get( 'builder' ) - vals.kernel = get( 'kernel' ) - vals.root = get( 'root' ) - vals.extra = get( 'extra' ) - - #setup vbds - - vbds = [] - - for i in range( int( get( 'num_vbds' ) ) ): - vbds.append( ( get( 'vbd%s_dom0' % i ), get('vbd%s_domU' % i ), get( 'vbd%s_mode' % i ), None ) ) - - vals.disk = vbds - - #misc - - vals.pci = [] - - vals.blkif = None - vals.netif = None - vals.restart = None - vals.console = None - vals.ramdisk = None - vals.ssidref = -1 - vals.bootloader = None - vals.usb = [] - vals.acpi = [] - - #setup vifs - - vals.vif = [] - vals.nics = 1 - - ip = get( 'ip_addr' ) - nfs = get( 'ip_nfs' ) - gate = get( 'ip_gateway' ) - mask = get( 'ip_subnet' ) - host = get( 'hostname' ) - dhcp = get( 'dhcp' ) - - vals.cmdline_ip = "%s:%s:%s:%s:%s:eth0:%s" % (ip, nfs, gate, mask, host, dhcp) - - opts = None - - try: - return make_config( opts, vals ) - except Exception, e: - return [["There was an error creating the domain config SXP. This is typically due to an interface change in xm/create.py:make_config", e]] - diff --git a/tools/python/xen/sv/DomInfo.py b/tools/python/xen/sv/DomInfo.py deleted file mode 100755 index 89feca0..0000000 --- a/tools/python/xen/sv/DomInfo.py +++ /dev/null @@ -1,268 +0,0 @@ -from xen.xend.XendClient import server -from xen.xend import PrettyPrint - -from xen.sv.HTMLBase import HTMLBase -from xen.sv.util import * -from xen.sv.GenTabbed import * -from xen.sv.Wizard import * - -DEBUG=1 - -class DomInfo( GenTabbed ): - - def __init__( self, urlWriter ): - - self.dom = 0; - - GenTabbed.__init__( self, "Domain Info", urlWriter, [ 'General', 'SXP', 'Devices', 'Migrate', 'Save' ], [ DomGeneralTab, DomSXPTab, DomDeviceTab, DomMigrateTab, DomSaveTab ] ) - - def write_BODY( self, request ): - try: - dom = int( getVar( 'dom', request ) ) - except: - request.write( "<p>Please Select a Domain</p>" ) - return None - - GenTabbed.write_BODY( self, request ) - - def write_MENU( self, request ): - domains = [] - - try: - domains = server.xend_domains() - domains.sort() - except: - pass - - request.write( "\n<table style='border:0px solid white' cellspacing='0' cellpadding='0' border='0' width='100%'>\n" ) - request.write( "<tr class='domainInfoHead'>" ) - request.write( "<td class='domainInfoHead' align='center'>Domain</td>\n" ) - request.write( "<td class='domainInfoHead' align='center'>Name</td>\n" ) - request.write( "<td class='domainInfoHead' align='center'>State</td>\n" ) - request.write( "<td class='domainInfoHead' align='center'></td>\n" ) - request.write( "</tr>" ) - - odd = True - if not domains is None: - for domain in domains: - odd = not odd; - if odd: - request.write( "<tr class='domainInfoOdd'>\n" ) - else: - request.write( "<tr class='domainInfoEven'>\n" ) - domInfo = getDomInfo( domain ) - request.write( "<td class='domainInfo' align='center'>%(id)s</td>\n" % domInfo ) - url = self.urlWriter( "&dom=%(id)s" % domInfo ) - request.write( "<td class='domainInfo' align='center'><a href='%s'>%s</a></td>\n" % ( url, domInfo['name'] ) ) - request.write( "<td class='domainInfo' align='center'>%(state)5s</td>\n" % domInfo ) - if domInfo[ 'id' ] != "0": - request.write( "<td class='domainInfo' align='center'>" ) - if domInfo[ 'state' ][ 2 ] == "-": - request.write( "<img src='images/small-pause.png' onclick='doOp2( \"pause\", \"%(dom)-4s\" )'>" % domInfo ) - else: - request.write( "<img src='images/small-unpause.png' onclick='doOp2( \"unpause\", \"%(dom)-4s\" )'>" % domInfo ) - request.write( "<img src='images/small-destroy.png' onclick='doOp2( \"destroy\", \"%(dom)-4s\" )'></td>" % domInfo ) - else: - request.write( "<td> </td>" ) - request.write( "</tr>\n" ) - else: - request.write( "<tr colspan='10'><p class='small'>Error getting domain list<br/>Perhaps XenD not running?</p></tr>") - request.write( "</table>" ) - -class DomGeneralTab( CompositeTab ): - def __init__( self, urlWriter ): - CompositeTab.__init__( self, [ DomGenTab, DomActionTab ], urlWriter ) - -class DomGenTab( GeneralTab ): - - def __init__( self, _ ): - - titles = {} - - titles[ 'ID' ] = 'dom' - titles[ 'Name' ] = 'name' - titles[ 'CPU' ] = 'cpu' - titles[ 'Memory' ] = ( 'mem', memoryFormatter ) - titles[ 'State' ] = ( 'state', stateFormatter ) - titles[ 'Total CPU' ] = ( 'cpu_time', smallTimeFormatter ) - titles[ 'Up Time' ] = ( 'up_time', bigTimeFormatter ) - - GeneralTab.__init__( self, {}, titles ) - - def write_BODY( self, request ): - - self.dom = getVar('dom', request) - - if self.dom is None: - request.write( "<p>Please Select a Domain</p>" ) - return None - - self.dict = getDomInfo( self.dom ) - - GeneralTab.write_BODY( self, request ) - -class DomSXPTab( PreTab ): - - def __init__( self, _ ): - self.dom = 0 - PreTab.__init__( self, "" ) - - - def write_BODY( self, request ): - self.dom = getVar('dom', request) - - if self.dom is None: - request.write( "<p>Please Select a Domain</p>" ) - return None - - try: - domInfo = server.xend_domain( self.dom ) - except: - domInfo = [["Error getting domain details."]] - - self.source = sxp2prettystring( domInfo ) - - PreTab.write_BODY( self, request ) - -class DomActionTab( ActionTab ): - - def __init__( self, _ ): - actions = { "shutdown" : "Shutdown", - "reboot" : "Reboot", - "pause" : "Pause", - "unpause" : "Unpause", - "destroy" : "Destroy" } - ActionTab.__init__( self, actions ) - - def op_shutdown( self, request ): - dom = getVar( 'dom', request ) - if not dom is None and dom != '0': - if DEBUG: print ">DomShutDown %s" % dom - try: - server.xend_domain_shutdown( int( dom ), "poweroff" ) - except: - pass - - def op_reboot( self, request ): - dom = getVar( 'dom', request ) - if not dom is None and dom != '0': - if DEBUG: print ">DomReboot %s" % dom - try: - server.xend_domain_shutdown( int( dom ), "reboot" ) - except: - pass - - def op_pause( self, request ): - dom = getVar( 'dom', request ) - if not dom is None and dom != '0': - if DEBUG: print ">DomPause %s" % dom - try: - server.xend_domain_pause( int( dom ) ) - except: - pass - - def op_unpause( self, request ): - dom = getVar( 'dom', request ) - if not dom is None and dom != '0': - if DEBUG: print ">DomUnpause %s" % dom - try: - server.xend_domain_unpause( int( dom ) ) - except: - pass - - def op_destroy( self, request ): - dom = getVar( 'dom', request ) - if not dom is None and dom != '0': - if DEBUG: print ">DomDestroy %s" % dom - try: - server.xend_domain_destroy(int( dom )) - except: - pass - -class DomDeviceTab( CompositeTab ): - - def __init__( self, urlWriter ): - CompositeTab.__init__( self, [ DomDeviceListTab, DomDeviceOptionsTab, DomDeviceActionTab ], urlWriter ) - -class DomDeviceListTab( NullTab ): - - title = "Device List" - - def __init__( self, _ ): - pass - -class DomDeviceOptionsTab( NullTab ): - - title = "Device Options" - - def __init__( self, _ ): - pass - -class DomDeviceActionTab( ActionTab ): - - def __init__( self, _ ): - ActionTab.__init__( self, { "addvcpu" : "Add VCPU", "addvbd" : "Add VBD", "addvif" : "Add VIF" } ) - -class DomMigrateTab( CompositeTab ): - - def __init__( self, urlWriter ): - CompositeTab.__init__( self, [ DomMigrateExtraTab, DomMigrateActionTab ], urlWriter ) - -class DomMigrateExtraTab( Sheet ): - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "Configure Migration", 0) - self.addControl( TickControl('live', 'True', 'Live migrate:') ) - self.addControl( InputControl('rate', '0', 'Rate limit:') ) - self.addControl( InputControl( 'dest', 'host.domain', 'Name or IP address:', ".*") ) - -class DomMigrateActionTab( ActionTab ): - - def __init__( self, _ ): - actions = { "migrate" : "Migrate" } - ActionTab.__init__( self, actions ) - - def op_migrate( self, request ): - try: - domid = int( getVar( 'dom', request ) ) - live = getVar( 'live', request ) - rate = getVar( 'rate', request ) - dest = getVar( 'dest', request ) - dom_sxp = server.xend_domain_migrate( domid, dest, live == 'True', rate ) - success = "Your domain was successfully Migrated.\n" - except Exception, e: - success = "There was an error migrating your domain\n" - dom_sxp = str(e) - -class DomSaveTab( CompositeTab ): - - def __init__( self, urlWriter ): - CompositeTab.__init__( self, [ DomSaveExtraTab, DomSaveActionTab ], urlWriter ) - -class DomSaveExtraTab( Sheet ): - - title = "Save location" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "Save Domain to file", 0 ) - self.addControl( InputControl( 'file', '', 'Suspend file name:', ".*") ) - -class DomSaveActionTab( ActionTab ): - - def __init__( self, _ ): - actions = { "save" : "Save" } - ActionTab.__init__( self, actions ) - - def op_save( self, request ): - - try: - dom_sxp = server.xend_domain_save( config['domid'], config['file'] ) - success = "Your domain was successfully saved.\n" - except Exception, e: - success = "There was an error saving your domain\n" - dom_sxp = str(e) - - try: - dom = int( getVar( 'dom', request ) ) - except: - pass diff --git a/tools/python/xen/sv/GenTabbed.py b/tools/python/xen/sv/GenTabbed.py deleted file mode 100755 index 6631663..0000000 --- a/tools/python/xen/sv/GenTabbed.py +++ /dev/null @@ -1,147 +0,0 @@ -import types - -from xen.sv.HTMLBase import HTMLBase -from xen.sv.util import getVar - -class GenTabbed( HTMLBase ): - - def __init__( self, title, urlWriter, tabStrings, tabObjects ): - HTMLBase.__init__(self) - self.tabStrings = tabStrings - self.tabObjects = tabObjects - self.urlWriter = urlWriter - self.title = title - - def write_BODY( self, request ): - if not self.__dict__.has_key( "tab" ): - try: - self.tab = int( getVar( 'tab', request, 0 ) ) - except: - self.tab = 0 - - request.write( "\n<div class='title'>%s</div>" % self.title ) - - TabView( self.tab, self.tabStrings, self.urlWriter ).write_BODY( request ) - - try: - request.write( "\n<div class='tab'>" ) - render_tab = self.tabObjects[ self.tab ] - render_tab( self.urlWriter ).write_BODY( request ) - request.write( "\n</div>" ) - except Exception, e: - request.write( "\n<p>Error Rendering Tab</p>" ) - request.write( "\n<p>%s</p>" % str( e ) ) - - request.write( "\n<input type=\"hidden\" name=\"tab\" value=\"%d\">" % self.tab ) - - def perform( self, request ): - request.write( "Tab> perform" ) - request.write( "<br/>op: " + str( getVar( 'op', request ) ) ) - request.write( "<br/>args: " + str( getVar( 'args', request ) ) ) - request.write( "<br/>tab: " + str( getVar( 'tab', request ) ) ) - - try: - action = getVar( 'op', request, 0 ) - if action == "tab": - self.tab = int( getVar( 'args', request ) ) - else: - this.tab = int( getVar( 'tab', request, 0 ) ) - self.tabObjects[ self.tab ]( self.urlWriter ).perform( request ) - except: - pass - -class PreTab( HTMLBase ): - - def __init__( self, source ): - HTMLBase.__init__( self ) - self.source = source - - def write_BODY( self, request ): - request.write( "\n<pre>" ) - request.write( self.source ) - request.write( "\n</pre>" ) - -class GeneralTab( HTMLBase ): - - def __init__( self, dict, titles ): - HTMLBase.__init__( self ) - self.dict = dict - self.titles = titles - - def write_BODY( self, request ): - - request.write( "\n<table width='100%' cellspacing='0' cellpadding='0' border='0'>" ) - - def writeAttr( niceName, attr, formatter=None ): - if type( attr ) is types.TupleType: - ( attr, formatter ) = attr - - if attr in self.dict: - if formatter: - temp = formatter( self.dict[ attr ] ) - else: - temp = str( self.dict[ attr ] ) - request.write( "\n<tr><td width='50%%'><p>%s:</p></td><td width='50%%'><p>%s</p></td></tr>" % ( niceName, temp ) ) - - for niceName, attr in self.titles.items(): - writeAttr( niceName, attr ) - - request.write( "</table>" ) - -class NullTab( HTMLBase ): - - def __init__( self, title="Null Tab" ): - HTMLBase.__init__( self ) - self.title = title - - def write_BODY( self, request ): - request.write( "\n<p>%s</p>" % self.title ) - -class ActionTab( HTMLBase ): - - def __init__( self, actions ): - self.actions = actions - HTMLBase.__init__( self ) - - def write_BODY( self, request ): - for item in self.actions.items(): - try: - ((op, attr), title) = item - except: - (op, title) = item - attr = "" - request.write( "\n<div class='button' onclick=\"doOp2( '%s', '%s' )\">%s</a></div>" % (op, attr, title) ) - -class CompositeTab( HTMLBase ): - - def __init__( self, tabs, urlWriter ): - HTMLBase.__init__( self ) - self.tabs = tabs - self.urlWriter = urlWriter - - def write_BODY( self, request ): - for tab in self.tabs: - tab( self.urlWriter ).write_BODY( request ) - - def perform( self, request ): - for tab in self.tabs: - tab( self.urlWriter ).perform( request ) - -class TabView( HTMLBase ): - - # tab - int, id into tabs of selected tab - # tabs - list of strings, tab names - # urlWriter - - def __init__( self, tab, tabs, urlWriter ): - HTMLBase.__init__(self) - self.tab = tab - self.tabs = tabs - self.urlWriter = urlWriter - - def write_BODY( self, request ): - for i in range( len( self.tabs ) ): - if self.tab == i: - at = " id='activeTab'" - else: - at = "" - request.write( "\n<div%s class='tabButton' onclick=\"doOp2( 'tab', '%d' )\">%s</div>" % ( at, i, self.tabs[ i ] ) ) diff --git a/tools/python/xen/sv/HTMLBase.py b/tools/python/xen/sv/HTMLBase.py deleted file mode 100755 index d0fca13..0000000 --- a/tools/python/xen/sv/HTMLBase.py +++ /dev/null @@ -1,53 +0,0 @@ -from xen.sv.util import * - -class HTMLBase: - - isLeaf = True - - def __init__( self ): - pass - - def render_POST( self, request ): - self.perform( request ) - return self.render_GET( request ) - - def render_GET( self, request ): - pass - - def write_BODY( self, request ): - pass - - def write_TOP( self, request ): - pass - - def write_BOTTOM( self, request ): - pass - - def get_op_method(self, op): - """Get the method for an operation. - For operation 'foo' looks for 'op_foo'. - - op operation name - returns method or None - """ - op_method_name = 'op_' + op - return getattr(self, op_method_name, None) - - def perform(self, req): - """General operation handler for posted operations. - For operation 'foo' looks for a method op_foo and calls - it with op_foo(req). Replies with code 500 if op_foo - is not found. - - The method must return a list when req.use_sxp is true - and an HTML string otherwise (or list). - Methods may also return a Deferred (for incomplete processing). - - req request - """ - op = req.args.get('op') - if not op is None and len(op) == 1: - op = op[0] - op_method = self.get_op_method(op) - if op_method: - op_method( req ) diff --git a/tools/python/xen/sv/Main.py b/tools/python/xen/sv/Main.py deleted file mode 100755 index ea62af1..0000000 --- a/tools/python/xen/sv/Main.py +++ /dev/null @@ -1,82 +0,0 @@ - -from xen.sv.NodeInfo import NodeInfo -from xen.sv.DomInfo import DomInfo -from xen.sv.CreateDomain import CreateDomain -from xen.sv.RestoreDomain import RestoreDomain - -from xen.sv.util import getVar - -# adapter to make this all work with mod_python -# as opposed to Twisted -# (c) Tom Wilkie 2005 - -class Args: - def __init__( self, req ): - from mod_python.util import FieldStorage - self.fieldStorage = FieldStorage( req, True ) - - # return a list of values for the given key, - # or None if key not there - def get( self, var ): - retVar = self.fieldStorage.getlist( var ) - if len( retVar ) == 0: - return None - else: - return retVar - - # return a list of tuples, - # (key, value) where value is a list of values - def items( self ): - result = []; - for key in self.fieldStorage.keys(): - result.append( (key, self.fieldStorage.getlist( key ) ) ) - return result - -# This is the Main class -# It pieces together all the modules - -class Main: - def __init__( self ): - self.modules = { "node": NodeInfo, - "create": CreateDomain, - "restore" : RestoreDomain, - "info": DomInfo } - - self.init_done = False - - def init_modules( self, request ): - for moduleName, module in self.modules.iteritems(): - self.modules[ moduleName ] = module( self.urlWriter( moduleName, request.url ) ) - - def render_menu( self, request ): - if not self.init_done: - self.init_modules( request ) - self.init_done = True - - for _, module in self.modules.iteritems(): - module.write_MENU( request ) - request.write( "\n" ) - - def render_main( self, request ): - if not self.init_done: - self.init_modules( request ) - self.init_done = True - - moduleName = getVar('mod', request) - if moduleName not in self.modules: - request.write( '<p>Please select a module</p>' ) - else: - module = self.modules[ moduleName ] - module.write_BODY( request ) - - def do_POST( self, request ): - if not self.init_done: - self.init_modules( request ) - self.init_done = True - - moduleName = getVar( 'mod', request ) - if moduleName in self.modules: - self.modules[ moduleName ].perform( request ) - - def urlWriter( self, module, url ): - return lambda x: "%s?mod=%s%s" % ( url, module, x ) diff --git a/tools/python/xen/sv/NodeInfo.py b/tools/python/xen/sv/NodeInfo.py deleted file mode 100755 index f8b47b1..0000000 --- a/tools/python/xen/sv/NodeInfo.py +++ /dev/null @@ -1,73 +0,0 @@ -from xen.xend.XendClient import server - -from xen.sv.util import * -from xen.sv.GenTabbed import * - -class NodeInfo( GenTabbed ): - - def __init__( self, urlWriter ): - GenTabbed.__init__( self, "Node Details", urlWriter, [ 'General', 'Dmesg', 'SXP' ], [ NodeGeneralTab, NodeDmesgTab, NodeSXPTab ] ) - - def write_MENU( self, request ): - request.write( "<p class='small'><a href='%s'>Node details</a></p>" % self.urlWriter( '' ) ) - -class NodeGeneralTab( CompositeTab ): - def __init__( self, urlWriter ): - CompositeTab.__init__( self, [ NodeInfoTab, NodeActionTab ], urlWriter ) - -class NodeInfoTab( GeneralTab ): - - def __init__( self, urlWriter ): - - nodeInfo = {} - try: - nodeInfo = sxp2hash( server.xend_node() ) - except: - nodeInfo[ 'system' ] = 'Error getting node info' - - dictTitles = {} - dictTitles[ 'System' ] = 'system' - dictTitles[ 'Hostname' ] = 'host' - dictTitles[ 'Release' ] = 'release' - dictTitles[ 'Version' ] ='version' - dictTitles[ 'Machine' ] = 'machine' - dictTitles[ 'Cores' ] = 'cores' - dictTitles[ 'Hyperthreading' ] = ( 'hyperthreads_per_core', hyperthreadFormatter ) - dictTitles[ 'CPU Speed' ] = ( 'cpu_mhz', cpuFormatter ) - dictTitles[ 'Memory' ] = ( 'memory', memoryFormatter ) - dictTitles[ 'Free Memory' ] = ( 'free_memory', memoryFormatter ) - - GeneralTab.__init__( self, dict=nodeInfo, titles=dictTitles ) - -class NodeDmesgTab( PreTab ): - - def __init__( self, urlWriter ): - try: - dmesg = server.xend_node_get_dmesg() - except: - dmesg = "Error getting node information: XenD not running?" - PreTab.__init__( self, dmesg ) - -class NodeActionTab( ActionTab ): - - def __init__( self, urlWriter ): - ActionTab.__init__( self, { "shutdown" : "shutdown", - "reboot" : "reboot" } ) - - def op_shutdown( self, request ): - if debug: print ">NodeShutDown" - server.xend_node_shutdown() - - def op_reboot( self, request ): - if debug: print ">NodeReboot" - server.xend_node_reboot() - -class NodeSXPTab( PreTab ): - - def __init__( self, urlWriter ): - try: - nodeSXP = sxp2string( server.xend_node() ) - except: - nodeSXP = 'Error getting node sxp' - - PreTab.__init__( self, nodeSXP ) diff --git a/tools/python/xen/sv/RestoreDomain.py b/tools/python/xen/sv/RestoreDomain.py deleted file mode 100755 index b836a43..0000000 --- a/tools/python/xen/sv/RestoreDomain.py +++ /dev/null @@ -1,50 +0,0 @@ -from xen.sv.Wizard import * -from xen.sv.util import * -from xen.sv.GenTabbed import PreTab - -from xen.xm.create import make_config, OptVals - -from xen.xend.XendClient import server - -class RestoreDomain( Wizard ): - def __init__( self, urlWriter ): - - sheets = [ ChooseRestoreDomain, - DoRestore ] - - Wizard.__init__( self, urlWriter, "Restore Domain", sheets ) - - -class ChooseRestoreDomain( Sheet ): - title = "Configure Restore" - - def __init__( self, urlWriter ): - Sheet.__init__( self, urlWriter, "Configure Restore", 0) - - self.addControl( InputControl( 'file', '', - 'Suspend file name:', - ".*") ) - -class DoRestore( Sheet ): - title = "Restore Done" - - def __init__(self, urlWriter ): - Sheet.__init__(self, urlWriter, "Restore Done", 1) - - def write_BODY( self, request, err ): - - if not self.passback: self.parseForm( request ) - config = ssxp2hash ( string2sxp( self.passback ) ) - - try: - dom_sxp = server.xend_domain_restore( config['file'] ) - success = "Your domain was successfully restored.\n" - except Exception, e: - success = "There was an error restoring your domain\n" - dom_sxp = str(e) - - pt = PreTab( success + sxp2prettystring( dom_sxp ) ) - pt.write_BODY( request ) - - request.write( "<input type='hidden' name='passback' value=\"%s\"></p>" % self.passback ) - request.write( "<input type='hidden' name='sheet' value='%s'></p>" % self.location ) diff --git a/tools/python/xen/sv/Wizard.py b/tools/python/xen/sv/Wizard.py deleted file mode 100755 index c4ac53b..0000000 --- a/tools/python/xen/sv/Wizard.py +++ /dev/null @@ -1,245 +0,0 @@ -from xen.sv.util import * -from xen.sv.HTMLBase import HTMLBase -from xen.sv.GenTabbed import GenTabbed, ActionTab -from xen.xend import sxp - -import re - -DEBUG = 0 - -class Wizard( GenTabbed ): - - def __init__( self, urlWriter, title, sheets ): - self.title = title - self.sheets = sheets - self.urlWriter = urlWriter - self.offset = 0 - GenTabbed.__init__( self, title, urlWriter, map( lambda x: x.title, sheets ), sheets ) - - def write_MENU( self, request ): - request.write( "<p class='small'><a href='%s'>%s</a></p>" % (self.urlWriter( '' ), self.title) ) - - def write_BODY( self, request ): - GenTabbed.write_BODY( self, request ) - actionTab = ActionTab( { ("tab", str(self.tab-1)) : "< Prev", ("tab", str(self.tab+1)) : "Next >", "finish" : "Finish" } ) - actionTab.write_BODY( request ) - - def perform( self, request ): - try: - action = getVar( 'op', request, 0 ) - if action == "tab": - self.tab = int( getVar( 'args', request ) ) - oldtab = int( getVar( 'tab', request ) ) - if not self.tabObjects[ oldtab ]( self.urlWriter ).validate( request ): - self.tab = oldtab - else: - self.tab = int( getVar( 'tab', request, 0 ) ) - self.tabObjects[ self.tab ]( self.urlWriter ).perform( request ) - getattr( self, "op_" + getVar( "op", request ), None )( request ) - except: - pass - - def op_finish( self, request ): - pass - -class Sheet( HTMLBase ): - - def __init__( self, urlWriter, title, location ): - HTMLBase.__init__( self ) - self.urlWriter = urlWriter - self.fields = [] - self.title = title - self.location = location - self.passback = None - - def parseForm( self, request ): - do_not_parse = [ 'mod', 'op', 'passback' ] - - passed_back = request.args - - temp_passback = passed_back.get( "passback" ) - - if temp_passback is not None and len( temp_passback ) > 0: - temp_passback = temp_passback[ len( temp_passback )-1 ] - else: - temp_passback = "( )" - - last_passback = ssxp2hash( string2sxp( temp_passback ) ) #use special function - will work with no head on sxp - - if DEBUG: print last_passback - - for (key, value) in passed_back.items(): - if key not in do_not_parse: - last_passback[ key ] = value[ len( value ) - 1 ] - - self.passback = sxp2string( hash2sxp( last_passback ) ) #store the sxp - - if DEBUG: print self.passback - - def write_BODY( self, request ): - - if not self.passback: self.parseForm( request ) - - request.write( "<p>%s</p>" % self.title ) - - previous_values = ssxp2hash( string2sxp( self.passback ) ) #get the hash for quick reference - - request.write( "<table width='100%' cellpadding='0' cellspacing='1' border='0'>" ) - - for (field, control) in self.fields: - control.write_Control( request, previous_values.get( field ) ) - if previous_values.get( field ) is not None and not control.validate( previous_values.get( field ) ): - control.write_Help( request ) - - request.write( "</table>" ) - - request.write( "<input type='hidden' name='passback' value=\"%s\"></p>" % self.passback ) - #request.write( "<input type='hidden' name='visited-sheet%s' value='True'></p>" % self.location ) - - def addControl( self, control ): - self.fields.append( [ control.getName(), control ] ) - - def validate( self, request ): - - if not self.passback: self.parseForm( request ) - - check = True - - previous_values = ssxp2hash( string2sxp( self.passback ) ) #get the map for quick reference - if DEBUG: print previous_values - - for (field, control) in self.fields: - if not control.validate( previous_values.get( field ) ): - check = False - if DEBUG: print "> %s = %s" % (field, previous_values.get( field )) - - return check - -class SheetControl( HTMLBase ): - - def __init__( self, reg_exp = ".*" ): - HTMLBase.__init__( self ) - self.name = "" - self.reg_exp = reg_exp - - def write_Control( self, request, persistedValue ): - request.write( "<tr colspan='2'><td>%s</td></tr>" % persistedValue ) - - def write_Help( self, request ): - request.write( "<tr><td align='right' colspan='2'><p class='small'>Text must match pattern:" ) - request.write( " %s</p></td></tr>" % self.reg_exp ) - - def validate( self, persistedValue ): - if persistedValue is None: - persistedValue = "" - - return not re.compile( self.reg_exp ).match( persistedValue ) is None - - def getName( self ): - return self.name - - def setName( self, name ): - self.name = name - -class InputControl( SheetControl ): - - def __init__( self, name, defaultValue, humanText, reg_exp = ".*", help_text = "You must enter the appropriate details in this field." ): - SheetControl.__init__( self, reg_exp ) - self.setName( name ) - - self.defaultValue = defaultValue - self.humanText = humanText - self.help_text = help_text - - def write_Control( self, request, persistedValue ): - if persistedValue is None: - persistedValue = self.defaultValue - - request.write( "<tr><td width='50%%'><p>%s</p></td><td width='50%%'><input size='40'type='text' name='%s' value=\"%s\"></td></tr>" % (self.humanText, self.getName(), persistedValue) ) - - def write_Help( self, request ): - request.write( "<tr><td align='right' colspan='2'><p class='small'>" ) - request.write( " %s</p></td></tr>" % self.help_text ) - -class TextControl( SheetControl ): - - def __init__( self, text ): - SheetControl.__init__( self ) - self.text = text - - def write_Control( self, request, persistedValue ): - request.write( "<tr><td colspan='2'><p>%s</p></td></tr>" % self.text ) - -class SmallTextControl( SheetControl ): - - def __init__( self, text ): - SheetControl.__init__( self ) - self.text = text - - def write_Control( self, request, persistedValue ): - request.write( "<tr><td colspan='2'><p class='small'>%s</p></tr></td>" % self.text ) - -class ListControl( SheetControl ): - - def __init__( self, name, options, humanText ): - SheetControl.__init__( self ) - self.setName( name ) - self.options = options - self.humanText = humanText - - def write_Control( self, request, persistedValue ): - request.write( "<tr><td width='50%%'><p>%s</p></td><td width='50%%'>" % self.humanText ) - request.write( "<select name='%s'>" % self.getName() ) - for (value, text) in self.options: - if value == persistedValue: - request.write( "<option value='%s' selected>%s\n" % (value, text) ) - else: - request.write( "<option value='%s'>%s\n" % (value, text) ) - request.write( "</select></td></tr>" ) - - def validate( self, persistedValue ): - for (value, text) in self.options: - if value == persistedValue: - return True - - return False - -class FileControl( InputControl ): - - def __init__( self, name, defaultValue, humanText, reg_exp = ".*", help_text = "You must enter the appropriate details in this field." ): - InputControl.__init__( self, name, defaultValue, humanText ) - - def validate( self, persistedValue ): - if persistedValue is None: return False - try: - open( persistedValue ) - return True - except IOError, TypeError: - return False - - def write_Help( self, request ): - request.write( "<tr><td colspan='2' align='right'><p class='small'>File does not exist: you must enter a valid, absolute file path.</p></td></tr>" ) - -class TickControl( SheetControl ): - - def __init__( self, name, defaultValue, humanText ): - SheetControl.__init__( self ) - self.setName( name ) - self.defaultValue = defaultValue - self.humanText = humanText - - def write_Control( self, request, persistedValue ): - request.write( "<tr><td width='50%%'><p>%s</p></td><td width='50%%'>" % self.humanText ) - - #request.write( str( persistedValue ) ) - - #TODO: Theres a problem with this: it doesn't persist an untick, because the browsers don't pass it back. Need a fix... - - if persistedValue == 'True': - request.write( "<input type='checkbox' name='%s' value='True' checked>" % self.getName() ) - else: - request.write( "<input type='checkbox' name='%s' value='True'>" % self.getName() ) - - request.write( "</td></tr>" ) - - diff --git a/tools/python/xen/sv/__init__.py b/tools/python/xen/sv/__init__.py deleted file mode 100755 index 8d1c8b6..0000000 --- a/tools/python/xen/sv/__init__.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tools/python/xen/sv/util.py b/tools/python/xen/sv/util.py deleted file mode 100755 index cfed397..0000000 --- a/tools/python/xen/sv/util.py +++ /dev/null @@ -1,126 +0,0 @@ -from xen.xend.XendClient import server -from xen.xend import sxp -from xen.xend import PrettyPrint - -import types - -def getDomInfo( domain ): - domInfoHash = {} - try: - domInfoHash = sxp2hash( server.xend_domain( domain ) ) - domInfoHash['dom'] = domain - except: - domInfoHash['name'] = "Error getting domain details" - return domInfoHash - -def sxp2hash( s ): - sxphash = {} - - for child in sxp.children( s ): - if isinstance( child, types.ListType ) and len( child ) > 1: - if isinstance( child[1], types.ListType ) and len( child ) > 1: - sxphash[ child[0] ] = sxp2hash( child[1] ) - else: - sxphash[ child[0] ] = child[1] - - return sxphash - -def ssxp2hash( s ): - sxphash = {} - - for i in s: - if isinstance( i, types.ListType ) and len( i ) > 1: - sxphash[ i[0] ] = i[1] - - return sxphash - -def hash2sxp( h ): - hashsxp = [] - - for (key, item) in h.items(): - hashsxp.append( [key, item] ) - - return hashsxp - -def string2sxp( string ): - pin = sxp.Parser() - pin.input( string ) - return pin.get_val() - -def sxp2string( sexp ): - return sxp.to_string( sexp ) - -def sxp2prettystring( sxp ): - class tmp: - def __init__( self ): - self.str = "" - def write( self, str ): - self.str = self.str + str - temp = tmp() - PrettyPrint.prettyprint( sxp, out=temp ) - return temp.str - -def getVar( var, request, default=None ): - - arg = request.args.get( var ) - - if arg is None: - return default - else: - return arg[ len( arg )-1 ] - -def bigTimeFormatter( time ): - time = float( time ) - weeks = time // 604800 - remainder = time % 604800 - days = remainder // 86400 - - remainder = remainder % 86400 - - hms = smallTimeFormatter( remainder ) - - return "%d weeks, %d days, %s" % ( weeks, days, hms ) - -def smallTimeFormatter( time ): - time = float( time ) - hours = time // 3600 - remainder = time % 3600 - mins = remainder // 60 - secs = time % 60 - return "%02d:%02d:%04.1f (hh:mm:ss.s)" % ( hours, mins, secs ) - -def stateFormatter( state ): - states = [ 'Running', 'Blocked', 'Paused', 'Shutdown', 'Crashed' ] - - stateStr = "" - - for i in range( len( state ) ): - if state[i] != "-": - stateStr += "%s, " % states[ i ] - - return stateStr + " (%s)" % state - -def memoryFormatter( mem ): - mem = int( mem ) - if mem >= 1024: - mem = float( mem ) / 1024 - return "%3.2fGb" % mem - else: - return "%7dMb" % mem - -def cpuFormatter( mhz ): - mhz = int( mhz ) - if mhz > 1000: - ghz = float( mhz ) / 1000.0 - return "%4.2fGHz" % ghz - else: - return "%4dMHz" % mhz - -def hyperthreadFormatter( threads ): - try: - if int( threads ) > 1: - return "Yes" - else: - return "No" - except: - return "No" diff --git a/tools/sv/Makefile b/tools/sv/Makefile deleted file mode 100644 index c9ae1de..0000000 --- a/tools/sv/Makefile +++ /dev/null @@ -1,3 +0,0 @@ - -.PHONY: all -all: diff --git a/tools/sv/images/destroy.png b/tools/sv/images/destroy.png deleted file mode 100755 index 9545fc4837b958ef6e146c2c5f21e30258e8d8ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2408 zcmW+&3pCW(AHTnOV`e-WljqE+)}xY<rBs-~RH$ac%Bp3IWRy;x6Ds`%BReV23LDM8 z5GsvI*;+Nx4yyI2Rul4yj7Lj`HYxVk|DJR2J@?#u?mge{=kdM2@^)<_X`5&R07zcj zJ$;ec>3b*OkTHvM@GUZ7BG^0G0CcHdaRb*QYvXuMV7%Xv1Mx>gW5WS^{}Dkr!|QNp zM7VEw=>DXb*6=L=5WaYMvi%dg1z(qz+|YH3o_j~IaDl$wL__kNw`TF%f@R3V<GG9f zPSNf3;#lXt?H35XG%A&!ygfaK^KRXmu_2Ss`mjF6H8wWVD@Uj>5R|<Nqr0UH<9%zU z`WoUMMh~V=X-3=2TkY}cPP^*rYSV;-gbhpwhpG3Yqf6U=eE?9IQQ4478OV~zZb!5$ zd+#Sa%MnX~QQA#2bMwuT^z<&s<uh#NfE?VP4dt8CbEGb!$-uUE&DoAdLV}U8@lyT$ z`&5Fq_Bx#9OKzDOOJL+}!Oa%vbT}BZxLAh{eGoSNzY7=kNYm4w&;)Y;qt{78TQ*$W z`J0nt%Hr3bGecqc!GmM#<nki-tRNVyP}|E+VZ=Y|eWN^Mx<)uA<PSbpw6(QOYeu;l zA&*i9{jKcm9;uW{OM2nIeeWD}8Sr#6v2b>k>+#RL+i|09Q3e`Zp)$g0J4vpJ08|#= zNv@8_$;%Ve$BmMkUf&FPEMR>7cPfO~(A(P^aU5yl`G2tMG!QCNEBh*@^&{oEN4hUc zzC8lGH^v1A2S-Q6#KhPGA2yE9hGI8v{KTR)<6zo`H$)6$!_ay<1CCCfY|f^K4<||~ zil<MX$|@?93>%wP27>`U<<!@23^XfPb#iI(jNjC~BmFx>AG+%(7q+lK=$sL=B34*( zb@A(b)AY=U4~`%DL{?MNCabE_`c#mWMMN`~;4mWPntcBm(jO<6`ZU9>`Q@r%fFi8S zZb;H7u}04(9-drk^O<Nw6;SHx>Wn=(oX1I8{z8zyd}F_O<_&_Xq7;usxeg2t4px_y zrTZEp5G+d`(W$;F9JApO;hAOf_^^)Gukp=#Ez4x?Xv#6xf^kjABeJ(6zx~~5dm~kC zSo1nz6GTQxpk?dPOmj=Qc;K9!b)<O4!1|4`kr5O4IA$P;b=dcNtYmPo>6Gj^sckQV z>ykJP54Pr8VZwB%!HNoV?>r2FVOe&(Jo@wWpjl9owtu5|hAhw3`DA3>#Ui^M{l~27 z%C>ApE%v#?fC`<2^N)s^wIl*R>oo}52`TXeMtw7EVd#17F1^JM0gkV0vwC%^=H*|% zZ7^=T<fhxUO;M(M)`qthGDQz;*-8fIhf0`EEMU*pAujq|-StD~>bo1Aoge?XN$!j} zdj`>4T0UKV4b45sFi|~)j^*^y@XWs@P`*>8>7PK4wWH(Cly;Ww;h;pRL?U7D*pbB! z2%t{#c^1&*dwARecTf}?3RG5ExK02)!Pt^YB7Z`quKvZ@*%?Qp(W2QgQ++PdJX8Io z!>CLg5<7oAW#fr2@r)ZYRO`DeTOFPO+R#8|kR4E(>NFY%CtLz7Pz!ABQRlY~y~;G_ zc~Je+o4ONa$%J8hUX)mhi22g8y~q8ADg1MWI6c-{7Jh8EK-+ps7#S&!%-I$V<y>W# zVhqRb;1upH2s2ro6<%i#@ElsYyG?rkX5iqU4~Uiqx|E$)wi%bYp73_ah9=y(h;@kK z<0nz)d6&zCuR1%Sx^_jvvMS(je@G~V_gcubivwEq8E_z6y29q9SfE82FF>taxiZ=Z zqneX(YL}3w3gL`c{cAy7ZuaWZREQ@z93IX&otF!J-zi_Q*<Q;2g~*HAZ3?5jIULEj z7jj*p{EQ7BEfR@56D(RF89>h!R~dyZK`252MJr$}Vps!1#R1^eCaCU9mAdv3fH2p6 zic<9Q_X$ZX+LZt)DAp`Tf}|~EarG<z2GxO)Bvvi%X|unymi`@)sOH0u_w@QcTQ2~W zJH5(FH*H490PWR#{n62z9d=?CCF|0v^X4Go4~>j8q;s)&JpSz#+<1<!jq>bwoyZ51 z$t|C=kARF|*hB>R_3QH46coY?sZ>gb6I#so%@g}EP#sj+z7;!-RTa<wpEj58YVYBE z8+&PWKZ*F`d$y#_cEfl4<;@rjMwF(sltUfc*ERs58a4n~7j?V4y9X{CGGGM_En4Zi z+Q!B(?6i4KxJ<k}2+eCHnqVvRe(dS#NxNc><SZw-egZ!Can0->xS=#9h$Q{f|A@Pr zhQ=+DoSlD9V7juvW0wO0!3?nOOt&pb+j=PS=S&zig;)or2%1!AFDxv$!5@(%hffA? z-Fm=Y7-inTfF!G0;_jgK+ziHM2j}YaH5|L=&1OU8Q)nbuVM8}}e0;n{@rTIN#Va-A zN>vV?354D1&mZ3v`0L*k-?(}jF-mJJ1~IiAU!6B^o`OVvmQen1$n5Z~xY1qJlvXA% zx!wQp#OA&tA9tWqB$kwx_GPRi>#+hOer#%NtN=ZkZ`DP{1?^ooLv(5MG76m6cRyjm zy4p&NRc1_1MqT&N04P0<9OUPB`*cakH=QrQs#4uwAG5Nl+~-0IEgjnFeLc9L__7Lr zKg>!lZFJ5>fJ(gJG1+sEJA@RIcDB9bFq7inQCL(Y#)oH)txBD-uADtKH*UzO{Wh-| ztz&UV(lauK_K_hy7G}8|XwD71eQ>lN(loj8Crl3!(<~d=%XDA7c)@RPRNAr1*9fZ# z!}=Y)%gYU2T5hn8MuGEvUi$j_iKhyXYNGyOn?pp~MV<JvHFWx=wKs4H(-6NJa_s6y zYYGhP$B`pt9Kp4K8?g}8%uhVO>rBuID}g|(aP|`lUEsK8&9l<L69Dp@x%JR??_D^6 z`W%1$;5bsWy6a8aUrl!)j(Y_Cfv-=cIsr?UJSn2$6~`>zch?;<gl(5}6nP&YIlmJ> zcc&`XlU>g2@K`RUeIZP~ZML$sbY(P~!QgV@*jo9zAv~2_qu6wl8fX=R>WQkBHDd0z zoGvVce(F%T54y_j5+HRED<vgGtX2!9K`2C6+yByn_#?I;YK1Z6u}@b;(ps1qc@`p@ zmo4Tpg{ySCny|{JK74}|5)r<qph;YrAWvLA_IqWeb+xSsM__{Dd4u0Hij)cDs|36_ LyF6>$`KkW_*RmVu diff --git a/tools/sv/images/finish.png b/tools/sv/images/finish.png deleted file mode 100755 index 6c5d18a9b7f6091f3a92723f27029b7629ee45e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1189 zcmV;W1X}xvP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp200004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$H%UZ6RCwBA zeDmfF0}L=SGBW)8_YX{iFgrUt!>?bz6rVnQ>h|v4JG-}U-)epM@Im_j|Nm@2<-fSN zxL%5ji(h7CWj&^(q_iEV{_fwue;Gc1{><?G`*#LeSy_fZfBwMD2M8cWY?iUHv4Jd6 zy?5_k(XCszLOy={C<5d&u&}T&FflQ~)dMXB8wL^wTKq{tL1Dd$ib^+7{3^&objtt& z2*Wav#uqPMWSl*Fw)W-Amr~5k%qSLs)L;W3M}iFI<>mdTuC87O^zkGhX88U4H(U)s z0HIh03=SrsZ#s@0J5~yFG0X=rOOV;v04NwiKvh+BmYJDZKG2~*U}69P!~#<U3c5RY z?sObEa-<aILu|gmXAua1LIUKV8#ivG0UgY0XlR(k!NCER0|+2+_<#(4_Uu{u@#DwA z79j^4IRIn^Fq9bX-o2X$45>nx!vO+_3FH!>H<izvInxXZUrH@Pwh(0Y)vH%Kfhk!R zWFbHRfi1gz`*!K;*RMrEuAwFXIsE6(pRAWIU1|UYEkFP<0XgzFZ{7?CSxO54jUvAX z4<6_M1P~K2nR|Zv^htnLmVts3=phzh$b|p|5DPHr+k=uhC^ZrjEFg8D)CCHbA3uJ8 zGC!D2gzxMD0tjTIHZi^eS;WuJ&!DWV%pff-4YuIn!-ov_@81U(PxveZ>HYHMixEHo zvAlo(UW%9$2ueJ1a&io6YHAF8e0*TTK|Tce4(3Aw!TBE`fS7=qm<eT6m}P>3f($%7 zJYbiCLIdPe5JoNl@Bx4T0$KK-7=@rB2jm0fvJT`MVC2J#D0~2D&0l~3Vgd%mGh*xm z8T|P1V=(^u^(!b2!149``EwKp;0sBB0Adjq7QPIuLbM5GXprk)y?O=q9k3Vzm-4_Y z15O+uHWB&lEkFRVaB^~90<t5BaT>@6zy!qrbR4`|A;uz5))EpDS_=?BOu$HA1FT_x z5E*swdJBY!u?Xs`Z@`e-0}w!<IJ*tBa2axqN=*QA5YV#K!0fUIAb>z+BPf&h0F(1i zbl(x{TLPB726|>T$R2<IVgltcpsm-%#KiJJ0_f!$B^H7b6)-=}=H});3d)NB0mKAK zUEjWaV-OJ$nF(~keDvUiSqN)!5$j`6@B!m#7BJJ-gUkdaE`R_62P4QrPywr`s8|3j zA-1FE8(6CggbB4lU={(@%m8{I2WZ|OkY%8J3J^d{Fc*Uq0KNPP=w%<Emy3Zx@CiA! z!7RXK5lkGY?>i9B06IPgm=1o!%mB#)1P~K?f&eP~2W*b@0rQ0mP{9_UtG<H59$eD` z%S4#tU~G^$G&}qTs#_1tx1K=9W`c?*bO!+h5DSiS3>4m{ftLCLgH#<D%$`7D3m~lv zG*AG@<^rnu3Ji(Qz&!dCXwg<+7P<nod^f)83LwA$D7i&LWmbQW00000NkvXXu0mjf Dy`t*W diff --git a/tools/sv/images/next.png b/tools/sv/images/next.png deleted file mode 100755 index da10bbfb9b48eeebdfdebea4c05bd29648fed054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1270 zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp200004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$h)G02RCwBA zeDmfF0}L=SGBW)8_YX{iFgrUt!>?bz6rVnQ>h|v4JG-}U-)epM@Im_j|Nm@2<-fSN zxL%5ji(h7CWj&^(q_iEV{_fwue;Gc1{><?G`*#LeSy_fZfBwMD2M8cWY?iUHv4Jd6 zy?5_k(XCszLOy={C<5d&u&}T&FflQ~)dMXB8wL^wTKq{tL1Dd$ib^+7{3^&objtt& z2*Wav#uqPMWSl*Fw)W-Amr~5k%qSLs)L;W3M}iFI<>mdTuC87O^zkGhX88U4H(U)s z0HIh03=SrsZ#s@0J5~yFG0Y&4g&>PS!Gvr%IsnOofU2tMEHg8+e4yGNFfo7tVu2|F z1>K!HcRG$7IZ_JqAxtxf@8smf0P^LoUAw?yAT~At5(fqEjT<-8fDUFgG&D@&;NSqu z0R#}(i6DcYJ$sgZ{P=OOMKG6xG=VfbIyy3FXlQ_3%i!$n43>wv78?MW0SqOEyLay< z0z;}0=5T-jVgeZk)Tn&s%$a6T_#y`p$UtCFFlcLQ!^J?By12LyWg*Dyt5>gf0#mXs z$U=Ys0$X<b_U+QwuV0ITT!XFw=rRUiYD5tSCIF%=1j+yW`IGh1rArN<Pyz@bCLl-t z=FOYo*x~>r_Wb#ChAmsRkZmC}iu@itc%TCiKuo}7?)mA{Cjnd$4)QI~*JN7=3LT(_ zSb%1P00a;dFzMSPXFO~Glv43o=;r1I_5m&np}w;R2p}e)A=<cnMXZIORO;pBh0{Wi z&%b>6VgwLCOz+>nm%^7xaajmVVJLF)^73E{IXOAOSq4jR{s#ykCZGf}t|ADRg`h+O z%##>$APYgkid;k?1AqVmS@xfS1OO_KB_t#mEG#TA<bbJ~;o7xp4Cq-1T0r~-2p}e4 zQSyvf`#=_nh=?%w`1mjg3k##j0c!__J$v?m)!+yzMt}ff0&2QUC^e#6Bp@Jw;iKKV zcY_OTT!{^sc-{g85EC#$FHvd{$Vd1r0(pj?pMNbt05J&)3a$axus?7GB`C5*MMcTB z2<oeEz<AsP5I~?fyA8B(8MdGV<rz=~=;!B0wnZR$pk=H1`1tk!1Q4ifWRRAY?g8et zpXj~=@wvIVK~+9k7C|k04fM=xkUana!~{w?KwGbiiHYTd1kj5aP^rIt`*v`=A*VWG zEP__Dvw;pi3Ni~IfLMO~_yJC;zyvV!+qZA#z=ld9tg?d@#K0OHY_Oc19K)eQhluqN zNbf8j9-ewo6oKpj2q4D&`}f1E6QE1@fIe9Pw9pehW5UWj<eD6xML=~kfbpFNbog%& z9~3130mKArBSKyK3Fu`Xpn_tc;h#Wa$aNdY5?mI+GBQx#cOaetEY@;>YJbDb0LcRc z5EFWW04n?kY>xE_2?@CX6>I?p!B>#4z%GNfuwcFe(I9bXGwwG~-FjfY^#nRL6I48* zI|v|vSg^SgWB@Q2PXjIW1?Dq#V7z()g)M-zF3><w9^eA1`3m&yXJ8(E3bbe|FbiD) gTD}`!Tml3b0AQ7WJRz?@@c;k-07*qoM6N<$f~_$chyVZp diff --git a/tools/sv/images/pause.png b/tools/sv/images/pause.png deleted file mode 100755 index 6e16daa177a47f3cf58fc0dc83bea2f2cba888c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1662 zcmV-^27&pBP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&5J^NqRCwBA z{Qv(y1GT{0w{Hc2lo1f?y?XUZ^Zxz&CSSgMk^cAZA1@GdK$ZPuVq*Hj#>VzaL`3A0 zva<3i4i1h>K=E_J!onY@<raVdVx-h#A3uKN2U4!@-o10aaN&aQ^XJc{$uS4$(J!j1 zsvC86bvH0GGw<f-=l@8Fy8r@+Y>xpwqyUVCptEPs#@xDf%aDPJ02qU>9334yg@lCG z0X_JD95Vm{h-8lelN%q9iamDhSkB|ek2M%*2pAa||G2uk76=LoE(RvkPo(Gt2q2O? z2K1B*&@&l8PX#m35ddTGp_i9eiiCv39%A(X1Q5|4117zkO`A3~e*XMfh+%+$ySsZX zu&|jzj9P#IBIq%ohXjEoTiM2q8!H$F0g#uMUu<JzlMl>$@A0Vv2q3&3113F*4<A0% z?A*CCn_&<EZf@=~K0ZFaz<l=tml}Wo!s#)frv!nXY94H!f&nfrt~0*AzHUIzVU0O} z0Aj+W@yCxJWrNjIAn@(mH<Mkvb}hvv4-i0DV+<HmIm?zUn~W#47`(l`@mb2Sb?a7Q zLY-oBjE#-U%+1Za(ZvA*hy`8X&6_tan>TN6!)F+<NyH#3DvDDcSlAF1>eMg?*g)t4 znsHu9NeQJY00<x^^vV}hPksOXotI$<fgL+`?1DBN-~b?iP&@`~qs1OSemt0A=mADx z%#|Vw00a;dQod3+eE4t<!w>~`?%b&X#+m|*4-i0bkNy1lGl<r0KUxD|Dc%WV0|XEg zw7}p$b?Q_S!w?6+R2TO8^=nW!iUA;in4o#f6&PFE48s5b`-IUT8X$m}prxTR!!QBB zyfy(u0|XEgFc}J*K7BfHxOfcM;9z<A@}&Sk05Ji3!A9@jzZYj1K7bKeWrYC*5EHPM zs>d+Q0I;j&4-i01z-ZGPZXWyk^{Xd905M&^e%+Q~_yI<M0Ad2Rpv8xw$NmEZ5EHNz z;Tm?n0(Qj!0ti$pvJc0k2oOL_fB*hv7=|(SA0U80N%7Ax^w?j300MSmnSKnrbjZl~ z7a)K@9{W5DW9$b&05M5QN^YU%RMKDoz}^ZwKmaj`ii%zbmW;zLH39?>6E83CrQzl) zV2m9B2p}dlHnwv>#;{3?z|{9cS64R#Ab^+@6%{|Qva;S8M)~ZEm6g>8fB*vbpn*QD z8ZH$zu$1Qp(EtGi_LzWxz-|^6mLcycVB~zz*4CB;u>k@I>@f`ujgLx7O2wZ(eH!Y1 zYqqzy2T#fa1Q2{&QA9*!9S;xBtD&0LfZeYfa&mI(V0?f8f_u!w#N+``q6yfo9+Dp8 z;^Gqa_xFDQ;{yZ`%GkY(jLc$Seq$JF1<AX2?^Y=&D5xNd0R#|=$Bc}OKB=p#y8`pt z?V*w+fByXW8rXWe=;h^wQa}I%5XOwAv$OLaRaMnVz$7^&q7B%<c%7b}jxnDH5I{KR zpl8gO(f<AW_X>7)c5HP8gRrnLzS<u&x=c)+Ly<Ya0%Jo-NeR}$UVs3?S$Sz{YIa?{ zdNt?IpFce4bsWgT*RNkwqxnO&IY3YC1XfWvCsF_c2<PNFus(PXtlv~Yp8ECc*Pu#% zpFe+ID=#mf5EK-IbFBwJ05Rb+z{$z!g|f1;5HKAx0F&i__iaGg29*4Oo=Oc34Sj)6 zEkFPfz2s=-%$ak6#i}bGAD=9+>rHo00aFdAvHm_gJ6nku^#B1x(ju`{t5&%@fBt+b zFyE<ha&powmVilbFEBt^v$C@6iPZ-XKqN2g+p=W~Xl23t4<A0Lb8~ZR)2i_da@W_d zUvC5LU;&n#1`!bvBsF9K0*LH|m}}RrRe1UG<pp4U_W+m&^*J~=7^sm%fvExHp^HEd zeFXOI;}a7TACO}XKmbv^bavgkb^Nbhy>bP%0BV6P7EWNBO%+u4fjmi!M?v=g{{0(N zINb-<YZri?3FPPJ7l@9Irl`>h5I~I7Y&xx9zg_@Xp&9{0Tn|`Bg?;(*<uA~DQ2z*2 z3-iEwxWHI>2~5JTfdTLq*rU(~20${fje0IBDvD~0odE(206x2i9mk?v%K!iX07*qo IM6N<$f|-xg+W-In diff --git a/tools/sv/images/previous.png b/tools/sv/images/previous.png deleted file mode 100755 index 22292d6e9c8d7aa0c3ee21d9dfa96988178837c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1285 zcmV+g1^W7lP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp200004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$mq|oHRCwBA zdGqEC0}QaRurNG+{Fs50laqm$mzRN=nVI3|&!5Wo?%nhJ{rk7o%a<>8zkT~A4php< z$jJChKtSNBu(0qoAt9kd($dnq*x1<a1JyJ9|NkG1nV6WsGz<U)5F<9rKo$WF)4p@( zPU(XO4+4P}@csGo2P_X1hpYeh?;it59B2sxKR^E)H8r(0N=iz7K>qDtzkXp@1`t3f zma($3G5}o<!g)7u-fa5(`7=Mr0+1$b0NEgr#ee_)We^t^e`aiK+$<p>F$3ffWHkT* z1h)(nWIzoZr%s)kc>DJ4G?*AJ05TjT4>AnIhB*ip0#;U5-9TSf0E7P@Ob<W+vA`H# zzkX#nfByV5V9+Ike25%e=m6vckl`*aE@1YaJ$t}3$a0WHAj=OQK3ocNh>D6z87N3W z03d)^U~vUZ1ci6+-X+>1XJ=;yRaI5E*ujGb!M+6P1<8XfJbwImDHj*lU0{&T1o;>s zfS5oQy?ggg_v+QFogkMH>mv;f4Y;_rwl;&AnHg9f20-e7LCA3C%$a7OxH8CWfB<3w zx#rTPOAWvz%Ze)@pj)J_u8t!2@#9BO$Y3}W6iTmOzZM0ifl`oV00G1VOxilno;~ve z`H)<TwrttL@cj96tO*Jv229!EK+nhn1P~L@<`5u*1y}G9V-e5{urIIykY%4feG+)_ z;)N$b0I>jlWsl2OAd5h9Ad6s$0h>jjOpOnK5(hAg*#iU+%a<=-jIhNO%pxx@F9vye zd9p2n`3|U78z6u{!S^3q$p9)JU0q!<ECQxnhV9$86KxSJWxjv^UJ4+9uqHoHk_E*N zx<w!W%sb%3K&(aJVhWfZfF5852p~|>|BEgOitKCGu7Oe!hDHku3kF~&Wq_3m!~&o_ z{{aFB<TFNWE&&+^Du!;|x`iSKtWp?!e0&&0L_~<T5ELyO930O80ti%syu}r%pdx4Y z?%fzZ1lD6DSqMsvKu2B%2p}e4J+v0Y!Dk`Jhm=|fOmLR~0*DD1KYM__`-U&s60%TK zR1}=3a0MYdJNpkoLBTZu0mQ_|#|N@(HON46E%fvA167(R1u=3E0xenwjI-MS0mKAq zGXOcWfrh;%lreEx2&_gJxVgDeYGs(OfO+gEuzk`4vIii5z*P)T;ZdMrv$44hmxZuY z3W_gKCI^-J=*1q$0x>bMd|>EZ2c>X;0Ac}!HOK|Pgi;SIx<r89PQzE#fGh+#YVY2? z;COoU=n(_3cE`x%(BPX7Oh7Y%4JNQ100G1Tav8{09v+@Qz;Mk0Hg<rH|Cd3Gh5PpH z1M|@>0yzTMLffvWs8|3}`{TzCusA>fF~O=9XrtvfP-70zpcz2?9hSjym3JVFT!%qh zSf7BwSqzLCAE4YPkQm4e5C#Y!CM-$yFHmtNFkg5AHLeE+$8V4Z<n{$zGqha@@+DB+ zSD@GyV1v~K=&L@U*gy0H0}wzgc!KI6(3b~+8eD<Fpaaa0-rv7}mj)Wb3pA7)sN@?^ v%?F^G%Roy{0Ha_#P|ZzHxr(ch00=Mu{2iBr9p6k*00000NkvXXu0mjf_-z#c diff --git a/tools/sv/images/reboot.png b/tools/sv/images/reboot.png deleted file mode 100755 index 358e6deb8fc74e1a89d5f615ffaf4d264e8c89fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3132 zcmX9=dpMNa9{xUabDznrAu-Azsb*-{Vfe-+2Ahf53`K(mg<KwG-13bP((GuHCR==V zb)uB%B1LL27>=S7nyxN~45`jWveT|Jo%6?9>silQ&sx9B`+I-y309zwj;4tw0025n zU$0=*>iA=*V^y=r`_OCEf{thW%m9Ef#YhmxUbQ#Q@aANMq{L-pMyK-t#(|U=9*LP8 z9nTBqMIXpY>*u)wfYxKC7lX}z5%cx?cXw2a^kr)b2CiI3c-N8r$#3a(d*;CSgS?8r z);>2YALf5wMF!lc4h|3FVq<f<`uZ}%JUphHakxG*vbrledJ;d9t_1<q;Q1S6=I)EA zEn$dtjkznIoB91)-Zi|r8--$TZ!fud(;lFMaSl|fU{tt(ibmp%;acA6r+4d7E-o%Y zk!X-ca=Uo(;_dYf@lNjU-+laEVF=KH9Briq2I($1{N}!K>db)Q%N_e4z#G*U)pr5Y zr^X-V3+YV=lFA7RN)eWq4?80`^YU0T2sph!<))*^jf$&b&At2X^Pi|0Y>*!4fqn)` z`_0{tQGkj$4SoFzazR1CNkRXz{+2iZO<<a#vIl0K-->VaDKpbqTbjj>(hDC6-SfX4 zV6oZzcyV!#8<bDzvU!X;=?^+KAbVFa-u!WU&gbj4*4EZ2I%t!n)|u?&)XE$f7zinO zf+9d@I(E67MEPF%{&jn+fv>|YiG-q!2JY!|hQHDr9Y2hXjeSsi+wpmI1cfF<m4Owt zXi4GK=Qm<~9Oa(K*PX*a<!AVY<7ijc9~kk+sEJ@40Se%|lGPVSR^GqF{dyS!IJ4AO z?U_5)R{#7rjpQ`-{~I3vNSb|o{yEZ?AmM9bp;1lAgF(0aZ@I?XX#iL_8Y>kKJnzWK z+|rc3Q3OoiOMG_yjM~*2)1*b!>EsQkls9)xoil9k3WFG{(GW=}hB_~QQcMoFSLKz0 z7w?Q5o&nTKG&&YBqao6SQ1Yc^lwlv~Q+0K<wzISIf8Od-0k*jxlSw5KiIkF)Cxw4q z<m++HUNPI1ZfW=;6-L2;M;e_n*JI{#)J~+x)|>{)Jx4}Ijhn7rGv<DQbkSD4nnzow zD}f|ODnBQu8-*f%(Z=bT0<9J&G)Uzp+%XN*SaUIaX__tmNd-QOnXSkFd3Hx1Z0hHC z^Hxg>FEuSK8q(D+k3FGtgqv451#&lwE$r+>pwgGq6ToI>&5tw^xlLQ7GC)oJ@FvNe z9@>s)S8~v*({)CvlmkgkF*}8i&%5|!r00HJrFOr2*1Si?=ktlVd3l}Gpr%>4Q99Li zT#G?*Q+?0S(mux8dY;n<M@&{#RZUoyL}h(=eyezL?AqScGQkxs)*E58p`oD&ig<X8 z-hIKRj1tq?-Hlpc#>AK(82a??844Dl=XX<8DAeDXa_`OEwC*agLhU$GRD=~ic;J@( zRBHj^M#Mwg`B0C&&Al#)gnIJyIHWs%CwW8nIfr<bYiCbS&&1puGvf>@<M;R7#rQ}@ z5)8x?R24nm|L_>uR-?c}kIf<pgX-L<O?z8)1B9+W`_VwZ!-%DhZ9-tJt46OJ^71O| zl*>y5;`{jYm*-tFYyS6!nw2L=>eDs2DU%sV@(Y7m@NeTP&pIy=ZL$hX=N1+MDrceE z#l^)KR!9iy9e9bz`i5Tl#2OJSQf-)er-z8OZh413FV6UbDvQ+Oj&9~I9~5|KhuTbZ zk??{Tv@zhnx#;u9aUmVE)fXafkk>10V>5yTi`biHEPL$AXX%YHc9@{T%_c=ZeKYIf zm=K2-{Xn47pU!Hn6(3O73>SMs6DsDK7{+9A0t0ou>GFEy5U_W!K1UM^Tj-eM89~31 z+D{zZ2@j&%{P84M3>O{Ld)dbN<rnXD?HO}=Vl27)(eF;ec@OQO=L!V{p{Yr-H5C!X zzvFE8Fpdw;4%JOABGQV=N=s#6`ClY=5KWNB4k)W82E>R+^vXajTzBi3AlbjE*0YRR zzH8O>_&)Q3K_9FtFkYjHkduw7#`PsTD=n<@1rhr4Po@$}-s-o%T}n+@{cQ)IT4@hW z9tsoy5{*6}sXkVLyQwAqyl14ev{Wy{I^(uKmIQNPi_LxkJ)$UE!Qy&f^M+b*)JfTI zRH&iTBUp5_$+}>j#zF)yPAWlJUmxxib5qf(7pPW(5no&_*;4&vLodlkuq=3yAv5T? ztETmP6er!Yc`q}eW=Z9WmYfh%ZKtfYzH=ksgH)#}!z-m<7$YjrVW>y}eWlNB-M^`< z{$jIil7GT$|K3@wtJxZw07<V1W@zOWUN*Z5{OHRcu<}^M(Jb2xLk?oKm$N#Sru+3% z^NyQIkWwO=pOv*o#$Z;6lThp>lOOIF|EWO<Z`8M4eBxl=P*|{{&61HVEu}}+Q_nPt zMB4m|na{3Aa*DNNG8sz-Z8POuI0uR7pgPHl`&*lTz-z!3b2?V1a_-4CY?kIoS=V}B zWq(+B__@wUk8~2vuq}?|U_+v3fQD{T!D|(3TXE(4ahD=v=5eflF;Z%}UZfy#dX7PY zwoOW=34JBH)^qz$Xf#?HYayqq&sT1`+F8T^aU(e!f1qV<RgY?{XApdL$Nt^xP)AG{ zx`46ze7p)@BjS#u?@h)|ksXIRzwi;MJ&oqw*c^4A4_+THnM0%Awfh603@vgT4w#~O z%o$a(A!<?0WylOX5(3rV&RaVwnUUA39UV<G@>15KXmt>Xv)3BY_WbBwL(i#d$kkd_ z(6|A0D3u4^-aU9#*D8k2iN#o}hREVKMz<vr*y(bud;Y0sAqrRAqCo;%tFjqNW@ct) zR^CS+`lRZUbq!xJBE&N^G}K&GH<$?L_Z?YFaaij4pShO}M5p_<L;Y9-3i1^_&)nSS zcBc~1M`3!aX^GN)Tp^=YQ$r(q;_chr%!sv>_uVgBJ-4UAyxu6n1`;e~0E5=;f?r>C z%h-33X+Se_dOODET*3Udu&}Tuvbh^@$XA#>iTvU2>|70svsu%OPo_2}^h5H&kj`js z)N7p>RaxYk9PB%_(OWwG)IXpdKb^{2Z$+UHF8qx(839`qDdP`xbffp_geqzr8lC~R zd?-tk-WYi={dn}pHyvJ&5{0kO%eiTX4<9x!!4sfVRUbXwHQ8N!7Nyflvf3t`cVqS8 z*|H0*AEHsNh^5xR2Bg%masjFm{^rtfM)wMeQG2?os&_uM{4$qWuHs$CfuMwg2fe?n zt+@k#f@<o#DZKcvTLNq#BV}M>$y9#Y&CQK?hIS7yIEhT-2AUDTsyAe~C@qk|0CP)J zQ4tSU|8!DN8-Yo@x-P`8pl!$2&?ew)mCP|X4P-?{v>Y<z!zGnl?6}AFW0Ee}?KV=S zR@4~5tv<RdZA!M28x=z4<r3JN1TilZ3Zm<j|9}kJPzv-Ak{SdCIfCOu$=qW@eu06z z!}kCLh%<`_>Z?$L=K65$<}8}#4_3z6&OpLlh^40AbtG3konk|S{n)I(G4o%9)l9^% zuI5|_5}7aPmmqiV5@X3A1WeZKtE0y5cA-2C<8CFEV36DRZsj#%`7HC-jmu&zmgSS2 zoJ@Aif`P8^uV6*UddVL(npa}w7*erto<0m)+wYEw^}c=?&dRY(2uJ@<X*`WxSy}mb zBqJjN?pb29$j%%<9wNPR;7VItwm*wSc-&$JfL^KKKUJ+3lk)2B9;|kKFjw0ifAO*^ z$BH&(=r6y#FD)sNw!;__ToRSOGxNi%n#)0TZv}q-!EeQl80eBYB|OM>+cxr{{&gzh zciUH+6VdiV5gBrbg-;Uch7A+oorq9yL+dRE2Zs|;mRJI0x#Qi-n>?)q9>Y%Z;RKld zxIjFamcFDn>}d@jwF7CUFth9;FHdFKipO9};xk*IB90*OQwOZp?PZ-6nlKI6Ltw@0 zXl{KAW8c2q$e5TZRQjNbmP*e)R$JTuwK=LI9g{t5tgya?>P3tie68>Ngd@|+<Kait zVPcmB_Z@GCBzRnBp^J4p!-xbE8}BKM6`PItYb)2*Q8ebj8&<<N2B0M#bm0h6pULSq zw^=b!&RIi4;}}QaI_gg{x9>*ldGQBNr5!2;6e|htI@<K29b70j77L*L4qW!G8g$ C+(l6U diff --git a/tools/sv/images/shutdown.png b/tools/sv/images/shutdown.png deleted file mode 100755 index 48a52dce217ebe0e3e3d5c148bb1bfcfa2a7fd88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2901 zcmWkwc{r5YAAjH3V;CB;6_ZQ`VaA9o!#g4jGRD$GiJ7s)O_H)iy))`sldan%)eyH$ zj5bPYl59^&q9m<9yB1lBy7;~Qan5<pdCqg5@A-Z|%Qu_5)m=qNR|x<B6;BUW9<ti} z83Y_M=efnaMHWmH+lLJRFZ+9a`BunYC((_c=)X5IF)2JD0$_{w3L+?;d%~k4coE^E zlzkl$jsT!E>gmc3NFEUUx4i6(zNL6mzZVOasH;sjrOt6?-Zmz6zQ3Pdyzu*H?bw4O z%k#2MCkB)GAW|qi)ZEsVw9UoklRX~aMwQLmg@=D6^(H7o0E0JCcf!DV8f~&oW?W|A zm>ib0yp(>8WZ*=nTUlAjuV1$USYRZR!4UUld`5@MqIBSM5%Y7CT4)Cchm5?uCmShF zm6eq@wJt^3Iy*1Ba|W?$kmwL`Y%NyyND}w%o=*I5r{){WUH9QNglU2uFqHrP!I2DB zwM-Vz_x0VIQBcrrFT)!Y2=yVL@G~PU0ZqN!e|1}J>yCTL&ruqB3ejW82gvC#a6U{2 zipN)w$;DKOM3O7+m?fJ;0vI(<eROK)@ar2<m)%e3tNflBCH1k6KFx4GvLxaL1nh{2 zjI_}kd(LW^z!E4GESz_$T_(w(tMSm!8dGCqV>An-rJx?}v9+!D?Ck9H&w7qlgD@=I zYypM7T=L~@W4(q4^M+hraPkPmAXczb3d+(5J<1!Rmvr^?l44_HlfapGhteiM6rr{a z_Vh*ZoBKZZ*R9hVTFX6bh=(0N4G%vCo|qAheb0#+4t~*neT+!^1`79FId;rVnf|^> zQKd?OrBlfqwV}&j-qiaKnWzEwN7+1H5y;=gke)e{F{6415VbZP`gt9xR46)Ooy7qF zY&mKy>OA;$@U+U6T-tXH0(=D&W%>mtNuHozo_am{?7ZcpDjWrtrxLaO?HZH5SsV+j z$xw$K@!maE3R7eJ8Ak{RPyYP$jIBkc>Y7fp%`vIxoJMsZd+S3e-zn@f6Tt$VB(>hz zJq)0-Ry0jx`}`HrLDZ^Qv}PM+uC%n2Xm4*nH9}?p0l^$kPlmR(Ha#mh_mP*c0F+w< zvJ!?oOmBV!@JOhVpw!3u4hJ{n^`|NY<z2mcmB|kYVJc?Ds|ntnt|!wJk>rf}dRs?2 zT>dQng941#E0O}J%V6YLde~wrfzR1`EE|ncBlGU_8qyXLi0$Q-Mg}1vAvi59E!>a- zu=}T<i+|}((+6xMI?c_^+Hn5Sz$dOJOD=9bn*+9%qP&R|_``bC84I?8*D8@lu6*L3 zpPx@uw3=>Vjt$<~?`quEcEW&p@9?6oTV7^n=EGO7v{uiwq^k1u`8yio*AiOs1j_no z@k3Hf6?sydYc|-^v$72H-0T_a&=30H-2=JNC&Z}e#b0y86Z)*?EG&sck{f4dr*m&5 zB8Na2MSRzfh-3ouG^EBhZct8Le;ZnRsl5E5thV;VyIGWjn)IcPhe<L-wQT?R=Jp=p zru`$t9OH(D25m<cE4wBEj=PaQKUHp)rJ@FTclUHJOunjhJ!U~OVq>vZ^RwgRM|TfQ zDy;2%sC;*g-a%Bjh+=5i93~RAK;G~0cfNF;b?BnlAbbal%Yg!6=AgYoD@3uR&S8U` z!y)x?*i(X%pb^;+rt`ewzJAUonn6a95d)l^9rtfMWw}cU;Tf5JLl3;*tE|x@cLB9< zDTESYAt<*NBrh+qIOUT3eVR`F^!7E1CH+l53MWkCd+@`1T;ed1=xcbAzBY(F(0wXZ z7RO?AaD9AKR$rk{eSPZ?KUVaH*LKRPyV$5bPB3lJo(?6A|G7&au+F~a9T=$T_PM9Z z%X&9nGOc$>?bm+`%pJs%V2Fhg-1VS1BRAWHo$Yn7rBGsJmEcbh*_k{w=4E1`k#*>l zl$45zjbXygItanws&XP@LAkdS`hk%fMa(ZPI<V9Gr*#+;?1SKpQ;w6LpI^l+YNmn+ z0b(VRpTK2JQvhn%GWhW-Ui*cqh57lcFO@l{KaqKUSNHe6V4KIrs$TmYGj_mi#qs@4 zFdzV{whKx(jGco6r7dGv>UNP$-J<2}e;CeMnfAI$EhCZ|B&(dy*7kxl>8WGt4hKO~ z47}(lzqqw*6FYGZeiscTq4iIsqX?9+KE<?dyP9E1HOz|1`-*E9whS@3pKG??_<QK1 zZD?p{UZtn^H2z8o0*4Kd*EzsE$T(o=LX?QR!tE~}=4W)F={CVE+?$o1U7jTl-X!0` z1e<*S5LsIJb)~;8%wZ4l(I<<>R{4`*flluLgp<{%FibH0m_}s;VTytWs+`7_UXt%Q z$A{5nD_<O5hgT*L;5L^6p<1sAHGm|!j^}<mfczTuudrgkO;&I>ZNVx>nv<i{5B8Qh z9z7uP@$vDS{*<d_sW^@j%%Ub6z5Wm&&!*e^(?*wkbk!bi9@uC{Q`y=*1yI*D_LuS! z5)!nVvTj5@TiHjzrGD0>|N9InaB)S&Cp??|aI<V&SD-6Ji0ZD6wnJzx8LN;=^Q#*h z9XO$=+fnRw4_t>WWjdMF)zwZ2UinpsJB4yH3#C8w<^D>o?Lf(2&>F5_#?*#rs(==2 z3JTP4adB}amACf3cd8hWQf?`%gq9xW2mn~PC&rE9<AaY{j7+!*z;PYJBonAZ!<slc zF`*P$Tx1=tio#iJPE52;-h$JCe?`dtbMs!rZn#A<Gc)^!t3%uXv9i=9f_IT#w^{g( z6qTU@L~1WspM(HwrPX9I`fI(|F|$@z+?6CY3+MJA$%V2_)EW|ol{W2Fe{l`<8gCt& z(bU9B=IJBaH6x7bD)ZZvHb0dRW`CQq-aKQq%EY|5bs4(gIR^CJ!c(_%-vNQuvLJMO z0++d>mxJ#U%TO-C!Md?tm?0DXN~86+;p5Zf;NalGrKKejlm-JXr{~|?-0g4EtuPt$ z(Mdapw(DtY%Zxd>k+u;oGKi+BYA9Ngl?LctCNvsM+J`7Grx$p!Adp=Q5)+Mau#0YQ z`t~{jw&7;wO%Z0eD)4HM7@y^Fx*0X{Gf)xKDG)JWpjmnaX-sOB<ya?`ei4sa^#B`# z5(@_U`?Vb>T{>G@XGWhrWMK4SD33$KoF14P8Wx=_E6clH0U+kp#YS&7$4i~p11$IH zDKafZvKntX43UX4BPC9aERA4>D5mKpKb47J8Ks^w&iS&_{<57%#2s=OqMSl12mv3< zcARGjw>Z#WYzs5f_So&Fpx-Xs#S`LL|BAt0Kg30{eUJ>tuR5X_>cwt2d{JT=$NBp? zG^c;*lUr+hY<2sb27RwD);w47$4}!^iF|{5_?KShiccw~sp%UFfFYBxK&!x=JDaF9 z8eue;1OtW*aKvcWSqY-_H1ywG6FTlRzQ<qYi2cho5v>R8R99C|){-L-eeRV%(slOC z%<T9JNA7OV$#B~pRR;9!zNY5p)R+!+q#?TLLF5PD9c)ap)Z}X)eICowyz~LQ9UKJe z)!$$;nc1O6I5o(~a`Mgf2<7Mq_6GUaY%sM;B0aeJPRfe0ax&!b53H-IsC4hSj!2Z@ zp|v9ew_-J6PbPs+#Q?=w=9diIjvFam8HGE((&gO)6bp;{77WIB&~5~Y@3B|Zt7{=` z%M*QO+hq8&;<JGcVZ<15PNE=pKbMD2!S%0h#0}}AZioIrna#abSP<R3qCiwuVd?)g z5rfi7{{7>cI(@}BShv2rt`nMxfG!-6l_&8Z8PI;{j*S~b&)#EgfEx67YS{Uy9RUFv feXAVM7;V6O*9ZG8<Bt1~z8LUy+v-~55+?aSHj%~{ diff --git a/tools/sv/images/small-destroy.png b/tools/sv/images/small-destroy.png deleted file mode 100755 index f800bd768599e99d2b41f832aa0c92d922d73b41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzbxA})RCw9| zDFD|00qpGT00RR90PyheIo#abWa8rDNBjHx1{M|;#vUFXoe~lfvk?&y00M{+sDR<_ z-MjgxPoHl8{{1^AND~N4N=h=ke*Kz3T3ULxg@r{1Kmf74d-u-l)TvY5zkdB<Wnp1q zU}R)uP*PH25D*Xm*}`z^)~!^a=|=zphy`d}_KzPwSV5++v9U48%gZx>z{!&*89*9A z7^D~=fLMTTas!!SWMsr(U|_(&!NI}s;K2ii$B!Q~01W^;<KxGVx&Q&h1aud>l#~>M zm6a6(H#av}LRndvK}Sc2;m@Bx3{b!X5I{_Pe0(QFL`1-DLk6Ovq6|z-Obq}3{|8zB z1R#KzfWDg!vgYT{pC}4JVjx8z476!JKmalE@bGK~S}}j$zI_aD-@aw|{P{D(rAwC> zu3x_nb_US213-7r1PCA&kUPZ1#Zw<Xe0T`xvB-b_{^<ivX8|gD0JM57J3ISSApHp- ZzyQ+jk#`~~Vom@6002ovPDHLkV1j@-#AW~h diff --git a/tools/sv/images/small-pause.png b/tools/sv/images/small-pause.png deleted file mode 100755 index 7bbdbfaafed8a5154933cd68bed6e160e8d731a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmV;j0ZsmiP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzL`g(JRCw9| zDFD|00qpGT00RR90PpYbIosRYWaQ-JNBsQ!1{D<*#vUFXof8uivk(vv00M~d!-o$H zckbNDKX>k2`|sbsIsgCv&j12UOiT<Qwt|AfY;$w-41fS)diU;~*|B5Cx@BZ!I1>{S z8H9v{7+6_Z84?l_81(h^8LnKpl6vpny%>N1Vgj0${r&rQR!&Y%1`r0B#K_19X0x-i zgZZ~^-AV-rAf`u;9=U-`fLVzQKw=>GfBg7S7a)L`fbL=knLq$A0R#|}prGK1zkmPY zQ~@%Tg@xq_Kmaj`h=@$br3hrxzkmN2xVgFK0|XFrdV2b;A3uJ`1KnZx;>8Pww{PDv z0K*YX1H+U7Xxjl`IF<ke5DUm!psA@(pFTZw^XAP+peg!5!&t6eyY>L+k+r<Myi<Wb c{{#?V0K+eX)Z)E+U;qFB07*qoM6N<$f`~`84gdfE diff --git a/tools/sv/images/small-unpause.png b/tools/sv/images/small-unpause.png deleted file mode 100755 index 6ae5687a0ccb0aa833a06b219ac383e8a884f6df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 500 zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzhDk(0RCwBA zeDmfF12Z!-!-o$aEN|VqmGbc6L-+sx|FemUiyxDfm7OanD7YDj82|!^5vYLS?%lij zr%s(}2WsHt<>h5~@!|yoBO@aN6B84Iii*l?Gc&UcfB<58_wJn;P*L}{Z{IjgO-&gB z0s<K1<>eWGrh*j%ZAra%?_LZ*05RRUb0_=9j~}dTY-|iyu3TaG{rfkAudgqIw6rwC z-@kvsrh*g$1Q4^mz5R5cZXS@pmoHx!9z1veR-~`5&+zHfCx*9g-!lCA^@|@MfS7<L zu!F1s0gzBvLtFtD?;gE7bnASr+VVgmZ;1jvei|Nem`{QUeF<mBWScJAECaQX6O z1{M|;23A(qCjbG&BqAaLvKs6jU0q!UNl8hDy?ggET)%!DtOz8>&CNX@Ab?mnIXOY$ zH2?kk_ldw@VgQB$1JHvEAkTpm0TmzM;NX}E5I`&-lZ1qXQh)yZdFbQEkCCrmzt#ta qCkxOi4}fl83v|v@pxZwI1Q-D0x2PKrYw5%Q0000<MNUMnLSTYAF4Ers diff --git a/tools/sv/images/unpause.png b/tools/sv/images/unpause.png deleted file mode 100755 index c9713088147357d721c5c3ebfdcbd8c106e53a58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1890 zcmV-o2c7tdP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&^hrcPRCwBA z{Qv(y1GT{0w{Hc2lo1f?y?XUZ^Zxz&CSSgMk^cAZA1@GdK$ZPuVq*Hj#>VzaL`3A0 zva<3i4i1h>K=E_J!onY@<raVdVx-h#A3uKN2U4!@-o10aaN&aQ^XJc{$uS4$(J!j1 zsvC86bvH0GGw<f-=l@8Fy8r@+Y>xpwqyUVCptEPs#@xDf%aDPJ02qU>9334yg@lCG z0X_JD95Vm{h-8lelN%q9iamDhSkB|ek2M%*2pAa||G2uk76=LoE(RvkPo(Gt2q2O? z2K1B*&@&l8PX#m35ddTGp_i9eiiCv39%A(X1Q5|4117zkO`A3~e*XMfh+%+$ySsZX zu&|jzj9P#IBIq%ohXjEoTiM2q8!H$F0g#uMUu<JzlMl>$@A0Vv2q3&3113F*4<A0% z?A*CCn-t4gSXe;$gW>n@-!$<YH#hegA0HoIV7_~SOASB(G2!u)Ai19M@bF*&TFk)8 z%1RTDef|2?WHS(e+=xpJKmg(N*pDAS%E<MUoSYnkq@*NGJ@@U~H<Mkvb}hvv4-i0D zJqC=a98&WXur&eq6b#VXbMN23_dI#>WGOZ|fB?eq*qb+RT-L8&-$tsZfW<M2r|9K5 zU<0A+-o1M+=;8nY#Dre?g6gU7-@o%x!&Atf^Y!(mndf%w*s%-RaDW4V07CH?u#Fab z{P=N_Dqmpx4zH(R09d)w(sPW!m_tdD00G2=l&=&HA3mHzs);vm-efp)<_uA4Y3aE; zcka{xV@(0Z2M8dz$A13&8ANW|@6@SNgTiybQoIw!1_&S~Xo0~GbX*c8h7JbL0aIPr z>({SA-6#ft0AhmXEmvS{X;W(OVDKEUPZ$lN0Ro5#S{gc2%V2Um2kc~0Gp|hm(EtI& z1Wbkkr%#^_q-Lm*>N!w7M=j3*+rBI>U%nIo2p}e4FW3lJgNsu;BM+eG7=cw*7(f6q z0bAjEwCZAz>bcO+PzFv;PKxaXcD4Kg0*DD1ZJM;~Kat`&U>}PiDk_R%&jDNio&W*F zbp85uTUvJxN%0&zJ3BQz#|RKWOu**9I0GF3IiBO<;v%~Y0SF)_U@5}IKqo*i&w)k- z00Ib9Dzeja%z_lpfl5hGfdcBllA06&0*LAF-@kMpkO2lJ(Q3bZ`2rq4Au-1O0|XE# zDgL3Sr%X&t7|hJfh*AqIu^BdP+C=i85YSJ50RjlvPh|QroIC|ihm4GW0Rjl*vCo6e zQ?FjVBHL5Y82bSbKuo}H`xa_WB~imu8#ivGXiO5=TVV$XASO{!(d(pS=E3eMSZV|a zAQoO;-b;hQQ!ie;VA#BQGgU^9fiZRjAb^;Fb;UU#<Nt8+6fpJu(ACuq0SF)_MMcFA zz+UVfYUZ<n@)WG<v$C@K01!an9yHL0Rn)4eN%hp0EnBEMc>yftxj{5Q0D(OwARw@t zjAjc40C|X1PyPD!i)x+%M$QLqZEZ;q8z6wd9@Eg!_^70$RQ&1FCyG1;imie26cjYu z+uMUD<pBZ+KCUPtBC?K$hvyYJd2KLw3fTR+Atxud4#o!vASR@|@c<~%1ngFmWFTnx zOhrXypkoTuy%F~J_kRH60|XGt*u9L5%wk}EV<4p<0cHFR8#aKZbOy{*@7}#zrJ$gI z61o5ZgyJzHBco61>guk*ymp(EBneCg;1&Ze&w*MLwDQ!?pFdv%TTd6gyu45f2!H^> zm>+X?cHX0^syYdnB>$3_#<6-1)}W<@r=XqD*Xil$81s1m0fco%Gb}7@ija^{H!w6v z&A=$hlGdIA+P5J)I~(iJJU{^9oP*ZX)a+tsXaDl&4{80-@87?JJ$K{A4O)9@C$Ngb zIgtVoKzNr!?Ay0b0_ec!AjeU2e4SG8`Sa(sKu_g_hKAx?4gnBAO!y3Na&mg1tgI{q z@)R&8{tdK;K#>4Se)972srWnv0ssL-^pc~QGiS~P7OSp&e0;K`4z5rG08<U9vHl*I zr<90M4-h~kEfQO`YL(0L=g+4C^PL(s#@LCCC1BFq3k*=!tgI}1V)X$85XsB>fb|h* zWx@OpA3msab8~A`qw$Q(Ltnpsy$!U3MOawaAR;1yq=qa&0Fk{AbM4x-3NK&2ya254 z9su*8J_iQ}12vK;s1ycz=pxWVAA!C5_{7A-2jrLo5I__!on5zX9Y3(Xas}3TwZIk& zC$P<?3L2gUd6F29g6s!1%YcQ`ePCbe0?;#o{QUd^(b3TqEu94jAVzBToY${kFYxy5 zTO(kI>jAsyVPC#{`3p23)ISmiVjfrz7Z@uqfl2r^FaX{HdldS>07wS5QO`w1MNw_B cGeCd=0K&9|^EfPl`~Uy|07*qoM6N<$f`4^S82|tP diff --git a/tools/sv/images/xen.png b/tools/sv/images/xen.png deleted file mode 100755 index 344c361b3cc1182bf22ab1da590936157f8e851d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10575 zcmW-nc{o)67sv0+oyA~mV<(g~OZHvN2+5L3Xoy@wlSm5L-JwKMDI}F{X|ZN1WC@eK zQjMZyZBxh+BD>%H{^ogR?sNb7Jaf<I+;d*<_xYsL_wFY1O7j8$K;C0-<BDE$(XS&9 z0sXylCy|0)a7Sp)GywS6*W<#_L+_;`Y#9;z!-67C`<)B~XaQmVfeL#<{f-2>2KoiW zgue{5006bGdu(WK(f$5wo10cGYLfUK0)S~Xkj53l;(!96*!wPDN7lx7W6y;mp3MDQ zGel|hJINXQshxS+m$g+ANfN~HNw@HmPbU;2gvNz3^Q?m7PD9tk`$r<0PR~p?3@Uf4 zUVV96$#&lf%iCFjQpcakENOS-m6X_j5UuszJN@amyN=H%;SOE?mdh6Nj`u|joGEK3 zYjrlW<^=a#`Fp9OaF5|p%iBpRnX1kH)2d;OCBYAlCW>rWFPZl;avVl8*Pe^~N?AMO zrrOBxl{^2}<ss#K+uhc4Ett`ho|V@-Bv%9E<B$0E$h3T=>%3i$njZ8h#n1gI|M&ga z{n(HBdmk2k`u)d3uzpA&qYc||NU*S*r^<_b)*3SvCG&bzBsXx6OM%q8jH;5}lCI3d zmKMLJqB34U@Oq;5zfIZc4)2294?oaEZAFZ4ICuRz)jb$u#FGsCUXXtJnZLBxAtFZb zUxKkTx#m&EY_#V5R8;*5S)!k0b9LzFs+rZh%gQigEGL;Ia2RiwZ=}Ow0FPxahv6e` z>TtWiA+6xw)+FTICeXIoEFz|<M=Jo%w*kGnSjDT$Qv=U#!;{7w`$n?cNfGAo9>~9z z5RfFRr9mJ9JPP8{swzTlcqfaG9M|nUd3Uv7lC5;wb=J2gSTZ}U5h?BneCxs>;3ke> zu7gfRC#j7xI(`kn&$<jwYox6G45p;XQo0J{1F&glJxIK1wJhOjT&pg}wVgk&CK`54 zf|q3I0zHS9i2L`}&0avv#$?>I6?L*m*itzOX!}oI%{Et-`!5w_$(4?6$zklqgkq?` zW3B@2F@|zgQD`^#7}TMKW7`^cIja2Fp{5vX4t(5YJ6+r?LNLp`w`oP^|EO{ptK#nm z<>X_W0xUUEAA+H~Hw3fejHG-2;sK1!l!&7M<D@8-l5M49y$lQUs^7Bw>R`jg;T$9{ zaIU11J{H*>w`h@mf~4vRZGzu6b>^uPTn8ok_9cqiBBf}zY#&pbkbms$+qaEEYSm)d z!0y7EmVg4xC~|Xsj2SR5;MlkmF3=4j|0TRLT}_!nU$d$_*TNIRr;Cj{<z!)D(S^tf zvp+TCS}!22_=%XU#>2F9-X2AKb@xVc>_blbT2t6a<2ruf2bDy2t4fw$WFB83R8FgM zeR8S#7g#|nV6Pjd?e+yb^Qr%$L*Ke@7Er7ammKfr*azY5h9#IXyr$vsd(k2{e_Yh+ zb=FX@IAokp%0s9me(yP`l<?T?sV4gjp_0;*vG(t4%ef@Z^t8N!e73(-mV-H+#v`)I zZ*Wzts9hrO#Anvfq&TuP+FkTe3(XJ*O0JO3mEY8KUbl5vM9hnXmofGi6%p|l7847^ z*lAKi*6<!%lG`uZW6(r&$Q~RV?Ao?%TNlUm!st-_=_KEV*af276<SB%Wk>c1bt4Wc zK0=(lwF5Ak9$>|Ox?pED1^o9+3|GTs>2YrAa@Y?Wyo@(RTs$Z%J39cA>*j>03*`2x zU3aiPK9(XP#Wuq$>xm;iT@}7f1XUfVYE7`5OgR1n)MsIJww?wY9mEkS4ZEvAD7tP| z4jUF$0WKf{P%|&a?&A?|w5aC37a{^|8^0^Lxk30`*Dhp2pnvH>9T6&gkKk}l-WRBG zp74Fe`410WHlN4L|1>TVNX<Q@!0(?z*cUV0lr)0Xtj%LhJ-=W05?=W)4?5L~mssf~ z`0OHhu!3uYzZ5`k#^$)r&CQh|S8z&p!S1_{Zznj`a293MSgfg}xgRgXkho1&$zi2Y zU)Dq|oX7;8Gy#+!?cK9GCa^Hzzg2f%I7YEpuIE8=^}~%94(fDpi<=(cxZTLp(^H&o z&MVr@wKHxMIXCfIgSwbp;=}wF)R?rn5eB);X}g9|df1yJCvU{*J=tv@V=pi3GfvwH z2vIeal+@|hnt1YFA7;4^5TR{Ycl|#Tf(G7z16@Q!1gY){>kH6ksppUw`Hx`-(coN3 zg{OU=Khp>sm|9}qi99%+uP1IT)4LNhOQe6ps<b*m-{lP)HhHs`cxv%(^?C|H0_=Xl z8+r1@{{<#3Qw{oJ4nH_DJyid1V`=t#8HeYKjhqKy_rn*$ZP-4Np2a}P{@6vKCObR3 zjRUT(BG|>rqAN92lI&Qu)xl@S6B2%O3d?c(G&*k~;cRW+MmA>sMcN=j{C1nVAi!zg zh=;z_5nL~6NWwe!9uE(nb)h!B1?FZH>Ls#ksiAu$O(MpGLgwOaR5bq!tJ~TxNA;bM z!UDFJmyd_X0#w-{u8?b2(JM)R7{c@5fWiho1R5EioLu8|60)GisRa+Eq{_pjzpvll zceHZ8X|it;EvU`>MTHw((Uox+N}j|c0j%0h*!}krMa4op8tugqgynVb{?0Ff+SFCf zYiFus7S%D5`r64ZxEYJqTW;M}YZ70PiU`AJJNS7<Nm&^$LZOT}=NpVGvyW-h0`7gq z-W;e7-4EDthVI={GJ<+ZUS9K;Zk7m2KJF5fw~YVv;luo~)y1hN)PKBJJ{Yy&;q(a| zZsr@#`^bM!kE9jvrYEngE$f49(IY0&e-xsJ#7v+&ANDJX0XQMPMmd>?tZRxor&o5J z6Wd7X-&Imlg1vL+j?1q%H#+c65%Jk308?(Jr+B}zyPMmgn%deufMWWr6{(!bl~q(# z{nf-LvEzA2SlAKEsL4E)>*=zpJpBCLxR6p-?B#!cU-7{iED^z?SM`bOX3>x3V*4@! z{>!_ilVVJDTp!~d!Fdb|@)~S_7b75l|C3QsKZ$zsZ*H3Imr{GTCtcApen~-~tj=<~ zx_Y7;oi3D|SwN9K1i#hZ=ttkgfr}RfhIe0*dzlif5{wtn(QUwZB&@f$w>NNbo0Oit zDfgE<F3IZyQ-RSdf5({;LVRfb`g0x|BH1srK+IM9$$z=ZrSrS(ChWc~EHTmY0E5w| z<u5b21h8B8;XDp=BG%^hxyO^!K?8vA!kG4{pItGY`}Zr7oZQa$IJv!l|6cVQtYB%` zNM<;&C}Kn+5oAjJy{hUWx%ZY?+n=@N`EJoOAR6YP`gbsx(jMK+BB5)=!xq!Hkmq_S zA1{M(yW{bAymxGDtYGoJ*y+ztcZW|8*2=Slm-r0)G7DpaaEmHZtf`xq#KgpWS;{#g zY-3f2Hl5|eetxq^Sy@P3ZS8Ut*X%ew8rG98iohysUY0DnryBKU*&c_|7;a(~YT?M1 z2=Y_+|1fky-t#i@busmWWe800NKXn32*8z;mNvb5`Euuj9$o5u^v`#<wNL)+y8aIl zAvH{Z%0|$;nUT@g*G2%xVqY2K<8H*deXth`<D};MyrCfsYp%-AQU46&r7>tyJU#WG z@}mP4hhF@m?#3jd`|QL%8#yK^2|uECy#cO!r~b=_G35M=!^v;D6V_K2nyRX*n1>Dx zAB1e47xvIN1rMAK9FWjpM=SxF!q+c%JfvnuK-zPGQBg+!8WUF0JC9)enY6Ud*F8Nw zH-v?S%Q&sC=V!m~K1O$u93v1g7z}%aL|(dx#i1Lm(wEIA?E(IzhjEj4_VtNYwgR?5 zjSt~iYjTMlRFU<0WW<*z?}NN9)o2eL2m72>hH`lF^;R(ITUqXk%+qg;p`(k>OG+Fj zh8yDM`0rKZbbQwB?e4C<b@l3e&&Q7*qGR$=Q1S}4(uE{Ruv17%)|2j>QQ$AxNZaB7 zkApeWZ2X1J3`rsdXfuBz^H|J?U7(|@Y(xcExlf_r_oXo40j$C8cGy6ICuD#PoYK}W zt4zi~Rm*~TPfc0MBrBcwVN-pNcV#rE8vK3|_&UJd-CZ7}lrF8W{<HeGu&~Z}8k8x* z-I1uC`s-RzQ4w+L)~%YHy(v7*zw$raAwUlVg$$x6YfjG$XFhoF09kyn_WGLkS%EEP z0k}!wIjp0BB{ThPS|}u$t-uOyOmP@K+;K61nEDzIF`97w^CEd%IZVrM<2&}rQ$se6 zMaTtmzR!|N$Tqxl17;!l=gCcfM<*mok$zEZEXh<sobb^)gqpu4!FMbB*#;$zCbeP7 zU6-G&l}9T-JBGkS^qEDN&`c9W=BR2>Fjd|jH;%~+n?*mOVqytNOMkwm{Qgv-;p$ov zzdUCf{jD|Kmvu1-EL-e@ed0<y68!!Bk&+n_`;#jFU%^kGpB`yS!3vF8MJcQ=v}H&j zQiNU5-8{min>}XWKpjUQMUAWF)R|5^A_(-UfT0_>P~1>sf_b!OHJknCTq&BTph{Xj zN5@=MLnBV8vytS)9O-_8J-eMbZpi#2rb6V6gKF}c5>}1I(SUbx-d`=6wd6*bBEvU0 zCKF&CpX@`#Rn$O>Xt0~Fudup4{CjHRv16s!%i5$alW)|x7_NR-`N3z6H?5L3w(2~e z#vFT8`0CZG`t0oNN7e@>?gD578hjGSS9cBvD}Qu_cJ+(aC9^PITXcehgHHk!3B>~8 zVEU!ZuVdYX6})_Wc$V;1XTP<SlcT$l1dBdBOl?p}aq&=TS=rjRi3xSyzp5I{p|upE z;0AVRRV>X4Q|iB%A)$@#v&=q+j<G+rVBc&^Fa)t(e0<*(oQ47$?`x8R|pz*Zg+6 zFvjs+5E|2W1=!!$Mfl+R(@_Zt>r^s1^ERio1@rd?AA6?^zKg!daZ(~U#NUgh?%Ow; z)zGjmtE&3Ylp`>7iaW@JAO(g1y4zIQ%AQc1Q*SVJ_onsR>qw>`GRhh2RfvT!r$h^L za&mOoUh#xUt>h9dIfs%&=pG+kS1&0#CT2)$$Bv+V`}PTgE4T2K#b8>}&ZLdCsc&r= z*LQf=D6CEonbXu&0&XV8&HYH{7wW(`+8RqpTw6{|OxzED-Qcf&BcEMFRpwLcy3?yb z)X~jjiHI3IN~`A2ixym3S=qq%kCH=5lt4!{RVZ@zzNgqen=J4f0UCd>g+kfS7cmo> zCyT--JaOQMnQReH<@Z#wo2sI!CU?T=$LBbU1yg1~0lx3JF!(by?uJpQD<;3gkej(5 zGF%rQd!UN4*dU5cSmc%^;w31#PyX5tpOw(jS2<WttMaZlG!K7_&Q`}Vuc{J}J{5f( zUEN~9<N7stXV{6mSZ8L+TRY$}?ez;3{mX4jmJxR)j!BGp*zj{}NanFLBgggWtyh&% zQ~f6(%pX3<>SYw2FDsybR^eeRln+!L%!Jd=Z^^FDDxv*(g%NV@n)Bz{=&@Bhx_f$B z$z5WCa45f_SvFvTVQbCTR95~izjR5ESp^cArv;1tHbjiS*MRDi@r;FHm@rQ?o1Gb~ z{Xk)e%>(9|;~X|Yo}#dQJIPWK*VBkqp}sUfJ$>0il3#OAB1j34VjFl6+H|!B8$$=G zAt<tu()S$DULf!&1krEt9K0mZiad(icKIW0IOx~H&+&fCd!FC_*Ev=?UnS=v$Pi2d z7tX^|Ml4KPsXX=4@Np({X?$!<jrXri(N26pKBgM<1xkbE=uk>?fo#j@j~@jX$7@$P z!^20RZw<JBl<J%z!uuwc@);A;V{5EixEP3}ED%DOA}n%}0GXFxvJxRi^4_&s%Y>B( zA#O;NYZq?fJ5XJC=BTGM$fxE3r6yb}C}@;wCGsdlyYt9=CXhAY#mTLw6=_2Uxk0Y3 zT40p(=I@D#^Oet@H35s_zSvWRCJnBl>@({^va)OU?%g{>mZT+fIQY<9e1!_$gZPe> z?jY0$T~qD|IeK*bA?Hk;P~V9mQV5SP!J}}7Hno*2tp(Zn<2*>}oZ+k5IuZ}DajDYx zcEnglPPi$s-&CQr6@g)TQpP$J=|54C(Il#qGAGa;u5($Q)%%S1f}jxf%U6(50cN+b zojqX@ai%_2>R9t8h}I2efLvcyQh#3`k3(C0<)RWdrGiCT-V+^N!&CHvFW7}ODB$3x z>QWHzdEkI5_4r*qW8)E=6Fro}e@Z06NOVkd`&f+cm!W>7db<v7kl<0Dz<IRvdCygq zH;t!f3e?kUZ^!)pSdNPN6Z%~3u#x96V98q(Sn5!Y*Y7!&`=k$I{tna~^UmBv6z@Os zZ92~9R1?r4$lW~AfkBazc}H5)4+Gkhm~12FF*D8Z7bVswCCX`z)F8SNDARH2*Sp&l zKm=f%`M$>&5<5xkQ(PbY@<jpT<s#Vc%i{yS<1Y&ujy!$(Db`Wg^d$eYr%w-lpPIUb znf&q`zwm(eoBile!z;jv%AU14u?<|Tp(;zHJb5xlqu)6EvCOmTUUldr@7lY|OS6Zy z(DK%Tu!*@(nmH2#7kIy)uCUm-^9WGd=gz^!`FeY=X{%j?7f)d0qWw<&dOL;lxRLxL zZ~f2LmN*@>k3Z(rJ>rTu3NcAV;c4$pVDkLc8waUTz|LkFdHKz#nc;>omayZ(8GOXZ zFBpc;wY9Z{aH=n<vG3u^2bYMq?qV01NvLYwP-VBeDs{v|kr6Z(mkP-|lab`y*YL-~ zED_<NY+_Xs<j2FS2pRHt5pa9GIX2<qY6Pz>_O8v?#UIhEpU1E=zt6Fz4$>>=f_dYC z+ewNbn4-byFXYe5t4{ew$%8o{8~H2&Eo|^HI?Hg?R^MTV&`w?XzUp|s!yry5)@4fG zVBfxSB2k)wull~@(DSAE_6t&zE(I3CccSiMwK^U5?oE^x7TyX>(q^$TSxGO>*-{;S z=&OImKRmo$9rC$(@7o$_or_6;x#@mbc}5Ys>wjj;FP<Ajo3|&}F^2SC_`Digma4;B zejHs}f-TW0SVExfcEVC5nKWfVykCU8q@^;)rjn9JeX-j!x#T$g0kFlF<P?IKtdJsR zBu;h_^XFUMydgIR$tb{FiVy`9yS9+*p#%&BC9&?eYC!KU$TLFiuMB`Krms3Xmn8ZU z<Fc<_RU~vJOd`DxnR7^s{l?_Lvzd2Q$3BU6miV&nzfUF0__IhFLOrWngG9u$*|hHg z9Gge2)OI&f`iwkR2UA4m59!p$4jjFLY?ssf{<Y%lSzE!&!zA@vRCl8>Sy#Hgy}P@Z zMI^2tw@q33KL3x`DI$8sK;DaCaN+iuSqwG}AM*;xdp!)Cl3{u(6_MwNrjXwaYI?Z< zZQv8D_L~OttDF#DL;SL9s$GL{JBnZ7fMfOuXIP#X(k!~&kA<BUWXG=TIzAwf$1puU z(irOU?vS|7-9|vB&jp2d>NN2dgGqhl$x&b9Vf$3c8gyaL@8aI6L!zHOd4fHVf(&cg z3ove^T`?yUL+TSSM&XBEETOspt0!7~hwMd)rASJtvoWqehPP!Y^DHSzLRl+8&1XnS zxmpJa!5_F!GP-af&$fdyoyMpzr0zG6?KDq7o{|uwcd#IQ1v`vlIX*26wFaQ0+en(B z?ww9Z5-X_eeNRukp!oqXyN2qnkVd|735O~Pf-AwJDIm}iIvPpo<BuVKM^o?BqITc7 z=2)$q=sv^<RAiX}l^$F2iZ-@bME`LP3)3FBu78B;E=b(+jg_!GH~Iucqf6G-)~&Rm z$b03hU*42(?7zu6koXv{p5u**nt&U^$Q2uWUTs@v=)t2$k8T0W6VH<SlJCyGNFjb{ zH!l;%s%WYpd8Vc*MM%W_%EIqbj#2-SJV`2WC!2xH@^b|O|Dr}90}0gS8huWZ4aEi_ zbrl*19<7;#f3vYf6vf7*gypRgMJIm$Uge)OYWmRKElj-C3tL2=OO%u)H8}s-F|(-@ zmHzlv;rX9(H{H#dd`)F#lO)s$IEN@3bJXp`^K@~YPK?v=&bd{DT*-bJN?+yed3tt> zKXFcx8$bQM<I?LF7o8RGfccT8n>TMxCp#RFMD<Me9wzqziMt2YbJM)ewVTj)eeRVh ztBWO<NQ^Uy`DT$556|*RyuwiKaH&5|LT_`?hE?}@cz8pu&k~bay?M6$JU+BswZm!O zzV0KO#h3A@T;SF|aB5XjyPUwbjqdza-W+>{?S)wu-BsDz{-~&^MzB)UTum)4@_T!x z-LJQ|6g8aSsiIR34h|!<bdpCMTw+PzmQpKh1GemzV|=&2^4W9=DKAfG>*Ck#BA_zA zvs8$t!Ovoy7D!8i1s2XJYtl;yIRK(g5LaUh$IyF;{hIwBKD6+cVSA6(B&HXs46{ID zcF^0KF%1tMq>>{t@J079hEBAB@7g|fHcwcb#m`5OVasF3eqZ8rweTE!s31Q<$WRhW z4YgxMCSGpg>%SO?&9O&BM3<H1#w@`<UdHrRuzvH)XDqa*IdXF&!CCKI>;~XC=jd|V zavfiKof?!ZJ&9tu+Wk4yQJ^|TcLsN0-oye<eA@67^^dcR0;*#re?O)cPE&20vLq5& z7J~f-nBY>_g3N2ewId=+6}QY!H%?7X{-}?cf1nBGoL0DM{_1h;La-D)PQ%D37nDT4 zw4F0DGHQZJzvYWVd7yE=xod_x-bPJHn{tiW5^h+|#iLlmGql4V2-`qU&mTy|xAa#X zyADU4DlRSE#Mo}Tj2Z!dHhOz|*KyT5H>ISdlL^W%=3%5jp4;$6>>;v#Ucr=p4ip`x zdWq-hbe3RX_b)`~<+^NjJ<mr5(I+xFF^89%&@N*XqEPx(z>CahFe9wS5B=xLL51!1 z#cLKi*9MaxDXili8OXvHWKSTsoxr_o1#uFIi><@j3^sML<(%LZ{uCbgXT!?sY7%zf zVAzGsOj_n4BdFP*P`!BwSXZ$<@5$*L#j0H4g_OK;E6c*nM4@aU>V0{&a2COym4z+n zH;rG?(L6OVTo<YF4{h~`zS1!0SQmCl-imN`NE@lkK#_NuCuDMiFxLduk0X&kHd%g4 z#57-^WyP?loHvBBPPm@1IO(a6n0W3oq@KEsildS6s3?MJd|$lEm<hmm0DrVV3LX+_ zL+Qwt3V36c??xL2gX%4eJB3*+SUEKzrQ@f&?HU6iSm^wNb3f>T8P7lI2X!sgA0ILc z9LuD*VK}(e7jNE7?O+Gz#4i2WYMU-58SY9^aRP3c%?pf$3q#vE<dCrEDE&Oe72p4e zdL-p=kLJOH0|JneEXHn0o?i39=!vy%(Rm7?S~mqI)qh!>8u*fi^(n!X|AZdS!k?-z zEq^{W#Qme*|0GC1$g8#}STtj<6aNhB*dT3cT04TY<)GBzj#Gi2q&oavSO~)o{T1#z zxXaXCxZTdI!~M+Qi^KFOLdZcMjC)mQ)PH{7#r9u^6c$qrzep(@dq>;Zc{^@#5<^x# z0iG(;1jUSv0m}Tq+}ug-Pr_CxYwbx<QQEclHgRLzt=#JM8>k)Qi^JiTu3Wv^gr&SZ z3|(?BaC-``46@v>$gzJXwhs=j5p;g}Vy5<Dl|`WRyYb)K$(e<_FO>j}HVKG{Lk+c5 zRwclasmjj-_O^5^!J)U!r>Cc7;HpjudJa#>{0VIDSk~_($S_W%Ph*Xs?&)`*(s`VF z-i_g%GAO9IWdZgNsH%X|H?`OtQ{oNdv;W_;$X$;`!;ZiU)A~@i3cl_Uu5wDM@{eGj z`7-K?h<8h9AEKWUUDsxlv0i#>0)5~WAavK<pFcn(ZW=@hV|2T@@_6K%d_%qb{QOHW zDHn9p`Z+qf6K^zG3%i3aHFRkjCYNMQzwtHqJZfb1j$hBq%QJwiO#~~6-aeR?+aSYs zd)8q&o$w88Zej(^(etu76Im2JsfEw~=vft<!$oCtr&l+iS$@2KU?AyCrW^+yHN3c{ z(jqW>ZqaQT$fzl&?hXVq#;uS$XHZXI<8wotG1Jl9a5sAs7_daP=r^(2szsSo;yR-# zdkH_f-n?1IhTyDHjw>q400XAh9Q9dao!Lf!0B1KfH7Rj@T~wX(|H?41dvy7AfZU!< zO)afwD@#k+7<~?z-XhP4Oqp2+Q|sk)2JfT21{p_=b?&~cNS1lg2G734X>NB%j$F+; z+$#nJEdc|6F(81!9lC@Mj$p-ZWoKy6()q`}`cPjt!*c6j$lsGdsik4CM*^a;2gTzs zkRtZ*?%lg;MK!7A_JCm!tF6Y~)ARHE+S=MDj%&`{T~=^rU^uj}zR$yBQHwpRB`qhn z<IcT%f2H%jSc0Y6cwR@_xu17nKmM`;ZBYLsKeVSxWbDWvX>IP=D~LU@t>f|Gj!MKl zwNrO<8Ew%OiU*pI8bUu_+5m6-jixNc-Rpsv?Su^N=F-gB(rd~}N`HC!ELK32DW?fO zl_czcgmbW!I5Cl|i6bwh9ACi&*I+~b`d~ejFCv-wJ^XG+ilwr$@{o&*%dfAaqoW|< zn^k3$95Y;@FeN3$-o~c&6a?l<jGZ|DAQjFGSblj`b)=-CVw1Oww}y59jEN31^5(YH z<|2x}c(_5DHug3sABzl)z{>9pQTQI>s3+;__*b;FH&K-dMfupk6Oi)@qLUkegQI@r zJSr|8-?e*p#|Yb%$0jBADKe_d7OUVYTk3J53XDvTO~K)RNsO~2KyD>}=PvSp9q5m~ zeO7$|RWtqzhn0=i8guLxTCWYh>%KNGFK<CddwX(wP)+x>T8_-2q|IcbuqXHL-8*p; zWtOe%R=0<hA2HRR16VsBty1efS@$I=I?xjA{{1vmJiGBKM<Wd0smKk#x~<|+19oVQ zw?F!Y{YzJ9%wo_A+O~|<%+UrF7kJsXPV+MOCIOH2cbb}-oL%Bbp{n1fU+5%9BI+Y3 z&rZ1SLi@Rsugjt-%eX1o4977!8<vc(70fHX51%D@z9B>7D^ilFpJ2b#@LVfYJRzeh zbnJd~92hx(`c5EqKGn@>|0atSE5TS;$BJL`=iKC}`y@2;G6BiBMm<uHY~+txXXuEA zaK7J$I*)_h@7_ec;KPu+8n32sB1ZADlq40qW5<rB^0G4O_fui8@V@1><x?-_f4$QH zD3;o6PXw5lYf4;~j;PbuuGSh=05sDNfsQLPoU}NwtnoH>AksH7G7^=vjq3*NtW~+b z+!%7%McVIXj<bLyAux!WY{@l|EYin^hHQdC&F46+L<hW$?>Qp>eibMa41RWt=&aWg z8;nHyC|HhNaO<-q($n#O<%`y1#L}+ck+>jo(H^qK_qPa4Zjt}g-5rx*k%&j%y;kfE z4<JS$?<8m(HavJ@deC&I`X^w7MgG-+CT9|C>Mm+<UeHYJavuH^vJIW{Hj_vs?bVeP zGzbLSTSWTNp3k3`<@!vc1up=J5U`FRbjf$dQiFCttzkIAnh5<4$!kqqTADXsz!gPy zBUK%m4u%3OJs0{5r!Gz=mX?$x+x7XryJ0+oFA4ziiEr8L^7+oI8}|408N&kuGBLL5 zOp=2bGx`$d-SxRK!0moAp@H^6ldUeEn+EqPMxT+dPQsW$u~K<QU8x`T+;i$ldGHS= zZJNr<kHm!x459}D@cnd&x)WcmE!e^yyk%j<X6FUGJSD}%7SuE}GAN9dG|VZbJvXMP z?%SAF3S53mNN^UzzIM;H_y+6~69Wy*2F1s(NkBhR9!V0)4}HNBKJHW~z_xzb7tm*B zppYQ(vEDkLuhpJmFA<fjTNDdi2S21#c%60jRxHN2A3kkgem-jmj+f>ya9R^9`lVh> zeDz}T#i;gwSdcl1tw)?W1vLJuiZwu`?~|#i={tQrJsgeF-0A3PKejWu)CP)dyOx`~ zD8jI{y3=eT{Tr1OhA?TJmwiL9M8bq>9108#kOM|o<<_vWbft{ntcP%GQOiU58!`9t zSuTQg7PZG!?#ZFR1(WMua?<8-;zzAWy^oPN4DGuUvW+tE*c_=EMQ#$j0*E1Hi7#Kj zj++@BRVKLcnT4g_1y9g=RoP#)upvuL%-~?GbJ{7z+uAgR@Z|Q6zN}BuEDtH5G$9;v zU$8-|8h&iionyC1U=)fQ>@kmhCb0Y;>A|7$Tq$QFyrj*#E8SzgAEP29$c<8=d*68o z(T8@Zs1W3ufvAU4Eb@V)V+(bgYLRLYJjqgh!y-5j-x=6_g6J<Gm$KIr7T8=m=W$jy znLuPI7Yngp_3>$zPe@&^ZrJBKcL7Tv{1;QBpLLI`WZ1SsY~wck<Y#!=b1#-)Hnwfn zih1yMo|2Lhb#;Y$TJ#AZGmLbuxs<m+v{D9Z@f4m&JVo74Qfz!=8FAvTJllLtg7IzL zdL#f7VQ$Qo<lb8ifcz8E2R*P_M=^%a$HSF}Py9FQ!XEP$IrUJ0t+hz*yE*|pklzcv z6a%Gq9-;QX0rkL$vjgZba5H5aJ|e_uMONf&;ldYpajvp_*OG`Bw|w(9YSaHi>-m>e z-s`#<#yb!zOOWEWom;kREM30mD)_bAHNyg}#7bdKc!EI@ZwZ)d-^Jm{0PJ{P1?F*G zzeyC`5vcPMV;DAvG46XP(MpRq$I=CiMwU0$S2qzE57tg^Zu+|~aiZNlDIU4WZ?9J1 z>q7Y+9TKe4YyJPQ&N`?y5%=@&N$&dt&`TjcXYZyvQvrX94H13H^l-!KZ}jv;7iS_1 z&v?&rIhdMrvBx2x(>$Xwei<9=xQ_8dD@{&{n5_aI?bw4Q_*+<QP0cG-dhj~)+Z{40 zAH{hc$lMoC7pQA|3~6QSPvI>to~gNVn=I0ALFOcHgp2-|gD(`8L5kfonsl<hu5<Uf z6bEbWJwtZH3ZLe7+OxhCyOoW?p%9Ftn=JL;@YkO|kAttmWS!kA(F$hMEk#DI@a5S{ z(;93bk}%oqjCdZ>NK+KC93uvEQjX^mZ7s*twsLc}b8v*Zu^Yls1hYE@lA2ptKWOA& zdOFVR`V6WskQ@6q;r2RYU>r4-CuqCKh*7Txa;u#4ezBcdc(WSKVl~S(Fpt@oTsOgK z4VPtjWrK=Npqare7<z%vVk@5$PGL<Vf=*;-w&2W?MJi1(t%P#bGd?0`2R~wzv0Obt z=*F}*(*YMTEXMTaH^|0JMQ(JQ{P#9#tefVo@DGT)DnmO3Qx~-DWPVf<(MQYK9|#NM zy_TA!7`(TLxk`8{znMjfeE+dEvIY%O=8X`c7`V?%Fq}77i$6H$>iz1kN*P506T;S~ zO<GD1$|{R?3ec1NiTN=?dCXtnP&FmOaFDsMTOQ3OH}gk4Uc45VTpM@J8MavGB~S&o zn;SSxot@$OrEhljN|#Yn#I!kQ7Ug~GdGmqrOdnP&t-*>L40u4vu~<#=HB7HIM&-e; zLa^Zf$D0<eUZ9PGj4P8wyGfG56yOw~OAWza@IJ)+wnFlWniDkjyQ6G$x6InX30b!E z7*i+HzYX&^(KTTANiv;eJ3VVv2*;y;&A@z{jO1tJsn#>lF*AW$t;L?;BluIGZCAn2 zRD9?!;`z<9Dh94^2;)b<1)HsBCFd#J2YaAovzE5DDj8;n7QOyL9&2PDRR&$`uSwjN z>=TOsrH=+FrBr{p0m>}%a?+j=p3q9|m1)P~5M{1!2<0oc^#$*-2N*|dZkEM6IP~Ev zrxm9zbqOr(F6H1BBMlsg|D95++cF^-`~@s6*5KHjz`I=m;v!u+?`?VV=#$hIQN)l= zH7c_Cu!iZ^$}sr=3?9Qx5JUA7aSmsw8=+9)<~FwRid<feC9A8Y`h2)3zbv|Bdv}Sy oC>M)rs1Hn`3s^67ItKz}j!9|m4-Pt_CnAA8wtH<JSwqSH1D0-?1ONa4 diff --git a/tools/sv/inc/script.js b/tools/sv/inc/script.js deleted file mode 100755 index ebafa1e..0000000 --- a/tools/sv/inc/script.js +++ /dev/null @@ -1,31 +0,0 @@ -function update( objRef, text ) { - if ( document.all || document.getElementById ) { - obj = ( document.getElementById )? document.getElementById( objRef ) : document.all( objRef ); - obj.innerHTML= text - } -} - -function buttonMouseOver( objRef ) { - if ( document.all || document.getElementById ) { - obj = ( document.getElementById )? document.getElementById( objRef ) : document.all( objRef ); - objRef.style.background = "white"; - } -} - -function buttonMouseOut( objRef ) { - if ( document.all || document.getElementById ) { - obj = ( document.getElementById )? document.getElementById( objRef ) : document.all( objRef ); - objRef.style.background = "grey"; - } -} - -function doOp( op ) { - document.forms[0].op.value = op - document.forms[0].submit() -} - -function doOp2( op, args ) { - document.forms[0].op.value = op - document.forms[0].args.value = args - document.forms[0].submit() -} diff --git a/tools/sv/inc/style.css b/tools/sv/inc/style.css deleted file mode 100755 index 1606b21..0000000 --- a/tools/sv/inc/style.css +++ /dev/null @@ -1,95 +0,0 @@ -.small { - font-size: 10px -} - -TD.domainInfo { - font-size: 10px; - color: black -} - -TD.domainInfoHead { - font-size: 10px; - color: white; - font-face: bold -} - -TD.domainInfoHead {background-color: black} -TR.domainInfoOdd {background-color: white} -TR.domainInfoEven {background-color: lightgrey} - -body { - margin: 0px; - padding: 0px; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #000000; -} - -div#menu { - position: absolute; - left: 10px; - top: 10px; - width: 160px; - padding: 10px; - border: 0px solid black; - text-align: center; -} - -div#main { - position: absolute; - left: 200px; - top: 10px; - right: 10px; - padding: 10px; - border: 0px solid black; -} - -div.button { - float: right; - margin: 10px 0px 0px 10px; - padding: 5px; - text-align: center; - border: 1px solid black; - background: gray; - cursor: hand; -} - -div.tabButton { - position: relative; - top: 0px; - float: left; - margin: 0px 10px -1px 0px; - padding: 5px; - text-align: center; - border: 1px solid black; - background: gray; - cursor: hand; -} - -div.tabButton#activeTab { - top: 0px; - background: white; - border-color: black black white black; -} - -div.button:hover, div.tabButton:hover { - background: white; -} - -div.button a, div.tabButton a { - font-size: 12px; - font-weight: bold; -} - -div.title { - float: right; - font-size: 14px; - font-weight: bold; -} - -div.tab { - overflow: auto; - clear: both; - border: 1px solid black; - padding: 10px; -} diff --git a/tools/sv/index.psp b/tools/sv/index.psp deleted file mode 100755 index 829d468..0000000 --- a/tools/sv/index.psp +++ /dev/null @@ -1,34 +0,0 @@ -<% -import sys - -debug = True and False - -for path in sys.path: - if debug: req.write( path + "<br/>" ) - -from xen.sv.Main import Main, TwistedAdapter - -main = Main() -request = TwistedAdapter( req ) -main.do_POST( request ) -%> -<html> -<head> - <title>XenSV</title> - <script src="inc/script.js"></script> - <link rel="StyleSheet" type="text/css" href="inc/style.css"> -</head> -<body> - <form method="post" action="<%=request.uri%>"> - <div id="menu"> - <img src="images/xen.png"> - <% main.render_menu( request ) %> - </div> - <div id="main"> - <% main.render_main( request ) %> - </div> - <input type="hidden" name="op" value=""> - <input type="hidden" name="args" value=""> - </form> -</body> -</html> -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 9/9] tools: drop 'sv' 2013-07-31 15:15 ` [PATCH 9/9] tools: drop 'sv' Ian Campbell @ 2013-08-07 15:13 ` Ian Jackson 0 siblings, 0 replies; 30+ messages in thread From: Ian Jackson @ 2013-08-07 15:13 UTC (permalink / raw) To: Ian Campbell; +Cc: keir, xen-devel Ian Campbell writes ("[PATCH 9/9] tools: drop 'sv'"): > I'm not even sure what this thing is. Looks like some sort of Twisted Python > based frontend to xend. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (8 preceding siblings ...) 2013-07-31 15:15 ` [PATCH 9/9] tools: drop 'sv' Ian Campbell @ 2013-07-31 15:29 ` Andrew Cooper 2013-07-31 15:35 ` Ian Campbell 2013-07-31 16:37 ` Andrew Cooper 2013-08-12 14:53 ` Fabio Fantoni 11 siblings, 1 reply; 30+ messages in thread From: Andrew Cooper @ 2013-07-31 15:29 UTC (permalink / raw) To: Ian Campbell; +Cc: Ian Jackson, Keir Fraser, xen-devel On 31/07/13 16:15, Ian Campbell wrote: > depends on "autoconf: regenerate configure scripts with 4.4 version" > > This series removes some of the really old deadwood from the tools build > and makes some other things which are on their way out configurable at > build time with a default depending on how far down the slope I judge > them to be. > > * nuke in tree copy of libaio > * nuke obsolete tools: xsview, miniterm, lomount & sv > * make xend optional, still on by default (for now!) > * disable blktap1 by default (needs qemu patch, just posted) > * some cleanup of .*ignore > > Ian. In what way is lomount obsolete? XenServer relies on it and I am unaware of any alternative. Other than that, I am very happy about the other nuked items which allows me to clean up some of our local hacks to the upstream build system. ~Andrew > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff 2013-07-31 15:29 ` [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Andrew Cooper @ 2013-07-31 15:35 ` Ian Campbell 2013-07-31 15:57 ` Andrew Cooper 0 siblings, 1 reply; 30+ messages in thread From: Ian Campbell @ 2013-07-31 15:35 UTC (permalink / raw) To: Andrew Cooper; +Cc: Ian Jackson, Keir Fraser, xen-devel On Wed, 2013-07-31 at 16:29 +0100, Andrew Cooper wrote: > On 31/07/13 16:15, Ian Campbell wrote: > > depends on "autoconf: regenerate configure scripts with 4.4 version" > > > > This series removes some of the really old deadwood from the tools build > > and makes some other things which are on their way out configurable at > > build time with a default depending on how far down the slope I judge > > them to be. > > > > * nuke in tree copy of libaio > > * nuke obsolete tools: xsview, miniterm, lomount & sv > > * make xend optional, still on by default (for now!) > > * disable blktap1 by default (needs qemu patch, just posted) > > * some cleanup of .*ignore > > > > Ian. > > In what way is lomount obsolete? XenServer relies on it and I am > unaware of any alternative. As referenced in the actual patch: kpartx > Other than that, I am very happy about the other nuked items which > allows me to clean up some of our local hacks to the upstream build system. > > ~Andrew > > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel > ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff 2013-07-31 15:35 ` Ian Campbell @ 2013-07-31 15:57 ` Andrew Cooper 0 siblings, 0 replies; 30+ messages in thread From: Andrew Cooper @ 2013-07-31 15:57 UTC (permalink / raw) To: Ian Campbell; +Cc: Ian Jackson, Keir Fraser, xen-devel On 31/07/13 16:35, Ian Campbell wrote: > On Wed, 2013-07-31 at 16:29 +0100, Andrew Cooper wrote: >> On 31/07/13 16:15, Ian Campbell wrote: >>> depends on "autoconf: regenerate configure scripts with 4.4 version" >>> >>> This series removes some of the really old deadwood from the tools build >>> and makes some other things which are on their way out configurable at >>> build time with a default depending on how far down the slope I judge >>> them to be. >>> >>> * nuke in tree copy of libaio >>> * nuke obsolete tools: xsview, miniterm, lomount & sv >>> * make xend optional, still on by default (for now!) >>> * disable blktap1 by default (needs qemu patch, just posted) >>> * some cleanup of .*ignore >>> >>> Ian. >> In what way is lomount obsolete? XenServer relies on it and I am >> unaware of any alternative. > As referenced in the actual patch: kpartx Sorry - I hadn't read that far before replying. I have quickly played with kpartx and it appears to be a suitable alternative. I shall see about moving across. ~Andrew > >> Other than that, I am very happy about the other nuked items which >> allows me to clean up some of our local hacks to the upstream build system. >> >> ~Andrew >> >>> _______________________________________________ >>> Xen-devel mailing list >>> Xen-devel@lists.xen.org >>> http://lists.xen.org/xen-devel > ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (9 preceding siblings ...) 2013-07-31 15:29 ` [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Andrew Cooper @ 2013-07-31 16:37 ` Andrew Cooper 2013-08-01 6:11 ` Matt Wilson 2013-08-12 14:53 ` Fabio Fantoni 11 siblings, 1 reply; 30+ messages in thread From: Andrew Cooper @ 2013-07-31 16:37 UTC (permalink / raw) To: Ian Campbell; +Cc: Ian Jackson, Keir Fraser, xen-devel On 31/07/13 16:15, Ian Campbell wrote: > depends on "autoconf: regenerate configure scripts with 4.4 version" > > This series removes some of the really old deadwood from the tools build > and makes some other things which are on their way out configurable at > build time with a default depending on how far down the slope I judge > them to be. > > * nuke in tree copy of libaio > * nuke obsolete tools: xsview, miniterm, lomount & sv > * make xend optional, still on by default (for now!) > * disable blktap1 by default (needs qemu patch, just posted) > * some cleanup of .*ignore > > Ian. Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> With the exception of the lomount issue which has an acceptable solution, XenServer currently employs all kinds of gross hacks to make this dead wood disappear. I will be very glad to remove some of those hacks. ~Andrew > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff 2013-07-31 16:37 ` Andrew Cooper @ 2013-08-01 6:11 ` Matt Wilson 2013-08-20 15:03 ` Ian Campbell 0 siblings, 1 reply; 30+ messages in thread From: Matt Wilson @ 2013-08-01 6:11 UTC (permalink / raw) To: Andrew Cooper; +Cc: Keir Fraser, Ian Jackson, Ian Campbell, xen-devel On Wed, Jul 31, 2013 at 05:37:00PM +0100, Andrew Cooper wrote: > On 31/07/13 16:15, Ian Campbell wrote: > > depends on "autoconf: regenerate configure scripts with 4.4 version" > > > > This series removes some of the really old deadwood from the tools build > > and makes some other things which are on their way out configurable at > > build time with a default depending on how far down the slope I judge > > them to be. > > > > * nuke in tree copy of libaio > > * nuke obsolete tools: xsview, miniterm, lomount & sv > > * make xend optional, still on by default (for now!) > > * disable blktap1 by default (needs qemu patch, just posted) > > * some cleanup of .*ignore > > > > Ian. > > Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> > > With the exception of the lomount issue which has an acceptable > solution, XenServer currently employs all kinds of gross hacks to make > this dead wood disappear. I will be very glad to remove some of those > hacks. Nice. Acked-by: Matt Wilson <msw@amazon.com> ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff 2013-08-01 6:11 ` Matt Wilson @ 2013-08-20 15:03 ` Ian Campbell 0 siblings, 0 replies; 30+ messages in thread From: Ian Campbell @ 2013-08-20 15:03 UTC (permalink / raw) To: Matt Wilson; +Cc: Andrew Cooper, Keir Fraser, Ian Jackson, xen-devel On Wed, 2013-07-31 at 23:11 -0700, Matt Wilson wrote: > On Wed, Jul 31, 2013 at 05:37:00PM +0100, Andrew Cooper wrote: > > On 31/07/13 16:15, Ian Campbell wrote: > > > depends on "autoconf: regenerate configure scripts with 4.4 version" > > > > > > This series removes some of the really old deadwood from the tools build > > > and makes some other things which are on their way out configurable at > > > build time with a default depending on how far down the slope I judge > > > them to be. > > > > > > * nuke in tree copy of libaio > > > * nuke obsolete tools: xsview, miniterm, lomount & sv > > > * make xend optional, still on by default (for now!) > > > * disable blktap1 by default (needs qemu patch, just posted) > > > * some cleanup of .*ignore > > > > > > Ian. > > > > Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> > > > > With the exception of the lomount issue which has an acceptable > > solution, XenServer currently employs all kinds of gross hacks to make > > this dead wood disappear. I will be very glad to remove some of those > > hacks. > > Nice. > > Acked-by: Matt Wilson <msw@amazon.com> Applied with all these acks/reviews and Ian J's too. Thanks everyone. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell ` (10 preceding siblings ...) 2013-07-31 16:37 ` Andrew Cooper @ 2013-08-12 14:53 ` Fabio Fantoni 11 siblings, 0 replies; 30+ messages in thread From: Fabio Fantoni @ 2013-08-12 14:53 UTC (permalink / raw) To: Ian Campbell; +Cc: Ian Jackson, Keir Fraser, xen-devel Il 31/07/2013 17:15, Ian Campbell ha scritto: > depends on "autoconf: regenerate configure scripts with 4.4 version" > > This series removes some of the really old deadwood from the tools build > and makes some other things which are on their way out configurable at > build time with a default depending on how far down the slope I judge > them to be. > > * nuke in tree copy of libaio > * nuke obsolete tools: xsview, miniterm, lomount & sv > * make xend optional, still on by default (for now!) > * disable blktap1 by default (needs qemu patch, just posted) > * some cleanup of .*ignore > > Ian. Tested-by: Fabio Fantoni <fabio.fantoni@m2r.biz> Applied the whole series of 9 patches, added --disable-xend on configure of my test build. The only small problem found was on apply of the third patch, gave me malformed on libaio files to delete, simple solved on my test with manually delete of libaio files (should be only the email or the my procedure of patch copy the problem). > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 30+ messages in thread
end of thread, other threads:[~2013-08-20 15:03 UTC | newest] Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-07-31 15:15 [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Ian Campbell 2013-07-31 15:15 ` [PATCH 1/9] tools: move xm and xend under tools python Ian Campbell 2013-08-07 15:03 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 2/9] tools: make building xend configurable Ian Campbell 2013-08-07 15:04 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 3/9] tools: remove in tree libaio Ian Campbell 2013-08-01 8:38 ` Egger, Christoph 2013-08-01 14:39 ` Ian Campbell 2013-08-07 15:06 ` Ian Jackson 2013-08-08 9:07 ` Ian Campbell 2013-08-20 14:28 ` Ian Campbell 2013-07-31 15:15 ` [PATCH 4/9] tools: delete xsview Ian Campbell 2013-08-07 15:06 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 5/9] tools: remove miniterm Ian Campbell 2013-08-07 15:07 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 6/9] tools: remove lomount Ian Campbell 2013-08-07 15:08 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 7/9] .*ignore: remove some cruft Ian Campbell 2013-08-07 15:09 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 8/9] tools: disable blktap1 build by default Ian Campbell 2013-08-07 15:13 ` Ian Jackson 2013-07-31 15:15 ` [PATCH 9/9] tools: drop 'sv' Ian Campbell 2013-08-07 15:13 ` Ian Jackson 2013-07-31 15:29 ` [PATCH 0/9] tools: remove or disable old/useless/unused/unmainted stuff Andrew Cooper 2013-07-31 15:35 ` Ian Campbell 2013-07-31 15:57 ` Andrew Cooper 2013-07-31 16:37 ` Andrew Cooper 2013-08-01 6:11 ` Matt Wilson 2013-08-20 15:03 ` Ian Campbell 2013-08-12 14:53 ` Fabio Fantoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.
