listener: change the names of attribute libsensor API

Previous attribute APIs are for getting or setting sensor listener attribute.
To distinguish between sensor listener attribute API and
sensor handle attribute API, change the names.

Sensor handle attribute API will be uploaded in later patch,
and they will use "sensord_get/set_attribute_int".

changed API

sensord_get_attribute_int -> sensord_listener_get_attribute_int
sensord_set_attribute_int -> sensord_listener_set_attribute_int
sensord_get_attribute_str -> sensord_listener_get_attribute_str
sensord_set_attribute_str -> sensord_listener_set_attribute_str

Change-Id: Ic8a6f8e4799535d3f314afebcd40e57fb33fb7b1
Signed-off-by: TaeminYeom <taemin.yeom@samsung.com>

diff --git a/include/sensor_internal.h b/include/sensor_internal.h
index e331764ce600072153eced3b6f813c63e96c04c8..5eb85dc9670b03cd7b4dfd3e0ce5bc670c4ed2d2 100644 (file)
--- a/include/sensor_internal.h
+++ b/include/sensor_internal.h
@@ -395,7 +395,7 @@ bool sensord_change_event_max_batch_latency(int handle, unsigned int event_type,
 bool sensord_set_option(int handle, int option);
 
 /*
- * @brief Set the attribute to a connected sensor
+ * @brief Set the attribute to a connected sensor listener
  *
  * @param[in] handle a handle represensting a connected sensor.
  * @param[in] attribute an attribute to change
@@ -405,10 +405,10 @@ bool sensord_set_option(int handle, int option);
  * @retval -EINVAL Invalid parameter
  * @retval -EPERM Operation not permitted
  */
-int sensord_set_attribute_int(int handle, int attribute, int value);
+int sensord_listener_set_attribute_int(int handle, int attribute, int value);
 
 /*
- * @brief Get the attribute to a connected sensor
+ * @brief Get the attribute to a connected sensor listener
  *
  * @param[in] handle a handle represensting a connected sensor.
  * @param[in] attribute an attribute to get value
@@ -418,10 +418,10 @@ int sensord_set_attribute_int(int handle, int attribute, int value);
  * @retval -EINVAL Invalid parameter
  * @retval -EPERM Operation not permitted
  */
-int sensord_get_attribute_int(int handle, int attribute, int* value);
+int sensord_listener_get_attribute_int(int handle, int attribute, int* value);
 
 /**
- * @brief Set the attribute to a connected sensor
+ * @brief Set the attribute to a connected sensor listener
  *
  * @param[in] handle a handle represensting a connected sensor.
  * @param[in] attribute an attribute to change
@@ -432,10 +432,10 @@ int sensord_get_attribute_int(int handle, int attribute, int* value);
  * @retval -EINVAL Invalid parameter
  * @retval -EPERM Operation not permitted
  */
-int sensord_set_attribute_str(int handle, int attribute, const char *value, int len);
+int sensord_listener_set_attribute_str(int handle, int attribute, const char *value, int len);
 
 /**
- * @brief Get the attribute to a connected sensor
+ * @brief Get the attribute to a connected sensor listener
  *
  * @param[in] handle a handle represensting a connected sensor.
  * @param[in] attribute an attribute to get value
@@ -446,7 +446,7 @@ int sensord_set_attribute_str(int handle, int attribute, const char *value, int
  * @retval -EINVAL Invalid parameter
  * @retval -EPERM Operation not permitted
  */
-int sensord_get_attribute_str(int handle, int attribute, char **value, int *len);
+int sensord_listener_get_attribute_str(int handle, int attribute, char **value, int *len);
 
 /**
  * @brief Send data to sensorhub

diff --git a/src/client-dummy/client_dummy.cpp b/src/client-dummy/client_dummy.cpp
index 8432ba21784148f5b735ce938f6ca2016c2bc1b3..0d157e8a850e52f9d4bab54342acf24349c17f73 100644 (file)
--- a/src/client-dummy/client_dummy.cpp
+++ b/src/client-dummy/client_dummy.cpp
@@ -198,22 +198,22 @@ API bool sensord_set_option(int handle, int option)
        return false;
 }
 
-API int sensord_set_attribute_int(int handle, int attribute, int value)
+API int sensord_listener_set_attribute_int(int handle, int attribute, int value)
 {
        return OP_ERROR;
 }
 
-API int sensord_get_attribute_int(int handle, int attribute, int* value)
+API int sensord_listener_get_attribute_int(int handle, int attribute, int* value)
 {
        return OP_ERROR;
 }
 
-API int sensord_set_attribute_str(int handle, int attribute, const char *value, int len)
+API int sensord_listener_set_attribute_str(int handle, int attribute, const char *value, int len)
 {
        return OP_ERROR;
 }
 
-API int sensord_get_attribute_str(int handle, int attribute, char **value, int *len)
+API int sensord_listener_get_attribute_str(int handle, int attribute, char **value, int *len)
 {
        return OP_ERROR;
 }

diff --git a/src/client/sensor_internal.cpp b/src/client/sensor_internal.cpp
index 1930b29330bdb25cf46989283eafbc60b986827e..5274f608b072e93767091e35070397025a8381c9 100644 (file)
--- a/src/client/sensor_internal.cpp
+++ b/src/client/sensor_internal.cpp
@@ -699,7 +699,7 @@ API bool sensord_set_option(int handle, int option)
        return true;
 }
 
-API int sensord_set_attribute_int(int handle, int attribute, int value)
+API int sensord_listener_set_attribute_int(int handle, int attribute, int value)
 {
        sensor::sensor_listener *listener;
 
@@ -718,7 +718,7 @@ API int sensord_set_attribute_int(int handle, int attribute, int value)
        return OP_SUCCESS;
 }
 
-API int sensord_get_attribute_int(int handle, int attribute, int* value)
+API int sensord_listener_get_attribute_int(int handle, int attribute, int* value)
 {
        sensor::sensor_listener *listener;
 
@@ -737,7 +737,7 @@ API int sensord_get_attribute_int(int handle, int attribute, int* value)
        return OP_SUCCESS;
 }
 
-API int sensord_set_attribute_str(int handle, int attribute, const char *value, int len)
+API int sensord_listener_set_attribute_str(int handle, int attribute, const char *value, int len)
 {
        sensor::sensor_listener *listener;
 
@@ -755,7 +755,7 @@ API int sensord_set_attribute_str(int handle, int attribute, const char *value,
        return OP_SUCCESS;
 }
 
-API int sensord_get_attribute_str(int handle, int attribute, char **value, int* len)
+API int sensord_listener_get_attribute_str(int handle, int attribute, char **value, int* len)
 {
        sensor::sensor_listener *listener;
 
@@ -1140,13 +1140,13 @@ API bool sensord_is_supported_event_type(sensor_t sensor, unsigned int event_typ
 /* deprecated */
 API bool sensord_send_sensorhub_data(int handle, const char *data, int data_len)
 {
-       return (sensord_set_attribute_str(handle, 0, data, data_len) == OP_SUCCESS);
+       return (sensord_listener_set_attribute_str(handle, 0, data, data_len) == OP_SUCCESS);
 }
 
 /* deprecated */
 API bool sensord_send_command(int handle, const char *command, int command_len)
 {
-       return (sensord_set_attribute_str(handle, 0, command, command_len) == OP_SUCCESS);
+       return (sensord_listener_set_attribute_str(handle, 0, command, command_len) == OP_SUCCESS);
 }
 
 /* deprecated */

diff --git a/src/sensorctl/loopback.cpp b/src/sensorctl/loopback.cpp
index aedf77ac7484a15a19882ac391ff5037fe4cbd05..4abd90bb942183146b622940275e56d0b7800d85 100644 (file)
--- a/src/sensorctl/loopback.cpp
+++ b/src/sensorctl/loopback.cpp
@@ -64,7 +64,7 @@ bool loopback_manager::run(int argc, char *argv[])
                for (int i = 4; i < argc; i++)
                        test_data[i+2] = atoi(argv[i]);
 
-               int error = sensord_set_attribute_str(handle, 0, test_data, sizeof(test_data));
+               int error = sensord_listener_set_attribute_str(handle, 0, test_data, sizeof(test_data));
                WARN_IF(error != 0, "Failed to set attribute\n");
                bool ret = sensord_disconnect(handle);
                WARN_IF(ret != true, "Failed to disconnect\n");
@@ -79,7 +79,7 @@ bool loopback_manager::run(int argc, char *argv[])
 
                char test_data[4] = {SHUB_INST_LIB_REMOVE, SHUB_LOOP_BACK_LIB, };
 
-               int error = sensord_set_attribute_str(handle, 0, test_data, sizeof(test_data));
+               int error = sensord_listener_set_attribute_str(handle, 0, test_data, sizeof(test_data));
                WARN_IF(error != 0, "Failed to set attribute\n");
                bool ret = sensord_disconnect(handle);
                WARN_IF(ret != true, "Failed to disconnect\n");

diff --git a/src/sensorctl/sensor_adapter.cpp b/src/sensorctl/sensor_adapter.cpp
index 9cf0a32d7611be060484b11d8dc2431cf73b964e..04bf88424699eec49ffc87a7775c90618f8e04b6 100644 (file)
--- a/src/sensorctl/sensor_adapter.cpp
+++ b/src/sensorctl/sensor_adapter.cpp
@@ -147,7 +147,7 @@ bool sensor_adapter::set_attribute(int handle, int attribute, int value)
 {
        bool ret;
 
-       ret = sensord_set_attribute_int(handle, attribute, value);
+       ret = sensord_listener_set_attribute_int(handle, attribute, value);
        ASSERT_TRUE(ret);
 
        return true;
@@ -157,7 +157,7 @@ bool sensor_adapter::set_attribute(int handle, int attribute, char *value, int s
 {
        int ret;
 
-       ret = sensord_set_attribute_str(handle, attribute, value, size);
+       ret = sensord_listener_set_attribute_str(handle, attribute, value, size);
 
        return ((ret == 0) ? true : false);
 }

diff --git a/src/sensorctl/testcase/sensor_listener.cpp b/src/sensorctl/testcase/sensor_listener.cpp
index 7cdf8b88a31acbafb48d5e4ecc9a7f463f9870d4..bae71623d6d9f0d1edf540a76436e3c43fc7f22c 100644 (file)
--- a/src/sensorctl/testcase/sensor_listener.cpp
+++ b/src/sensorctl/testcase/sensor_listener.cpp
@@ -245,10 +245,10 @@ TESTCASE(sensor_listener, set_get_attribute_int_1)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_int(handle, attr, 1);
+       err = sensord_listener_set_attribute_int(handle, attr, 1);
        ASSERT_EQ(err, 0);
 
-       err = sensord_get_attribute_int(handle, attr, &value);
+       err = sensord_listener_get_attribute_int(handle, attr, &value);
        ASSERT_EQ(err, 0);
 
        ASSERT_EQ(value, 1);
@@ -272,10 +272,10 @@ TESTCASE(sensor_listener, set_get_attribute_int_2)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_int(handle, attr, 1);
+       err = sensord_listener_set_attribute_int(handle, attr, 1);
        ASSERT_EQ(err, 0);
 
-       err = sensord_get_attribute_int(handle, attr, &value);
+       err = sensord_listener_get_attribute_int(handle, attr, &value);
        ASSERT_EQ(err, 0);
 
        ASSERT_EQ(value, 1);
@@ -300,11 +300,11 @@ TESTCASE(sensor_listener, set_get_attribute_int_3)
 
        handle = sensord_connect(sensor);
 
-       err = sensord_set_attribute_int(handle, attr, 1);
+       err = sensord_listener_set_attribute_int(handle, attr, 1);
        ASSERT_EQ(err, 0);
 
        for (int i = 0 ; i < 10; i ++) {
-               err = sensord_get_attribute_int(handle, attr, &value);
+               err = sensord_listener_get_attribute_int(handle, attr, &value);
                ASSERT_EQ(err, 0);
        }
 
@@ -331,7 +331,7 @@ TESTCASE(sensor_listener, get_attribute_int_1)
        handle = sensord_connect(sensor);
 
        // attr 100 value is never set in these tests.
-       err = sensord_get_attribute_int(handle, attr, &value);
+       err = sensord_listener_get_attribute_int(handle, attr, &value);
        ASSERT_EQ(err, -5);
 
        ret = sensord_disconnect(handle);
@@ -355,7 +355,7 @@ TESTCASE(sensor_listener, set_attribute_string_1)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
+       err = sensord_listener_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
        ASSERT_EQ(err, 0);
 
        ret = sensord_disconnect(handle);
@@ -378,10 +378,10 @@ TESTCASE(sensor_listener, set_get_attribute_string_1)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
+       err = sensord_listener_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
        ASSERT_EQ(err, 0);
 
-       err = sensord_get_attribute_str(handle, attr, &(value.get()), &len);
+       err = sensord_listener_get_attribute_str(handle, attr, &(value.get()), &len);
        ASSERT_EQ(err, 0);
        ASSERT_EQ(len, TEST_STRING_LEN);
        ASSERT_EQ(strncmp(value.get(), TEST_STRING, len), 0);
@@ -409,10 +409,10 @@ TESTCASE(sensor_listener, set_get_attribute_string_2)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_str(handle, attr, attr_value, BUF_SIZE);
+       err = sensord_listener_set_attribute_str(handle, attr, attr_value, BUF_SIZE);
        ASSERT_EQ(err, 0);
 
-       err = sensord_get_attribute_str(handle, attr, &(value.get()), &len);
+       err = sensord_listener_get_attribute_str(handle, attr, &(value.get()), &len);
        ASSERT_EQ(err, 0);
        ASSERT_EQ(len, BUF_SIZE);
 
@@ -436,11 +436,11 @@ TESTCASE(sensor_listener, set_get_attribute_string_3)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
+       err = sensord_listener_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
        ASSERT_EQ(err, 0);
 
        for (int i = 0; i < 10; i++) {
-               err = sensord_get_attribute_str(handle, attr, &(value.get()), &len);
+               err = sensord_listener_get_attribute_str(handle, attr, &(value.get()), &len);
                ASSERT_EQ(err, 0);
                ASSERT_EQ(len, TEST_STRING_LEN);
                ASSERT_EQ(strncmp(value.get(), TEST_STRING, len), 0);
@@ -467,10 +467,10 @@ TESTCASE(sensor_listener, set_get_get_attribute_string_1)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
+       err = sensord_listener_set_attribute_str(handle, attr, TEST_STRING, TEST_STRING_LEN);
        ASSERT_EQ(err, 0);
 
-       err = sensord_get_attribute_str(handle, attr, &(value.get()), &len);
+       err = sensord_listener_get_attribute_str(handle, attr, &(value.get()), &len);
        ASSERT_EQ(err, 0);
        ASSERT_EQ(len, TEST_STRING_LEN);
        ASSERT_EQ(strncmp(value.get(), TEST_STRING, len), 0);
@@ -485,7 +485,7 @@ TESTCASE(sensor_listener, set_get_get_attribute_string_1)
 
        handle = sensord_connect(sensor);
 
-       err = sensord_get_attribute_str(handle, attr, &(value2.get()), &len);
+       err = sensord_listener_get_attribute_str(handle, attr, &(value2.get()), &len);
        ASSERT_EQ(err, 0);
        ASSERT_EQ(len, TEST_STRING_LEN);
        ASSERT_EQ(strncmp(value2.get(), TEST_STRING, len), 0);
@@ -512,7 +512,7 @@ TESTCASE(sensor_listener, get_attribute_string_2)
        handle = sensord_connect(sensor);
 
        // attr 100 value is never set in these tests.
-       err = sensord_get_attribute_str(handle, attr, &(value.get()), &len);
+       err = sensord_listener_get_attribute_str(handle, attr, &(value.get()), &len);
        ASSERT_EQ(err, -EIO);
 
        ret = sensord_disconnect(handle);
@@ -616,7 +616,7 @@ static int attribute_value = 0;
 static gboolean change_attribute_int(gpointer gdata)
 {
        int *handle = reinterpret_cast<int *>(gdata);
-       int ret = sensord_set_attribute_int(*handle, attribute, attribute_value);
+       int ret = sensord_listener_set_attribute_int(*handle, attribute, attribute_value);
        if (ret < 0)
                return false;
 
@@ -707,7 +707,7 @@ static gboolean change_attribute_str(gpointer gdata)
 {
        int *handle = reinterpret_cast<int *>(gdata);
        int len = strlen(attribute_value_str) + 1;
-       int ret = sensord_set_attribute_str(*handle, attribute, attribute_value_str, len);
+       int ret = sensord_listener_set_attribute_str(*handle, attribute, attribute_value_str, len);
        if (ret < 0)
                return false;
 
@@ -767,10 +767,10 @@ TESTCASE(skip_sensor_listener, light_sensor_set_attribute_int_1)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_set_attribute_int(handle, attr, 2);
+       err = sensord_listener_set_attribute_int(handle, attr, 2);
        ASSERT_EQ(err, 0);
 
-       err = sensord_get_attribute_int(handle, attr, &value);
+       err = sensord_listener_get_attribute_int(handle, attr, &value);
        ASSERT_EQ(err, 0);
        ASSERT_EQ(value, 2);
 
@@ -793,7 +793,7 @@ TESTCASE(skip_sensor_listener, light_sensor_get_attribute_int_1)
        ASSERT_EQ(err, 0);
 
        handle = sensord_connect(sensor);
-       err = sensord_get_attribute_int(handle, attr, &value);
+       err = sensord_listener_get_attribute_int(handle, attr, &value);
        ASSERT_EQ(err, 0);
        ASSERT_EQ(value, 2);