467e5fb162
Handling clean exit of the renderer when stopOpenGLRenderer is called. This is done by openning a connection to the renderer and flag that it should exit. Added 'clientFlags' field which must be send after every connection is made to the renderer for this purpose. The server will wait for running rendering threads to exit and then will close all EGL/GL resources and will exit. The stopOpenGLRenderer will return only when the renderer has exited. Change-Id: I8272b8ea59d5fc78453bb7bd2d25908068869fa7
127 lines
3.2 KiB
C++
127 lines
3.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 "RenderServer.h"
|
|
#include "TcpStream.h"
|
|
#include "RenderThread.h"
|
|
#include "FrameBuffer.h"
|
|
#include <set>
|
|
|
|
typedef std::set<RenderThread *> RenderThreadsSet;
|
|
|
|
RenderServer::RenderServer() :
|
|
m_listenSock(NULL),
|
|
m_exiting(false)
|
|
{
|
|
}
|
|
|
|
RenderServer *RenderServer::create(int port)
|
|
{
|
|
RenderServer *server = new RenderServer();
|
|
if (!server) {
|
|
return NULL;
|
|
}
|
|
|
|
server->m_listenSock = new TcpStream();
|
|
if (server->m_listenSock->listen(port) < 0) {
|
|
ERR("RenderServer::create failed to listen on port %d\n", port);
|
|
delete server;
|
|
return NULL;
|
|
}
|
|
|
|
return server;
|
|
}
|
|
|
|
int RenderServer::Main()
|
|
{
|
|
RenderThreadsSet threads;
|
|
|
|
while(1) {
|
|
TcpStream *stream = m_listenSock->accept();
|
|
if (!stream) {
|
|
fprintf(stderr,"Error accepting connection, aborting\n");
|
|
break;
|
|
}
|
|
|
|
unsigned int clientFlags;
|
|
if (!stream->readFully(&clientFlags, sizeof(unsigned int))) {
|
|
fprintf(stderr,"Error reading clientFlags\n");
|
|
delete stream;
|
|
continue;
|
|
}
|
|
|
|
DBG("\n\n\n\n Got new stream!!!! \n\n\n\n\n");
|
|
// check if we have been requested to exit while waiting on accept
|
|
if ((clientFlags & IOSTREAM_CLIENT_EXIT_SERVER) != 0) {
|
|
m_exiting = true;
|
|
break;
|
|
}
|
|
|
|
RenderThread *rt = RenderThread::create(stream);
|
|
if (!rt) {
|
|
fprintf(stderr,"Failed to create RenderThread\n");
|
|
delete stream;
|
|
}
|
|
|
|
if (!rt->start()) {
|
|
fprintf(stderr,"Failed to start RenderThread\n");
|
|
delete stream;
|
|
delete rt;
|
|
}
|
|
|
|
//
|
|
// remove from the threads list threads which are
|
|
// no longer running
|
|
//
|
|
for (RenderThreadsSet::iterator n,t = threads.begin();
|
|
t != threads.end();
|
|
t = n) {
|
|
// first find next iterator
|
|
n = t;
|
|
n++;
|
|
|
|
// delete and erase the current iterator
|
|
// if thread is no longer running
|
|
if ((*t)->isFinished()) {
|
|
delete (*t);
|
|
threads.erase(t);
|
|
}
|
|
}
|
|
|
|
// insert the added thread to the list
|
|
threads.insert(rt);
|
|
|
|
printf("Started new RenderThread\n");
|
|
}
|
|
|
|
//
|
|
// Wait for all threads to finish
|
|
//
|
|
for (RenderThreadsSet::iterator t = threads.begin();
|
|
t != threads.end();
|
|
t++) {
|
|
int exitStatus;
|
|
(*t)->wait(&exitStatus);
|
|
delete (*t);
|
|
}
|
|
threads.clear();
|
|
|
|
//
|
|
// de-initialize the FrameBuffer object
|
|
//
|
|
FrameBuffer::finalize();
|
|
return 0;
|
|
}
|