From cdbc9afe5da5fe728ce8fa62e36ded17efe70032 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 3 Apr 2018 16:51:49 +0200 Subject: ctrl: fix deferred commands (and hence fix osmo-bts-sysmo 'clock-info' cmd) The CTRL interface has a ctrl_cmd_def_* API that allows deferring a CTRL command reply until later. However, the command handling currently fails to acknowledge this and deallocates the struct ctrl_cmd anyway. Fix: in struct ctrl_cmd, add a defer pointer to be populated by ctrl_cmd_def_make(). A cmd thus marked as deferred is not deallocated at the end of command handling. This fix needs no change in calling code. (Another idea was to return a different code than CTRL_CMD_HANDLED when the command is to be deferred, but that would require adjusting each user of ctrl_cmd_def_make(). The implicit marking is safer and easier.) Show that handling deferred commands is fixed by adjusting the expectations of ctrl_test.c's test_deferred_cmd() and removing the now obsolete exit_early label. One symptom of the breakage is that osmo-bts-sysmo crashes when asked to report a trx's clock-info, which is aggravated by the fact that the sysmobts-mgr does ask osmo-bts-sysmo for a clock-info. The crash appears since Id583b413f8b8bd16e5cf92a8a9e8663903646381 -- it looked like just fixing an obvious memory leak, which it did as shown by the unit test, but deferred ctrl commands actually relied on that leak. Both fixed now. Related: OS#3120 Change-Id: I24232be7dcf7be79f4def91ddc8b8f8005b56318 --- tests/ctrl/ctrl_test.ok | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/ctrl/ctrl_test.ok') diff --git a/tests/ctrl/ctrl_test.ok b/tests/ctrl/ctrl_test.ok index 6a902be0..07f4aac5 100644 --- a/tests/ctrl/ctrl_test.ok +++ b/tests/ctrl/ctrl_test.ok @@ -176,5 +176,6 @@ ok test_deferred_cmd get_test_defer called ctrl_handle_msg() returned 0 -deferred command apparently deallocated too soon +invoking ctrl_test_defer_cb() asynchronously +ctrl_test_defer_cb called success -- cgit v1.2.3