Commitc1b8afa

and

authored

fix: memory leak in bidi classes (#770)

* clean unneeded fields after close* added assertions to tests---------Co-authored-by: Anthonios Partheniou <partheniou@google.com>

1 parentfb1c3a9 commitc1b8afaCopy full SHA for c1b8afa

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,8 @@ def close(self):`
`306`	`306`	`self._request_queue.put(None)`
`307`	`307`	`self.call.cancel()`
`308`	`308`	`self._request_generator=None`
	`309`	`+self._initial_request=None`
	`310`	`+self._callbacks= []`
`309`	`311`	`# Don't set self.call to None. Keep it around so that send/recv can`
`310`	`312`	`# raise the error.`
`311`	`313`
`@@ -717,6 +719,7 @@ def stop(self):`
`717`	`719`	`_LOGGER.warning("Background thread did not exit.")`
`718`	`720`
`719`	`721`	`self._thread=None`
	`722`	`+self._on_response=None`
`720`	`723`
`721`	`724`	`@property`
`722`	`725`	`defis_active(self):`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,9 @@ def test_close(self):`
`296`	`296`	`# ensure the request queue was signaled to stop.`
`297`	`297`	`assertbidi_rpc.pending_requests==1`
`298`	`298`	`assertbidi_rpc._request_queue.get()isNone`
	`299`	`+# ensure request and callbacks are cleaned up`
	`300`	`+assertbidi_rpc._initial_requestisNone`
	`301`	`+assertnotbidi_rpc._callbacks`
`299`	`302`
`300`	`303`	`deftest_close_no_rpc(self):`
`301`	`304`	`bidi_rpc=bidi.BidiRpc(None)`
`@@ -623,6 +626,8 @@ def cancel_side_effect():`
`623`	`626`	`assertbidi_rpc.pending_requests==1`
`624`	`627`	`assertbidi_rpc._request_queue.get()isNone`
`625`	`628`	`assertbidi_rpc._finalized`
	`629`	`+assertbidi_rpc._initial_requestisNone`
	`630`	`+assertnotbidi_rpc._callbacks`
`626`	`631`
`627`	`632`	`deftest_reopen_failure_on_rpc_restart(self):`
`628`	`633`	`error1=ValueError("1")`
`@@ -777,6 +782,7 @@ def on_response(response):`
`777`	`782`	`consumer.stop()`
`778`	`783`
`779`	`784`	`assertconsumer.is_activeisFalse`
	`785`	`+assertconsumer._on_responseisNone`
`780`	`786`
`781`	`787`	`deftest_wake_on_error(self):`
`782`	`788`	`should_continue=threading.Event()`
`@@ -884,6 +890,7 @@ def close_side_effect():`
`884`	`890`
`885`	`891`	`consumer.stop()`
`886`	`892`	`assertconsumer.is_activeisFalse`
	`893`	`+assertconsumer._on_responseisNone`
`887`	`894`
`888`	`895`	`# calling stop twice should not result in an error.`
`889`	`896`	`consumer.stop()`

Comments

(0)