Optimizations and 64-bitfixif.

petli · petli · commit 6e1026aa39c1 · 2001-01-06T17:58:06.000Z
diff --git a/NEWS b/NEWS
@@ -1,3 +1,27 @@
+-*-outline-*-
+
+		      NEWS for Python X Library
+
+		      		      
+* Version 0.7  6 Jan 2001
+
+** Fixed the 64-bit platform fix.
+
+As it turns out, the attempted fix for 64-bit platforms in v0.6 didn't
+really work.  Close study of structmodules.c gave the answer why, and
+now it really should work.  Yeah.
+
+** Optimizations of core protocol engine
+
+Python Xlib is now at least 25% faster after the core of the protocol
+engine has been rewritten.  This is some quite cute code: tailor-made
+methods are generated for all structures, resulting in a 650% speed-up
+in generating binary data, and a 75% speed-up in parsing binary data.
+
+Interested Python hackers are recommended to take a look at the Struct
+class in Xlib/protocol/rq.py.
+
+
 
 * Version 0.6  29 Dec 2000
 
diff --git a/README b/README
@@ -1,15 +1,23 @@
 
 			 The Python X Library
 
-		       Version 0.4, 4 Oct 2000
+		       Version 0.7, 6 Jan 2000
 
 
 *** Copyright
 
+Copyright (C) 2000,2001  Peter Liljenberg
+
 The Python X Library is released under GPL, see the file COPYING for
 details.
 
 
+*** Requirements
+
+The Python X Library requires Python 1.5.2 or newer, though it hasn't
+been tested with any newer Python versions yet.
+
+
 *** Installation
 
 Just copy the Xlib directory to some place in the module path.  E.g.:
@@ -34,12 +42,11 @@ and the newer plxlib) which were interfaces to the C Xlib.
 
 This is possible to do since X client programs communicate with the X
 server via the X protocol.  The communication takes place over TCP/IP,
-Unix sockets, DECnet or any other suitable streaming network protocol.
-The C Xlib is merely an interface to this protocol, providing
-functions suited for a C environment.
+Unix sockets, DECnet or any other streaming network protocol.  The C
+Xlib is merely an interface to this protocol, providing functions
+suitable for a C environment.
 
-There are three advantages of choosing to implement a pure Python
-library:
+There are three advantages of implementing a pure Python library:
 
  * Integration:  The library can make use of the wonderful object
    system in Python, providing an easy-to-use class hierarchy.
@@ -54,22 +61,21 @@ library:
 
 *** Project status
 
-The low-level protocol and a rudimentary object oriented interface is
-complete, implementing client-side X11R6.  This should be usable for
-writing applications.  It runs at least on Linux using XFree86 as the
-server, but should run on most Unices.
+The low-level protocol is complete, implementing client-side X11R6.
+The high-level object oriented interface is also fully functional.
+It is possible to write client applications with the library.
+Currently, the only real application using Python Xlib is the window
+manager PLWM, starting with version 2.0.  
 
-A resource database has been implemented and there is a framework for
-adding X extension code.  Currently only the XTEST extension has been
-implemented.  
+There is a resource database implementation, ICCCM support and a
+framework for adding X extension code.  Currently only the XTEST
+extension has been implemented.
 
-There are most likely bugs, as only a rather small subset of all the
-requests and methods have been tested.  The code is released anyway to
-let other interested Python hackers have a look (and hopefully help
-out with debugging and coding :).
+There are most likely still bugs, although a large part of the library
+has been exercised now and seems to work just fine.
 
-There are some documentation now, but it doesn't cover any methods
-yet.
+There are some documentation, but it doesn't cover the object oriented
+interface methods yet.
 
 See the file TODO for a detailed list of what is missing,
 approximately ordered by importance.
@@ -81,7 +87,7 @@ Author email: Peter Liljenberg <petli@ctrl-c.liu.se>
 
 The Python X Library is a SourceForged project.  The project page is
 http://sourgeforge.net/projects/python-xlib/.  Source is available
-from that page as real releases and from the CVS tree.
+from that page as tar.gz-releases and from the CVS tree.
 
 There isn't any real web page yet, only a derivative of this file.  It
 is located at http://python-xlib.sourceforge.net/.
diff --git a/TODO b/TODO
@@ -8,9 +8,9 @@
 
 *** To be a real C Xlib replacement
 
-* High-level functions: currently, there are only methods which
-  directly correspond to X requests.  Perhaps there should be some
-  simpler functions (e.g. Window.resize_window() in addition to
+* High-level functions: currently, there are mostly methods which
+  directly correspond to X requests.  There should be some simpler
+  functions (e.g. Window.resize_window() in addition to
   Window.configure(), Drawable.rectangle() in addition to
   Drawable.poly_rectangle(), etc), and possibly also compound
   functions (e.g. create_pixmap_from_image() which would load an image
@@ -24,6 +24,9 @@
 
 *** Miscellaneous
 
+* Faster, faster!  The protocol engine isn't very fast, despite the
+  optimizations in version 0.7.
+
 * The tread support and the protocol engine needs to be stress
   tested.  They _seem_ to work, but that's no guarantee.
 
diff --git a/Xlib/__init__.py b/Xlib/__init__.py
@@ -1,8 +1,8 @@
-# $Id: __init__.py,v 1.7 2000-12-29 16:16:54 petli Exp $
+# $Id: __init__.py,v 1.8 2001-01-06 17:58:06 petli Exp $
 #
 # Xlib.__init__ -- glue for Xlib package
 #
-#    Copyright (C) 2000 Peter Liljenberg <petli@ctrl-c.liu.se>
+#    Copyright (C) 2000,2001 Peter Liljenberg <petli@ctrl-c.liu.se>
 #
 #    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
@@ -33,4 +33,6 @@
     'xobject',
     ]
 
-__version__ = (0, 6)
+__version__ = (0, 7)
+
+
diff --git a/Xlib/protocol/ChangeLog b/Xlib/protocol/ChangeLog
@@ -1,3 +1,23 @@
+2001-01-04    <petli@cendio.se>
+
+	* rq.py: The fix for 64-bit platforms didn't work, and close
+	scrutiny of structmodule.c shows why: it turns out that '='
+	translates into '<' or '>', the one the platform would use.  This
+	means B is one byte, H is two and L is four, and no extra
+	alignment, always.  '@', which is the default, selects native
+	number of bytes, which on Alpha means that 'L' is eight bytes.
+
+	Now the code goes to pains to ensure that '=' encoding is always
+	used, so _now_ it should work on all platforms.  Ahem.
+	
+
+2000-12-29    <petli@cendio.se>
+
+	* rq.py: Optimizations:
+	  + replace calls to Field.get_name() with access to attribute
+	    name. 
+	    (Struct.build_from_args): 
+
 Fri Dec 29 17:05:02 2000  Peter Liljenberg  <petli@cendio.se>
 
 	* rq.py: Alpha forces us to probe how many bytes each struct code
diff --git a/Xlib/protocol/display.py b/Xlib/protocol/display.py
@@ -1,8 +1,8 @@
-# $Id: display.py,v 1.9 2000-12-22 13:23:34 petli Exp $
+# $Id: display.py,v 1.10 2001-01-06 17:58:06 petli Exp $
 #
 # Xlib.protocol.display -- core display communication
 #
-#    Copyright (C) 2000 Peter Liljenberg <petli@ctrl-c.liu.se>
+#    Copyright (C) 2000,2001 Peter Liljenberg <petli@ctrl-c.liu.se>
 #
 #    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
@@ -659,7 +659,7 @@ def parse_error_response(self, request):
 	estruct = self.error_classes.get(code, error.XError)
 	
 	e = estruct(self, self.data_recv[:32])
-	self.data_recv = self.data_recv[32:]
+	self.data_recv = buffer(self.data_recv, 32)
 
 	# print 'recv Error:', e
 
@@ -713,7 +713,7 @@ def parse_request_response(self, request):
 	req._parse_response(self.data_recv[:self.request_length])
 	# print 'recv Request:', req
 	
-	self.data_recv = self.data_recv[self.request_length:]
+	self.data_recv = buffer(self.data_recv, self.request_length)
 	self.request_length = 0
 
 
@@ -735,7 +735,7 @@ def parse_event_response(self, etype):
 	estruct = self.event_classes.get(etype, event.AnyEvent)
 
 	e = estruct(display = self, binarydata = self.data_recv[:32])
-	self.data_recv = self.data_recv[32:]
+	self.data_recv = buffer(self.data_recv, 32)
 
 	# Drop all requests having an error handler,
 	# but which obviously succeded
@@ -953,7 +953,7 @@ class ConnectionSetupRequest(rq.GetAttrData):
     
 			       
     def __init__(self, display, *args, **keys):
-	self._binary = self._request.build_from_args(args, keys)
+	self._binary = apply(self._request.to_binary, args, keys)
 	self._data = None
 
 	# Don't bother about locking, since no other threads have
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
diff --git a/Xlib/xobject/drawable.py b/Xlib/xobject/drawable.py
diff --git a/examples/profilex.py b/examples/profilex.py

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-# $Id: __init__.py,v 1.7 2000-12-29 16:16:54 petli Exp $`
	`1`	`+# $Id: __init__.py,v 1.8 2001-01-06 17:58:06 petli Exp $`
`2`	`2`	`#`
`3`	`3`	`# Xlib.__init__ -- glue for Xlib package`
`4`	`4`	`#`
`5`		`-# Copyright (C) 2000 Peter Liljenberg <petli@ctrl-c.liu.se>`
	`5`	`+# Copyright (C) 2000,2001 Peter Liljenberg <petli@ctrl-c.liu.se>`
`6`	`6`	`#`
`7`	`7`	`# This program is free software; you can redistribute it and/or modify`
`8`	`8`	`# it under the terms of the GNU General Public License as published by`
`@@ -33,4 +33,6 @@`
`33`	`33`	`'xobject',`
`34`	`34`	`]`
`35`	`35`
`36`		`-__version__ = (0, 6)`
	`36`	`+__version__ = (0, 7)`
	`37`	`+`
	`38`	`+`