Commit graph

90 commits

Author SHA1 Message Date
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
d9e60f502c clean up server name 2013-12-04 19:46:03 -08:00
ZappoMan
b3e9d369e4 removed all dead VoxelServer code, now mostly handled by OctreeServer 2013-12-04 19:20:11 -08:00
ZappoMan
5ff12ab8d1 first cut at getting voxel server based on octree server 2013-12-04 17:41:52 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
2013-12-04 11:40:54 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Stephen Birarda
8fbd1e4cfb repairs after merge with upstream master 2013-12-03 12:28:44 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Stephen Birarda
3d14fba7ab have AssignmentFactory return a ThreadedAssignment 2013-12-03 12:14:24 -08:00
Stephen Birarda
5143c68b91 fix packet sending from VoxelScriptingInterface 2013-12-03 12:09:47 -08:00
Stephen Birarda
6f7e16dc22 hook VS to new QCA infrastructure 2013-12-03 11:11:08 -08:00
Stephen Birarda
606eaa579a switch node pinging to QTimer in QCoreApplication instance 2013-12-03 10:57:31 -08:00
Stephen Birarda
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
ZappoMan
7cc5339702 cleanup comments and coding standard 2013-11-27 07:40:23 -08:00
ZappoMan
491512fbce major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:26:54 -08:00
ZappoMan
78d39ed948 added timing details for better debugging and results measurement 2013-11-25 10:41:07 -08:00
ZappoMan
8bb2bd2ecf get voxel packet statistics to work and add them to server status page 2013-11-25 00:26:37 -08:00
ZappoMan
cb56ad2e2f fix a couple of bugs in display of voxel stats on server status 2013-11-21 10:43:40 -08:00
ZappoMan
1a4ffcec93 removing more noise and dont sleep if we failed to lock the node 2013-11-13 16:24:01 -08:00
ZappoMan
ba9cd6fdd4 removing more noise 2013-11-13 16:04:21 -08:00
ZappoMan
5b09248ba9 remove noisy debugging 2013-11-13 15:15:54 -08:00
ZappoMan
4640d337b7 added more noisy debugging 2013-11-13 13:47:39 -08:00
ZappoMan
4ac6338b8b added Noisy debugging to voxel server main loop 2013-11-13 12:54:34 -08:00
ZappoMan
2b604864d6 fix bug where VoxelEditPacketSender oversends to unknown jurisdictions 2013-11-12 00:35:55 -08:00
ZappoMan
c625d79fd2 removed comment 2013-11-11 17:27:29 -08:00
ZappoMan
59cfa89f1b fixed CR feedback 2013-11-11 17:26:04 -08:00
ZappoMan
0eace966e9 added support to also show inbound packet stats per sender 2013-11-11 17:20:31 -08:00
ZappoMan
af8438b098 add stats to voxel server to show average voxel edit packet statistics 2013-11-11 16:31:36 -08:00
ZappoMan
2e8cb63abb add more voxel edit transit time debugging 2013-11-08 10:47:47 -08:00
ZappoMan
a75e577d0a voxel edit packet debugging support 2013-11-08 09:32:06 -08:00
ZappoMan
fffbdb1db0 reverted code 2013-11-07 15:52:19 -08:00
ZappoMan
385865c6c1 remove comment 2013-11-07 15:25:21 -08:00
ZappoMan
ce41477f46 fix VS crash on domain server restart 2013-11-07 15:23:23 -08:00
ZappoMan
77ba88e56d removed dead comment 2013-11-07 13:06:57 -08:00
ZappoMan
b5f6a51728 fix thread contention issues and VS crash on domain server shutdown and restart 2013-11-07 13:03:04 -08:00
ZappoMan
f9291e6e5c implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer 2013-11-06 15:22:17 -08:00
ZappoMan
0da28fd44c debbugging for node shutdown in VS 2013-11-06 11:20:40 -08:00
ZappoMan
1b18b53cfd removed force_crash by default 2013-11-06 00:09:37 -08:00
ZappoMan
c1b22dfdd6 added force_crash to test crashing behavior 2013-11-06 00:00:21 -08:00
ZappoMan
58b74e1f58 added uptime/start time to server status page, and disabled noisy debuggin 2013-11-05 20:49:20 -08:00
ZappoMan
e89079e86c add server config to the status page 2013-11-04 15:32:53 -08:00
Stephen Birarda
9e3de05e97 activate public socket if a node sends data to VS and AM 2013-10-31 13:55:26 -07:00
ZappoMan
3b04eabe8a made sending environments off by default 2013-10-29 15:46:23 -07:00
ZappoMan
f12064c647 clean up voxel server stats page 2013-10-28 13:24:25 -07:00
ZappoMan
03b2ace488 moved blended _children union into BLENDED_UNION_CHILDREN 2013-10-28 12:54:37 -07:00
Stephen Birarda
b1a7e7c052 make the NodeList handle ping reply packets in VS 2013-10-24 17:03:49 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
Stephen Birarda
b4a2214d26 add notion of pool back to assignment 2013-10-22 11:43:06 -07:00
Stephen Birarda
bd806241fd don't attempt to send in UDPSocket with NULL destAddress 2013-10-17 17:01:15 -07:00