This patch allows the OpenGLES rendering library to use Unix sockets instead of TCP ones when communicating with its clients. On certain benchmarks (e.g. 0xBench teapot), this provides a noticeable improvement (x1.05 fps) without any other changes. On practice, Unix sockets are faster than TCP sockets, even local ones. Also, this introduces a moderate amount of abstraction that will allow us to use Win32 named pipes on Windows (where TCP sockets are much slower than they are on Unix). Note that by default, TCP streams are still used. The client (emulator) must call the new API 'setStreamMode' to change it to STREAM_MODE_UNIX between 'initLibrary' and 'startOpenglRenderer' calls. + Adjust callers / user appropriately. Change-Id: I4105bbf07541f3146b50a58d1a5b51e8cf044fab
92 lines
2.2 KiB
C++
92 lines
2.2 KiB
C++
/*
|
|
* 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 "TcpStream.h"
|
|
#include <cutils/sockets.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#ifndef _WIN32
|
|
#include <netinet/in.h>
|
|
#include <netinet/tcp.h>
|
|
#else
|
|
#include <ws2tcpip.h>
|
|
#endif
|
|
|
|
TcpStream::TcpStream(size_t bufSize) :
|
|
SocketStream(bufSize)
|
|
{
|
|
}
|
|
|
|
TcpStream::TcpStream(int sock, size_t bufSize) :
|
|
SocketStream(sock, bufSize)
|
|
{
|
|
// disable Nagle algorithm to improve bandwidth of small
|
|
// packets which are quite common in our implementation.
|
|
#ifdef _WIN32
|
|
DWORD flag;
|
|
#else
|
|
int flag;
|
|
#endif
|
|
flag = 1;
|
|
setsockopt( sock, IPPROTO_TCP, TCP_NODELAY, (const char*)&flag, sizeof(flag) );
|
|
}
|
|
|
|
int TcpStream::listen(unsigned short port)
|
|
{
|
|
m_sock = socket_loopback_server(port, SOCK_STREAM);
|
|
if (!valid()) return int(ERR_INVALID_SOCKET);
|
|
|
|
return 0;
|
|
}
|
|
|
|
SocketStream * TcpStream::accept()
|
|
{
|
|
int clientSock = -1;
|
|
|
|
while (true) {
|
|
struct sockaddr_in addr;
|
|
socklen_t len = sizeof(addr);
|
|
clientSock = ::accept(m_sock, (sockaddr *)&addr, &len);
|
|
|
|
if (clientSock < 0 && errno == EINTR) {
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
|
|
TcpStream *clientStream = NULL;
|
|
|
|
if (clientSock >= 0) {
|
|
clientStream = new TcpStream(clientSock, m_bufsize);
|
|
}
|
|
return clientStream;
|
|
}
|
|
|
|
int TcpStream::connect(unsigned short port)
|
|
{
|
|
return connect("127.0.0.1",port);
|
|
}
|
|
|
|
int TcpStream::connect(const char* hostname, unsigned short port)
|
|
{
|
|
m_sock = socket_network_client(hostname, port, SOCK_STREAM);
|
|
if (!valid()) return -1;
|
|
return 0;
|
|
}
|