499 commits

Author	SHA1	Message	Date
ZappoMan	ff17c6a071	quiet some debugging	2014-04-01 10:08:46 -07:00
ZappoMan	21e0bc119b	moved OctreeServer::stopTrackingThread() to destructor instead of setIsShuttingDown()	2014-04-01 09:50:10 -07:00
ZappoMan	20d944a43b	removed some debug	2014-04-01 09:31:40 -07:00
ZappoMan	6ed9b968b0	removed some extra debugging	2014-04-01 09:23:19 -07:00
ZappoMan	9df315d889	removed dead debug code	2014-03-31 20:54:58 -07:00
ZappoMan	7cd39d3ef0	add forceNodeShutdown() to handle forced shutdown of nodes in case of server shutdown	2014-03-31 20:53:34 -07:00
ZappoMan	b5c538b051	added some debugging	2014-03-31 18:22:06 -07:00
ZappoMan	9d60be9773	cleanup some debugging	2014-03-31 17:57:48 -07:00
ZappoMan	ef68f164c9	tweak shutdown	2014-03-31 17:05:31 -07:00
ZappoMan	dc302e7126	tweak shutdown	2014-03-31 16:51:00 -07:00
ZappoMan	7a683b177d	added some debugging, and reordered some shutdown logic	2014-03-31 16:43:25 -07:00
ZappoMan	5c37a79378	cleanup of debuggin	2014-03-31 15:42:16 -07:00
ZappoMan	b3734d870b	cleanup	2014-03-31 15:39:12 -07:00
ZappoMan	1eb15b0d12	cleanup	2014-03-31 15:37:53 -07:00
ZappoMan	a9d153054f	remove _process mutex since it's no longer needed	2014-03-31 15:28:13 -07:00
ZappoMan	27f42b5b86	clean up headers	2014-03-31 15:15:54 -07:00
ZappoMan	514f43c6cc	revert tweaks	2014-03-31 15:10:36 -07:00
ZappoMan	a82a583030	cleanup	2014-03-31 14:59:28 -07:00
ZappoMan	6601a0d4e9	cleaning up nodeKilled()	2014-03-31 14:54:39 -07:00
ZappoMan	6df3ff57c4	cleanup isNull() usage	2014-03-31 14:30:25 -07:00
ZappoMan	226274e98b	cleaning up SharedNodePointer usage	2014-03-31 14:24:08 -07:00
ZappoMan	0f9df4a8ee	clean up includes	2014-03-31 14:11:47 -07:00
ZappoMan	faa062f8ab	use single instance of SharedAssignmentPointer for assignment client so we actually get reference counting	2014-03-31 14:08:19 -07:00
ZappoMan	7c8295dd94	Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers	2014-03-28 11:06:02 -07:00
ZappoMan	640dbaacab	migration to shared pointers	2014-03-28 11:05:54 -07:00
Stephen Birarda	eb35b63651	use a shared pointer for more elegant cleanup at assignment conclusion	2014-03-28 10:48:44 -07:00
ZappoMan	8856a609a4	first cut at migrating to SharedOctreeServerPointer for ref count management of OctreeServer	2014-03-28 09:46:23 -07:00
ZappoMan	0cb9bec1aa	keep SharedNodePointer in the OctreeSendThread	2014-03-27 19:29:18 -07:00
ZappoMan	c540427b9e	tweaks to _processLock to reduce time it's locked	2014-03-27 15:03:46 -07:00
Stephen Birarda	0fc83d81fd	Merge pull request #2555 from ZappoMan/backtotrylockanduuid ... added back use of nodeWithUUID() instead of sharedpointer	2014-03-27 13:55:17 -07:00
ZappoMan	bda96ef935	added back use of nodeWithUUID() instead of sharedpointer	2014-03-27 13:35:22 -07:00
Stephen Birarda	21eef6c15e	make sure VoxelServer and ParticleServer are in Agent interest list	2014-03-27 13:10:03 -07:00
ZappoMan	9fdfa4a7a8	switch to using SharedNodePointer instead of UUID in octree server send thread	2014-03-27 02:33:32 -07:00
AndrewMeadows	cec3f944d7	Merge pull request #2525 from ZappoMan/scaling_work ... Voxel/Particle Server Scaling Work	2014-03-26 15:16:22 -07:00
ZappoMan	c56efb9e4c	formatting tweaks	2014-03-26 13:41:49 -07:00
ZappoMan	0451ce455f	added --statusHost config option to allow us to specify the host name of the status page	2014-03-26 13:25:38 -07:00
Stephen Birarda	28f962ea2b	fix for AudioMixer kill and re-add and no sound load in bot	2014-03-26 13:19:20 -07:00
ZappoMan	18eda50118	added thread counts to json stats	2014-03-26 13:13:55 -07:00
ZappoMan	7a3e19eb0f	Merge branch 'master' of https://github.com/worklist/hifi into scaling_work	2014-03-26 12:18:08 -07:00
ZappoMan	bc68ed1300	moved stopTrackingThread() to setIsShuttingDown() to reduce chance of object conflict	2014-03-26 11:59:55 -07:00
Stephen Birarda	962c7350f3	wait on broadcastThread before destroying AvatarMixer, closes #2499	2014-03-26 11:53:57 -07:00
ZappoMan	c3aab7337f	added more performance stats tracking to octree server	2014-03-26 11:36:35 -07:00
Stephen Birarda	e2b230445f	add a method to Agent for last read frame loudness	2014-03-26 10:28:59 -07:00
Stephen Birarda	34634af975	add mutex header to NodeData	2014-03-25 16:05:51 -07:00
Stephen Birarda	c8b3ae0c40	add a mutex to NodeData and leverage in AvatarMixer threads	2014-03-25 15:49:47 -07:00
Stephen Birarda	6f4f55038b	add back selective inclusion of Avatars based on distance	2014-03-25 15:31:53 -07:00
Stephen Birarda	6b8c60e964	remove waitForBytesWritten for initial tests	2014-03-25 15:10:53 -07:00
Stephen Birarda	292fb51b43	use performance throttling instead of distance to decide when to send	2014-03-25 15:05:17 -07:00
Stephen Birarda	269615bc40	thread broadcast of avatar data in AvatarMixer	2014-03-25 14:02:24 -07:00
Stephen Birarda	0407c6d324	use QTimer to clock broadcastAvatarData method	2014-03-25 13:50:22 -07:00