tagging old releases taken from pypirelease-1.2.4

10 files changed, 409 insertions, 0 deletions

diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..33bd881
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,17 @@
+Metadata-Version: 1.0
+Name: py-sendfile
+Version: 1.2.4
+Summary: A Python interface to sendfile(2)
+Home-page: http://code.sp-its.at/projects/py-sendfile
+Author: Stephan Peijnik
+Author-email: stephan@peijnik.at
+License: LGPLv2.1+
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: POSIX :: BSD :: FreeBSD
+Classifier: Operating System :: POSIX :: AIX
+Classifier: Programming Language :: C
diff --git a/py_sendfile.egg-info/PKG-INFO b/py_sendfile.egg-info/PKG-INFO
new file mode 100644
index 0000000..33bd881
--- /dev/null
+++ b/py_sendfile.egg-info/PKG-INFO
@@ -0,0 +1,17 @@
+Metadata-Version: 1.0
+Name: py-sendfile
+Version: 1.2.4
+Summary: A Python interface to sendfile(2)
+Home-page: http://code.sp-its.at/projects/py-sendfile
+Author: Stephan Peijnik
+Author-email: stephan@peijnik.at
+License: LGPLv2.1+
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: POSIX :: BSD :: FreeBSD
+Classifier: Operating System :: POSIX :: AIX
+Classifier: Programming Language :: C
diff --git a/py_sendfile.egg-info/SOURCES.txt b/py_sendfile.egg-info/SOURCES.txt
new file mode 100644
index 0000000..2c935d0
--- /dev/null
+++ b/py_sendfile.egg-info/SOURCES.txt
@@ -0,0 +1,9 @@
+sendfilemodule.c
+setup.cfg
+setup.py
+test.py
+py_sendfile.egg-info/PKG-INFO
+py_sendfile.egg-info/SOURCES.txt
+py_sendfile.egg-info/dependency_links.txt
+py_sendfile.egg-info/not-zip-safe
+py_sendfile.egg-info/top_level.txt
\ No newline at end of file
diff --git a/py_sendfile.egg-info/dependency_links.txt b/py_sendfile.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/py_sendfile.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/py_sendfile.egg-info/not-zip-safe b/py_sendfile.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/py_sendfile.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/py_sendfile.egg-info/top_level.txt b/py_sendfile.egg-info/top_level.txt
new file mode 100644
index 0000000..981c721
--- /dev/null
+++ b/py_sendfile.egg-info/top_level.txt
@@ -0,0 +1 @@
+sendfile
diff --git a/sendfilemodule.c b/sendfilemodule.c
new file mode 100644
index 0000000..23bab84
--- /dev/null
+++ b/sendfilemodule.c
@@ -0,0 +1,313 @@
+/* py-sendfile 1.0
+   A Python module interface to sendfile(2)
+   Copyright (C) 2005 Ben Woolley <user tautolog at gmail>
+
+   The AIX support code is:
+
+   Copyright (C) 2008,2009 Niklas Edmundsson <nikke@acc.umu.se>
+
+   This 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.1 of the License, or (at your option) any later version.
+
+   This 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 the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <Python.h>
+
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+static PyObject *
+method_sendfile(PyObject *self, PyObject *args)
+{
+    int fd, s, sts;
+    off_t offset, sbytes;
+    size_t nbytes;
+    PyObject *headers;
+    struct iovec *header_iovs;
+    struct iovec *footer_iovs;
+    struct sf_hdtr hdtr;
+
+    headers = NULL;
+
+    if (!PyArg_ParseTuple(args, "iiLi|O:sendfile", &fd, &s, &offset, &nbytes, &headers))
+        return NULL;
+
+    if (headers != NULL) {
+        int i, listlen;
+        PyObject *string;
+        char *buf;
+        int headerlist_len;
+        int headerlist_string = 0;
+        int footerlist_len;
+        int footerlist_string = 0;
+        PyObject *headerlist;
+        PyObject *footerlist;
+
+        if (PyTuple_Check(headers) && PyTuple_Size(headers) > 1) {
+            //printf("arg is tuple length %d\n", PyTuple_Size(headers));
+            headerlist = PyTuple_GetItem(headers, 0);
+            if (PyList_Check(headerlist)) {
+                headerlist_len = PyList_Size(headerlist);
+            } else if (PyString_Check(headerlist)) {
+                headerlist_string = 1;
+                headerlist_len = 1;
+            } else {
+                headerlist_len = 0;
+            }
+
+            footerlist = PyTuple_GetItem(headers, 1);
+            if (PyList_Check(footerlist)) {
+                //printf("footer is list\n");
+                footerlist_len = PyList_Size(footerlist);
+            } else if (PyString_Check(footerlist)) {
+                //printf("footer is string\n");
+                footerlist_string = 1;
+                footerlist_len = 1;
+            } else {
+                //printf("footer is invalid\n");
+                footerlist_len = 0;
+            }
+        } else {
+            if (PyTuple_Check(headers)) {
+                headerlist = PyTuple_GetItem(headers, 0);
+            } else {
+                headerlist = headers;
+            }
+            if (PyList_Check(headerlist)) {
+            	headerlist_len = PyList_Size(headerlist);
+            } else if (PyString_Check(headerlist)) {
+                headerlist_string = 1;
+                headerlist_len = 1;
+            } else {
+                headerlist_len = 0;
+            }
+
+            footerlist_len = 0;
+            footer_iovs = 0;
+        }
+        //printf("header list size and type: %d, %d\nfooter list size and type: %d, %d\n", headerlist_len, headerlist_string, footerlist_len, footerlist_string);
+
+        header_iovs = (struct iovec*) malloc( sizeof(struct iovec) * headerlist_len );
+        for (i=0; i < headerlist_len; i++) {
+            if (headerlist_string) {
+                //printf("found string\n");
+                string = headerlist;
+            } else {
+                //printf("found list\n");
+                string = PyList_GET_ITEM(headerlist, i);                
+            }
+            buf = (char *) PyString_AsString(string);                
+            //printf("buf: %s\n", buf);
+            header_iovs[i].iov_base = buf;
+            header_iovs[i].iov_len = PyString_GET_SIZE(string);
+        }
+
+        footer_iovs = (struct iovec*) malloc( sizeof(struct iovec) * footerlist_len );
+        for (i=0; i < footerlist_len; i++) {
+            if (footerlist_string) {
+                //printf("found string\n");
+                string = footerlist;
+            } else {
+                //printf("found list\n");
+                string = PyList_GET_ITEM(footerlist, i);                
+            }
+            buf = (char *) PyString_AsString(string);
+            //printf("buf: %s\n", buf);
+            footer_iovs[i].iov_base = buf;
+            footer_iovs[i].iov_len = PyString_GET_SIZE(string);
+        }
+
+        hdtr.headers = header_iovs;
+        hdtr.hdr_cnt = headerlist_len;
+        hdtr.trailers = footer_iovs;
+        hdtr.trl_cnt = footerlist_len;
+
+	Py_BEGIN_ALLOW_THREADS;
+        sts = sendfile(s, fd, (off_t) offset, (size_t) nbytes, &hdtr, (off_t *) &sbytes, 0);
+	Py_END_ALLOW_THREADS;
+        free(header_iovs);
+        free(footer_iovs);
+    } else {
+	Py_BEGIN_ALLOW_THREADS;
+        sts = sendfile(s, fd, (off_t) offset, (size_t) nbytes, NULL, (off_t *) &sbytes, 0);
+	Py_END_ALLOW_THREADS;
+    }
+    if (sts == -1) {
+        if (errno == EAGAIN || errno == EINTR) {
+            return Py_BuildValue("LL", offset + nbytes, sbytes);
+        } else {
+            PyErr_SetFromErrno(PyExc_OSError);
+            return NULL;
+        }
+    } else {
+        return Py_BuildValue("LL", offset + nbytes, sbytes);
+    }
+}
+
+#elif defined(_AIX)
+#include <sys/socket.h>
+
+static PyObject *
+method_sendfile(PyObject *self, PyObject *args)
+{
+    int out_fd, in_fd;
+    off_t offset;
+    size_t count;
+    char *hdr=NULL, *trail=NULL;
+    int hdrsize, trailsize;
+    ssize_t sts=0;
+    struct sf_parms sf_iobuf;
+    int rc;
+
+    if (!PyArg_ParseTuple(args, "iiLk|s#s#", 
+                          &out_fd, &in_fd, &offset, &count, &hdr, &hdrsize,
+			  &trail, &trailsize))
+        return NULL;
+
+    if(hdr != NULL) {
+        sf_iobuf.header_data = hdr;
+        sf_iobuf.header_length = hdrsize;
+    }
+    else {
+        sf_iobuf.header_data = NULL;
+        sf_iobuf.header_length = 0;
+    }
+    if(trail != NULL) {
+        sf_iobuf.trailer_data = trail;
+        sf_iobuf.trailer_length = trailsize;
+    }
+    else {
+	sf_iobuf.trailer_data = NULL;
+	sf_iobuf.trailer_length = 0;
+    }
+    sf_iobuf.file_descriptor = in_fd;
+    sf_iobuf.file_offset = offset;
+    sf_iobuf.file_bytes = count;
+	 
+    Py_BEGIN_ALLOW_THREADS;
+    do {
+	sf_iobuf.bytes_sent = 0; /* Really needed? */
+        rc = send_file(&out_fd, &sf_iobuf, SF_DONT_CACHE);
+	sts += sf_iobuf.bytes_sent;
+    } while( rc == 1 || (rc == -1 && errno == EINTR) );
+    Py_END_ALLOW_THREADS;
+
+    offset = sf_iobuf.file_offset;
+
+    if (rc == -1) {
+        PyErr_SetFromErrno(PyExc_OSError);
+        return NULL;
+    } else {
+        return Py_BuildValue("Lk", offset, sts);
+    }
+}
+
+
+#else /* Linux, should be better check */
+#include <sys/sendfile.h>
+
+static PyObject *
+method_sendfile(PyObject *self, PyObject *args)
+{
+    int out_fd, in_fd;
+    off_t offset;
+    size_t count;
+    ssize_t sts;
+
+    if (!PyArg_ParseTuple(args, "iiLk", &out_fd, &in_fd, &offset, &count))
+        return NULL;
+	 
+    Py_BEGIN_ALLOW_THREADS;
+    sts = sendfile(out_fd, in_fd, (off_t *) &offset, (ssize_t) count);
+    Py_END_ALLOW_THREADS;
+    if (sts == -1) {
+        PyErr_SetFromErrno(PyExc_OSError);
+        return NULL;
+    } else {
+        return Py_BuildValue("Lk", offset, sts);
+    }
+}
+
+#endif
+
+static PyMethodDef SendfileMethods[] = {
+    {"sendfile",  method_sendfile, METH_VARARGS,
+"sendfile(out_fd, in_fd, offset, count) = [position, sent]\n"
+"\n"
+"FreeBSD only:\n"
+"sendfile(out_fd, in_fd, offset, count, headers_and_or_trailers) = [position, sent]\n"
+"\n"
+"AIX:\n"
+"sendfile(out_fd, in_fd, offset, count, header, trailer) = [position, sent]\n"
+"where header and trailer is optional\n"
+"\n"
+"Direct interface to FreeBSD and Linux sendfile(2) using the Linux API, except that errors are turned into Python exceptions, and instead of returning only the amount of data being sent, it returns a tuple that contains the new file pointer, and the amount of data that has been sent.\n"
+"\n"
+"For example:\n"
+"\n"
+"from sendfile import *\n"
+"sendfile(out_socket.fileno(), in_file.fileno(), int_start, int_len)\n"
+"\n"
+"On Linux, item 0 of the return value is always a reliable file pointer. The value specified in the offset argument is handed to the syscall, which then updates it according to how much data has been sent. The length of data sent is returned in item 1 of the return value.\n"
+"\n"
+"FreeBSD sf_hdtr is also supported as an additional argument which can be a string, list, or tuple. If it is a string, it will create a struct iovec of length 1 containing the string which will be sent as the header. If a list, it will create a struct iovec of the length of the list, containing the strings in the list, which will be concatenated by the syscall to form the total header. If a tuple, it will expect a string or list of strings in two items: the first representing the header, and the second representing the trailer, processed the same way as the header. You can send only a footer by making the header an empty string or list, or list of empty strings.\n"
+"\n"
+"On AIX, the returned position is the actual file position as updated by the kernel. The returned sent bytes are including header and trailer, so if you are doing non-blocking IO you have to take that into account.\n"
+"FreeBSD example with string header:\n"
+"\n"
+"from sendfile import *\n"
+"sendfile(out_socket.fileno(), in_file.fileno(), 0, 0, \"HTTP/1.1 200 OK\\r\\nContent-Type: text/html\\r\\nConnection: close\\r\\n\\r\\n\")\n"
+"\n"
+"FreeBSD example with both header and trailer as a string:\n"
+"\n"
+"from sendfile import *\n"
+"sendfile(out_socket.fileno(), in_file.fileno(), int_start, int_len, ('BEGIN', 'END'))\n"
+"\n"
+"FreeBSD example with mixed types:\n"
+"\n"
+"from sendfile import *\n"
+"sendfile(out_socket.fileno(), in_file.fileno(), int_start, int_len, ([magic, metadata_len, metadata, data_len], md5))\n"
+"\n"
+"Although the FreeBSD sendfile(2) requires the socket file descriptor to be specified as the second argument, this function will ALWAYS require the socket as the first argument, like Linux and Solaris. Also, if an sf_hdtr is specified, the function will return the total data sent including all of the headers and trailers. Note that item 0 of the return value, the file pointer position, is determined on FreeBSD only by adding offset and count, so if not all of the data has been sent, this value will be wrong. You will have to use the value in item 1, which tells you how much total data has actually been sent, and be aware that header and trailer data are included in that value, so you may need to reconstruct the headers and/or trailers yourself if you would like to find out exactly which data has been sent. However, if you do not send any headers or trailers, you can just add item 1 to where you started to find out where you need to start from again. I do not consider this much of a problem because if you are sending header and trailer data, the protocol will likely not allow you to just keep sending from where the failure occured without getting into complexities, anyway.\n"
+"\n"
+"The variable has_sf_hdtr is provided for determining whether sf_hdtr is supported."},
+    {NULL, NULL, 0, NULL}        /* Sentinel */
+};
+
+static void
+insint (PyObject *d, char *name, int value)
+{
+    PyObject *v = PyInt_FromLong((long) value);
+    if (!v || PyDict_SetItemString(d, name, v))
+        PyErr_Clear();
+
+    Py_XDECREF(v);
+}
+
+PyMODINIT_FUNC
+initsendfile(void)
+{
+    PyObject *m = Py_InitModule("sendfile", SendfileMethods);
+
+    PyObject *d = PyModule_GetDict (m);
+
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(_AIX)
+    insint (d, "has_sf_hdtr", 1);
+#else
+    insint (d, "has_sf_hdtr", 0);
+#endif
+    PyModule_AddStringConstant(m, "__doc__", "Direct interface to FreeBSD and Linux sendfile(2), for sending file data to a socket directly via the kernel.");
+    PyModule_AddStringConstant(m, "__version__", "1.2.4");
+}
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..ce729b1
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,28 @@
+from setuptools import setup
+from distutils.core import Extension
+
+sendfile_module = Extension('sendfile',
+                    sources = ['sendfilemodule.c'])
+
+setup (name = 'py-sendfile',
+       version = '1.2.4',
+       description = 'A Python interface to sendfile(2)',
+       author = 'Ben Woolley', 
+       author_email = 'user tautolog at gmail',
+       maintainer = 'Stephan Peijnik', 
+       maintainer_email = 'stephan@peijnik.at',
+       url = 'http://code.sp-its.at/projects/py-sendfile',
+       license = 'LGPLv2.1+',
+       classifiers = [
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: POSIX :: BSD :: FreeBSD',
+        'Operating System :: POSIX :: AIX',
+        'Programming Language :: C',
+   
+        ],
+       ext_modules = [sendfile_module],
+       zip_safe = False,
+       )
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..90d8a60
--- /dev/null
+++ b/test.py
@@ -0,0 +1,17 @@
+import SocketServer, os, socket, sendfile
+datafile = open('sendfilemodule.c', 'rb')
+datafileblocksize = os.fstat(datafile.fileno()).st_blksize
+print datafileblocksize
+class handler(SocketServer.BaseRequestHandler):
+	def handle (self):
+		if sendfile.has_sf_hdtr:
+			#print sendfile.sendfile(self.request.fileno(), datafile.fileno(), 0, 0, (["HTTP/1.1 200 OK\r\n", "Content-Type: text/html\r\n", "Connection: close\r\n\r\n"], 'test'))
+			print sendfile.sendfile(self.request.fileno(), datafile.fileno(), 0, 0, ["HTTP/1.1 200 OK\r\n", "Content-Type: text/html\r\n", "Connection: close\r\n\r\n"])
+			#print sendfile.sendfile(self.request.fileno(), datafile.fileno(), 0, 0, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n", 'test')
+		else:
+			print sendfile.sendfile(self.request.fileno(), datafile.fileno(), 0, 0)
+		self.request.close()
+SocketServer.ThreadingTCPServer.request_queue_size = socket.SOMAXCONN
+SocketServer.ThreadingTCPServer.allow_reuse_address = True
+server = SocketServer.ThreadingTCPServer (('', 8079), handler)
+server.serve_forever()