Skip to content

Commit c070543

Browse files
committed
Remove debugging messages
1 parent c8fba72 commit c070543

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

computercraft/sess.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -178,25 +178,21 @@ def __init__(self, body_fn, sess=None):
178178
parent_g = get_current_greenlet()
179179
if parent_g is self._sess._server_greenlet:
180180
self._parent = None
181-
debug(self._task_id, 'G.__init__', 'parent None')
182181
else:
183182
self._parent = parent_g.cc_greenlet
184183
self._parent._children.add(self._task_id)
185-
debug(self._task_id, 'G.__init__', 'parent', self._parent._task_id)
186184

187185
self._children = set()
188186
self._g = greenlet(body_fn)
189187
self._g.cc_greenlet = self
190188

191189
def detach_children(self):
192190
if self._children:
193-
debug(self._task_id, 'G.detach_children', self._children)
194191
ch = list(self._children)
195192
self._children.clear()
196193
self._sess.drop(ch)
197194

198195
def _on_death(self, error=None):
199-
debug(self._task_id, 'G._on_death', error)
200196
self._sess._greenlets.pop(self._task_id, None)
201197
self.detach_children()
202198
if error is not None:
@@ -213,34 +209,26 @@ def defer_switch(self, *args, **kwargs):
213209
def switch(self, *args, **kwargs):
214210
# switch must be called from server greenlet
215211
assert get_current_greenlet() is self._sess._server_greenlet
216-
debug(self._task_id, 'G.switch', args, kwargs)
217212
try:
218213
task = self._g.switch(*args, **kwargs)
219214
except SystemExit:
220-
debug(self._task_id, 'G.switch: ', 'SystemExit')
221215
self._on_death(True)
222216
return
223-
except Exception as e:
224-
debug(self._task_id, 'G.switch: ', 'Exception', e, type(e), format_exc(limit=None, chain=False))
217+
except Exception:
225218
self._on_death({'error': format_exc(limit=None, chain=False)})
226219
return
227220

228-
debug(self._task_id, 'G.switch: result', repr(task))
229-
230221
# lua_eval call or simply idle
231222
if isinstance(task, dict):
232223
x = self
233224
while x._g.dead:
234225
x = x._parent
235226
tid = x._task_id
236-
debug(self._task_id, 'G.switch: start task for', tid)
237227
self._sess._sender({
238228
'action': 'task',
239229
'task_id': tid,
240230
**task,
241231
})
242-
else:
243-
debug(self._task_id, f'G.switch: {"dead" if self._g.dead else "idle"}')
244232

245233
if self._g.dead:
246234
if self._parent is None:
@@ -264,7 +252,6 @@ def on_task_result(self, task_id, result):
264252
if task_id not in self._greenlets:
265253
# ignore for dropped tasks
266254
return
267-
debug('on_task_result', task_id, result)
268255
self._greenlets[task_id].switch(result)
269256

270257
def create_task_id(self):
@@ -281,8 +268,6 @@ def collect(task_id):
281268
for task_id in task_ids:
282269
all_tids.extend(collect(task_id))
283270

284-
debug('Sess.drop', all_tids)
285-
286271
self._sender({
287272
'action': 'drop',
288273
'task_ids': all_tids,

computercraft/subapis/parallel.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from ..sess import debug, CCGreenlet, get_current_greenlet
1+
from ..sess import CCGreenlet, get_current_greenlet
22

33

44
__all__ = (
@@ -16,8 +16,7 @@ def waitForAny(*task_fns):
1616
g.defer_switch()
1717

1818
try:
19-
result = sess._server_greenlet.switch()
20-
debug('waitForAny switch result', result)
19+
sess._server_greenlet.switch()
2120
finally:
2221
pgl.detach_children()
2322

@@ -32,8 +31,6 @@ def waitForAll(*task_fns):
3231

3332
try:
3433
for _ in range(len(task_fns)):
35-
result = sess._server_greenlet.switch()
36-
debug('waitForAll switch result', result)
37-
debug('waitForAll finish')
34+
sess._server_greenlet.switch()
3835
finally:
3936
pgl.detach_children()

0 commit comments

Comments
 (0)