wangyix
c6a9a8924d
changed NetworkPacket::_sendingNode to ::_node
2014-06-10 16:43:53 -07:00
wangyix
5ab271330e
moved sendNack() into packetDistributor()
...
...for the purpose of enforcing packets sent per interval in
OctreeSendThread. Corrected mistake in keeping track of number of
special packets sent where sendSpecialPacket() was assumed to only send
one packet per call.
2014-06-10 15:35:48 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
wangyix
b39559d860
packet recovery seems to be working
...
Seems to impact FPS a lot. OctreeSceneStats is not being locked (causes
freezing, need to find out why).
2014-06-06 17:44:30 -07:00
wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
wangyix
5461a06e99
completed code to resend nacked packets on AC
2014-06-06 09:33:14 -07:00
wangyix
1a7e3a859c
started work on resending nacked packets
2014-06-05 18:00:58 -07:00
wangyix
6f45939113
re-enabled piggy-backing in OctreeSendThread
2014-06-04 11:02:31 -07:00
wangyix
50746a6540
extra commit of previous commit?
2014-06-03 16:19:12 -07:00
ZappoMan
758df4f58b
silence some unused variable warnings and move some debug code to only execute in debug mode
2014-06-02 10:43:50 -07:00
wangyix
d8b0b03e59
removed _sequenceNumber from OctreeSendThread
...
inlined getSequenceNumber and incrementSequenceNumber
2014-05-29 13:39:57 -07:00
wangyix
f82be105e8
moved _sequenceNumber back to OctreeQueryNode
2014-05-29 12:54:34 -07:00
wangyix
fe1a0e4565
removed debug stuff i missed
2014-05-29 11:27:14 -07:00
wangyix
c87c474877
removed debug info, cleaned code for pull req
2014-05-29 10:39:40 -07:00
wangyix
c799077379
added flag,seq,ts to ParticleErase and ModelErase
...
... this fixes unreasonable flight-time issue
2014-05-28 17:20:10 -07:00
wangyix
e89d33dc60
added if to not track ParticleErase packets
2014-05-27 18:02:49 -07:00
wangyix
fe5fabdd61
removed old code that was commented out
...
changed tabs to spaces
2014-05-23 11:17:59 -07:00
wangyix
87d927d447
moved _sequenceNumber back to OctreeQueryNode
...
instead added incrementSequenceNumber() to OctreeQueryNode for
sendthread to use
2014-05-23 10:09:46 -07:00
wangyix
2dd78b36db
moved _sequenceNumber to OctreeSendThread
2014-05-23 09:47:08 -07:00
ZappoMan
9a63fa7550
some cleanup
2014-04-21 13:36:13 -07:00
ZappoMan
2c02178802
Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers
...
Conflicts:
assignment-client/src/AssignmentClient.cpp
assignment-client/src/AssignmentClient.h
libraries/shared/src/NodeList.cpp
2014-04-18 14:28:54 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
ZappoMan
193e237285
tweaks
2014-04-01 10:58:20 -07:00
ZappoMan
9d757434ab
testing tweak
2014-04-01 10:47:25 -07:00
ZappoMan
21e0bc119b
moved OctreeServer::stopTrackingThread() to destructor instead of setIsShuttingDown()
2014-04-01 09:50:10 -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
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
7a683b177d
added some debugging, and reordered some shutdown logic
2014-03-31 16:43:25 -07:00
ZappoMan
b3734d870b
cleanup
2014-03-31 15:39:12 -07:00
ZappoMan
a9d153054f
remove _process mutex since it's no longer needed
2014-03-31 15:28:13 -07:00
ZappoMan
a82a583030
cleanup
2014-03-31 14:59:28 -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
faa062f8ab
use single instance of SharedAssignmentPointer for assignment client so we actually get reference counting
2014-03-31 14:08:19 -07:00
ZappoMan
640dbaacab
migration to shared pointers
2014-03-28 11:05:54 -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
ZappoMan
bda96ef935
added back use of nodeWithUUID() instead of sharedpointer
2014-03-27 13:35:22 -07:00
ZappoMan
9fdfa4a7a8
switch to using SharedNodePointer instead of UUID in octree server send thread
2014-03-27 02:33:32 -07:00
ZappoMan
bc68ed1300
moved stopTrackingThread() to setIsShuttingDown() to reduce chance of object conflict
2014-03-26 11:59:55 -07:00
ZappoMan
c3aab7337f
added more performance stats tracking to octree server
2014-03-26 11:36:35 -07:00
ZappoMan
3cb3cb81c4
fixes to voxel server crashes on client shutdown
2014-03-21 14:15:02 -07:00
ZappoMan
b4f5a6d1ce
add _isShuttingDown to OctreeQueryNode and bail as fast as possible when shutting down
2014-03-20 14:44:47 -07:00
ZappoMan
b3f60a068d
remove isScheduledForDelete from OctreeQueryNode
2014-03-19 00:17:14 -07:00
ZappoMan
499c4bd500
fix octree server crashes on various shutdown corner cases
2014-03-18 17:44:53 -07:00