commit 00851ae403fb292d6871bcd0ea28bd19b8b8d50a
author Roman Kiryanov <rkir@google.com> Wed Dec 11 15:28:01 2019 -0800
committer Roman Kiryanov <rkir@google.com> Wed Dec 11 15:33:09 2019 -0800
tree 8fe860b3f9265f1f4853886261f6249093f12a1b
parent d9944e2e5a003a253f734b5b077f186f04c27133

Add a function to open 'pipe:%s:%s' pipes

goldfish opens 'pipe:qemud:%s' pipes, this change
simplifies opening such pipe names.

Bug: 145244672
Test: build
Change-Id: Idb7795279094bb50e9546725b96b2600ae637418
Signed-off-by: Roman Kiryanov <rkir@google.com>

shared/OpenglCodecCommon/qemu_pipe.h

diff --git a/shared/OpenglCodecCommon/qemu_pipe.h b/shared/OpenglCodecCommon/qemu_pipe.h
index 82c4a94..ea15ab4 100644
--- a/shared/OpenglCodecCommon/qemu_pipe.h
+++ b/shared/OpenglCodecCommon/qemu_pipe.h
@@ -120,8 +120,9 @@
  * except for a few special cases (e.g. GSM modem), where EBUSY will be
  * returned if more than one client tries to connect to it.
  */
+
 static __inline__ QEMU_PIPE_HANDLE
-qemu_pipe_open(const char* pipeName) {
+qemu_pipe_open_ns(const char* ns, const char* pipeName) {
     char  buff[256];
     int   buffLen;
     QEMU_PIPE_HANDLE   fd;
@@ -131,7 +132,11 @@
         return -1;
     }
 
-    snprintf(buff, sizeof buff, "pipe:%s", pipeName);
+    if (ns) {
+        buffLen = snprintf(buff, sizeof(buff), "pipe:%s:%s", ns, pipeName);
+    } else {
+        buffLen = snprintf(buff, sizeof(buff), "pipe:%s", pipeName);
+    }
 
     fd = QEMU_PIPE_RETRY(open(QEMU_PIPE_PATH, O_RDWR | O_NONBLOCK));
     if (fd < 0 && errno == ENOENT) {
@@ -143,8 +148,6 @@
         return -1;
     }
 
-    buffLen = strlen(buff);
-
     if (!WriteFully(fd, buff, buffLen + 1)) {
         D("%s: Could not connect to %s pipe service: %s", __FUNCTION__, pipeName, strerror(errno));
         return -1;
@@ -153,6 +156,16 @@
     return fd;
 }
 
+static __inline__ QEMU_PIPE_HANDLE
+qemu_pipe_open_qemud(const char* pipeName) {
+    return qemu_pipe_open_ns("qemud", pipeName);
+}
+
+static __inline__ QEMU_PIPE_HANDLE
+qemu_pipe_open(const char* pipeName) {
+    return qemu_pipe_open_ns(NULL, pipeName);
+}
+
 static __inline__ void
 qemu_pipe_close(QEMU_PIPE_HANDLE pipe) {
     close(pipe);