From 63ef9ff5fa4b1e68029a54bb60c97b99bdf5defc Mon Sep 17 00:00:00 2001 From: bohu Date: Tue, 28 Mar 2017 14:51:36 -0700 Subject: [PATCH] Revert "Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" It broke master BUG: 36695011 This reverts commit ff87855e10423a1ad6f764f378b8182f86c6f738. Change-Id: Ic1057a416748d4a3c9736cf3bb73982b8d45e5d5 --- adb/Android.mk | 3 +- adb/transport_local.cpp | 2 +- .../system/qemu_pipe.h | 16 ++--- qemu_pipe/Android.mk | 19 ------ qemu_pipe/include/qemu_pipe.h | 62 ------------------- 5 files changed, 11 insertions(+), 91 deletions(-) rename qemu_pipe/qemu_pipe.cpp => include/system/qemu_pipe.h (91%) delete mode 100644 qemu_pipe/Android.mk delete mode 100644 qemu_pipe/include/qemu_pipe.h diff --git a/adb/Android.mk b/adb/Android.mk index a05bb551e..e84120542 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -128,7 +128,7 @@ LOCAL_SANITIZE := $(adb_target_sanitize) # Even though we're building a static library (and thus there's no link step for # this to take effect), this adds the includes to our path. -LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libqemu_pipe libbase +LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase LOCAL_WHOLE_STATIC_LIBRARIES := libadbd_usb @@ -361,7 +361,6 @@ LOCAL_STRIP_MODULE := keep_symbols LOCAL_STATIC_LIBRARIES := \ libadbd \ libbase \ - libqemu_pipe \ libbootloader_message \ libfs_mgr \ libfec \ diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp index 12b98ba3b..4198a5247 100644 --- a/adb/transport_local.cpp +++ b/adb/transport_local.cpp @@ -289,7 +289,7 @@ static void server_socket_thread(void* arg) { #define open adb_open #define read adb_read #define write adb_write -#include +#include #undef open #undef read #undef write diff --git a/qemu_pipe/qemu_pipe.cpp b/include/system/qemu_pipe.h similarity index 91% rename from qemu_pipe/qemu_pipe.cpp rename to include/system/qemu_pipe.h index a4529deb8..af2507997 100644 --- a/qemu_pipe/qemu_pipe.cpp +++ b/include/system/qemu_pipe.h @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -#include "qemu_pipe.h" +#ifndef ANDROID_INCLUDE_SYSTEM_QEMU_PIPE_H +#define ANDROID_INCLUDE_SYSTEM_QEMU_PIPE_H #include #include #include #include -#include - // 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 @@ -50,7 +48,7 @@ // 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) { +static __inline__ int qemu_pipe_open(const char* pipeName) { // Sanity check. if (!pipeName || memcmp(pipeName, "pipe:", 5) != 0) { errno = EINVAL; @@ -83,7 +81,9 @@ 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) { +static int __inline__ qemu_pipe_frame_send(int fd, + const void* buff, + size_t len) { char header[5]; snprintf(header, sizeof(header), "%04zx", len); ssize_t ret = TEMP_FAILURE_RETRY(write(fd, header, 4)); @@ -104,7 +104,7 @@ int qemu_pipe_frame_send(int fd, const void* buff, size_t len) { // 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) { +static int __inline__ qemu_pipe_frame_recv(int fd, void* buff, size_t len) { char header[5]; ssize_t ret = TEMP_FAILURE_RETRY(read(fd, header, 4)); if (ret != 4) { @@ -130,3 +130,5 @@ int qemu_pipe_frame_recv(int fd, void* buff, size_t len) { } return size; } + +#endif /* ANDROID_INCLUDE_HARDWARE_QEMUD_PIPE_H */ diff --git a/qemu_pipe/Android.mk b/qemu_pipe/Android.mk deleted file mode 100644 index 6e0144ce1..000000000 --- a/qemu_pipe/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2011 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) - -common_static_libraries := \ - libbase -include $(CLEAR_VARS) -LOCAL_CLANG := true -LOCAL_SANITIZE := integer -LOCAL_SRC_FILES:= \ - qemu_pipe.cpp -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - system/base/include -LOCAL_MODULE:= libqemu_pipe -LOCAL_STATIC_LIBRARIES := $(common_static_libraries) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_CFLAGS := -Werror -include $(BUILD_STATIC_LIBRARY) diff --git a/qemu_pipe/include/qemu_pipe.h b/qemu_pipe/include/qemu_pipe.h deleted file mode 100644 index 16486c087..000000000 --- a/qemu_pipe/include/qemu_pipe.h +++ /dev/null @@ -1,62 +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_CORE_INCLUDE_QEMU_PIPE_H -#define ANDROID_CORE_INCLUDE_QEMU_PIPE_H - -#include - -#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 must begin with 'pipe:' (e.g. 'pipe:camera' or 'pipe:opengles'). -// -// 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_CORE_INCLUDE_QEMU_PIPE_H */