Stephen Birarda
|
ca87d64dc7
|
fix for audio-mixer shutdown hang, removing spaces
|
2015-05-13 12:03:21 -07:00 |
|
Stephen Birarda
|
a6ce721586
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-05-11 16:20:16 -07:00 |
|
Stephen Birarda
|
7b903d29e7
|
fix missed conflict on merge with upstream/master
|
2015-05-11 12:58:00 -07:00 |
|
Seth Alves
|
83748096ef
|
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
|
2015-05-11 11:37:53 -07:00 |
|
Stephen Birarda
|
8c6715e4fc
|
resolve conflicts on merge with upstream/master
|
2015-05-11 11:10:22 -07:00 |
|
Stephen Birarda
|
2dc866755d
|
fix OS comments, remove test call from Agent
|
2015-05-11 09:56:10 -07:00 |
|
Stephen Birarda
|
ebeba81233
|
make sure an ACM asks for PID in log
|
2015-05-08 17:37:48 -07:00 |
|
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
|
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
|
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
|
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
|
805250d1e1
|
don't double conditional to fire SN assert
|
2015-05-08 09:25:44 -07:00 |
|
Stephen Birarda
|
3e0029e6e6
|
use .data on QPointer for slot connection
|
2015-05-07 17:29:31 -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 |
|
Stephen Birarda
|
bfccf02912
|
use lamdbas for linkedDataCreateCallback
|
2015-05-07 15:37:02 -07:00 |
|
Stephen Birarda
|
790f7a08cf
|
clean up sequence numbers for killed sending nodes
|
2015-05-07 14:34:06 -07:00 |
|
Stephen Birarda
|
fe011e6752
|
keep track of out of order sends in AM
|
2015-05-07 14:13:27 -07:00 |
|
Stephen Birarda
|
b3f7ec1545
|
keep track of starves and skips on other avatars
|
2015-05-06 16:49:51 -07:00 |
|
Stephen Birarda
|
e540a6dbb3
|
fix packet sequence number unmarshal
|
2015-05-06 14:48:10 -07:00 |
|
Stephen Birarda
|
ff676958e8
|
fix hash replacement in PacketHeaders
|
2015-05-06 14:24:11 -07:00 |
|
Stephen Birarda
|
0d1c1bf8dd
|
lock NodeData when attempting to read stats
|
2015-05-06 11:51:46 -07:00 |
|
Stephen Birarda
|
460abd85b9
|
don't double send data to a receiver
|
2015-05-06 11:35:45 -07:00 |
|
Stephen Birarda
|
3887467048
|
store last broadcasted sequence number
|
2015-05-06 10:41:24 -07:00 |
|
Stephen Birarda
|
6b3cf1ba4a
|
remove dependency of PacketHeaders on NodeList
|
2015-05-05 12:19:42 -07:00 |
|
Stephen Birarda
|
31bbf15a55
|
remove unused variable
|
2015-05-04 11:30:56 -07:00 |
|
Stephen Birarda
|
6cff75f7c1
|
resolve conflicts on merge with upstream/master
|
2015-05-04 10:05:44 -07:00 |
|
Stephen Birarda
|
274e98974b
|
Merge pull request #4734 from Atlante45/ac_fix
Fix for bot_procedural
|
2015-05-04 12:44:08 -04:00 |
|
Seth Alves
|
9f1cb2a4e5
|
fix kill/terminate order
|
2015-05-01 16:56:39 -07:00 |
|