Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data

assignment-client/CMakeLists.txt

@@ -8,9 +8,17 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
 # setup for find modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/")
 
+find_package(Qt5Network REQUIRED)
+
 include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
+qt5_use_modules(${TARGET_NAME} Network)
+
+# include glm
+include(${MACRO_DIR}/IncludeGLM.cmake)
+include_glm(${TARGET_NAME} ${ROOT_DIR})
+
 # link in the shared library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})

assignment-client/src/Agent.cpp

@@ -25,11 +25,11 @@ void Agent::run(QUrl scriptURL) {
     NodeList::getInstance()->setOwnerType(NODE_TYPE_AGENT);
     NodeList::getInstance()->setNodeTypesOfInterest(&NODE_TYPE_AVATAR_MIXER, 1);
     
-    QNetworkAccessManager* manager = new QNetworkAccessManager();
+    QNetworkAccessManager manager;
     
-    qDebug() << "Attemping download of " << scriptURL;
+    qDebug() << "Attemping download of " << scriptURL << "\n";
     
-    QNetworkReply* reply = manager->get(QNetworkRequest(scriptURL));
+    QNetworkReply* reply = manager.get(QNetworkRequest(scriptURL));
     
     QEventLoop loop;
     QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
@@ -47,15 +47,14 @@ void Agent::run(QUrl scriptURL) {
     QScriptValue agentValue = engine.newQObject(this);
     engine.globalObject().setProperty("Agent", agentValue);
     
-    qDebug() << "Downloaded script:" << scriptString;
+    qDebug() << "Downloaded script:" << scriptString << "\n";
-    
+    qDebug() << "Evaluated script:" << engine.evaluate(scriptString).toString() << "\n";
-    qDebug() << "Evaluated script:" << engine.evaluate(scriptString).toString();
     
     timeval thisSend;
     timeval lastDomainServerCheckIn = {};
     int numMicrosecondsSleep = 0;
     
-    const float DATA_SEND_INTERVAL_USECS = (1 / 60.0f) * 1000 * 1000;
+    const long long DATA_SEND_INTERVAL_USECS = (1 / 60.0f) * 1000 * 1000;
     
     sockaddr_in senderAddress;
     unsigned char receivedData[MAX_PACKET_SIZE];
@@ -65,6 +64,11 @@ void Agent::run(QUrl scriptURL) {
         // update the thisSend timeval to the current time
         gettimeofday(&thisSend, NULL);
         
+        // if we're not hearing from the domain-server we should stop running
+        if (NodeList::getInstance()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
+            break;
+        }
+        
         // send a check in packet to the domain server if DOMAIN_SERVER_CHECK_IN_USECS has elapsed
         if (usecTimestampNow() - usecTimestamp(&lastDomainServerCheckIn) >= DOMAIN_SERVER_CHECK_IN_USECS) {
             gettimeofday(&lastDomainServerCheckIn, NULL);

assignment-client/src/Agent.h

@@ -9,9 +9,6 @@
 #ifndef __hifi__Agent__
 #define __hifi__Agent__
 
-#include <glm/glm.hpp>
-#include <glm/gtc/quaternion.hpp>
-
 #include "SharedUtil.h"
 
 #include <QtCore/QObject>

assignment-client/src/main.cpp

@@ -12,6 +12,9 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 
+#include <QtCore/QCoreApplication>
+
+#include "Agent.h"
 #include <Assignment.h>
 #include <AudioMixer.h>
 #include <AvatarMixer.h>
@@ -92,8 +95,18 @@ void childClient() {
                 
                 if (deployedAssignment.getType() == Assignment::AudioMixerType) {
                     AudioMixer::run();
-                } else {
+                } else if (deployedAssignment.getType() == Assignment::AvatarMixerType) {
                     AvatarMixer::run();
+                } else {
+                    // figure out the URL for the script for this agent assignment
+                    QString scriptURLString("http://%1:8080/assignment/%2");
+                    scriptURLString = scriptURLString.arg(inet_ntoa(domainSocketAddr),
+                                                          deployedAssignment.getUUIDStringWithoutCurlyBraces());
+                    
+                    qDebug() << "Starting an Agent assignment-client with script at" << scriptURLString << "\n";
+                    
+                    Agent scriptAgent;
+                    scriptAgent.run(QUrl(scriptURLString));
                 }
             } else {
                 qDebug("Received a bad destination socket for assignment.\n");
@@ -171,6 +184,8 @@ void parentMonitor() {
 
 int main(int argc, const char* argv[]) {
     
+    QCoreApplication app(argc, (char**) argv);
+    
     setvbuf(stdout, NULL, _IOLBF, 0);
     
     // use the verbose message handler in Logging

domain-server/CMakeLists.txt

@@ -11,11 +11,11 @@ setup_hifi_project(${TARGET_NAME} TRUE)
 # remove and then copy the files for the webserver
 add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E remove_directory
-                   $<TARGET_FILE_DIR:${TARGET_NAME}>/web)
+                   $<TARGET_FILE_DIR:${TARGET_NAME}>/resources/web)
 add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                  "${PROJECT_SOURCE_DIR}/src/web"
+                  "${PROJECT_SOURCE_DIR}/resources/web"
-                  $<TARGET_FILE_DIR:${TARGET_NAME}>/web)
+                  $<TARGET_FILE_DIR:${TARGET_NAME}>/resources/web)
 
 # link the shared hifi library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)

domain-server/resources/web/assignment/index.shtml

@@ -6,8 +6,7 @@
   </head>
   <body>
     <pre id='editor' style='font-size: 14px;'><!--#include "placeholder.js"--></pre>
-    <script src='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'></script>
+    <script src='js/jquery-2.0.3.min.js'></script>
-    <script src='//api.filepicker.io/v1/filepicker.js'></script>
     <script src='js/ace/ace.js' type='text/javascript'></script>
     <script src='js/assignment.js' type='text/javascript'></script>
     <div class='big-button' id='deploy-button'>

domain-server/resources/web/assignment/js/assignment.js

@@ -6,9 +6,6 @@ $(document).ready(function(){
   editor.getSession().setMode("ace/mode/javascript");
   editor.getSession().setTabSize(2);
   
-  // setup the Ink filepicker
-  filepicker.setKey("ARhz9KegMS0ioo5o9bPOcz");
-  
   $('#deploy-button').click(function(){
     script = editor.getValue();
     

domain-server/src/main.cpp

@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <QtCore/QMutex>
+
 #include "Assignment.h"
 #include "NodeList.h"
 #include "NodeTypes.h"
@@ -40,6 +42,9 @@ unsigned char packetData[MAX_PACKET_SIZE];
 
 const int NODE_COUNT_STAT_INTERVAL_MSECS = 5000;
 
+QMutex assignmentQueueMutex;
+std::deque<Assignment*> assignmentQueue;
+
 unsigned char* addNodeToBroadcastPacket(unsigned char* currentPosition, Node* nodeToAdd) {
     *currentPosition++ = nodeToAdd->getType();
     
@@ -67,21 +72,28 @@ static int mongooseRequestHandler(struct mg_connection *conn) {
     }
 }
 
-const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "web/assignment";
+const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "resources/web/assignment";
 
 static void mongooseUploadHandler(struct mg_connection *conn, const char *path) {
-    // create an assignment for this saved script
+    // create an assignment for this saved script, for now make it local only
-    Assignment scriptAssignment(Assignment::CreateCommand, Assignment::AgentType);
+    Assignment *scriptAssignment = new Assignment(Assignment::CreateCommand, Assignment::AgentType, Assignment::LocalLocation);
     
     QString newPath(ASSIGNMENT_SCRIPT_HOST_LOCATION);
     newPath += "/";
     // append the UUID for this script as the new filename, remove the curly braces
-    newPath += scriptAssignment.getUUID().toString().mid(1, scriptAssignment.getUUID().toString().length() - 2);
+    newPath += scriptAssignment->getUUIDStringWithoutCurlyBraces();
     
     // rename the saved script to the GUID of the assignment and move it to the script host locaiton
     rename(path, newPath.toStdString().c_str());
 
     qDebug("Saved a script for assignment at %s\n", newPath.toStdString().c_str());
+    
+    // add the script assigment to the assignment queue
+    // lock the assignment queue mutex since we're operating on a different thread than DS main
+    ::assignmentQueueMutex.lock();
+    ::assignmentQueue.push_back(scriptAssignment);
+    ::assignmentQueueMutex.unlock();
+
 }
 
 int main(int argc, const char* argv[]) {
@@ -121,9 +133,6 @@ int main(int argc, const char* argv[]) {
     const long long GLOBAL_ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000;
     timeval lastGlobalAssignmentRequest = {};
     
-    // setup the assignment queue
-    std::deque<Assignment*> assignmentQueue;
-    
     // as a domain-server we will always want an audio mixer and avatar mixer
     // setup the create assignments for those
     Assignment audioMixerAssignment(Assignment::CreateCommand,
@@ -146,7 +155,7 @@ int main(int argc, const char* argv[]) {
     
     // list of options. Last element must be NULL.
     const char *options[] = {"listening_ports", "8080",
-                             "document_root", "./web", NULL};
+                             "document_root", "./resources/web", NULL};
     
     callbacks.begin_request = mongooseRequestHandler;
     callbacks.upload = mongooseUploadHandler;
@@ -156,19 +165,21 @@ int main(int argc, const char* argv[]) {
     
     while (true) {
         
+        ::assignmentQueueMutex.lock();
         // check if our audio-mixer or avatar-mixer are dead and we don't have existing assignments in the queue
         // so we can add those assignments back to the front of the queue since they are high-priority
         if (!nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER) &&
-            std::find(assignmentQueue.begin(), assignmentQueue.end(), &avatarMixerAssignment) == assignmentQueue.end()) {
+            std::find(::assignmentQueue.begin(), assignmentQueue.end(), &avatarMixerAssignment) == ::assignmentQueue.end()) {
             qDebug("Missing an avatar mixer and assignment not in queue. Adding.\n");
-            assignmentQueue.push_front(&avatarMixerAssignment);
+            ::assignmentQueue.push_front(&avatarMixerAssignment);
         }
         
         if (!nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER) &&
-            std::find(assignmentQueue.begin(), assignmentQueue.end(), &audioMixerAssignment) == assignmentQueue.end()) {
+            std::find(::assignmentQueue.begin(), ::assignmentQueue.end(), &audioMixerAssignment) == ::assignmentQueue.end()) {
             qDebug("Missing an audio mixer and assignment not in queue. Adding.\n");
-            assignmentQueue.push_front(&audioMixerAssignment);
+            ::assignmentQueue.push_front(&audioMixerAssignment);
         }
+        ::assignmentQueueMutex.unlock();
         
         while (nodeList->getNodeSocket()->receive((sockaddr *)&nodePublicAddress, packetData, &receivedBytes) &&
                packetVersionMatch(packetData)) {
@@ -269,11 +280,13 @@ int main(int argc, const char* argv[]) {
                 
                 qDebug("Received a request for assignment.\n");
                 
+                ::assignmentQueueMutex.lock();
+                
                 // this is an unassigned client talking to us directly for an assignment
                 // go through our queue and see if there are any assignments to give out
-                std::deque<Assignment*>::iterator assignment = assignmentQueue.begin();
+                std::deque<Assignment*>::iterator assignment = ::assignmentQueue.begin();
                 
-                while (assignment != assignmentQueue.end()) {
+                while (assignment != ::assignmentQueue.end()) {
                     
                     // give this assignment out, no conditions stop us from giving it to the local assignment client
                     int numHeaderBytes = populateTypeAndVersion(broadcastPacket, PACKET_TYPE_CREATE_ASSIGNMENT);
@@ -284,11 +297,18 @@ int main(int argc, const char* argv[]) {
                                                     numHeaderBytes + numAssignmentBytes);
                     
                     // remove the assignment from the queue
-                    assignmentQueue.erase(assignment);
+                    ::assignmentQueue.erase(assignment);
+                    
+                    if ((*assignment)->getType() == Assignment::AgentType) {
+                        // if this is a script assignment we need to delete it to avoid a memory leak
+                        delete *assignment;
+                    }
                     
                     // stop looping, we've handed out an assignment
                     break;
                 }
+                
+                ::assignmentQueueMutex.unlock();
             }
         }
         
@@ -296,8 +316,10 @@ int main(int argc, const char* argv[]) {
         if (usecTimestampNow() - usecTimestamp(&lastGlobalAssignmentRequest) >= GLOBAL_ASSIGNMENT_REQUEST_INTERVAL_USECS) {
             gettimeofday(&lastGlobalAssignmentRequest, NULL);
             
+            ::assignmentQueueMutex.lock();
+            
             // go through our queue and see if there are any assignments to send to the global assignment server
-            std::deque<Assignment*>::iterator assignment = assignmentQueue.begin();
+            std::deque<Assignment*>::iterator assignment = ::assignmentQueue.begin();
             
             while (assignment != assignmentQueue.end()) {
                 
@@ -308,7 +330,12 @@ int main(int argc, const char* argv[]) {
                     nodeList->sendAssignment(*(*assignment));
                     
                     // remove the assignment from the queue
-                    assignmentQueue.erase(assignment);
+                    ::assignmentQueue.erase(assignment);
+                    
+                    if ((*assignment)->getType() == Assignment::AgentType) {
+                        // if this is a script assignment we need to delete it to avoid a memory leak
+                        delete *assignment;
+                    }
                     
                     // stop looping, we've handed out an assignment
                     break;
@@ -318,6 +345,7 @@ int main(int argc, const char* argv[]) {
                 }
             }
             
+            ::assignmentQueueMutex.unlock();
         }
         
         if (Logging::shouldSendStats()) {

libraries/shared/src/Assignment.cpp

@@ -89,6 +89,10 @@ Assignment::~Assignment() {
     delete _attachedLocalSocket;
 }
 
+QString Assignment::getUUIDStringWithoutCurlyBraces() const {
+    return _uuid.toString().mid(1, _uuid.toString().length() - 2);
+}
+
 void Assignment::setAttachedPublicSocket(const sockaddr* attachedPublicSocket) {
     if (_attachedPublicSocket) {
         // delete the old socket if it exists

libraries/shared/src/Assignment.h

@@ -49,6 +49,7 @@ public:
     ~Assignment();
     
     const QUuid& getUUID() const { return _uuid; }
+    QString getUUIDStringWithoutCurlyBraces() const;
     Assignment::Command getCommand() const { return _command; }
     Assignment::Type getType() const { return _type; }
     Assignment::Location getLocation() const { return _location; }

libraries/voxels/src/VoxelTree.cpp

@@ -1927,7 +1927,7 @@ void reorderChildrenForNudge(void* extraData) {
         for (int i = 0; i < NUMBER_OF_CHILDREN / 2; i++) {
             lastToNudgeVote[POSITIVE_Z_ORDERING[i]]++;
         }
-    } else if (nudgeVec.z > 0) {
+    } else if (nudgeVec.z < 0) {
         for (int i = 0; i < NUMBER_OF_CHILDREN / 2; i++) {
             lastToNudgeVote[NEGATIVE_Z_ORDERING[i]]++;
         }