Ticket #67: xpra-mmap-zerocopy.patch

xpra/client.py

@@ -201 +201 @@
 
     def draw(self, x, y, width, height, coding, img_data, rowstride):
         gc = self._backing.new_gc()
+        log.info("draw(%s,%s,%s,%s,%s,...)", x, y, width, height, coding)
         if coding == "mmap":
             assert self._client.supports_mmap
             log("drawing from mmap: %s", img_data)
-            data = ""
             import ctypes
             data_start = ctypes.c_uint.from_buffer(self._client.mmap, 0)
-            for offset, length in img_data:
-                self._client.mmap.seek(offset)
-                data += self._client.mmap.read(length)
+            if len(img_data)==1:
+                #construct an array directly from the mmap zone:
+                ts = time.time()
+                start = time.time()
+                offset, length = img_data[0]
+                arraytype = ctypes.c_char * length 
+                data = arraytype.from_buffer(self._client.mmap, offset)
+                end = time.time()
+                log.info("drawing directly from mmap, array took=%s", int(100000*(end-start))/100.0)
+                start = time.time()
+                self._backing.draw_rgb_image(gc, x, y, width, height, gtk.gdk.RGB_DITHER_NONE, data, rowstride)
+                end = time.time()
+                ps = int(length/(end-ts)/1024/1024)
+                log.info("actual drawing took=%s", int(100000*(end-start))/100.0)
+                log.info("Mpixels/s=%s", ps)
                 data_start.value = offset+length
-            self._backing.draw_rgb_image(gc, x, y, width, height, gtk.gdk.RGB_DITHER_NONE, data, rowstride)
+            else:
+                ts = time.time()
+                start = time.time()
+                data = ""
+                pixels = 0
+                for offset, length in img_data:
+                    self._client.mmap.seek(offset)
+                    data += self._client.mmap.read(length)
+                    data_start.value = offset+length
+                    pixels += length
+                end = time.time()
+                log.info("drawing from mmap group: %s, took=%s", img_data, int(100000*(end-start))/100.0)
+                start = time.time()
+                self._backing.draw_rgb_image(gc, x, y, width, height, gtk.gdk.RGB_DITHER_NONE, data, rowstride)
+                end = time.time()
+                ps = int(pixels/(end-ts)/1024/1024)
+                log.info("actual drawing took=%s", int(100000*(end-start))/100.0)
+                log.info("Mpixels/s=%s", ps)
         elif coding == "rgb24":
             if rowstride>0:
                 assert len(img_data) == rowstride * height