Changeset 1964

Timestamp:

05/24/08 00:49:43

Author:

fumanchu

Message:

Initial broken foray into sendfile madness. The benchmark hangs for some odd reason.

Files:

• branches/sendfile/cherrypy/_cptools.py (modified) (1 diff)
• branches/sendfile/cherrypy/_cpwsgi.py (modified) (2 diffs)
• branches/sendfile/cherrypy/lib/static.py (modified) (1 diff)
• branches/sendfile/cherrypy/test/benchmark.py (modified) (1 diff)
• branches/sendfile/cherrypy/wsgiserver/__init__.py (modified) (2 diffs)

branches/sendfile/cherrypy/_cptools.py

@@ -156 +156 @@
-    
-    def _wrapper(self, **kwargs):
+        """If self.callable returns True, turn off any other handler."""
-        if self.callable(**kwargs):
-            cherrypy.request.handler = None

branches/sendfile/cherrypy/_cpwsgi.py

@@ -123 +123 @@
-            s, h, b = _cperror.bare_error()
-            self.iter_response = iter(b)
+        
+        if isinstance(b, self.environ['wsgi.file_wrapper']):
+            self.file_response = b
-    
-    def iredirect(self, path, query_string):
@@ -298 +301 @@
-        so that any WSGI middleware in self.pipeline can run first.
-        """
-
+
+
+
+
+
-    
-    def __call__(self, environ, start_response):

branches/sendfile/cherrypy/lib/static.py

@@ -68 +68 @@
-    
-    # Set Content-Length and use an iterable (file object)
-
+
+
+
-    c_len = st.st_size
-    bodyfile = open(path, 'rb')
+    fw = getattr(cherrypy.request, 'wsgi_environ', {}).get('wsgi.file_wrapper')
+    if fw is not None:
+        # TODO: support Content-Range
+        response.headers['Content-Length'] = c_len
+        response.body = fw(bodyfile)
+        print ".",
+        return response.body
-    
-    # HTTP/1.0 didn't have Range/Accept-Ranges headers, or the 206 code

branches/sendfile/cherrypy/test/benchmark.py

@@ -286 +286 @@
-    
-    print
-4
+500
-           "%s server threads):" % cherrypy.server.thread_pool)
-
-
-
-
-
-
+2
+
+#
+#
+#
+#
-
-

branches/sendfile/cherrypy/wsgiserver/__init__.py

@@ -546 +546 @@
-        response = self.wsgi_app(self.environ, self.start_response)
-        try:
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        finally:
-            if hasattr(response, "close"):
@@ -1540 +1547 @@
-        self.environ.update(ssl_environ)
-
+class FileWrapper(object):
+
+    def __init__(self, filelike, blksize=8192):
+        self.filelike = filelike
+        self.blksize = blksize
+    
+    def close(self):
+        if hasattr(self.filelike, 'close'):
+            self.filelike.close()
+    
+    def __iter__(self):
+        return self
+    
+    def next(self):
+        data = self.filelike.read(self.blksize)
+        if data:
+            return data
+        raise StopIteration
+#HTTPConnection.environ['wsgi.file_wrapper'] = FileWrapper
+    
+try:
+    import sendfile
+except ImportError:
+    pass
+else:
+    class SendFileWrapper(FileWrapper):
+    
+        def _transmit(self, socket):
+            fd = self.filelike.fileno()
+            filelen = os.fstat(fd).st_size
+            offset = 0
+            while offset < filelen:
+                try:
+                    pos, sent = sendfile.sendfile(
+                        socket.fileno(), fd, offset, 
+                        self.blksize)
+                    offset += sent
+                except socket.error, e:
+                    if e.args[0] not in socket_errors_nonblocking:
+                        raise
+                    print format_exc()
+#    HTTPConnection.environ['wsgi.file_wrapper'] = SendFileWrapper
+
+