open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve debug_set_trace: add Allocate and Input events

Browse Source 
Also log events at the beginning and end of Input.choose_nameplate and
Input.choose_words, since those are the two big locally-driven (UI) triggers
that cause multiple messages to be fired and lots of work to happen.
This commit is contained in:
Brian Warner 2018-02-14 00:32:49 -08:00
parent 2fadadc4db
commit dce01174eb
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/_boss.py
View File

@ -108,14 +108,16 @@ class Boss(object):
def _set_trace(self, client_name, which, file): def _set_trace(self, client_name, which, file):
names = {"B": self, "N": self._N, "M": self._M, "S": self._S, names = {"B": self, "N": self._N, "M": self._M, "S": self._S,
"O": self._O, "K": self._K, "SK": self._K._SK, "R": self._R, "O": self._O, "K": self._K, "SK": self._K._SK, "R": self._R,
"RC": self._RC, "L": self._L, "C": self._C, "RC": self._RC, "L": self._L, "A": self._A, "I": self._I,
"T": self._T} "C": self._C, "T": self._T}
for machine in which.split(): for machine in which.split():
t = (lambda old_state, input, new_state, machine=machine: t = (lambda old_state, input, new_state, machine=machine:
self._print_trace(old_state, input, new_state, self._print_trace(old_state, input, new_state,
client_name=client_name, client_name=client_name,
machine=machine, file=file)) machine=machine, file=file))
names[machine].set_trace(t) names[machine].set_trace(t)
if machine == "I":
self._I.set_debug(t)
## def serialize(self): ## def serialize(self):
## raise NotImplemented ## raise NotImplemented

11
src/wormhole/_input.py
View File

@ -22,6 +22,13 @@ class Input(object):
self._nameplate = None self._nameplate = None
self._wordlist = None self._wordlist = None
self._wordlist_waiters = [] self._wordlist_waiters = []
self._trace = None
def set_debug(self, f):
self._trace = f
def _debug(self, what):
if self._trace:
self._trace(old_state="", input=what, new_state="")
def wire(self, code, lister): def wire(self, code, lister):
self._C = _interfaces.ICode(code) self._C = _interfaces.ICode(code)
@ -238,10 +245,14 @@ class Helper(object):
def get_nameplate_completions(self, prefix): def get_nameplate_completions(self, prefix):
return self._input.get_nameplate_completions(prefix) return self._input.get_nameplate_completions(prefix)
def choose_nameplate(self, nameplate): def choose_nameplate(self, nameplate):
self._input._debug("I.choose_nameplate")
self._input.choose_nameplate(nameplate) self._input.choose_nameplate(nameplate)
self._input._debug("I.choose_nameplate finished")
def when_wordlist_is_available(self): def when_wordlist_is_available(self):
return self._input.when_wordlist_is_available() return self._input.when_wordlist_is_available()
def get_word_completions(self, prefix): def get_word_completions(self, prefix):
return self._input.get_word_completions(prefix) return self._input.get_word_completions(prefix)
def choose_words(self, words): def choose_words(self, words):
self._input._debug("I.choose_words")
self._input.choose_words(words) self._input.choose_words(words)
self._input._debug("I.choose_words finished")

3
src/wormhole/wormhole.py
View File

@ -214,7 +214,8 @@ class _DeferredWormhole(object):
self._boss.close() # only need to close if it wasn't already self._boss.close() # only need to close if it wasn't already
return d return d
def debug_set_trace(self, client_name, which="B N M S O K SK R RC L C T", def debug_set_trace(self, client_name,
which="B N M S O K SK R RC L A I C T",
file=sys.stderr): file=sys.stderr):
self._boss._set_trace(client_name, which, file) self._boss._set_trace(client_name, which, file)