Merge branch 'release-0.4.10'

Author: paperManu

CMakeLists.txt

@@ -20,7 +20,7 @@
 cmake_minimum_required(VERSION 3.2)
 project(
     splash 
-    VERSION 0.4.8
+    VERSION 0.4.10
     LANGUAGES C CXX
 )
 
@@ -31,6 +31,8 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
+enable_testing()
+
 #
 # Package information
 #
@@ -49,14 +51,21 @@ pkg_search_module(GSL REQUIRED gsl)
 pkg_search_module(ZMQ REQUIRED libzmq)
 
 # Optional dependencies
-set(Python_ADDITIONAL_VERSIONS 3.4 3.5)
-find_package(PythonLibs)
+if(UNIX AND NOT APPLE)
+    set(Python_ADDITIONAL_VERSIONS 3.4 3.5)
+    find_package(PythonLibs)
+elseif(APPLE)
+    pkg_check_modules(PYTHON python3)
+    set(PYTHONLIBS_VERSION_STRING ${PYTHON_VERSION})
+    set(PYTHONLIBS_FOUND ${PYTHON_FOUND})
+endif()
+
 find_package(Doxygen)
 pkg_search_module(GPHOTO libgphoto2)
 pkg_check_modules(FFMPEG libavformat libavcodec libavutil libswscale)
 pkg_search_module(OPENCV opencv)
 pkg_search_module(PORTAUDIO portaudio-2.0)
-pkg_search_module(SHMDATA shmdata-1.2)
+pkg_search_module(SHMDATA shmdata-1.3)
 
 #
 # Configuration

NEWS

@@ -1,6 +1,23 @@
 Splash release notes
 ===================
 
+Splash 0.4.10 (2016-10-28)
+-------------------------
+Improvements:
+* Separated RT scheduling and core affinity options
+* Added a template realtime.conf to be put in /etc/security/limits.d
+* Cleaned up the threadpool
+* Updated shmdata dependency to version 1.3
+
+Bug fixed:
+* Fix: issue when deleting an image_shmdata object
+* Fix: texture upload loop crash when deleting a texture object
+* Fix: freeze of the engine (not the gui) when saving configuration while having a camera selected in the calibration view
+* Fix: blending crash issue when using multiple GPUs
+* Fix: Controller::getObjectTypes returned the local type, instead of the remote type
+* Fix: localhost address is now the default option when none is specified.
+* Fix: updated default spawn value
+
 Splash 0.4.8 (2016-09-30)
 -------------------------
 New features:

README.md

@@ -118,13 +118,16 @@ So, let's start with the installation of the dependencies. Firstly download and
 
 The following steps will be using the port command from MacPorts, you may replace it with the brew equivalent if you are more of a Homebrew user. Note that compiling with the Homebrew versions of the libraries has not been tested, so please report issues (and ideally solutions as I do not have a Mac with Homebrew...).
 
-You can now install the command line tools we will need to download and compile the sources:
+With MacPorts, install the following packages:
 
-    sudo port install automake autoconf libtool cmake git pkgconfig
+    sudo port install libtool cmake git pkgconfig gstreamer1 python35 gsl zmq glfw glm ffmpeg portaudio snappy
+
+With Homebrew, install the following packages:
+    
+    brew install libtool cmake git pkgconfig gstreamer1 python45 gsl zmq homebrew/versions/glfw3 glm portaudio ffmpeg snappy libgphoto2
 
 We then install Shmdata, which depends on GStreamer. Note that Shmdata is only needed if you want Splash to communicate with other Shmdata-compatible softwares. If you want to read video files or feed Splash through Syphon, you can skip this step.
 
-    sudo port install gstreamer1 python35
     git clone https://github.com/nicobou/shmdata
     cd shmdata
     ./autogen.sh && ./configure
@@ -133,8 +136,6 @@ We then install Shmdata, which depends on GStreamer. Note that Shmdata is only n
 
 Install all the other dependencies:
 
-    sudo port install gsl zmq glfw glm ffmpeg portaudio snappy
-
 And then grab and install Splash:
 
     git clone https://github.com/paperManu/splash

addons/blender/splash/__init__.py

@@ -20,7 +20,7 @@
 bl_info = {
     "name": "Splash output",
     "author": "Emmanuel Durand",
-    "version": (0, 4, 8),
+    "version": (0, 4, 10),
     "blender": (2, 72, 0),
     "location": "3D View > Toolbox, File > Export",
     "description": "Utility tools to connect Blender to the Splash videomapper",

data/config/realtime.conf

@@ -0,0 +1,4 @@
+# Allows for the realtime group to change process scheduling
+#
+@realtime   -   rtprio      99
+@realtime   -   memlock     unlimited

include/threadpool.h

@@ -44,7 +44,10 @@ class ThreadPool;
 class Worker
 {
   public:
-    Worker(ThreadPool& s) : pool(s) {}
+    Worker(ThreadPool& s)
+        : pool(s)
+    {
+    }
     void operator()();
 
   private:
@@ -67,7 +70,7 @@ class ThreadPool
     void addWorkers(unsigned int nbr);
     void setAffinity(const std::vector<int>& cores);
     void waitAllThreads();
-    void waitThreads(std::vector<unsigned int>&);
+    void waitThreads(std::vector<unsigned int>);
 
   private:
     friend class Worker;
@@ -92,8 +95,9 @@ unsigned int ThreadPool::enqueue(F f)
 {
     unsigned int id;
     {
-        // Acquire lock
-        queue_mutex.lock();
+    // Acquire lock
+    std:;
+        std::lock_guard<std::mutex> lock(queue_mutex);
 
         id = std::atomic_fetch_add(&nextId, 1u);
         if (id == std::numeric_limits<unsigned int>::max())
@@ -102,8 +106,6 @@ unsigned int ThreadPool::enqueue(F f)
         // Add the task
         tasks.push_back(std::shared_ptr<std::function<void()>>(new std::function<void()>(f)));
         tasksId.push_back(id);
-
-        queue_mutex.unlock();
     }
 
     // Wake up one thread
@@ -117,14 +119,13 @@ template <class F>
 void ThreadPool::enqueueWithoutId(F f)
 {
     {
-        // Acquire lock
-        queue_mutex.lock();
+    // Acquire lock
+    std:;
+        std::lock_guard<std::mutex> lock(queue_mutex);
 
         // Add the task
         tasks.push_back(std::shared_ptr<std::function<void()>>(new std::function<void()>(f)));
         tasksId.push_back(0);
-
-        queue_mutex.unlock();
     }
 
     // Wake up one thread

include/widget_global_view.h

@@ -45,15 +45,17 @@ class GuiGlobalView : public GuiWidget
     void setJoystick(const std::vector<float>& axes, const std::vector<uint8_t>& buttons);
     void setScene(std::weak_ptr<Scene> scene) { _scene = scene; }
 
-  protected:
-    std::shared_ptr<Camera> _camera, _guiCamera;
+  private:
+    std::shared_ptr<Camera> _camera{nullptr};
+    std::shared_ptr<Camera> _guiCamera{nullptr};
     std::weak_ptr<Scene> _scene;
     bool _camerasHidden{false};
     bool _beginDrag{true};
     bool _noMove{false};
 
     bool _hideCameras{false};
     bool _camerasColorized{false};
+    bool _camerasColorizedPreviousValue{false};
 
     // Size of the view
     int _camWidth{0}, _camHeight{0};

include/world.h

@@ -98,6 +98,7 @@ class World : public RootObject
     std::string _executionPath{""};
     std::mutex _configurationMutex;
     bool _enforceCoreAffinity{false}; //!< If true, World and Scenes have their affinity fixed in specific, separate cores
+    bool _enforceRealtime{false};     //!< If true, realtime scheduling is asked to the system, if possible
 
     // World parameters
     unsigned int _worldFramerate{60};

src/CMakeLists.txt

@@ -57,7 +57,7 @@ link_directories(${FFMPEG_LIBRARY_DIRS})
 link_directories(${PORTAUDIO_LIBRARY_DIRS})
 link_directories(${OPENCV_LIBRARY_DIRS})
 link_directories(${SNAPPY_LIBRARY_DIRS})
-link_directories(${PYTHON_LIBRARIES})
+link_directories(${PYTHON_LIBRARY_DIRS})
 
 #
 # Targets

src/controller.cpp

@@ -144,13 +144,13 @@ map<string, string> ControllerObject::getObjectTypes() const
     {
         if (!o.second->getSavable())
             continue;
-        types[o.first] = o.second->getType();
+        types[o.first] = o.second->getRemoteType();
     }
     for (auto& o : scene->_ghostObjects)
     {
         if (!o.second->getSavable())
             continue;
-        types[o.first] = o.second->getType();
+        types[o.first] = o.second->getRemoteType();
     }
 
     return types;