Merge pull request #392 from tribal-tec/master

Add default connection for autoconfigured server, Fix async texture readback

eq/admin/CMakeLists.txt

@@ -43,7 +43,7 @@ source_group(fabric REGULAR_EXPRESSION .*)
 source_group(\\ FILES CMakeLists.txt ${ADMIN_HEADERS} ${ADMIN_SOURCES})
 
 add_library(EqualizerAdmin SHARED ${ADMIN_HEADERS} ${ADMIN_SOURCES})
-target_link_libraries(EqualizerAdmin EqualizerFabric)
+target_link_libraries(EqualizerAdmin EqualizerFabric EqualizerServer)
 set_target_properties(EqualizerAdmin
   PROPERTIES VERSION ${VERSION} SOVERSION ${VERSION_ABI})
 

eq/admin/client.cpp

@@ -20,6 +20,8 @@
 #include "server.h"
 #include <co/global.h>
 
+#include <eq/server/localServer.h>
+
 namespace eq
 {
 namespace admin
@@ -42,7 +44,16 @@ Client::~Client()
 
 bool Client::connectServer( ServerPtr server )
 {
-    if( !Super::connectServer( server.get( )))
+    // connect to local server, if any
+    co::ConnectionPtr connection = server::connectLocalServer();
+    if( connection && connect( server, connection ))
+    {
+        server->setClient( this );
+        server->map();
+        return true;
+    }
+
+    if( !Super::connectServer( server ))
         return false;
 
     server->setClient( this );

eq/client/client.cpp

@@ -102,7 +102,7 @@ Client::~Client()
 
 bool Client::connectServer( ServerPtr server )
 {
-    if( Super::connectServer( server.get( )))
+    if( Super::connectServer( server ))
     {
         server->setClient( this );
         return true;
@@ -115,13 +115,11 @@ bool Client::connectServer( ServerPtr server )
     }
 
     // Use app-local server if no explicit server was set
-    co::ConnectionPtr connection =
-            server::startLocalServer( Global::getConfigFile( ));
-    if( !connection )
+    if( !server::startLocalServer( Global::getConfigFile( )))
         return false;
 
-    if( !connect( server.get(), connection ))
-        // giving up
+    co::ConnectionPtr connection = server::connectLocalServer();
+    if( !connection || !connect( server, connection ))
         return false;
 
     server->setClient( this );

eq/client/compressor/compressorReadDrawPixels.cpp

@@ -25,7 +25,6 @@
 #include <lunchbox/buffer.h>
 
 #define glewGetContext() glewContext
-#define EQ_ASYNC_PBO // remove to use textures for async RB instead of PBOs
 
 namespace eq
 {
@@ -460,7 +459,17 @@ void CompressorReadDrawPixels::startDownload( const GLEWContext* glewContext,
     const eq_uint64_t size = dims[1] * dims[3] * _depth;
     if( flags & EQ_COMPRESSOR_USE_FRAMEBUFFER )
     {
-#ifdef EQ_ASYNC_PBO
+        // async RB through texture
+        if( !GLEW_ARB_pixel_buffer_object )
+        {
+            const PixelViewport pvp( dims[0], dims[2], dims[1], dims[3] );
+            _initAsyncTexture( glewContext, pvp.w, pvp.h );
+            _texture->setExternalFormat( _format, _type );
+            _texture->copyFromFrameBuffer( _internalFormat, pvp );
+            _resizeBuffer( size );
+            return;
+        }
+
         if( _initPBO( glewContext, size ))
         {
             EQ_GL_CALL( glReadPixels( dims[0], dims[2], dims[1], dims[3],
@@ -469,13 +478,6 @@ void CompressorReadDrawPixels::startDownload( const GLEWContext* glewContext,
             glFlush(); // Fixes https://github.com/Eyescale/Equalizer/issues/118
             return;
         }
-#else  // else async RB through texture
-        const PixelViewport pvp( dims[0], dims[2], dims[1], dims[3] );
-        _initAsyncTexture( glewContext, pvp.w, pvp.h );
-        _asyncTexture->setExternalFormat( _format, _type );
-        _asyncTexture->copyFromFrameBuffer( _internalFormat, pvp );
-        return;
-#endif
         // else
         _resizeBuffer( size );
         EQ_GL_CALL( glReadPixels( dims[0], dims[2], dims[1], dims[3],
@@ -518,7 +520,13 @@ void CompressorReadDrawPixels::finishDownload(
 
     LBASSERT( flags & EQ_COMPRESSOR_USE_FRAMEBUFFER );
 
-#ifdef EQ_ASYNC_PBO
+    // async RB through texture
+    if( !GLEW_ARB_pixel_buffer_object )
+    {
+        *out = _downloadTexture( glewContext, KEEP_TEXTURE );
+        return;
+    }
+
     if( _pbo && _pbo->isInitialized( ))
     {
         const eq_uint64_t size = inDims[1] * inDims[3] * _depth;
@@ -537,9 +545,6 @@ void CompressorReadDrawPixels::finishDownload(
         }
     }
     *out = _buffer.getData();
-#else  // async RB through texture
-    *out = _downloadTexture( glewContext, KEEP_TEXTURE );
-#endif
 }
 
 }

eq/client/detail/channel.ipp

@@ -63,7 +63,7 @@ public:
 
     void frameViewFinish( eq::Channel * channel )
     {
-        if( !channel->getSAttribute(channel->SATTR_DUMP_IMAGE).empty( ))
+        if( !channel->getSAttribute( channel->SATTR_DUMP_IMAGE ).empty( ))
             frameWriter.write( channel );
 
     #ifdef EQUALIZER_USE_DISPLAYCLUSTER

eq/server/localServer.cpp

@@ -49,9 +49,14 @@ class ServerThread : public lunchbox::Thread
             return Thread::start();
         }
 
+    eq::server::ServerPtr getServer()
+        {
+            return _server;
+        }
+
 protected:
 
-    virtual void run()
+    void run() final
         {
             _server->run();
             _server->close();
@@ -72,12 +77,12 @@ class ServerThread : public lunchbox::Thread
 static ServerThread _serverThread;
 }
 
-co::ConnectionPtr startLocalServer( const std::string& config )
+bool startLocalServer( const std::string& config )
 {
     if( _serverThread.isRunning( ))
     {
         LBWARN << "Only one app-local per process server allowed" << std::endl;
-        return 0;
+        return false;
     }
 
     eq::server::Loader loader;
@@ -95,7 +100,7 @@ co::ConnectionPtr startLocalServer( const std::string& config )
     if( !server )
     {
         LBERROR << "Failed to load configuration" << std::endl;
-        return 0;
+        return false;
     }
 
     eq::server::Loader::addOutputCompounds( server );
@@ -106,6 +111,23 @@ co::ConnectionPtr startLocalServer( const std::string& config )
     // TODO: ref count is 2 since config holds ServerPtr
     // LBASSERTINFO( server->getRefCount() == 1, server );
 
+    if( !server->listen( ))
+    {
+        LBERROR << "Failed to setup server listener" << std::endl;
+        return false;
+    }
+
+    if( !_serverThread.start( server ))
+    {
+        LBERROR << "Failed to start server thread" << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+co::ConnectionPtr connectLocalServer()
+{
     co::ConnectionDescriptionPtr desc = new co::ConnectionDescription;
     desc->type = co::CONNECTIONTYPE_PIPE;
     co::ConnectionPtr connection = co::Connection::create( desc );
@@ -116,17 +138,8 @@ co::ConnectionPtr startLocalServer( const std::string& config )
     }
 
     co::ConnectionPtr sibling = connection->acceptSync();
-    if( !server->listen( sibling ))
-    {
-        LBERROR << "Failed to setup server listener" << std::endl;
-        return 0;
-    }
 
-    if( !_serverThread.start( server ))
-    {
-        LBERROR << "Failed to start server thread" << std::endl;
-        return 0;
-    }
+    _serverThread.getServer()->addConnection( sibling );
 
     return connection;
 }

eq/server/localServer.h

@@ -26,7 +26,9 @@ namespace eq
 namespace server
 {
 
-EQSERVER_API co::ConnectionPtr startLocalServer( const std::string& config );
+EQSERVER_API bool startLocalServer( const std::string& config );
+
+EQSERVER_API co::ConnectionPtr connectLocalServer();
 
 EQSERVER_API void joinLocalServer();