[Interface] rename (publish to send)

Prepare interface udpate,
- rename publish() to send()
- remove testcase - no client ID in data (If data handle does not have client ID, it will send data to all connected nodes.)

Signed-off-by: Jaeyun <jy1210.jung@samsung.com>

diff --git a/include/nnstreamer-edge.h b/include/nnstreamer-edge.h
index da471887142d5cf721fdbebea4049d14f1c9ef6a..b5ace1ff418bfdbaef3319d72ccef99ec65aca7f 100644 (file)
--- a/include/nnstreamer-edge.h
+++ b/include/nnstreamer-edge.h
@@ -125,9 +125,15 @@ int nns_edge_connect (nns_edge_h edge_h, const char *dest_host, int dest_port);
 int nns_edge_disconnect (nns_edge_h edge_h);
 
 /**
- * @brief Publish a message to desination (broker or connected node).
+ * @brief Send data to desination (broker or connected node), asynchronously.
  */
-int nns_edge_publish (nns_edge_h edge_h, nns_edge_data_h data_h);
+int nns_edge_send (nns_edge_h edge_h, nns_edge_data_h data_h);
+
+/**
+ * @brief Deprecated, use nns_edge_send() instead.
+ * @todo Remove this macro later.
+ */
+#define nns_edge_publish(h,d) nns_edge_send(h,d)
 
 /**
  * @brief Set nnstreamer edge info.

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-internal.c b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
index bcd34cdc6cab2b56f37eb5d8b838cef31dbfc55a..7d2cfdeec5fdfddbded7553eccdc8684640b6bf5 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-internal.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
@@ -1360,10 +1360,10 @@ nns_edge_disconnect (nns_edge_h edge_h)
 }
 
 /**
- * @brief Publish a message to desination (broker or connected node).
+ * @brief Send data to desination (broker or connected node), asynchronously.
  */
 int
-nns_edge_publish (nns_edge_h edge_h, nns_edge_data_h data_h)
+nns_edge_send (nns_edge_h edge_h, nns_edge_data_h data_h)
 {
   nns_edge_handle_s *eh;
   nns_edge_conn_data_s *conn_data;

diff --git a/tests/unittest_nnstreamer-edge.cc b/tests/unittest_nnstreamer-edge.cc
index e49373fef14c6b3c59dbacfa14b6f70dbd9e4412..6d58fcba7f7af7d2f01db47f8f81011908c8af57 100644 (file)
--- a/tests/unittest_nnstreamer-edge.cc
+++ b/tests/unittest_nnstreamer-edge.cc
@@ -110,7 +110,7 @@ _test_edge_event_cb (nns_edge_event_h event_h, void *user_data)
          * @note This is test code, responding to client.\r
          * Recommend not to call edge API in event callback.\r
          */\r
-        ret = nns_edge_publish (_td->handle, data_h);\r
+        ret = nns_edge_send (_td->handle, data_h);\r
         EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
       } else {\r
         /* Compare received data */\r
@@ -255,12 +255,12 @@ TEST(edge, connectLocal)
   for (i = 0; i < 5U; i++) {\r
     ret = nns_edge_data_set_info (data_h, "client_id", client1_id);\r
     EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
-    ret = nns_edge_publish (client1_h, data_h);\r
+    ret = nns_edge_send (client1_h, data_h);\r
     EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
     usleep (10000);\r
     ret = nns_edge_data_set_info (data_h, "client_id", client2_id);\r
     EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
-    ret = nns_edge_publish (client2_h, data_h);\r
+    ret = nns_edge_send (client2_h, data_h);\r
     EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
 \r
     usleep (100000);\r
@@ -657,9 +657,9 @@ TEST(edge, disconnectInvalidParam02_n)
 }\r
 \r
 /**\r
- * @brief Publish - invalid param.\r
+ * @brief Send - invalid param.\r
  */\r
-TEST(edge, publishInvalidParam01_n)\r
+TEST(edge, sendInvalidParam01_n)\r
 {\r
   nns_edge_data_h data_h;\r
   int ret;\r
@@ -670,7 +670,7 @@ TEST(edge, publishInvalidParam01_n)
   ret = nns_edge_data_set_info (data_h, "client_id", "10");\r
   EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
 \r
-  ret = nns_edge_publish (NULL, data_h);\r
+  ret = nns_edge_send (NULL, data_h);\r
   EXPECT_NE (ret, NNS_EDGE_ERROR_NONE);\r
 \r
   ret = nns_edge_data_destroy (data_h);\r
@@ -678,9 +678,9 @@ TEST(edge, publishInvalidParam01_n)
 }\r
 \r
 /**\r
- * @brief Publish - invalid param.\r
+ * @brief Send - invalid param.\r
  */\r
-TEST(edge, publishInvalidParam02_n)\r
+TEST(edge, sendInvalidParam02_n)\r
 {\r
   nns_edge_h edge_h;\r
   nns_edge_data_h data_h;\r
@@ -700,7 +700,7 @@ TEST(edge, publishInvalidParam02_n)
   eh = (nns_edge_handle_s *) edge_h;\r
   eh->magic = NNS_EDGE_MAGIC_DEAD;\r
 \r
-  ret = nns_edge_publish (edge_h, data_h);\r
+  ret = nns_edge_send (edge_h, data_h);\r
   EXPECT_NE (ret, NNS_EDGE_ERROR_NONE);\r
 \r
   eh->magic = NNS_EDGE_MAGIC;\r
@@ -713,9 +713,9 @@ TEST(edge, publishInvalidParam02_n)
 }\r
 \r
 /**\r
- * @brief Publish - invalid param.\r
+ * @brief Send - invalid param.\r
  */\r
-TEST(edge, publishInvalidParam03_n)\r
+TEST(edge, sendInvalidParam03_n)\r
 {\r
   nns_edge_h edge_h;\r
   int ret;\r
@@ -724,40 +724,13 @@ TEST(edge, publishInvalidParam03_n)
       (NNS_EDGE_FLAG_RECV | NNS_EDGE_FLAG_SEND), &edge_h);\r
   EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
 \r
-  ret = nns_edge_publish (edge_h, NULL);\r
+  ret = nns_edge_send (edge_h, NULL);\r
   EXPECT_NE (ret, NNS_EDGE_ERROR_NONE);\r
 \r
   ret = nns_edge_release_handle (edge_h);\r
   EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
 }\r
 \r
-/**\r
- * @brief Publish - invalid param.\r
- */\r
-TEST(edge, publishInvalidParam04_n)\r
-{\r
-  nns_edge_h edge_h;\r
-  nns_edge_data_h data_h;\r
-  int ret;\r
-\r
-  ret = nns_edge_create_handle ("temp-id", NNS_EDGE_CONNECT_TYPE_TCP,\r
-      (NNS_EDGE_FLAG_RECV | NNS_EDGE_FLAG_SEND), &edge_h);\r
-  EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
-\r
-  ret = nns_edge_data_create (&data_h);\r
-  EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
-\r
-  /* No client ID */\r
-  ret = nns_edge_publish (edge_h, data_h);\r
-  EXPECT_NE (ret, NNS_EDGE_ERROR_NONE);\r
-\r
-  ret = nns_edge_release_handle (edge_h);\r
-  EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
-\r
-  ret = nns_edge_data_destroy (data_h);\r
-  EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
-}\r
-\r
 /**\r
  * @brief Set info - invalid param.\r
  */\r
@@ -3052,7 +3025,7 @@ _test_edge_hybrid_event_cb (nns_edge_event_h event_h, void *user_data)
          * @note This is test code, responding to client.\r
          * Recommend not to call edge API in event callback.\r
          */\r
-        ret = nns_edge_publish (_td->handle, data_h);\r
+        ret = nns_edge_send (_td->handle, data_h);\r
         EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
       } else {\r
         /* Compare received data */\r
@@ -3181,7 +3154,7 @@ TEST(edgeMqtt, connectLocal)
   EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
 \r
   for (i = 0; i < 5U; i++) {\r
-    ret = nns_edge_publish (client_h, data_h);\r
+    ret = nns_edge_send (client_h, data_h);\r
     EXPECT_EQ (ret, NNS_EDGE_ERROR_NONE);\r
     usleep (10000);\r
   }\r