Implement helper routines for syncronous socket operations

Change-Id: I93af5f740decb1fb0f6e037a76223fa8dd5305ac

3 files changed, 207 insertions, 0 deletions

diff --git a/Makefile.android b/Makefile.android
index 96e132b..fef3531 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -755,6 +755,7 @@ UI_AND_CORE_SOURCES = \
                       android/keycode-array.c \
                       android/charmap.c \
                       android/async-utils.c \
+                      android/sync-utils.c \
                       android/async-console.c \
                       android/utils/assert.c \
                       android/utils/bufprint.c \
diff --git a/android/sync-utils.c b/android/sync-utils.c
new file mode 100644
index 0000000..aedc2e6
--- /dev/null
+++ b/android/sync-utils.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Contains helper routines dealing with syncronous access to a non-blocking
+ * sokets.
+ */
+
+#include "qemu-common.h"
+#include "errno.h"
+#include "iolooper.h"
+#include "sockets.h"
+#include "android/utils/debug.h"
+#include "android/sync-utils.h"
+
+#define  D(...)  do {  if (VERBOSE_CHECK(init)) dprint(__VA_ARGS__); } while (0)
+
+struct SyncSocket {
+    // Helper for performing synchronous I/O on the socket.
+    IoLooper* iolooper;
+
+    /* Opened socket handle. */
+    int fd;
+};
+
+SyncSocket*
+syncsocket_connect(int fd, SockAddress* sockaddr, int timeout)
+{
+    IoLooper* looper = NULL;
+    int connect_status;
+    SyncSocket* sync_socket;
+
+    socket_set_nonblock(fd);
+
+    for(;;) {
+        connect_status = socket_connect(fd, sockaddr);
+        if (connect_status >= 0) {
+            // Connected. Create IoLooper for the helper.
+            looper = iolooper_new();
+            break;
+        }
+
+        if (errno == EINPROGRESS || errno == EAGAIN || errno == EWOULDBLOCK) {
+            // Connection is in progress. Wait till it's finished.
+            looper = iolooper_new();
+            iolooper_add_write(looper, fd);
+            connect_status = iolooper_wait(looper, timeout);
+            if (connect_status > 0) {
+                iolooper_del_write(looper, fd);
+            } else {
+                iolooper_free(looper);
+                return NULL;
+            }
+        } else if (errno != EINTR) {
+            return NULL;
+        }
+    }
+
+    // We're now connected. Lets initialize SyncSocket instance
+    // for this connection.
+    sync_socket = malloc(sizeof(SyncSocket));
+    if (sync_socket == NULL) {
+        derror("PANIC: not enough memory\n");
+        exit(1);
+    }
+
+    sync_socket->iolooper = looper;
+    sync_socket->fd = fd;
+
+    return sync_socket;
+}
+
+void
+syncsocket_close(SyncSocket* ssocket)
+{
+    if (ssocket != NULL && ssocket->fd >= 0) {
+        if (ssocket->iolooper != NULL) {
+            iolooper_reset(ssocket->iolooper);
+        }
+        socket_close(ssocket->fd);
+        ssocket->fd = -1;
+    }
+}
+
+void
+syncsocket_free(SyncSocket* ssocket)
+{
+    if (ssocket != NULL) {
+        syncsocket_close(ssocket);
+        if (ssocket->iolooper != NULL) {
+            iolooper_free(ssocket->iolooper);
+        }
+        free(ssocket);
+    }
+}
+
+int
+syncsocket_start_read(SyncSocket* ssocket)
+{
+    if (ssocket == NULL || ssocket->fd < 0 || ssocket->iolooper == NULL) {
+        errno = EINVAL;
+        return -1;
+    }
+    iolooper_add_read(ssocket->iolooper, ssocket->fd);
+    return 0;
+}
+
+int
+syncsocket_stop_read(SyncSocket* ssocket)
+{
+    if (ssocket == NULL || ssocket->fd < 0 || ssocket->iolooper == NULL) {
+        errno = EINVAL;
+        return -1;
+    }
+    iolooper_del_read(ssocket->iolooper, ssocket->fd);
+    return 0;
+}
+
+int
+syncsocket_read_absolute(SyncSocket* ssocket,
+                         void* buf,
+                         int size,
+                         int64_t deadline)
+{
+    int ret;
+
+    if (ssocket == NULL || ssocket->fd < 0 || ssocket->iolooper == NULL) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    ret = iolooper_wait_absolute(ssocket->iolooper, deadline);
+    if (ret > 0) {
+        if (!iolooper_is_read(ssocket->iolooper, ssocket->fd)) {
+            D("%s: Internal error, iolooper_is_read() not set!", __FUNCTION__);
+            return -1;
+        }
+        do {
+            ret = read(ssocket->fd, buf, size);
+        } while( ret < 0 && errno == EINTR);
+    }
+    return ret;
+}
+
+int
+syncsocket_read(SyncSocket* ssocket, void* buf, int size, int timeout)
+{
+    return syncsocket_read_absolute(ssocket, buf, size, iolooper_now() + timeout);
+}
diff --git a/android/sync-utils.h b/android/sync-utils.h
new file mode 100644
index 0000000..8f8ddab
--- /dev/null
+++ b/android/sync-utils.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Contains helper routines dealing with syncronous access to a non-blocking
+ * sokets.
+ */
+
+#ifndef ANDROID_SYNC_UTILS_H
+#define ANDROID_SYNC_UTILS_H
+
+typedef struct SyncSocket SyncSocket;
+
+SyncSocket* syncsocket_connect(int fd, SockAddress* sockaddr, int timeout);
+
+void syncsocket_close(SyncSocket* ssocket);
+
+void syncsocket_free(SyncSocket* ssocket);
+
+int syncsocket_start_read(SyncSocket* ssocket);
+
+int syncsocket_stop_read(SyncSocket* ssocket);
+
+int syncsocket_read_absolute(SyncSocket* ssocket,
+                             void* buf,
+                             int size,
+                             int64_t deadline);
+
+int syncsocket_read(SyncSocket* ssocket, void* buf, int size, int timeout);
+
+#endif  // ANDROID_SYNC_UTILS_H