[sr-dev] git:master:185db312: janssonrpcc: do not lock in mod destroy

Daniel-Constantin Mierla miconda at gmail.com
Sat Sep 23 09:31:19 CEST 2017


Module: kamailio
Branch: master
Commit: 185db312ed91bba6c997a42a84c4da1e4ce2319f
URL: https://github.com/kamailio/kamailio/commit/185db312ed91bba6c997a42a84c4da1e4ce2319f

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-09-23T09:30:08+02:00

janssonrpcc: do not lock in mod destroy

- all children are killed already and if lock was already set results in
  a deadlock

---

Modified: src/modules/janssonrpcc/janssonrpcc_mod.c

---

Diff:  https://github.com/kamailio/kamailio/commit/185db312ed91bba6c997a42a84c4da1e4ce2319f.diff
Patch: https://github.com/kamailio/kamailio/commit/185db312ed91bba6c997a42a84c4da1e4ce2319f.patch

---

diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c
index 429d034bf0..654ea8280c 100644
--- a/src/modules/janssonrpcc/janssonrpcc_mod.c
+++ b/src/modules/janssonrpcc/janssonrpcc_mod.c
@@ -215,7 +215,6 @@ static int child_init(int rank)
 void mod_destroy(void)
 {
 	if(jsonrpc_server_group_lock) {
-		lock_get(jsonrpc_server_group_lock); /* blocking */
 		lock_dealloc(jsonrpc_server_group_lock);
 	}
 




More information about the sr-dev mailing list