Exploring better task job config api that work

interface/src/workload/GameWorkload.cpp

@@ -19,6 +19,7 @@ GameWorkloadContext::~GameWorkloadContext() {
 
 
 GameWorkload::GameWorkload() {
+
 }
 
 GameWorkload::~GameWorkload() {

libraries/task/src/task/Config.cpp

@@ -18,6 +18,8 @@
 
 using namespace task;
 
+int nakedJobConfigPointerTypeId = qRegisterMetaType<JobConfig*>();
+
 void JobConfig::setPresetList(const QJsonObject& object) {
     for (auto it = object.begin(); it != object.end(); it++) {
         JobConfig* child = findChild<JobConfig*>(it.key(), Qt::FindDirectChildrenOnly);

libraries/task/src/task/Config.h

@@ -86,17 +86,19 @@ protected:
 // A default Config is always on; to create an enableable Config, use the ctor JobConfig(bool enabled)
 class JobConfig : public QObject {
     Q_OBJECT
-    Q_PROPERTY(double cpuRunTime READ getCPURunTime NOTIFY newStats()) //ms
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY dirtyEnabled())
+        Q_PROPERTY(double cpuRunTime READ getCPURunTime NOTIFY newStats()) //ms
+        Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY dirtyEnabled())
 
-    double _msCPURunTime{ 0.0 };
+        double _msCPURunTime{ 0.0 };
 public:
     using Persistent = PersistentConfig<JobConfig>;
+    using QConfigList = QList<JobConfig*>;
 
     JobConfig() = default;
+ //   JobConfig(const JobConfig& src) = default;
     JobConfig(bool enabled) : alwaysEnabled{ false }, enabled{ enabled } {}
 
-    bool isEnabled() const { return alwaysEnabled || enabled; }
+    bool isEnabled() { return alwaysEnabled || enabled; }
     void setEnabled(bool enable) { enabled = alwaysEnabled || enable; emit dirtyEnabled(); }
 
     bool alwaysEnabled{ true };
@@ -113,7 +115,12 @@ public:
     void setCPURunTime(double mstime) { _msCPURunTime = mstime; emit newStats(); }
     double getCPURunTime() const { return _msCPURunTime; }
 
-public slots:
+    Q_INVOKABLE virtual bool isTask() const { return false; }
+    Q_INVOKABLE virtual QConfigList getSubConfigs() const { return QConfigList(); }
+    Q_INVOKABLE virtual int getNumSubs() const { return 0; }
+    Q_INVOKABLE virtual JobConfig* getSubConfig(int i) const { return nullptr; }
+
+    public slots:
     void load(const QJsonObject& val) { qObjectFromJsonValue(val, *this); emit loaded(); }
 
 signals:
@@ -122,6 +129,8 @@ signals:
     void dirtyEnabled();
 };
 
+using QConfigPointer = std::shared_ptr<JobConfig>;
+
 class TConfigProxy {
 public:
     using Config = JobConfig;
@@ -130,11 +139,12 @@ public:
 class TaskConfig : public JobConfig {
     Q_OBJECT
 public:
-    using QConfigPointer = std::shared_ptr<QObject>;
+    using QConfigList = QList<JobConfig*>;
 
     using Persistent = PersistentConfig<TaskConfig>;
 
-    TaskConfig() = default ;
+    TaskConfig() = default;
+  //  TaskConfig(const TaskConfig& src) = default;
     TaskConfig(bool enabled) : JobConfig(enabled) {}
 
 
@@ -156,7 +166,8 @@ public:
 
         if (tokens.empty()) {
             tokens.push_back(QString());
-        } else {
+        }
+        else {
             while (tokens.size() > 1) {
                 auto name = tokens.front();
                 tokens.pop_front();
@@ -170,6 +181,22 @@ public:
         return root->findChild<typename T::Config*>(tokens.front());
     }
 
+    Q_INVOKABLE bool isTask() const override { return true; }
+    Q_INVOKABLE QConfigList getSubConfigs() const override {
+        auto list = findChildren<JobConfig*>(QRegExp(".*"), Qt::FindDirectChildrenOnly);
+        QConfigList returned;
+        for (int i = 0; i < list.size(); i++) {
+            returned.push_back(list[i]);
+        }
+        return returned;
+    }
+
+    Q_INVOKABLE int getNumSubs() const override { return getSubConfigs().size(); }
+    Q_INVOKABLE JobConfig* getSubConfig(int i) const override {
+        auto subs = getSubConfigs();
+        return ((i < 0 || i >= subs.size()) ? nullptr : subs[i] );
+    }
+
     void connectChildConfig(QConfigPointer childConfig, const std::string& name);
     void transferChildrenConfigs(QConfigPointer source);
 
@@ -179,8 +206,8 @@ public slots:
     void refresh();
 };
 
-using QConfigPointer = std::shared_ptr<QObject>;
-
 }
 
+Q_DECLARE_METATYPE(task::JobConfig*);
+
 #endif // hifi_task_Config_h

scripts/developer/utilities/lib/jet/TaskList.qml

@@ -0,0 +1,150 @@
+//
+//  jet/TaskList.qml
+//
+//  Created by Sam Gateau, 2018/03/28
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+//import QtQuick 2.7
+//import QtQuick.Controls 1.4 as Original
+//import QtQuick.Controls.Styles 1.4
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+//import Hifi 1.0 as Hifi
+
+//import "qrc:///qml/styles-uit"
+//import "qrc:///qml/controls-uit" as HifiControls
+
+import "jet_qml.js" as Jet
+
+Rectangle {
+    id: root
+    width: parent ? parent.width : 100
+    height: parent ? parent.height : 100
+    property var config
+
+    property var renderConfig : Render
+
+    TextArea {
+        id: textArea
+        width: parent.width
+        height: parent.height
+        text: ""
+    }
+
+    Component.onCompleted: {
+        // Connect the signal from Selection when any selection content change and use it to refresh the current selection view
+       // Selection.selectedItemsListChanged.connect(resetSelectionView)
+        var message = "On Completed: \n"
+       var functor = Jet.job_print_functor(function (line) { message += line + "\n"; });
+       // Jet.task_traverseTree(Render, functor);
+        var lroot = Workload;
+        functor(lroot,0,0)
+      //  message += Workload["getSubConfigs"]() + '\n'
+        
+        //var subs = Workload;
+        message += " subs size =  " + lroot.getNumSubs()
+        for (var i = 0; i < lroot.getNumSubs(); i++) {
+            if (functor(lroot.getSubConfig(i), depth, i)) {
+             //   task_traverse(subs[i], functor, depth)
+            }
+        }
+        textArea.append(message);
+     }
+    function fromScript(mope) {
+        //print(message)
+        //var message = mope + '\n';
+        var message ='\n';
+        
+      //  Jet.task_traverseTree(Render, Jet.job_print_functor(function (line) { message += line + "\n"; }) );
+        /*
+
+        Render.findChildren();*/
+
+       // message += (Render.getSubConfigs())
+       // Render.getConfig("").findChildren();
+/**//*
+       var job = Render;
+       message +=(job.objectName + " " + (job.enabled ? "on" : "off")) + '\n'; 
+        var keys = Jet.job_propKeys(job);
+        for (var p=0; p < keys.length;p++) {
+            var prop = job[keys[p]]
+            message += (typeof prop + " " + keys[p] + " " + prop) + '\n';
+        }*/
+/*
+function task_traverse(root, functor, depth) {
+    if (root.isTask()) { 
+        var subs = root.getSubConfigs()
+        depth++;
+        for (var i = 0; i <subs.length; i++) {
+            if (functor(subs[i], depth, i)) {
+                task_traverse(subs[i], functor, depth)
+            }
+        }
+    }    
+}*/
+     /*   var functor = Jet.job_print_functor(function (line) { message += line + "\n"; });
+       // Jet.task_traverseTree(Render, functor);
+        var lroot = Jet.getRender().getConfig("UpdateScene");
+        functor(lroot,0,0)
+        var subs = lroot.getSubConfigs()
+        message += " subs size =  " + subs.length
+        for (var i = 0; i <subs.length; i++) {
+            if (functor(subs[i], depth, i)) {
+             //   task_traverse(subs[i], functor, depth)
+            }
+        }
+       // message += Render.getSubConfigs()
+   /*    var subs = root.getSubConfigs()
+        depth++;
+        for (var i = 0; i <subs.length; i++) {
+            if (functor(subs[i], depth, i)) {
+                task_traverse(subs[i], functor, depth)
+            }
+        }
+   // }    
+}*/     
+        /*var depth = 0;
+        if (functor(lroot, 0, 0)) {
+            var subs = lroot.getSubConfigs()
+            depth++;
+            for (var i = 0; i <subs.length; i++) {
+              //  message += JSON.stringify(subs[i]);
+         
+                if (functor(subs[i], depth, i)) {
+                   // task_traverse(subs[i], functor, depth)
+                }
+            }
+        } */
+     //   Jet.task_traverseTree(Render, functor)
+
+     //   message = genTree();
+       // print(message);
+    }
+
+    function clearWindow() {
+        textArea.remove(0,textArea.length);
+    }
+}
+/*
+Item {
+    HifiConstants { id: hifi;}
+    id: render;   
+    anchors.margins: hifi.dimensions.contentMargin.x
+    
+    color: hifi.colors.baseGray;   
+    Column {
+        spacing: 5
+        anchors.left: parent.left
+        anchors.right: parent.right       
+        anchors.margins: hifi.dimensions.contentMargin.x  
+        //padding: hifi.dimensions.contentMargin.x
+        HifiControls.Label {
+                    text: "Shading"       
+        }
+    }
+}*/

scripts/developer/utilities/lib/jet/jet.js

@@ -0,0 +1,119 @@
+//
+//  Job Engine & Task...
+//  jet.js
+//
+//  Created by Sam Gateau, 2018/03/28
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+"use strict";
+/*function Jet() {
+};
+Jet.prototype = {
+    // traverse task tree
+    task_traverse: function(root, functor, depth) {
+        var subs = root.findChildren(/.*//*)
+        depth++;
+        for (var i = 0; i <subs.length; i++) {
+            if (functor(subs[i], depth, i)) {
+                this.task_traverse(subs[i], functor, depth)
+            }
+        }    
+    },   
+    task_traverseTree: function(root, functor) {
+        if (functor(root, 0, 0)) {
+            this.task_traverse(root, functor, 0)
+        } 
+    },
+
+    // Access job properties
+    job_propKeys: function(job) {
+        var keys = Object.keys(job)
+        var propKeys = [];
+        for (var k=0; k < keys.length;k++) {
+            // Filter for relevant property
+            var key = keys[k]
+            if ((typeof job[key]) !== "function") {
+                if ((key !== "objectName") && (key !== "cpuRunTime") && (key !== "enabled")) {
+                    propKeys.push(keys[k]);
+                }
+            }
+        }   
+        return propKeys; 
+    }
+};
+
+jet = Jet();
+
+// Functors
+jet.job_print_functor = function (printout, maxDepth) {
+    if (maxDepth === undefined) maxDepth = 100
+    return function (job, depth, index) {
+        var tab = "    "
+        var depthTab = "";
+        for (var d = 0; d < depth; d++) { depthTab += tab }
+        printout(depthTab + index + " " + job.objectName + " " + (job.enabled ? "on" : "off")) 
+        var keys = jet.job_propKeys(job);
+        for (var p=0; p < keys.length;p++) {
+            var prop = job[keys[p]]
+            printout(depthTab + tab + tab + typeof prop + " " + keys[p] + " " + prop);
+        }
+
+        return depth < maxDepth;
+    }
+} 
+*/
+ // traverse task tree
+task_traverse = function (root, functor, depth) {
+    //if (root.isTask()) { 
+        var subs = root.getSubConfigs()
+        depth++;
+        for (var i = 0; i <subs.length; i++) {
+            if (functor(subs[i], depth, i)) {
+                task_traverse(subs[i], functor, depth)
+            }
+        }
+   // }    
+}
+task_traverseTree = function (root, functor) {
+    if (functor(root, 0, 0)) {
+        task_traverse(root, functor, 0)
+    }   
+}
+
+// Access job properties
+job_propKeys = function (job) {
+var keys = Object.keys(job)
+var propKeys = [];
+for (var k=0; k < keys.length;k++) {
+    // Filter for relevant property
+    var key = keys[k]
+    if ((typeof job[key]) !== "function") {
+        if ((key !== "objectName") && (key !== "cpuRunTime") && (key !== "enabled")) {
+            propKeys.push(keys[k]);
+        }
+    }
+}   
+return propKeys; 
+}
+job_print_functor = function (printout, maxDepth) {
+    if (maxDepth === undefined) maxDepth = 100
+    return function (job, depth, index) {
+        var tab = "    "
+        var depthTab = "";
+        for (var d = 0; d < depth; d++) { depthTab += tab }
+        printout(depthTab + index + " " + job.objectName + " " + (job.enabled ? "on" : "off")) 
+        var keys = job_propKeys(job);
+        for (var p=0; p < keys.length;p++) {
+            var prop = job[keys[p]]
+            printout(depthTab + tab + tab + typeof prop + " " + keys[p] + " " + prop);
+        }
+
+        return true
+     //   return depth < maxDepth;
+    }
+} 
+
+//jet.task_traverseTree(Render, jet.job_print_functor);

scripts/developer/utilities/lib/jet/jet_qml.js

@@ -0,0 +1,72 @@
+//
+//  Job Engine & Task...
+//  jet.js
+//
+//  Created by Sam Gateau, 2018/03/28
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+"use strict";
+
+ // traverse task tree
+function task_traverse(root, functor, depth) {
+    //if (root.isTask()) { 
+        var subs = root.getSubConfigs()
+        depth++;
+        for (var i = 0; i <subs.length; i++) {
+            if (functor(subs[i], depth, i)) {
+                task_traverse(subs[i], functor, depth)
+            }
+        }
+   // }    
+}
+function task_traverseTree(root, functor) {
+    if (functor(root, 0, 0)) {
+        task_traverse(root, functor, 0)
+    }   
+}
+
+// Access job properties
+function job_propKeys(job) {
+var keys = Object.keys(job)
+var propKeys = [];
+for (var k=0; k < keys.length;k++) {
+    // Filter for relevant property
+    var key = keys[k]
+    if ((typeof job[key]) !== "function") {
+        if ((key !== "objectName") && (key !== "cpuRunTime") && (key !== "enabled")) {
+            propKeys.push(keys[k]);
+        }
+    }
+}   
+return propKeys; 
+}
+
+function job_print_functor(printout, maxDepth) {
+    if (maxDepth === undefined) maxDepth = 100
+    return function (job, depth, index) {
+        var tab = "    "
+        var depthTab = "";
+        for (var d = 0; d < depth; d++) { depthTab += tab }
+        printout(depthTab + index + " " + job.objectName + " " + (job.enabled ? "on" : "off")) 
+        var keys = job_propKeys(job);
+        for (var p=0; p < keys.length;p++) {
+            var prop = job[keys[p]]
+            printout(depthTab + tab + tab + typeof prop + " " + keys[p] + " " + prop);
+        }
+
+        return true
+     //   return depth < maxDepth;
+    }
+} 
+
+function getRender() {
+    return Render
+}
+
+
+function getWorkload() {
+    return Workload
+}

scripts/developer/utilities/workload/inspectEngine.js

@@ -0,0 +1,40 @@
+//Script.include('../lib/jet/jet.js');
+
+
+
+
+(function() { // BEGIN LOCAL_SCOPE
+    //jet.task_traverseTree(Render, printJob);
+    var message = "test";
+ /*   var functor = job_print_functor(function (line) { message += line + "\n"; });
+        
+    task_traverseTree(Workload, functor
+    );
+   */ 
+    
+    print(message)
+
+var qml = Script.resolvePath('../lib/jet/TaskList.qml');
+var window = new OverlayWindow({
+    title: 'Inspect Engine',
+    source: qml,
+    width: 250, 
+    height: 300
+});
+
+window.sendToQml(message)
+
+window.closed.connect(function () { Script.stop(); });
+Script.scriptEnding.connect(function () {
+  /*  var geometry = JSON.stringify({
+        x: window.position.x,
+        y: window.position.y,
+        width: window.size.x,
+        height: window.size.y
+    })
+
+    Settings.setValue(HMD_DEBUG_WINDOW_GEOMETRY_KEY, geometry);*/
+    window.close();
+})
+
+}()); // END LOCAL_SCOPE

scripts/developer/utilities/workload/workload.qml

@@ -21,9 +21,7 @@ Rectangle {
     anchors.margins: hifi.dimensions.contentMargin.x
     
     color: hifi.colors.baseGray;
-    property var setupViews: Workload.getConfig("setupViews");
-    property var spaceToRender: Workload.getConfig("SpaceToRender");
-   
+     
     Column {
         spacing: 5
         anchors.left: parent.left
@@ -34,6 +32,13 @@ Rectangle {
         HifiControls.Label {
             text: "Workload"       
         }
+
+        CheckBox {
+            text: "Show Views"
+            checked: Workload.getConfig("SpaceToRender")["showViews"]
+            onCheckedChanged: { Workload.getConfig("SpaceToRender")["showViews"] = checked }
+        }
+
         HifiControls.CheckBox {
             boxSize: 20
             text: "Freeze Views"
@@ -41,7 +46,7 @@ Rectangle {
             onCheckedChanged: { Workload.getConfig("SpaceToRender")["freezeViews"] = checked, Workload.getConfig("setupViews")["freezeViews"] = checked; }
         }
 
-        RowLayout {
+        /*RowLayout {
             anchors.left: parent.left
             anchors.right: parent.right 
             Column {
@@ -115,6 +120,6 @@ Rectangle {
             checked: Workload.getConfig("SpaceToRender")["showViews"]
             onCheckedChanged: { Workload.getConfig("SpaceToRender")["showViews"] = checked }
         }
-        Separator {}
+        Separator {}*/
     }
 }