Add reference count to metal_common_state

to allow to invoke metal_init and metal_finish multiple times Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
OpenAMP · Jul 19, 2023 · 6fb9f45 · 6fb9f45
1 parent 4976e58
commit 6fb9f45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/init.c b/lib/init.c
@@ -11,6 +11,9 @@ int metal_init(const struct metal_init_params *params)
 {
 	int error = 0;
 
+	if (_metal.common.ref_count++ != 0)
+		return 0;
+
 	memset(&_metal, 0, sizeof(_metal));
 
 	_metal.common.log_handler   = params->log_handler;
@@ -24,11 +27,15 @@ int metal_init(const struct metal_init_params *params)
 	if (error)
 		return error;
 
+	++_metal.common.ref_count;
 	return error;
 }
 
 void metal_finish(void)
 {
+	if (--_metal.common.ref_count != 0)
+		return;
+
 	metal_sys_finish();
 	memset(&_metal, 0, sizeof(_metal));
 }
diff --git a/lib/sys.h b/lib/sys.h
@@ -61,6 +61,9 @@ struct metal_init_params {
  * specific singleton data structure (@see _metal).
  */
 struct metal_common_state {
+	/** reference count to track metal_init/metal_finish. */
+	int				ref_count;
+
 	/** Current log level. */
 	enum metal_log_level		log_level;