From 9d44f8855470418b4ee27d7ad337641e1ccaf9f3 Mon Sep 17 00:00:00 2001
From: Jonathan Aillet <jonathan.aillet@iot.bzh>
Date: Fri, 9 Aug 2019 10:58:19 +0200
Subject: 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>
---
 lib/4a-hal-utilities/4a-hal-utilities-data.h |  2 +-
 lib/4a-hal-utilities/4a-hal-utilities-ping.c | 52 ++++++++++++++++++++++++++++
 lib/4a-hal-utilities/4a-hal-utilities-ping.h | 28 +++++++++++++++
 lib/4a-hal-utilities/CMakeLists.txt          |  3 +-
 4 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 lib/4a-hal-utilities/4a-hal-utilities-ping.c
 create mode 100644 lib/4a-hal-utilities/4a-hal-utilities-ping.h

(limited to 'lib')

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
-- 
cgit 1.2.3-korg