[Asterisk-code-review] core: Fix ABI mismatch of ao2_global_obj. (...asterisk[16])

[Friendly Automation]

Friendly Automation has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/12943 )

Change subject: core: Fix ABI mismatch of ao2_global_obj.
......................................................................

core: Fix ABI mismatch of ao2_global_obj.

astobj2.c declares DEBUG_THREADS_LOOSE_ABI to avoid overhead of debug
threads tracking information in the internal structures of astobj2.
Unfortunately this means that ao2_global_obj contains the statically
allocated debug threads tracking fields which are used by initialization
and cleanup but main/astobj2.c believed those fields and associated
space did not exist.

Change-Id: Icef41ad97d88a8c1d1515e034ec8133cab3b1527
---
M main/astobj2.c
A main/astobj2_global.c
2 files changed, 97 insertions(+), 66 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/main/astobj2.c b/main/astobj2.c
index ebc0720..25fc37c 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -786,72 +786,6 @@
 	return orig_obj->priv_data.options;
 }
 
-void *__ao2_global_obj_replace(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name)
-{
-	void *obj_old;
-
-	if (!holder) {
-		/* For sanity */
-		ast_log(LOG_ERROR, "Must be called with a global object!\n");
-		ast_assert(0);
-		return NULL;
-	}
-	if (__ast_rwlock_wrlock(file, line, func, &holder->lock, name)) {
-		/* Could not get the write lock. */
-		ast_assert(0);
-		return NULL;
-	}
-
-	if (obj) {
-		__ao2_ref(obj, +1, tag, file, line, func);
-	}
-	obj_old = holder->obj;
-	holder->obj = obj;
-
-	__ast_rwlock_unlock(file, line, func, &holder->lock, name);
-
-	return obj_old;
-}
-
-int __ao2_global_obj_replace_unref(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name)
-{
-	void *obj_old;
-
-	obj_old = __ao2_global_obj_replace(holder, obj, tag, file, line, func, name);
-	if (obj_old) {
-		__ao2_ref(obj_old, -1, tag, file, line, func);
-		return 1;
-	}
-	return 0;
-}
-
-void *__ao2_global_obj_ref(struct ao2_global_obj *holder, const char *tag, const char *file, int line, const char *func, const char *name)
-{
-	void *obj;
-
-	if (!holder) {
-		/* For sanity */
-		ast_log(LOG_ERROR, "Must be called with a global object!\n");
-		ast_assert(0);
-		return NULL;
-	}
-
-	if (__ast_rwlock_rdlock(file, line, func, &holder->lock, name)) {
-		/* Could not get the read lock. */
-		ast_assert(0);
-		return NULL;
-	}
-
-	obj = holder->obj;
-	if (obj) {
-		__ao2_ref(obj, +1, tag, file, line, func);
-	}
-
-	__ast_rwlock_unlock(file, line, func, &holder->lock, name);
-
-	return obj;
-}
-
 
 void *__ao2_weakproxy_alloc(size_t data_size, ao2_destructor_fn destructor_fn,
 	const char *tag, const char *file, int line, const char *func)
diff --git a/main/astobj2_global.c b/main/astobj2_global.c
new file mode 100644
index 0000000..9d6d7f3
--- /dev/null
+++ b/main/astobj2_global.c
@@ -0,0 +1,97 @@
+/*
+ * astobj2_global - global containers for AO2 objects.
+ *
+ * Copyright (C) 2006 Marta Carbone, Luigi Rizzo - Univ. di Pisa, Italy
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Functions implementing ao2_global_obj routines.
+ *
+ * \author Richard Mudgett <rmudgett at digium.com>
+ */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/astobj2.h"
+#include "asterisk/utils.h"
+
+void *__ao2_global_obj_replace(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name)
+{
+	void *obj_old;
+
+	if (!holder) {
+		/* For sanity */
+		ast_log(LOG_ERROR, "Must be called with a global object!\n");
+		ast_assert(0);
+		return NULL;
+	}
+	if (__ast_rwlock_wrlock(file, line, func, &holder->lock, name)) {
+		/* Could not get the write lock. */
+		ast_assert(0);
+		return NULL;
+	}
+
+	if (obj) {
+		__ao2_ref(obj, +1, tag, file, line, func);
+	}
+	obj_old = holder->obj;
+	holder->obj = obj;
+
+	__ast_rwlock_unlock(file, line, func, &holder->lock, name);
+
+	return obj_old;
+}
+
+int __ao2_global_obj_replace_unref(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name)
+{
+	void *obj_old;
+
+	obj_old = __ao2_global_obj_replace(holder, obj, tag, file, line, func, name);
+	if (obj_old) {
+		__ao2_ref(obj_old, -1, tag, file, line, func);
+		return 1;
+	}
+	return 0;
+}
+
+void *__ao2_global_obj_ref(struct ao2_global_obj *holder, const char *tag, const char *file, int line, const char *func, const char *name)
+{
+	void *obj;
+
+	if (!holder) {
+		/* For sanity */
+		ast_log(LOG_ERROR, "Must be called with a global object!\n");
+		ast_assert(0);
+		return NULL;
+	}
+
+	if (__ast_rwlock_rdlock(file, line, func, &holder->lock, name)) {
+		/* Could not get the read lock. */
+		ast_assert(0);
+		return NULL;
+	}
+
+	obj = holder->obj;
+	if (obj) {
+		__ao2_ref(obj, +1, tag, file, line, func);
+	}
+
+	__ast_rwlock_unlock(file, line, func, &holder->lock, name);
+
+	return obj;
+}

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/12943
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: Icef41ad97d88a8c1d1515e034ec8133cab3b1527
Gerrit-Change-Number: 12943
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190925/47d5e457/attachment-0001.html>