[MERGE] Debug flags for HPSS

[Andrew Bennetts]

Andrew Bennetts wrote:
> This adds a -Dhpss to trace smart protocol requests and responses.
> 
> -Andrew.
> 

Attached this time!
-------------- next part --------------
# Bazaar merge directive format 1
# revision_id: andrew.bennetts at canonical.com-20070709055641-\
#   fy6ef6m7cw1ifrxj
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: b0d1026ed5166500e2780098ca6c1e580ca08a67
# timestamp: 2007-07-09 16:13:57 +1000
# source_branch: http://people.ubuntu.com/~andrew/bzr/hpss-debug-flag
# 
# Bazaar revision bundle v0.9
#
# message:
#   Make -Dhpss use mutter instead of note to be consistent with other debug_flags.
# committer: Andrew Bennetts <andrew.bennetts at canonical.com>
# date: Mon 2007-07-09 15:56:41.714999914 +1000

=== modified file bzrlib/debug.py // last-changed:andrew.bennetts at canonical.com
... -20070709043130-ur99iy0a2otc6sfc
--- bzrlib/debug.py
+++ bzrlib/debug.py
@@ -22,8 +22,9 @@
 
 Options include:
     
+ * error - show stack traces for all top level exceptions
  * hooks 
+ * hpss - trace smart protocol requests and responses
  * lock - trace when lockdir locks are taken or released
- * error - show stack traces for all top level exceptions
 
 """

=== modified file bzrlib/smart/protocol.py
--- bzrlib/smart/protocol.py
+++ bzrlib/smart/protocol.py
@@ -21,8 +21,10 @@
 
 from cStringIO import StringIO
 
+from bzrlib import debug
 from bzrlib import errors
 from bzrlib.smart import request
+from bzrlib.trace import mutter
 
 
 # Protocol version strings.  These are sent as prefixes of bzr requests and
@@ -299,6 +301,8 @@
         self._body_buffer = None
 
     def call(self, *args):
+        if 'hpss' in debug.debug_flags:
+            mutter('hpss call: %r', args)
         self._write_args(args)
         self._request.finished_writing()
 
@@ -307,6 +311,8 @@
 
         After calling this, call read_response_tuple to find the result out.
         """
+        if 'hpss' in debug.debug_flags:
+            mutter('hpss call w/body: %r (%r...)', args, body[:20])
         self._write_args(args)
         bytes = self._encode_bulk_data(body)
         self._request.accept_bytes(bytes)
@@ -318,6 +324,8 @@
         The body is encoded with one line per readv offset pair. The numbers in
         each pair are separated by a comma, and no trailing \n is emitted.
         """
+        if 'hpss' in debug.debug_flags:
+            mutter('hpss call w/readv: %r', args)
         self._write_args(args)
         readv_bytes = self._serialise_offsets(body)
         bytes = self._encode_bulk_data(readv_bytes)
@@ -339,6 +347,8 @@
         This should only be called once.
         """
         result = self._recv_tuple()
+        if 'hpss' in debug.debug_flags:
+            mutter('hpss result: %r', result)
         if not expect_body:
             self._request.finished_reading()
         return result

=== modified directory  // last-changed:andrew.bennetts at canonical.com-200707090
... 55641-fy6ef6m7cw1ifrxj
# revision id: andrew.bennetts at canonical.com-20070709055641-fy6ef6m7cw1ifrxj
# sha1: b0d1026ed5166500e2780098ca6c1e580ca08a67
# inventory sha1: 93d571f5c572bf87bfb80fdbe5b05f1bd8a812b6
# parent ids:
#   andrew.bennetts at canonical.com-20070709043130-ur99iy0a2otc6sfc
# base id: pqm at pqm.ubuntu.com-20070706141845-sije5bdx8pjw2fhk
# properties:
#   branch-nick: hpss-debug-flag

# message:
#   Add a -Dhpss debug flag.
# committer: Andrew Bennetts <andrew.bennetts at canonical.com>
# date: Mon 2007-07-09 14:31:30.180999994 +1000

=== modified file bzrlib/debug.py // encoding:base64
LS0tIGJ6cmxpYi9kZWJ1Zy5weQorKysgYnpybGliL2RlYnVnLnB5CkBAIC0yMiw4ICsyMiw5IEBA
CiAKIE9wdGlvbnMgaW5jbHVkZToKICAgICAKKyAqIGVycm9yIC0gc2hvdyBzdGFjayB0cmFjZXMg
Zm9yIGFsbCB0b3AgbGV2ZWwgZXhjZXB0aW9ucwogICogaG9va3MgCisgKiBocHNzIC0gdHJhY2Ug
c21hcnQgcHJvdG9jb2wgcmVxdWVzdHMgYW5kIHJlc3BvbnNlcwogICogbG9jayAtIHRyYWNlIHdo
ZW4gbG9ja2RpciBsb2NrcyBhcmUgdGFrZW4gb3IgcmVsZWFzZWQKLSAqIGVycm9yIC0gc2hvdyBz
dGFjayB0cmFjZXMgZm9yIGFsbCB0b3AgbGV2ZWwgZXhjZXB0aW9ucwogCiAiIiIKCg==

=== modified file bzrlib/smart/protocol.py // encoding:base64
LS0tIGJ6cmxpYi9zbWFydC9wcm90b2NvbC5weQorKysgYnpybGliL3NtYXJ0L3Byb3RvY29sLnB5
CkBAIC0yMSw4ICsyMSwxMCBAQAogCiBmcm9tIGNTdHJpbmdJTyBpbXBvcnQgU3RyaW5nSU8KIAor
ZnJvbSBienJsaWIgaW1wb3J0IGRlYnVnCiBmcm9tIGJ6cmxpYiBpbXBvcnQgZXJyb3JzCiBmcm9t
IGJ6cmxpYi5zbWFydCBpbXBvcnQgcmVxdWVzdAorZnJvbSBienJsaWIudHJhY2UgaW1wb3J0IG5v
dGUKIAogCiAjIFByb3RvY29sIHZlcnNpb24gc3RyaW5ncy4gIFRoZXNlIGFyZSBzZW50IGFzIHBy
ZWZpeGVzIG9mIGJ6ciByZXF1ZXN0cyBhbmQKQEAgLTI5OSw2ICszMDEsOCBAQAogICAgICAgICBz
ZWxmLl9ib2R5X2J1ZmZlciA9IE5vbmUKIAogICAgIGRlZiBjYWxsKHNlbGYsICphcmdzKToKKyAg
ICAgICAgaWYgJ2hwc3MnIGluIGRlYnVnLmRlYnVnX2ZsYWdzOgorICAgICAgICAgICAgbm90ZSgn
aHBzcyBjYWxsOiAlcicsIGFyZ3MpCiAgICAgICAgIHNlbGYuX3dyaXRlX2FyZ3MoYXJncykKICAg
ICAgICAgc2VsZi5fcmVxdWVzdC5maW5pc2hlZF93cml0aW5nKCkKIApAQCAtMzA3LDYgKzMxMSw4
IEBACiAKICAgICAgICAgQWZ0ZXIgY2FsbGluZyB0aGlzLCBjYWxsIHJlYWRfcmVzcG9uc2VfdHVw
bGUgdG8gZmluZCB0aGUgcmVzdWx0IG91dC4KICAgICAgICAgIiIiCisgICAgICAgIGlmICdocHNz
JyBpbiBkZWJ1Zy5kZWJ1Z19mbGFnczoKKyAgICAgICAgICAgIG5vdGUoJ2hwc3MgY2FsbCB3L2Jv
ZHk6ICVyICglci4uLiknLCBhcmdzLCBib2R5WzoyMF0pCiAgICAgICAgIHNlbGYuX3dyaXRlX2Fy
Z3MoYXJncykKICAgICAgICAgYnl0ZXMgPSBzZWxmLl9lbmNvZGVfYnVsa19kYXRhKGJvZHkpCiAg
ICAgICAgIHNlbGYuX3JlcXVlc3QuYWNjZXB0X2J5dGVzKGJ5dGVzKQpAQCAtMzE4LDYgKzMyNCw4
IEBACiAgICAgICAgIFRoZSBib2R5IGlzIGVuY29kZWQgd2l0aCBvbmUgbGluZSBwZXIgcmVhZHYg
b2Zmc2V0IHBhaXIuIFRoZSBudW1iZXJzIGluCiAgICAgICAgIGVhY2ggcGFpciBhcmUgc2VwYXJh
dGVkIGJ5IGEgY29tbWEsIGFuZCBubyB0cmFpbGluZyBcbiBpcyBlbWl0dGVkLgogICAgICAgICAi
IiIKKyAgICAgICAgaWYgJ2hwc3MnIGluIGRlYnVnLmRlYnVnX2ZsYWdzOgorICAgICAgICAgICAg
bm90ZSgnaHBzcyBjYWxsIHcvcmVhZHY6ICVyJywgYXJncykKICAgICAgICAgc2VsZi5fd3JpdGVf
YXJncyhhcmdzKQogICAgICAgICByZWFkdl9ieXRlcyA9IHNlbGYuX3NlcmlhbGlzZV9vZmZzZXRz
KGJvZHkpCiAgICAgICAgIGJ5dGVzID0gc2VsZi5fZW5jb2RlX2J1bGtfZGF0YShyZWFkdl9ieXRl
cykKQEAgLTMzOSw2ICszNDcsOCBAQAogICAgICAgICBUaGlzIHNob3VsZCBvbmx5IGJlIGNhbGxl
ZCBvbmNlLgogICAgICAgICAiIiIKICAgICAgICAgcmVzdWx0ID0gc2VsZi5fcmVjdl90dXBsZSgp
CisgICAgICAgIGlmICdocHNzJyBpbiBkZWJ1Zy5kZWJ1Z19mbGFnczoKKyAgICAgICAgICAgIG5v
dGUoJ2hwc3MgcmVzdWx0OiAlcicsIHJlc3VsdCkKICAgICAgICAgaWYgbm90IGV4cGVjdF9ib2R5
OgogICAgICAgICAgICAgc2VsZi5fcmVxdWVzdC5maW5pc2hlZF9yZWFkaW5nKCkKICAgICAgICAg
cmV0dXJuIHJlc3VsdAoK

=== modified directory  // last-changed:andrew.bennetts at canonical.com-200707090
... 43130-ur99iy0a2otc6sfc
# revision id: andrew.bennetts at canonical.com-20070709043130-ur99iy0a2otc6sfc
# sha1: 5a3e1185f12403f500586e9b8b4dd260e05d8dbe
# inventory sha1: 6b3c4a1737aa549c2393af111b788f0db37aa139
# parent ids:
#   pqm at pqm.ubuntu.com-20070706141845-sije5bdx8pjw2fhk
# properties:
#   branch-nick: hpss-debug-flag