[Edge] Allow NULL ID when create edge handle.

 - Allow NULL ID when create edge handle.
 - Add event_type to notify connection closure.

Signed-off-by: gichan <gichan2.jang@samsung.com>

diff --git a/include/nnstreamer-edge.h b/include/nnstreamer-edge.h
index cd808dbc187b5a4cdcbece7dc876b045399178b1..f2547e30bca2ff32252b913b99e6bba5312d47b2 100644 (file)
--- a/include/nnstreamer-edge.h
+++ b/include/nnstreamer-edge.h
@@ -48,6 +48,7 @@ typedef enum {
   NNS_EDGE_EVENT_CAPABILITY,
   NNS_EDGE_EVENT_NEW_DATA_RECEIVED,
   NNS_EDGE_EVENT_CALLBACK_RELEASED,
+  NNS_EDGE_EVENT_CONNECTION_CLOSED,
 
   NNS_EDGE_EVENT_CUSTOM = 0x01000000
 } nns_edge_event_e;

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-internal.c b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
index bff1d7490458c0ece23e1fe7ebf91210963b0f7b..4726c87b759c10693a844600b49331f04ce3e860 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-internal.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
@@ -775,6 +775,8 @@ _nns_edge_message_handler (void *thread_data)
         ("Received error from client, remove connection of client (ID: %lld).",
         (long long) client_id);
     _nns_edge_remove_connection (eh, client_id);
+    _nns_edge_invoke_event_cb (eh, NNS_EDGE_EVENT_CONNECTION_CLOSED,
+        NULL, 0, NULL);
   }
 
   return NULL;
@@ -1034,7 +1036,7 @@ _nns_edge_accept_socket (nns_edge_handle_s * eh)
 
   if ((NNS_EDGE_NODE_TYPE_QUERY_SERVER == eh->node_type)
       || (NNS_EDGE_NODE_TYPE_PUB == eh->node_type)) {
-    client_id = nns_edge_generate_client_id ();
+    client_id = nns_edge_generate_id ();
   } else {
     client_id = eh->client_id;
   }
@@ -1208,11 +1210,6 @@ nns_edge_create_handle (const char *id, nns_edge_connect_type_e connect_type,
 {
   nns_edge_handle_s *eh;
 
-  if (!STR_IS_VALID (id)) {
-    nns_edge_loge ("Invalid param, given ID is invalid.");
-    return NNS_EDGE_ERROR_INVALID_PARAMETER;
-  }
-
   if (connect_type < 0 || connect_type >= NNS_EDGE_CONNECT_TYPE_UNKNOWN) {
     nns_edge_loge ("Invalid param, set valid connect type.");
     return NNS_EDGE_ERROR_INVALID_PARAMETER;
@@ -1240,7 +1237,8 @@ nns_edge_create_handle (const char *id, nns_edge_connect_type_e connect_type,
 
   nns_edge_lock_init (eh);
   eh->magic = NNS_EDGE_MAGIC;
-  eh->id = nns_edge_strdup (id);
+  eh->id = STR_IS_VALID (id) ? nns_edge_strdup (id) :
+      nns_edge_strdup_printf ("%lld", (long long) nns_edge_generate_id ());
   eh->connect_type = connect_type;
   eh->host = nns_edge_strdup ("localhost");
   eh->port = 0;

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-util.c b/src/libnnstreamer-edge/nnstreamer-edge-util.c
index f5834ce1a1dbfceafa44021e54bf7bb4d3ba3b4c..f26014d635669f2d921add5a1ace183651507021 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-util.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-util.c
@@ -16,18 +16,18 @@
 #include "nnstreamer-edge-util.h"
 
 /**
- * @brief Generate client ID.
+ * @brief Generate ID.
  */
 int64_t
-nns_edge_generate_client_id (void)
+nns_edge_generate_id (void)
 {
   struct timespec ts;
-  int64_t client_id;
+  int64_t _id;
 
   clock_gettime (CLOCK_MONOTONIC, &ts);
-  client_id = ((int64_t) ts.tv_sec) * 1000000 + ts.tv_nsec / 1000;
+  _id = ((int64_t) ts.tv_sec) * 1000000 + ts.tv_nsec / 1000;
 
-  return client_id;
+  return _id;
 }
 
 /**

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-util.h b/src/libnnstreamer-edge/nnstreamer-edge-util.h
index 61065e91ef14a1bcd89989964db8915726f09d68..ba8ce5afeee7521f7a685e36b5880581db9bed85 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-util.h
+++ b/src/libnnstreamer-edge/nnstreamer-edge-util.h
@@ -60,7 +60,7 @@ extern "C" {
 /**
  * @brief Generate client ID.
  */
-int64_t nns_edge_generate_client_id (void);
+int64_t nns_edge_generate_id (void);
 
 /**
  * @brief Get available port number.

diff --git a/tests/unittest_nnstreamer-edge.cc b/tests/unittest_nnstreamer-edge.cc
index b27699df1c7395efd2f60f7df8652eb46d2d109b..33b505feeb488c2b5fd98e3f0156f71ec65b2867 100644 (file)
--- a/tests/unittest_nnstreamer-edge.cc
+++ b/tests/unittest_nnstreamer-edge.cc
@@ -270,19 +270,6 @@ TEST(edge, createHandleInvalidParam01_n)
   nns_edge_h edge_h;
   int ret;
 
-  ret = nns_edge_create_handle (NULL, NNS_EDGE_CONNECT_TYPE_TCP,
-      NNS_EDGE_NODE_TYPE_QUERY_CLIENT, &edge_h);
-  EXPECT_NE (ret, NNS_EDGE_ERROR_NONE);
-}
-
-/**
- * @brief Create edge handle - invalid param.
- */
-TEST(edge, createHandleInvalidParam02_n)
-{
-  nns_edge_h edge_h;
-  int ret;
-
   ret = nns_edge_create_handle ("temp-id", NNS_EDGE_CONNECT_TYPE_UNKNOWN,
       NNS_EDGE_NODE_TYPE_QUERY_CLIENT, &edge_h);
   EXPECT_NE (ret, NNS_EDGE_ERROR_NONE);
@@ -291,7 +278,7 @@ TEST(edge, createHandleInvalidParam02_n)
 /**
  * @brief Create edge handle - invalid param.
  */
-TEST(edge, createHandleInvalidParam03_n)
+TEST(edge, createHandleInvalidParam02_n)
 {
   int ret;
 
@@ -303,20 +290,7 @@ TEST(edge, createHandleInvalidParam03_n)
 /**
  * @brief Create edge handle - invalid param.
  */
-TEST(edge, createHandleInvalidParam04_n)
-{
-  nns_edge_h edge_h;
-  int ret;
-
-  ret = nns_edge_create_handle ("", NNS_EDGE_CONNECT_TYPE_MQTT,
-      NNS_EDGE_NODE_TYPE_QUERY_CLIENT, &edge_h);
-  EXPECT_NE (ret, NNS_EDGE_ERROR_NONE);
-}
-
-/**
- * @brief Create edge handle - invalid param.
- */
-TEST(edge, createHandleInvalidParam05_n)
+TEST(edge, createHandleInvalidParam03_n)
 {
   nns_edge_h edge_h;
   int ret;