Commit graph

25039 commits

Author SHA1 Message Date
Stephen Birarda
be03a65dc7 remember the pid of previous child processes 2015-05-08 17:30:22 -07:00
Stephen Birarda
7b91dbfe07 wait on all children simultaneously 2015-05-08 17:24:20 -07:00
Stephen Birarda
2916596948 put back call to clearAccessCache 2015-05-08 16:54:35 -07:00
Stephen Birarda
acac2f5a22 don't init if Settings not init 2015-05-08 16:51:27 -07:00
Stephen Birarda
ddb52348bc don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
Stephen Birarda
83cd50c7ae use waitOnChildren again from checkSpares 2015-05-08 16:24:20 -07:00
Stephen Birarda
ba2ccc1e98 change waitOnChildren syntax in AC monitor 2015-05-08 16:23:44 -07:00
Stephen Birarda
78942b0a87 let QSettings destructor call Setting::Manager sync 2015-05-08 15:49:28 -07:00
Stephen Birarda
637600697b remove ScriptEngine stop completion debug 2015-05-08 15:35:48 -07:00
Stephen Birarda
8359a1a492 add debug for completion of Agent script-engine stop 2015-05-08 15:30:11 -07:00
Stephen Birarda
b5d0a31ad4 remove clear access cache on Agent stop 2015-05-08 15:25:49 -07:00
Stephen Birarda
07d8a6a8ae remove debug for current state of ACM child process 2015-05-08 15:23:22 -07:00
Stephen Birarda
4c93e395ad ask QCoreApplication to quit when PacketTypeStopNode received 2015-05-08 15:22:58 -07:00
Stephen Birarda
fe2775ca94 print out state before wait 2015-05-08 15:10:37 -07:00
Stephen Birarda
15fdcb4fe0 fix non-block, add exit code debug 2015-05-08 15:09:11 -07:00
Stephen Birarda
e092b8c537 give each child one second to clean up 2015-05-08 15:04:54 -07:00
Stephen Birarda
78a1bcdcae add helpful debug for AC monitor cleanup 2015-05-08 15:01:03 -07:00
Stephen Birarda
897ed84cca remove debug calls used to find ACApp stall 2015-05-08 14:56:49 -07:00
Stephen Birarda
8307553d1b don't call exec from ACApp ctor 2015-05-08 14:53:30 -07:00
Stephen Birarda
692c3497cd return the actual exit code from the application 2015-05-08 14:45:46 -07:00
Stephen Birarda
aca71474d8 add debugging to AC monitor to capture hang 2015-05-08 14:43:31 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Stephen Birarda
99a9f2df90 don't allow an AC monitor to take over other local ACs 2015-05-08 14:02:19 -07:00
Stephen Birarda
df6ee4c7a5 immediately terminate instead of attempting network stop 2015-05-08 12:10:13 -07:00
Stephen Birarda
69143d8677 add a script for server load testing 2015-05-08 11:57:38 -07:00
Stephen Birarda
3d06a86670 drop packets on floor when shutting down 2015-05-08 11:57:25 -07:00
Stephen Birarda
fe1b8cc52b fix entity tree reset / add OST assert for myServer 2015-05-08 11:04:22 -07:00
Stephen Birarda
be58347aec consider assignment completed when worker thread is gone 2015-05-08 10:40:04 -07:00
Stephen Birarda
b080dfc1cf change comment for AC readyRead connect 2015-05-08 10:16:39 -07:00
Stephen Birarda
0f71e93c7f ensure no new OST creation on OctreeServer shutdown 2015-05-08 10:12:14 -07:00
Stephen Birarda
bab96a7711 more connect call fixes in AssignmentClient 2015-05-08 09:29:29 -07:00
Stephen Birarda
3e0029e6e6 use .data on QPointer for slot connection 2015-05-07 17:29:31 -07:00
Stephen Birarda
a3ce02181e fix ThreadedAssignment setFinished debug 2015-05-07 17:06:09 -07:00
Stephen Birarda
4c8c24eb00 remove an extra debug 2015-05-07 17:04:45 -07:00
Stephen Birarda
d75d204ff6 standardize cleanup of ThreadedAssignments 2015-05-07 17:03:43 -07:00
Philip Rosedale
b7b62c8d42 Merge pull request #4772 from AndrewMeadows/nova
PhysicsEngine cleanup in preparation for collidable avatars
2015-05-07 14:33:35 -07:00
Seth Alves
0347af9682 minor cleanup 2015-05-07 14:03:50 -07:00
samcake
bb77ba95d0 Merge pull request #4793 from ZappoMan/moreZoneProperties
Wire up the atmosphere and skybox properties into edit.js
2015-05-07 13:48:19 -07:00
ZappoMan
20fe43c852 wire up new zone properties, fix bug in group proprties decode 2015-05-07 13:05:00 -07:00
Seth Alves
f52747d8c1 re-enable code that ignores old packets 2015-05-07 11:53:57 -07:00
ZappoMan
d9f17d010c first cut at adding new zone properties to edit tools 2015-05-07 11:41:23 -07:00
Seth Alves
d52a45b57e Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 11:30:46 -07:00
Andrew Meadows
f0618501dd fix non-physical kinematic motion
also can set objects collisionless again
2015-05-07 11:29:42 -07:00
samcake
12c26f9c3c Merge pull request #4789 from Atlante45/display_zones
Display zones
2015-05-07 11:20:46 -07:00
Atlante45
7689837463 Merge branch 'display_zones' of github.com:Atlante45/hifi into display_zones 2015-05-07 20:17:07 +02:00
Atlante45
f761ba521a Quiet compiler 2015-05-07 20:16:03 +02:00
Atlante45
591548dc38 Missing comma 2015-05-07 20:15:40 +02:00
Atlante45
faabf29e84 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 19:58:26 +02:00
Clément Brisset
8997879b02 Merge https://github.com/highfidelity/hifi into display_zones 2015-05-07 18:39:51 +01:00
Clément Brisset
345875d0c4 Merge pull request #4775 from ZappoMan/skyboxPropertiesInZones
added skybox group properties to zones, wired up color to the actual skybox rendering
2015-05-07 19:35:33 +02:00