wangyix
95b2524784
removed magic number 65536 from OctreeInboundPacketProcessor
2014-06-16 16:08:48 -07:00
wangyix
14f50f4576
removed old SentPacketHistory
2014-06-16 14:05:27 -07:00
wangyix
ebfd65dea8
added OctreeInboundPacketProcessor::process() override to send nack periodically
...
added code to remove dead nodes' stats in sendNackPackets()
2014-06-16 12:30:16 -07:00
wangyix
2b20720f51
added sendNackPackets() to OctreeInboundPacketProcessor
...
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
2014-06-16 09:57:05 -07:00
wangyix
b210b07b81
rollovers are now handled in SingleSenderStats::trackInboundPacket
2014-06-13 11:08:15 -07:00
wangyix
3d4fae4b3f
Revert "added code for AC to send nack packets; no locking yet"
...
This reverts commit 15bd0878c4
.
2014-06-13 09:58:56 -07:00
wangyix
1491216962
Revert "added locking on _singleSenderStats; untested!"
...
This reverts commit c542da9707
.
2014-06-13 09:58:45 -07:00
wangyix
c542da9707
added locking on _singleSenderStats; untested!
2014-06-12 12:03:22 -07:00
wangyix
15bd0878c4
added code for AC to send nack packets; no locking yet
2014-06-12 11:37:05 -07:00
wangyix
7955979599
added _missingSequenceNumbers tracking to OctreeInboundPacketProcessor
2014-06-12 09:17:12 -07:00
ZappoMan
2db897a00e
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-11 14:40:25 -07:00
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
ZappoMan
50bc3b03df
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-10 10:43:59 -07:00
ZappoMan
a0783f3f4a
try appendElementData() a different way
2014-06-10 10:43:50 -07:00
ZappoMan
5eb6ddbdb3
first cut at support for extra element data
2014-06-09 16:04:25 -07:00
wangyix
8312e1642d
replaced takeFirst() with dequeue() for consistency
2014-06-09 15:15:43 -07:00
ZappoMan
c5647addf4
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-09 14:10:47 -07:00
wangyix
e45f2fed4b
changed writelock to readlock
...
plus a coding standard fix
2014-06-09 13:42:45 -07:00
ZappoMan
6f1ec01797
rename nodeBag to elementBag in a bunch of places
2014-06-09 13:42:44 -07:00
wangyix
ff2a5342ee
removed another extra space
2014-06-09 12:57:50 -07:00
wangyix
412d3e19fe
removed debug prints in parseNackPacket()
2014-06-09 12:56:00 -07:00
wangyix
0fce7e721a
removed more spaces
2014-06-09 12:40:01 -07:00
wangyix
968ea3563c
removed an extra space
2014-06-09 12:37:42 -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
4c4ff45f31
removed duplicate function bodies
2014-05-29 14:31:40 -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
f361b9a8a7
removed updatePacketTimestamp()
...
..from OctreeQueryNode
2014-05-27 18:04:53 -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
715e6b8e60
debugging model editing
2014-05-02 09:10:30 -07:00
ZappoMan
aac42058ac
first cut at modelserver
2014-04-30 09:25:52 -07:00
AndrewMeadows
94fabf7875
Merge pull request #2709 from ZappoMan/shared_and_weak_pointers
...
Voxel/Particle Server Performance Improvements
2014-04-22 10:28:39 -07:00
ZappoMan
60b8ab0de5
CR feedback
2014-04-21 17:45:38 -07:00
ZappoMan
a64d3ffc32
more cleanup
2014-04-21 16:38:45 -07:00
ZappoMan
7d18dbdfb8
more cleanup
2014-04-21 16:35:42 -07:00
Atlante45
cfc778d10c
Fix regexp fail
2014-04-21 16:32:17 -07:00
ZappoMan
e55c488964
clean up some old debugging
2014-04-21 16:17:59 -07:00
Atlante45
681aab5bf0
Remove printf and replace them by qDebug()
2014-04-21 16:17:45 -07:00
ZappoMan
003e3ae507
properly unhook delete notifications
2014-04-21 16:01:37 -07:00
ZappoMan
f3aa9d3b8f
unhook node bag from element notifications on shutdown to speed up cleanup
2014-04-21 15:45:12 -07:00
ZappoMan
7a8a8e2fac
delete tree on server shutdown
2014-04-21 15:14:06 -07:00
ZappoMan
75f079e2b3
tweak debugging
2014-04-21 14:15:13 -07:00
ZappoMan
9a63fa7550
some cleanup
2014-04-21 13:36:13 -07:00
ZappoMan
7798c6eb09
some debugging
2014-04-21 11:48:58 -07:00
ZappoMan
59cbda20c6
added some threading and event debugging
2014-04-20 19:48:17 -07:00
ZappoMan
50f7db8fe1
quiet some debugging
2014-04-18 15:02:10 -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
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Stephen Birarda
7ce91b3f96
fix headers who had their comments removed
2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
ZappoMan
dc7e2dbe1b
more debugging
2014-04-01 20:14:38 -07:00
ZappoMan
97b2e68988
more debugging
2014-04-01 14:05:05 -07:00
ZappoMan
b7695ba050
more debugging
2014-04-01 13:55:25 -07:00
ZappoMan
124619f8d9
more debugging
2014-04-01 12:51:34 -07:00
ZappoMan
6cb44a4d0c
more debugging
2014-04-01 12:33:59 -07:00
ZappoMan
916a5d2da0
more debugging
2014-04-01 12:24:03 -07:00
ZappoMan
f504569655
more debugging
2014-04-01 11:49:49 -07:00
ZappoMan
58a52cf5e1
more debugging
2014-04-01 11:45:29 -07:00
ZappoMan
30ff4a1d19
more debugging
2014-04-01 11:32:35 -07:00
ZappoMan
1aa05c4de5
more debugging
2014-04-01 11:26:55 -07:00
ZappoMan
9e445098f1
more debugging
2014-04-01 11:22:44 -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
ce8a599b16
tweak
2014-04-01 10:38:21 -07:00
ZappoMan
64c7a6a440
testing, remove create sending thread and processing of query
2014-04-01 10:25:32 -07:00
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