[sr-dev] git:master:5555e893: mqueue: use local variable to lock early only when needed

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 5555e893ea0997a7c71a3e424ef09c4570f122f6
URL: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4570f122f6

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2022-04-04T08:02:44+02:00

mqueue: use local variable to lock early only when needed

---

Modified: src/modules/mqueue/mqueue_api.c

---

Diff:  https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4570f122f6.diff
Patch: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4570f122f6.patch

---

diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c
index 59421f6e2f..b38f0a1069 100644
--- a/src/modules/mqueue/mqueue_api.c
+++ b/src/modules/mqueue/mqueue_api.c
@@ -293,6 +293,7 @@ int mq_item_add(str *qname, str *key, str *val)
 	mq_item_t *mi = NULL;
 	mq_item_t *miter = NULL;
 	mq_item_t *miter_prev = NULL;
+	int oplock = 0;
 	int len;
 
 	mh = mq_head_get(qname);
@@ -301,9 +302,10 @@ int mq_item_add(str *qname, str *key, str *val)
 		LM_ERR("mqueue not found: %.*s\n", qname->len, qname->s);
 		return -1;
 	}
-	
-	lock_get(&mh->lock);
+
 	if (mh->addmode == 1 || mh->addmode == 2) {
+		lock_get(&mh->lock);
+		oplock = 1;
 		miter = mh->ifirst;
 		miter_prev = mh->ifirst;
 		while (miter) {
@@ -344,7 +346,9 @@ int mq_item_add(str *qname, str *key, str *val)
 	if(mi==NULL)
 	{
 		LM_ERR("no more shm to add to: %.*s\n", qname->len, qname->s);
-		lock_release(&mh->lock);
+		if(oplock) {
+			lock_release(&mh->lock);
+		}
 		return -1;
 	}
 	memset(mi, 0, len);
@@ -352,12 +356,15 @@ int mq_item_add(str *qname, str *key, str *val)
 	memcpy(mi->key.s, key->s, key->len);
 	mi->key.len = key->len;
 	mi->key.s[key->len] = '\0';
-	
+
 	mi->val.s = mi->key.s + mi->key.len + 1;
 	memcpy(mi->val.s, val->s, val->len);
 	mi->val.len = val->len;
 	mi->val.s[val->len] = '\0';
 
+	if(oplock==0) {
+		lock_get(&mh->lock);
+	}
 	if(mh->ifirst==NULL)
 	{
 		mh->ifirst = mi;