{"action":"created","comment":{"url":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/61787873","id":61787873,"diff_hunk":"@@ -193,17 +195,45 @@ void ScriptEngine::runInThread() {\n     workerThread->start();\n }\n \n+void ScriptEngine::threadSafeAbortEvaluation() {\n+    if (QThread::currentThread() != thread()) {\n+        QMetaObject::invokeMethod(this, \"threadSafeAbortEvaluation\");\n+        return;\n+    }\n+    abortEvaluation();\n+}\n+\n void ScriptEngine::waitTillDoneRunning() {\n     // If the script never started running or finished running before we got here, we don't need to wait for it\n     if (_isRunning && _isThreaded) {\n \n         // NOTE: waitTillDoneRunning() will be called on the main Application thread, inside of stopAllScripts()\n         // we want the application thread to continue to process events, because the scripts will likely need to\n-        // marshall messages across to the main thread. For example if they access Settings or Meny in any of their\n+        // marshall messages across to the main thread. For example if they access Settings or Menu in any of their\n         // shutdown code.\n+        QString scriptName = getFilename();\n+\n+        auto startedWaiting = usecTimestampNow();\n         while (thread()->isRunning()) {\n             // process events for the main application thread, allowing invokeMethod calls to pass between threads\n             QCoreApplication::processEvents();\n+            auto stillWaiting = usecTimestampNow();\n+            auto elapsed = stillWaiting - startedWaiting;\n+            \n+            // if we've been waiting a second or more, then tell the script engine to stop evaluating\n+            static const auto MAX_SCRIPT_EVALUATION_TIME =  USECS_PER_SECOND;\n+            if (elapsed > MAX_SCRIPT_EVALUATION_TIME) {\n+                qCDebug(scriptengine) << \"Script \" << scriptName << \" has been running too long [\" << elapsed << \"] aborting evaluation.\";\n+                threadSafeAbortEvaluation();\n+            }\n+\n+            // if we've been waiting for more than 5 seconds then we should be more aggessive about stopping\n+            static const auto WAITING_TOO_LONG = USECS_PER_SECOND * 5;","path":"libraries/script-engine/src/ScriptEngine.cpp","position":47,"original_position":47,"commit_id":"6026e055aaa173978e300ffcf7bfc00fe6592ae4","original_commit_id":"6026e055aaa173978e300ffcf7bfc00fe6592ae4","user":{"login":"ZappoMan","id":2093195,"avatar_url":"https://avatars.githubusercontent.com/u/2093195?v=3","gravatar_id":"","url":"https://api.github.com/users/ZappoMan","html_url":"https://github.com/ZappoMan","followers_url":"https://api.github.com/users/ZappoMan/followers","following_url":"https://api.github.com/users/ZappoMan/following{/other_user}","gists_url":"https://api.github.com/users/ZappoMan/gists{/gist_id}","starred_url":"https://api.github.com/users/ZappoMan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZappoMan/subscriptions","organizations_url":"https://api.github.com/users/ZappoMan/orgs","repos_url":"https://api.github.com/users/ZappoMan/repos","events_url":"https://api.github.com/users/ZappoMan/events{/privacy}","received_events_url":"https://api.github.com/users/ZappoMan/received_events","type":"User","site_admin":false},"body":"agreed let me change that","created_at":"2016-05-02T19:15:53Z","updated_at":"2016-05-02T19:15:53Z","html_url":"https://github.com/highfidelity/hifi/pull/7769#discussion_r61787873","pull_request_url":"https://api.github.com/repos/highfidelity/hifi/pulls/7769","_links":{"self":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/61787873"},"html":{"href":"https://github.com/highfidelity/hifi/pull/7769#discussion_r61787873"},"pull_request":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/7769"}}},"pull_request":{"url":"https://api.github.com/repos/highfidelity/hifi/pulls/7769","id":67974381,"html_url":"https://github.com/highfidelity/hifi/pull/7769","diff_url":"https://github.com/highfidelity/hifi/pull/7769.diff","patch_url":"https://github.com/highfidelity/hifi/pull/7769.patch","issue_url":"https://api.github.com/repos/highfidelity/hifi/issues/7769","number":7769,"state":"open","locked":false,"title":"add support to abort evaluation of long running scripts on shutdown","user":{"login":"ZappoMan","id":2093195,"avatar_url":"https://avatars.githubusercontent.com/u/2093195?v=3","gravatar_id":"","url":"https://api.github.com/users/ZappoMan","html_url":"https://github.com/ZappoMan","followers_url":"https://api.github.com/users/ZappoMan/followers","following_url":"https://api.github.com/users/ZappoMan/following{/other_user}","gists_url":"https://api.github.com/users/ZappoMan/gists{/gist_id}","starred_url":"https://api.github.com/users/ZappoMan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZappoMan/subscriptions","organizations_url":"https://api.github.com/users/ZappoMan/orgs","repos_url":"https://api.github.com/users/ZappoMan/repos","events_url":"https://api.github.com/users/ZappoMan/events{/privacy}","received_events_url":"https://api.github.com/users/ZappoMan/received_events","type":"User","site_admin":false},"body":"This fixes problems on shutdown with scripts that might have infinite loops and/or are running extra slow for some unknown reason... and/or that might possibly be deadlocked on a script call","created_at":"2016-04-26T23:26:00Z","updated_at":"2016-05-02T19:15:53Z","closed_at":null,"merged_at":null,"merge_commit_sha":"436be357552be87853824791920372e5d1b81c02","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/highfidelity/hifi/pulls/7769/commits","review_comments_url":"https://api.github.com/repos/highfidelity/hifi/pulls/7769/comments","review_comment_url":"https://api.github.com/repos/highfidelity/hifi/pulls/comments{/number}","comments_url":"https://api.github.com/repos/highfidelity/hifi/issues/7769/comments","statuses_url":"https://api.github.com/repos/highfidelity/hifi/statuses/6026e055aaa173978e300ffcf7bfc00fe6592ae4","head":{"label":"ZappoMan:abortForInfiniteLoops","ref":"abortForInfiniteLoops","sha":"6026e055aaa173978e300ffcf7bfc00fe6592ae4","user":{"login":"ZappoMan","id":2093195,"avatar_url":"https://avatars.githubusercontent.com/u/2093195?v=3","gravatar_id":"","url":"https://api.github.com/users/ZappoMan","html_url":"https://github.com/ZappoMan","followers_url":"https://api.github.com/users/ZappoMan/followers","following_url":"https://api.github.com/users/ZappoMan/following{/other_user}","gists_url":"https://api.github.com/users/ZappoMan/gists{/gist_id}","starred_url":"https://api.github.com/users/ZappoMan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZappoMan/subscriptions","organizations_url":"https://api.github.com/users/ZappoMan/orgs","repos_url":"https://api.github.com/users/ZappoMan/repos","events_url":"https://api.github.com/users/ZappoMan/events{/privacy}","received_events_url":"https://api.github.com/users/ZappoMan/received_events","type":"User","site_admin":false},"repo":{"id":9376434,"name":"hifi","full_name":"ZappoMan/hifi","owner":{"login":"ZappoMan","id":2093195,"avatar_url":"https://avatars.githubusercontent.com/u/2093195?v=3","gravatar_id":"","url":"https://api.github.com/users/ZappoMan","html_url":"https://github.com/ZappoMan","followers_url":"https://api.github.com/users/ZappoMan/followers","following_url":"https://api.github.com/users/ZappoMan/following{/other_user}","gists_url":"https://api.github.com/users/ZappoMan/gists{/gist_id}","starred_url":"https://api.github.com/users/ZappoMan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZappoMan/subscriptions","organizations_url":"https://api.github.com/users/ZappoMan/orgs","repos_url":"https://api.github.com/users/ZappoMan/repos","events_url":"https://api.github.com/users/ZappoMan/events{/privacy}","received_events_url":"https://api.github.com/users/ZappoMan/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ZappoMan/hifi","description":"Test platform for various render and interface tests for next-gen VR system","fork":true,"url":"https://api.github.com/repos/ZappoMan/hifi","forks_url":"https://api.github.com/repos/ZappoMan/hifi/forks","keys_url":"https://api.github.com/repos/ZappoMan/hifi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ZappoMan/hifi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ZappoMan/hifi/teams","hooks_url":"https://api.github.com/repos/ZappoMan/hifi/hooks","issue_events_url":"https://api.github.com/repos/ZappoMan/hifi/issues/events{/number}","events_url":"https://api.github.com/repos/ZappoMan/hifi/events","assignees_url":"https://api.github.com/repos/ZappoMan/hifi/assignees{/user}","branches_url":"https://api.github.com/repos/ZappoMan/hifi/branches{/branch}","tags_url":"https://api.github.com/repos/ZappoMan/hifi/tags","blobs_url":"https://api.github.com/repos/ZappoMan/hifi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ZappoMan/hifi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ZappoMan/hifi/git/refs{/sha}","trees_url":"https://api.github.com/repos/ZappoMan/hifi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ZappoMan/hifi/statuses/{sha}","languages_url":"https://api.github.com/repos/ZappoMan/hifi/languages","stargazers_url":"https://api.github.com/repos/ZappoMan/hifi/stargazers","contributors_url":"https://api.github.com/repos/ZappoMan/hifi/contributors","subscribers_url":"https://api.github.com/repos/ZappoMan/hifi/subscribers","subscription_url":"https://api.github.com/repos/ZappoMan/hifi/subscription","commits_url":"https://api.github.com/repos/ZappoMan/hifi/commits{/sha}","git_commits_url":"https://api.github.com/repos/ZappoMan/hifi/git/commits{/sha}","comments_url":"https://api.github.com/repos/ZappoMan/hifi/comments{/number}","issue_comment_url":"https://api.github.com/repos/ZappoMan/hifi/issues/comments{/number}","contents_url":"https://api.github.com/repos/ZappoMan/hifi/contents/{+path}","compare_url":"https://api.github.com/repos/ZappoMan/hifi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ZappoMan/hifi/merges","archive_url":"https://api.github.com/repos/ZappoMan/hifi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ZappoMan/hifi/downloads","issues_url":"https://api.github.com/repos/ZappoMan/hifi/issues{/number}","pulls_url":"https://api.github.com/repos/ZappoMan/hifi/pulls{/number}","milestones_url":"https://api.github.com/repos/ZappoMan/hifi/milestones{/number}","notifications_url":"https://api.github.com/repos/ZappoMan/hifi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ZappoMan/hifi/labels{/name}","releases_url":"https://api.github.com/repos/ZappoMan/hifi/releases{/id}","deployments_url":"https://api.github.com/repos/ZappoMan/hifi/deployments","created_at":"2013-04-11T17:41:25Z","updated_at":"2016-01-12T17:09:47Z","pushed_at":"2016-04-30T22:45:46Z","git_url":"git://github.com/ZappoMan/hifi.git","ssh_url":"git@github.com:ZappoMan/hifi.git","clone_url":"https://github.com/ZappoMan/hifi.git","svn_url":"https://github.com/ZappoMan/hifi","homepage":null,"size":215418,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"highfidelity:master","ref":"master","sha":"28b5ef63b8f46f424a1f2caa33b15ebc573e10fa","user":{"login":"highfidelity","id":1565370,"avatar_url":"https://avatars.githubusercontent.com/u/1565370?v=3","gravatar_id":"","url":"https://api.github.com/users/highfidelity","html_url":"https://github.com/highfidelity","followers_url":"https://api.github.com/users/highfidelity/followers","following_url":"https://api.github.com/users/highfidelity/following{/other_user}","gists_url":"https://api.github.com/users/highfidelity/gists{/gist_id}","starred_url":"https://api.github.com/users/highfidelity/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/highfidelity/subscriptions","organizations_url":"https://api.github.com/users/highfidelity/orgs","repos_url":"https://api.github.com/users/highfidelity/repos","events_url":"https://api.github.com/users/highfidelity/events{/privacy}","received_events_url":"https://api.github.com/users/highfidelity/received_events","type":"Organization","site_admin":false},"repo":{"id":5372872,"name":"hifi","full_name":"highfidelity/hifi","owner":{"login":"highfidelity","id":1565370,"avatar_url":"https://avatars.githubusercontent.com/u/1565370?v=3","gravatar_id":"","url":"https://api.github.com/users/highfidelity","html_url":"https://github.com/highfidelity","followers_url":"https://api.github.com/users/highfidelity/followers","following_url":"https://api.github.com/users/highfidelity/following{/other_user}","gists_url":"https://api.github.com/users/highfidelity/gists{/gist_id}","starred_url":"https://api.github.com/users/highfidelity/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/highfidelity/subscriptions","organizations_url":"https://api.github.com/users/highfidelity/orgs","repos_url":"https://api.github.com/users/highfidelity/repos","events_url":"https://api.github.com/users/highfidelity/events{/privacy}","received_events_url":"https://api.github.com/users/highfidelity/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/highfidelity/hifi","description":"Open source software for shared virtual worlds using HMDs and dynamically assigned devices as servers.  San Francisco based startup, we are hiring: http://highfidelity.com/jobs  Documentation at http://docs.highfidelity.com  Contribute by reporting bugs & doing jobs on http://worklist.net","fork":false,"url":"https://api.github.com/repos/highfidelity/hifi","forks_url":"https://api.github.com/repos/highfidelity/hifi/forks","keys_url":"https://api.github.com/repos/highfidelity/hifi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/highfidelity/hifi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/highfidelity/hifi/teams","hooks_url":"https://api.github.com/repos/highfidelity/hifi/hooks","issue_events_url":"https://api.github.com/repos/highfidelity/hifi/issues/events{/number}","events_url":"https://api.github.com/repos/highfidelity/hifi/events","assignees_url":"https://api.github.com/repos/highfidelity/hifi/assignees{/user}","branches_url":"https://api.github.com/repos/highfidelity/hifi/branches{/branch}","tags_url":"https://api.github.com/repos/highfidelity/hifi/tags","blobs_url":"https://api.github.com/repos/highfidelity/hifi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/highfidelity/hifi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/highfidelity/hifi/git/refs{/sha}","trees_url":"https://api.github.com/repos/highfidelity/hifi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/highfidelity/hifi/statuses/{sha}","languages_url":"https://api.github.com/repos/highfidelity/hifi/languages","stargazers_url":"https://api.github.com/repos/highfidelity/hifi/stargazers","contributors_url":"https://api.github.com/repos/highfidelity/hifi/contributors","subscribers_url":"https://api.github.com/repos/highfidelity/hifi/subscribers","subscription_url":"https://api.github.com/repos/highfidelity/hifi/subscription","commits_url":"https://api.github.com/repos/highfidelity/hifi/commits{/sha}","git_commits_url":"https://api.github.com/repos/highfidelity/hifi/git/commits{/sha}","comments_url":"https://api.github.com/repos/highfidelity/hifi/comments{/number}","issue_comment_url":"https://api.github.com/repos/highfidelity/hifi/issues/comments{/number}","contents_url":"https://api.github.com/repos/highfidelity/hifi/contents/{+path}","compare_url":"https://api.github.com/repos/highfidelity/hifi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/highfidelity/hifi/merges","archive_url":"https://api.github.com/repos/highfidelity/hifi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/highfidelity/hifi/downloads","issues_url":"https://api.github.com/repos/highfidelity/hifi/issues{/number}","pulls_url":"https://api.github.com/repos/highfidelity/hifi/pulls{/number}","milestones_url":"https://api.github.com/repos/highfidelity/hifi/milestones{/number}","notifications_url":"https://api.github.com/repos/highfidelity/hifi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/highfidelity/hifi/labels{/name}","releases_url":"https://api.github.com/repos/highfidelity/hifi/releases{/id}","deployments_url":"https://api.github.com/repos/highfidelity/hifi/deployments","created_at":"2012-08-10T18:26:22Z","updated_at":"2016-05-02T09:54:27Z","pushed_at":"2016-05-02T18:45:09Z","git_url":"git://github.com/highfidelity/hifi.git","ssh_url":"git@github.com:highfidelity/hifi.git","clone_url":"https://github.com/highfidelity/hifi.git","svn_url":"https://github.com/highfidelity/hifi","homepage":"","size":264739,"stargazers_count":373,"watchers_count":373,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":221,"mirror_url":null,"open_issues_count":19,"forks":221,"open_issues":19,"watchers":373,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/7769"},"html":{"href":"https://github.com/highfidelity/hifi/pull/7769"},"issue":{"href":"https://api.github.com/repos/highfidelity/hifi/issues/7769"},"comments":{"href":"https://api.github.com/repos/highfidelity/hifi/issues/7769/comments"},"review_comments":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/7769/comments"},"review_comment":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/7769/commits"},"statuses":{"href":"https://api.github.com/repos/highfidelity/hifi/statuses/6026e055aaa173978e300ffcf7bfc00fe6592ae4"}}}}