Move ping function in 4a-hal-utilities

Move ping function in 4a-utilities and register it as verb
into 4a-hal-manager and into each created 4a-hal-*.
Updates 4a-hal json configuration files to match these modifications.

BUG-AGL: SPEC-2733

Change-Id: If93a31296206923860262b225a8c7e0e8a6fd521
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>

9 files changed, 88 insertions, 38 deletions

diff --git a/4a-hal-cfg-example/hal-4a-2ch-generic-usb.json b/4a-hal-cfg-example/hal-4a-2ch-generic-usb.json
index 9fe4c1d..0d16cc2 100644
--- a/4a-hal-cfg-example/hal-4a-2ch-generic-usb.json
+++ b/4a-hal-cfg-example/hal-4a-2ch-generic-usb.json
@@ -27,13 +27,6 @@
             "libs": ["hal-bluealsa.ctlso"]
         }
     ],
-    "controls": [
-        {
-            "uid": "ping",
-            "info": "Ping hal",
-            "action": "api://4a-hal-manager#ping"
-        }
-    ],
     "haldependencies" : {
         "uid" : "generic-usb",
         "class" : "mandatory",
diff --git a/4a-hal-cfg-example/hal-4a-example.json b/4a-hal-cfg-example/hal-4a-example.json
index ad02ece..9314b7b 100644
--- a/4a-hal-cfg-example/hal-4a-example.json
+++ b/4a-hal-cfg-example/hal-4a-example.json
@@ -27,13 +27,6 @@
             "libs": ["hal-bluealsa.ctlso"]
         }
     ],
-    "controls": [
-        {
-            "uid": "ping",
-            "info": "Ping hal",
-            "action": "api://4a-hal-manager#ping"
-        }
-    ],
     "haldependencies" : [
         {
             "uid" : "generic-usb",
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-data.h b/lib/4a-hal-utilities/4a-hal-utilities-data.h
index fe55495..5b25f58 100644
--- a/lib/4a-hal-utilities/4a-hal-utilities-data.h
+++ b/lib/4a-hal-utilities/4a-hal-utilities-data.h
@@ -22,7 +22,7 @@
 
 #include <urcu/list.h>
 
-#include <wrap-json.h>
+#include <json-c/json.h>
 
 #include <afb/afb-binding.h>
 
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-ping.c b/lib/4a-hal-utilities/4a-hal-utilities-ping.c
new file mode 100644
index 0000000..a40254f
--- /dev/null
+++ b/lib/4a-hal-utilities/4a-hal-utilities-ping.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2019 "IoT.bzh"
+ * Author Jonathan Aillet <jonathan.aillet@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <string.h>
+
+#include <json-c/json.h>
+
+#include <afb/afb-binding.h>
+
+#include "4a-hal-utilities-ping.h"
+
+/*******************************************************************************
+ *		HAL - Ping function					       *
+ ******************************************************************************/
+
+void HalUtlPing(afb_req_t request)
+{
+	static int count = 0;
+	int c;
+	json_object *countJ;
+
+	c = __sync_add_and_fetch(&count, 1, __ATOMIC_RELAXED);
+
+	AFB_REQ_NOTICE(request, "ping count = %d", c);
+
+	countJ = json_object_new_int(c);
+	if(! countJ) {
+		afb_req_fail(request, "count_json_int", "Didn't succeed to allocate count json integer");
+		return;
+	}
+
+	afb_req_success(request, countJ, "Ping count");
+
+	return;
+}
\ No newline at end of file
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-ping.h b/lib/4a-hal-utilities/4a-hal-utilities-ping.h
new file mode 100644
index 0000000..24ce444
--- /dev/null
+++ b/lib/4a-hal-utilities/4a-hal-utilities-ping.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2019 "IoT.bzh"
+ * Author Jonathan Aillet <jonathan.aillet@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _HAL_UTILITIES_PING_INCLUDE_
+#define _HAL_UTILITIES_PING_INCLUDE_
+
+#include <stdio.h>
+
+#include <afb/afb-binding.h>
+
+// HAL - Ping function
+void HalUtlPing(afb_req_t request);
+
+#endif /* _HAL_UTILITIES_PING_INCLUDE_ */
\ No newline at end of file
diff --git a/lib/4a-hal-utilities/CMakeLists.txt b/lib/4a-hal-utilities/CMakeLists.txt
index 48a81c5..0b2ab85 100644
--- a/lib/4a-hal-utilities/CMakeLists.txt
+++ b/lib/4a-hal-utilities/CMakeLists.txt
@@ -24,7 +24,8 @@ PROJECT_TARGET_ADD(4a-hal-utilities)
 	ADD_LIBRARY(${TARGET_NAME} STATIC
 		    4a-hal-utilities-data.c
 		    4a-hal-utilities-hal-api-handler.c
-		    4a-hal-utilities-hal-streams-handler.c)
+		    4a-hal-utilities-hal-streams-handler.c
+		    4a-hal-utilities-ping.c)
 
 	# Define target includes for this target client
 	TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} PUBLIC
diff --git a/src/4a-hal-manager/4a-hal-manager-cb.c b/src/4a-hal-manager/4a-hal-manager-cb.c
index 0768526..771ff50 100644
--- a/src/4a-hal-manager/4a-hal-manager-cb.c
+++ b/src/4a-hal-manager/4a-hal-manager-cb.c
@@ -43,26 +43,6 @@ void HalMgrDispatchApiEvent(afb_api_t apiHandle, const char *evtLabel, json_obje
  *		HAL Manager verbs functions				       *
  ******************************************************************************/
 
-void HalMgrPing(afb_req_t request)
-{
-	static int count = 0;
-	json_object *countJ;
-
-	count++;
-
-	AFB_REQ_NOTICE(request, "ping count = %d", count);
-
-	countJ = json_object_new_int(count);
-	if(! countJ) {
-		afb_req_fail(request, "count_json_int", "Didn't succeed to allocate count json integer");
-		return;
-	}
-
-	afb_req_success(request, countJ, "Ping count");
-
-	return;
-}
-
 void HalMgrLoaded(afb_req_t request)
 {
 	int requestJsonErr = 0, allHal = 0, verbose = 0, wrapRet = 0;
diff --git a/src/4a-hal-manager/4a-hal-manager.c b/src/4a-hal-manager/4a-hal-manager.c
index d4dc813..d08d83f 100644
--- a/src/4a-hal-manager/4a-hal-manager.c
+++ b/src/4a-hal-manager/4a-hal-manager.c
@@ -24,6 +24,7 @@
 
 #include "4a-hal-utilities-data.h"
 #include "4a-hal-utilities-hal-api-handler.h"
+#include "4a-hal-utilities-ping.h"
 
 #include "../4a-internals-hal/4a-internals-hal-api-loader.h"
 
@@ -38,7 +39,7 @@
 afb_verb_t HalManagerApiStaticVerbs[] =
 {
 	/* VERB'S NAME			FUNCTION TO CALL			SHORT DESCRIPTION */
-	{ .verb = "ping",		.callback = HalMgrPing,			.info = "Ping test"},
+	{ .verb = "ping",		.callback = HalUtlPing,			.info = "Ping for test"},
 	{ .verb = "loaded",		.callback = HalMgrLoaded,		.info = "Show loaded HAL"},
 	{ .verb = "load",		.callback = HalMgrLoad,			.info = "Load an external HAL to HAL Manager"},
 	{ .verb = "unload",		.callback = HalMgrUnload,		.info = "Unload an external HAL to HAL Manager"},
diff --git a/src/4a-internals-hal/4a-internals-hal-api-loader.c b/src/4a-internals-hal/4a-internals-hal-api-loader.c
index 8899f2c..ca53e01 100644
--- a/src/4a-internals-hal/4a-internals-hal-api-loader.c
+++ b/src/4a-internals-hal/4a-internals-hal-api-loader.c
@@ -29,6 +29,7 @@
 
 #include "4a-hal-utilities-hal-api-handler.h"
 #include "4a-hal-utilities-hal-streams-handler.h"
+#include "4a-hal-utilities-ping.h"
 
 #include "4a-internals-hal-api-loader.h"
 #include "4a-internals-hal-alsacore-link.h"
@@ -59,7 +60,8 @@ static CtlSectionT ctrlSectionsDefault[] =
 // Every HAL export the same API & Interface Mapping from SndCard to AudioLogic is done through alsaHalSndCardT
 static afb_verb_t InternalHalApiStaticVerbs[] =
 {
-	/* VERB'S NAME			FUNCTION TO CALL		SHORT DESCRIPTION */
+	/* VERB'S NAME			FUNCTION TO CALL			SHORT DESCRIPTION */
+	{ .verb = "ping",		.callback = HalUtlPing,			.info = "Ping for test"},
 	{ .verb = "info",		.callback = InternalHalInfo,		.info = "List available streams/controls for this api" },
 	{ .verb = "subscribe",		.callback = InternalHalSubscribe,	.info = "Subscribe to event(s) for values changes (streams/controls) for this api" },
 	{ .verb = "unsubscribe",	.callback = InternalHalUnsubscribe,	.info = "Unsubscribe to event(s) for values changes (streams/controls) for this api" },