Merge branch 'multiCoreOpt' of github.com:MrKepzie/Natron into multiC…

…oreOpt

App/App.pro

@@ -8,7 +8,7 @@ VERSION = 1.0.0
 TEMPLATE = app
 CONFIG += app
 CONFIG += moc
-CONFIG += boost glew opengl qt expat cairo
+CONFIG += boost glew opengl qt expat cairo sigar
 QT += gui core opengl network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent
 

Engine/AppManager.cpp

@@ -20,6 +20,10 @@
 #include <QDebug>
 #include <QAbstractSocket>
 #include <QCoreApplication>
+#include <QThread>
+
+#include <sigar.h>
+
 
 #include "Global/MemoryInfo.h"
 #include "Global/QtCompat.h" // for removeRecursively
@@ -81,6 +85,11 @@ struct AppManagerPrivate
 
     std::string currentOCIOConfigPath; //< the currentOCIO config path
 
+    mutable sigar_t* sigarInfos; // for CPU idle time
+    QMutex  cpuIdleTimeMutex;
+    U64 cpuIdleTime;
+    U64 cpuTotalTime;
+
     AppManagerPrivate()
         : _appType(AppManager::APP_BACKGROUND)
           , _appInstances()
@@ -103,9 +112,19 @@ struct AppManagerPrivate
           ,maxCacheFiles(0)
           ,currentCacheFilesCount(0)
           ,currentCacheFilesCountMutex()
+          ,sigarInfos(0)
+          ,cpuIdleTimeMutex()
+          ,cpuIdleTime(0)
+          ,cpuTotalTime(0)
 
     {
         setMaxCacheFiles();
+        sigar_open(&sigarInfos);
+    }
+
+    ~AppManagerPrivate()
+    {
+        sigar_close(sigarInfos);
     }
 
     void initProcessInputChannel(const QString & mainProcessServerName);
@@ -1665,6 +1684,52 @@ AppManager::getOCIOConfigPath() const
     return _imp->currentOCIOConfigPath;
 }
 
+int
+AppManager::evaluateBestNoConcurrentThreads(int currentNoThreads) const
+{
+    sigar_cpu_t cpuInfos;
+
+    U64 idleTimeElapsed;
+    U64 totalTimeElapsed;
+    {
+        QMutexLocker l(&_imp->cpuIdleTimeMutex);
+        sigar_cpu_get(_imp->sigarInfos, &cpuInfos);
+
+        idleTimeElapsed = cpuInfos.idle - _imp->cpuIdleTime;
+        U64 newTotalTime =  cpuInfos.user + cpuInfos.sys + cpuInfos.idle;
+        totalTimeElapsed = newTotalTime - _imp->cpuTotalTime;
+        _imp->cpuIdleTime = cpuInfos.idle;
+        _imp->cpuTotalTime = newTotalTime;
+    }
+
+    ///This can happen somehow, we don't treat this case
+    if (totalTimeElapsed == 0) {
+        return currentNoThreads;
+    }
+
+    double activityPercent =  1. - idleTimeElapsed / (double)totalTimeElapsed;    
+    int ret;
+
+    if (activityPercent < 1.) {
+        ret = activityPercent > 0. ? currentNoThreads / activityPercent : currentNoThreads;
+    } else {
+        ret = currentNoThreads - 1; 
+    }
+    return std::min(QThread::idealThreadCount(), ret);
+}
+
+void
+AppManager::resetCPUIdleTime()
+{
+    sigar_cpu_t cpuInfos;
+
+    QMutexLocker l(&_imp->cpuIdleTimeMutex);
+    sigar_cpu_get(_imp->sigarInfos, &cpuInfos);
+    _imp->cpuIdleTime = cpuInfos.idle;
+    _imp->cpuTotalTime = cpuInfos.user + cpuInfos.sys + cpuInfos.idle;
+
+}
+
 namespace Natron {
 void
 errorDialog(const std::string & title,

Engine/AppManager.h

@@ -280,6 +280,19 @@ class AppManager
     ///Non MT-safe!
     const std::string& getOCIOConfigPath() const;
 
+    /**
+     * @brief This functions aims to calculate the best number of parallel renders (threads)
+     * that should be concurrent to attain 100% CPU activity. This internally uses CPU idle
+     * time via the sigar library.
+     * This is to be used once a render is finished
+     **/
+    int evaluateBestNoConcurrentThreads(int currentNoThreads) const;
+
+    /**
+     * @brief Reset the CPU Idle time tracked, this is to be called when starting a new render
+     **/
+    void resetCPUIdleTime();
+
 public slots:
 
     ///Closes the application not saving any projects.

Engine/EffectInstance.cpp

@@ -3146,9 +3146,9 @@ OutputEffectInstance::~OutputEffectInstance()
 }
 
 void
-OutputEffectInstance::renderCurrentFrame()
+OutputEffectInstance::renderCurrentFrame(bool abortPrevious)
 {
-    _scheduler->renderCurrentFrame();
+    _scheduler->renderCurrentFrame(abortPrevious);
 }
 
 bool

Engine/EffectInstance.h

@@ -1158,7 +1158,7 @@ class OutputEffectInstance
 
     void notifyRenderFinished();
 
-    void renderCurrentFrame();
+    void renderCurrentFrame(bool abortPrevious = true);
 
     bool ifInfiniteclipRectToProjectDefault(RectD* rod) const;
 

Engine/Engine.pro

@@ -7,7 +7,7 @@ TARGET = Engine
 TEMPLATE = lib
 CONFIG += staticlib
 CONFIG += moc
-CONFIG += boost qt expat cairo
+CONFIG += boost qt expat cairo sigar
 QT += core network
 greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
 QT -= gui

Engine/Image.cpp

@@ -281,10 +281,10 @@ Bitmap::minimalNonMarkedRects(const RectI & roi) const
 
 #endif // NATRON_BITMAP_DISABLE_OPTIMIZATION
 # ifdef DEBUG
-    qDebug() << "render " << ret.size() << " rectangles";
+    /*qDebug() << "render " << ret.size() << " rectangles";
     for (std::list<RectI>::const_iterator it = ret.begin(); it != ret.end(); ++it) {
         qDebug() << "rect: " << "x1= " <<  it->x1 << " , x2= " << it->x2 << " , y1= " << it->y1 << " , y2= " << it->y2;
-    }
+    }*/
 # endif // DEBUG
     return ret;
 } // minimalNonMarkedRects

Engine/Image.h

@@ -198,6 +198,13 @@ class Image
         return dataSize() + _bitmap.getBounds().area();
     }
 
+
+    ///Overriden from BufferableObject
+    virtual std::size_t sizeInRAM() const OVERRIDE FINAL
+    {
+        return size();
+    }
+
     unsigned int getMipMapLevel() const
     {
         return this->_key._mipMapLevel;

Engine/Node.cpp

@@ -1675,7 +1675,9 @@ Node::makePreviewImage(SequenceTime time,
                        unsigned int* buf)
 {
     assert(_imp->knobsInitialized);
-
+    if (!_imp->liveInstance) {
+        return;
+    }
     {
         QMutexLocker locker(&_imp->mustQuitPreviewMutex);
         if (_imp->mustQuitPreview) {