sensord: replace usleep() code with sleep()

- this patch makes it a one second delay instead of 100ms.
  It's no problem.

Change-Id: I7f291e06247716a556a0bf8fa4e4293511beec59
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/sensorctl/testcase/unit_ipc.cpp b/src/sensorctl/testcase/unit_ipc.cpp
index 4528562..d820707 100644 (file)
--- a/src/sensorctl/testcase/unit_ipc.cpp
+++ b/src/sensorctl/testcase/unit_ipc.cpp
@@ -33,6 +33,7 @@ using namespace ipc;
 
 #define MAX_BUF_SIZE 4096
 #define TEST_PATH "/run/.sensord_test.socket"
+#define SLEEP_1S sleep(1)
 
 typedef bool (*process_func_t)(const char *msg, int size, int count);
 
@@ -115,11 +116,11 @@ static bool run_ipc_client_sleep_10s(const char *str, int size, int count)
 
        msg.enclose(buf, MAX_BUF_SIZE);
 
-       usleep(10000);
+       SLEEP_1S;
        ch->send_sync(&msg);
 
        /* Test */
-       sleep(1);
+       SLEEP_1S;
 
        ch->read_sync(reply);
        reply.disclose(buf);
@@ -150,7 +151,7 @@ static bool run_ipc_client_small_buffer(const char *str, int size, int count)
 
        msg.enclose(buf, MAX_BUF_SIZE);
 
-       usleep(10000);
+       SLEEP_1S;
 
        int buf_size;
        ch->get_option(SO_RCVBUF, buf_size);
@@ -193,7 +194,7 @@ static bool run_ipc_client_1M(const char *str, int size, int count)
 
        msg.enclose(buf, MAX_BUF_SIZE);
 
-       usleep(10000);
+       SLEEP_1S;
 
        for (int i = 0; i < 256; ++i) {
                ch->send_sync(&msg);
@@ -278,7 +279,7 @@ static bool run_ipc_client_2_channel_message(const char *str, int size, int coun
 
        msg.enclose("TESTTESTTEST", 12);
        ch[0]->send_sync(&msg);
-       usleep(100000);
+       SLEEP_1S;
        ch[0]->read_sync(reply);
        reply.disclose(buf);
        ret = strncmp(buf, "TEXTTEXTTEXTTEXT", 16);
@@ -289,7 +290,7 @@ static bool run_ipc_client_2_channel_message(const char *str, int size, int coun
 
        msg.enclose("TESTTESTTEST", 12);
        ch[1]->send_sync(&msg);
-       usleep(100000);
+       SLEEP_1S;
        ch[1]->read_sync(reply);
        reply.disclose(buf);
        ret = strncmp(buf, "TEXTTEXTTEXTTEXT", 16);
@@ -339,7 +340,7 @@ static bool run_ipc_client(const char *str, int size, int count)
        msg.enclose("TESTTESTTEST", 12);
        ch->send_sync(&msg);
 
-       usleep(100000);
+       SLEEP_1S;
 
        ch->read_sync(reply);
        reply.disclose(buf);
@@ -361,7 +362,7 @@ TESTCASE(sensor_ipc_client_sleep_1s, sleep_1s_p)
        pid_t pid = run_process(run_ipc_server_echo, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        for (int i = 0; i < 3; ++i) {
                pid = run_process(run_ipc_client_1M, NULL, 0, 0);
@@ -371,7 +372,7 @@ TESTCASE(sensor_ipc_client_sleep_1s, sleep_1s_p)
        bool ret = run_ipc_client_sleep_10s(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }
@@ -384,7 +385,7 @@ TESTCASE(sensor_ipc_client_small_2240, ipc_client_small_2240_p)
        pid_t pid = run_process(run_ipc_server_echo, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        for (int i = 0; i < 3; ++i) {
                pid = run_process(run_ipc_client_1M, NULL, 0, 0);
@@ -394,7 +395,7 @@ TESTCASE(sensor_ipc_client_small_2240, ipc_client_small_2240_p)
        bool ret = run_ipc_client_small_buffer(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }
@@ -407,7 +408,7 @@ TESTCASE(sensor_ipc_30_client_1M, ipc_client_p_30_1M)
        pid_t pid = run_process(run_ipc_server_echo, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        for (int i = 0; i < 30; ++i) {
                pid = run_process(run_ipc_client_1M, NULL, 0, 0);
@@ -417,7 +418,7 @@ TESTCASE(sensor_ipc_30_client_1M, ipc_client_p_30_1M)
        bool ret = run_ipc_client_1M(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }
@@ -430,12 +431,12 @@ TESTCASE(sensor_ipc_client_2_channel_message, 2_channel_message_p)
        pid_t pid = run_process(run_ipc_server, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        bool ret = run_ipc_client_2_channel_message(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }
@@ -448,12 +449,12 @@ TESTCASE(sensor_ipc_client_2_channel, 2_channel_p)
        pid_t pid = run_process(run_ipc_server, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        bool ret = run_ipc_client_2_channel(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }
@@ -466,7 +467,7 @@ TESTCASE(sensor_ipc_100_client, ipc_client_p_100)
        pid_t pid = run_process(run_ipc_server, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        for (int i = 0; i < 99; ++i) {
                pid = run_process(run_ipc_client, NULL, 0, 0);
@@ -476,7 +477,7 @@ TESTCASE(sensor_ipc_100_client, ipc_client_p_100)
        bool ret = run_ipc_client(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }
@@ -489,7 +490,7 @@ TESTCASE(sensor_ipc_2_client, ipc_client_p_2)
        pid_t pid = run_process(run_ipc_server, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        pid = run_process(run_ipc_client, NULL, 0, 0);
        EXPECT_GE(pid, 0);
@@ -497,7 +498,7 @@ TESTCASE(sensor_ipc_2_client, ipc_client_p_2)
        bool ret = run_ipc_client(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }
@@ -513,12 +514,12 @@ TESTCASE(sensor_ipc_client_0, ipc_client_p_0)
        pid_t pid = run_process(run_ipc_server, NULL, 0, 0);
        EXPECT_GE(pid, 0);
 
-       usleep(100000);
+       SLEEP_1S;
 
        bool ret = run_ipc_client(NULL, 0, 0);
        ASSERT_TRUE(ret);
 
-       usleep(100000);
+       SLEEP_1S;
 
        return true;
 }

diff --git a/src/sensorctl/testcase/unit_socket.cpp b/src/sensorctl/testcase/unit_socket.cpp
index 2cb240f..261976f 100644 (file)
--- a/src/sensorctl/testcase/unit_socket.cpp
+++ b/src/sensorctl/testcase/unit_socket.cpp
@@ -76,7 +76,7 @@ static bool run_socket_echo_server(const char *msg, int size, int count)
        }
        ASSERT_EQ(total_recv_size, (size * count));
 
-       usleep(10000);
+       sleep(1);
        /* echo message */
        while (send_count++ < count) {
                send_size = client_sock.send(buf, size);
@@ -105,7 +105,7 @@ static bool run_socket_client(const char *msg, int size, int count)
        int total_send_size = 0;
        stream_socket sock;
 
-       usleep(100000);
+       sleep(1);
 
        sock.create(TEST_PATH);
        sock.set_blocking_mode(true);
@@ -197,4 +197,4 @@ TESTCASE(sensor_ipc_socket, socket_p_1000)
        ASSERT_TRUE(ret);
 
        return true;
-}
\ No newline at end of file
+}

diff --git a/src/server/main.cpp b/src/server/main.cpp
index 90b6cf4..633630a 100644 (file)
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -46,7 +46,7 @@ static void on_new_failed(void)
                return;
        }
 
-       usleep(100000);
+       sleep(1);
 }
 
 int main(int argc, char *argv[])