diff options
Diffstat (limited to 'emulator/Conn/PipeComm')
| -rw-r--r-- | emulator/Conn/PipeComm/Android.bp | 3 | ||||
| -rw-r--r-- | emulator/Conn/PipeComm/PipeComm.cpp | 10 | ||||
| -rw-r--r-- | emulator/Conn/PipeComm/include/PipeComm.h | 8 | ||||
| -rw-r--r-- | emulator/Conn/PipeComm/include/qemu_pipe.h | 65 | ||||
| -rw-r--r-- | emulator/Conn/PipeComm/qemu_pipe.cpp | 104 |
5 files changed, 12 insertions, 178 deletions
diff --git a/emulator/Conn/PipeComm/Android.bp b/emulator/Conn/PipeComm/Android.bp index 6f8e3b4..4def19c 100644 --- a/emulator/Conn/PipeComm/Android.bp +++ b/emulator/Conn/PipeComm/Android.bp @@ -32,4 +32,7 @@ cc_library { "android.hardware.automotive.vehicle@2.0-libproto-native", "EmulatorCommConn", ], + whole_static_libs: [ + "//device/generic/goldfish:libqemud.ranchu", + ], } diff --git a/emulator/Conn/PipeComm/PipeComm.cpp b/emulator/Conn/PipeComm/PipeComm.cpp index c54bf9f..789cffb 100644 --- a/emulator/Conn/PipeComm/PipeComm.cpp +++ b/emulator/Conn/PipeComm/PipeComm.cpp @@ -18,11 +18,11 @@ #include <log/log.h> -#include "qemu_pipe.h" +#include "qemud.h" #include "PipeComm.h" -#define CAR_SERVICE_NAME "pipe:qemud:car" +#define CAR_SERVICE_NAME "car" namespace android { @@ -36,7 +36,7 @@ namespace impl { PipeComm::PipeComm(MessageProcessor* messageProcessor) : CommConn(messageProcessor), mPipeFd(-1) {} void PipeComm::start() { - int fd = qemu_pipe_open(CAR_SERVICE_NAME); + int fd = qemud_channel_open(CAR_SERVICE_NAME); if (fd < 0) { ALOGE("%s: Could not open connection to service: %s %d", __FUNCTION__, strerror(errno), fd); @@ -62,7 +62,7 @@ std::vector<uint8_t> PipeComm::read() { std::vector<uint8_t> msg = std::vector<uint8_t>(MAX_RX_MSG_SZ); int numBytes; - numBytes = qemu_pipe_frame_recv(mPipeFd, msg.data(), msg.size()); + numBytes = qemud_channel_recv(mPipeFd, msg.data(), msg.size()); if (numBytes == MAX_RX_MSG_SZ) { ALOGE("%s: Received max size = %d", __FUNCTION__, MAX_RX_MSG_SZ); @@ -81,7 +81,7 @@ int PipeComm::write(const std::vector<uint8_t>& data) { int retVal = 0; if (mPipeFd != -1) { - retVal = qemu_pipe_frame_send(mPipeFd, data.data(), data.size()); + retVal = qemud_channel_send(mPipeFd, data.data(), data.size()); } if (retVal < 0) { diff --git a/emulator/Conn/PipeComm/include/PipeComm.h b/emulator/Conn/PipeComm/include/PipeComm.h index 24dd686..2043ac4 100644 --- a/emulator/Conn/PipeComm/include/PipeComm.h +++ b/emulator/Conn/PipeComm/include/PipeComm.h @@ -44,16 +44,16 @@ class PipeComm : public CommConn { void start() override; void stop() override; - std::vector<uint8_t> read() override; - int write(const std::vector<uint8_t>& data) override; - inline bool isOpen() override { return mPipeFd > 0; } private: int mPipeFd; + + std::vector<uint8_t> read() override; + int write(const std::vector<uint8_t>& data) override; }; -} // impl +} // namespace impl } // namespace V2_0 } // namespace vehicle diff --git a/emulator/Conn/PipeComm/include/qemu_pipe.h b/emulator/Conn/PipeComm/include/qemu_pipe.h deleted file mode 100644 index bd3e71d..0000000 --- a/emulator/Conn/PipeComm/include/qemu_pipe.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2011 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. - */ - -#ifndef ANDROID_EMULATORPIPECOMM_QEMU_PIPE_H -#define ANDROID_EMULATORPIPECOMM_QEMU_PIPE_H - -#include <stddef.h> - -#ifdef __cplusplus -extern "C" { -#endif -// Try to open a new Qemu fast-pipe. This function returns a file descriptor -// that can be used to communicate with a named service managed by the -// emulator. -// -// This file descriptor can be used as a standard pipe/socket descriptor. -// -// 'pipeName' is the name of the emulator service you want to connect to, -// and should begin with 'pipe:' (e.g. 'pipe:camera' or 'pipe:opengles'). -// For backward compatibility, the 'pipe:' prefix can be omitted, and in -// that case, qemu_pipe_open will add it for you. - -// On success, return a valid file descriptor, or -1/errno on failure. E.g.: -// -// EINVAL -> unknown/unsupported pipeName -// ENOSYS -> fast pipes not available in this system. -// -// ENOSYS should never happen, except if you're trying to run within a -// misconfigured emulator. -// -// You should be able to open several pipes to the same pipe service, -// 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. -int qemu_pipe_open(const char* pipeName); - -// Send a framed message |buff| of |len| bytes through the |fd| descriptor. -// This really adds a 4-hexchar prefix describing the payload size. -// Returns 0 on success, and -1 on error. -int qemu_pipe_frame_send(int fd, const void* buff, size_t len); - -// Read a frame message from |fd|, and store it into |buff| of |len| bytes. -// If the framed message is larger than |len|, then this returns -1 and the -// content is lost. Otherwise, this returns the size of the message. NOTE: -// empty messages are possible in a framed wire protocol and do not mean -// end-of-stream. -int qemu_pipe_frame_recv(int fd, void* buff, size_t len); - -#ifdef __cplusplus -} -#endif - -#endif // ANDROID_EMULATORPIPECOMM_QEMU_PIPE_H diff --git a/emulator/Conn/PipeComm/qemu_pipe.cpp b/emulator/Conn/PipeComm/qemu_pipe.cpp deleted file mode 100644 index 1f541b5..0000000 --- a/emulator/Conn/PipeComm/qemu_pipe.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2011 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. - */ - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> - -#include <android-base/file.h> - -#include "qemu_pipe.h" - -using android::base::ReadFully; -using android::base::WriteFully; - -// Define QEMU_PIPE_DEBUG if you want to print error messages when an error -// occurs during pipe operations. The macro should simply take a printf-style -// formatting string followed by optional arguments. -#ifndef QEMU_PIPE_DEBUG -#define QEMU_PIPE_DEBUG(...) (void)0 -#endif - -int qemu_pipe_open(const char* pipeName) { - if (!pipeName) { - errno = EINVAL; - return -1; - } - - int fd = TEMP_FAILURE_RETRY(open("/dev/qemu_pipe", O_RDWR)); - if (fd < 0) { - QEMU_PIPE_DEBUG("%s: Could not open /dev/qemu_pipe: %s", __FUNCTION__, strerror(errno)); - return -1; - } - - // Write the pipe name, *including* the trailing zero which is necessary. - size_t pipeNameLen = strlen(pipeName); - if (WriteFully(fd, pipeName, pipeNameLen + 1U)) { - return fd; - } - - // now, add 'pipe:' prefix and try again - // Note: host side will wait for the trailing '\0' to start - // service lookup. - const char pipe_prefix[] = "pipe:"; - if (WriteFully(fd, pipe_prefix, strlen(pipe_prefix)) && - WriteFully(fd, pipeName, pipeNameLen + 1U)) { - return fd; - } - QEMU_PIPE_DEBUG("%s: Could not write to %s pipe service: %s", __FUNCTION__, pipeName, - strerror(errno)); - close(fd); - return -1; -} - -int qemu_pipe_frame_send(int fd, const void* buff, size_t len) { - char header[5]; - snprintf(header, sizeof(header), "%04zx", len); - if (!WriteFully(fd, header, 4)) { - QEMU_PIPE_DEBUG("Can't write qemud frame header: %s", strerror(errno)); - return -1; - } - if (!WriteFully(fd, buff, len)) { - QEMU_PIPE_DEBUG("Can't write qemud frame payload: %s", strerror(errno)); - return -1; - } - return 0; -} - -int qemu_pipe_frame_recv(int fd, void* buff, size_t len) { - char header[5]; - if (!ReadFully(fd, header, 4)) { - QEMU_PIPE_DEBUG("Can't read qemud frame header: %s", strerror(errno)); - return -1; - } - header[4] = '\0'; - size_t size; - if (sscanf(header, "%04zx", &size) != 1) { - QEMU_PIPE_DEBUG("Malformed qemud frame header: [%.*s]", 4, header); - return -1; - } - if (size > len) { - QEMU_PIPE_DEBUG("Oversized qemud frame (% bytes, expected <= %)", size, len); - return -1; - } - if (!ReadFully(fd, buff, size)) { - QEMU_PIPE_DEBUG("Could not read qemud frame payload: %s", strerror(errno)); - return -1; - } - return size; -} |