Retry read() when getting EINTR

Change-Id: I476b3db2a3dfb6519d885c67c052914201eeca4c

diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec
index 282e703..4bdd3df 100755 (executable)
--- a/packaging/download-provider.spec
+++ b/packaging/download-provider.spec
@@ -1,6 +1,6 @@
 Name:       download-provider
 Summary:    Download the contents in background
-Version:    2.2.6
+Version:    2.2.7
 Release:    0
 Group:      Development/Libraries
 License:    Apache-2.0

diff --git a/provider/download-provider-ipc.c b/provider/download-provider-ipc.c
index d227179..dfe587e 100644 (file)
--- a/provider/download-provider-ipc.c
+++ b/provider/download-provider-ipc.c
@@ -99,12 +99,26 @@ dp_ipc_fmt *dp_ipc_get_fmt(int sock)
                return NULL;
        }
        memset(ipc_info, 0x00, sizeof(dp_ipc_fmt));
-       ssize_t recv_size = read(sock, ipc_info, sizeof(dp_ipc_fmt));
-       if (recv_size <= 0 || recv_size != sizeof(dp_ipc_fmt)) {
-               TRACE_ERROR("socket read ipcinfo read size:%zd, errno:%d", recv_size, errno);
+
+       int errorcode = DP_ERROR_NONE;
+       int tryagain = 3;
+
+       do {
+               ssize_t recv_size = read(sock, ipc_info, sizeof(dp_ipc_fmt));
+               if (recv_size <= 0 || recv_size != sizeof(dp_ipc_fmt)) {
+                       TRACE_ERROR("socket read ipcinfo read size:%zd, errno:%d", recv_size, errno);
+                       errorcode = dp_ipc_check_stderr(errno);
+               } else {
+                       errorcode = DP_ERROR_NONE;
+               }
+       } while (sock >= 0 && (errorcode == DP_ERROR_IO_EINTR) && (--tryagain > 0));
+
+       if (errorcode != DP_ERROR_NONE) {
+               TRACE_ERROR("Failed to read sock[%d]", sock);
                free(ipc_info);
                return NULL;
        }
+
        return ipc_info;
 }