… | |
… | |
30 | * |
30 | * |
31 | * loop.c mainly deals with initialization and higher level socket |
31 | * loop.c mainly deals with initialization and higher level socket |
32 | * maintanance (checking for lost connections and if data has arrived.) |
32 | * maintanance (checking for lost connections and if data has arrived.) |
33 | */ |
33 | */ |
34 | |
34 | |
35 | #define BG_SCRUB_RATE 4 // how often to send a face in the background |
|
|
36 | |
|
|
37 | #include <global.h> |
35 | #include <global.h> |
38 | #include <sproto.h> |
36 | #include <sproto.h> |
39 | #include <sockproto.h> |
37 | #include <sockproto.h> |
40 | |
38 | |
41 | #include <sys/types.h> |
39 | #include <sys/types.h> |
… | |
… | |
47 | #include <unistd.h> |
45 | #include <unistd.h> |
48 | #include <arpa/inet.h> |
46 | #include <arpa/inet.h> |
49 | |
47 | |
50 | #include <loader.h> |
48 | #include <loader.h> |
51 | |
49 | |
|
|
50 | #define BG_SCRUB_RATE 4 // how often to send a face in the background |
|
|
51 | |
52 | #define MAX_QUEUE_DEPTH 500 //TODO |
52 | #define MAX_QUEUE_DEPTH 500 |
53 | #define MAX_QUEUE_BACKLOG 3. //TODO |
53 | #define MAX_QUEUE_BACKLOG 3. |
54 | |
54 | |
55 | void |
55 | void |
56 | client::reset_state () |
56 | client::reset_state () |
57 | { |
57 | { |
58 | if (!pl) |
58 | if (!pl) |
… | |
… | |
63 | } |
63 | } |
64 | |
64 | |
65 | void |
65 | void |
66 | client::queue_command (packet_type *handler, char *data, int datalen) |
66 | client::queue_command (packet_type *handler, char *data, int datalen) |
67 | { |
67 | { |
68 | tstamp stamp = now (); |
68 | tstamp stamp = NOW; |
69 | |
69 | |
70 | if (cmd_queue.size () >= MAX_QUEUE_DEPTH) |
70 | if (cmd_queue.size () >= MAX_QUEUE_DEPTH) |
71 | { |
71 | { |
72 | //TODO: just disconnect here? |
72 | //TODO: just disconnect here? |
73 | reset_state (); |
73 | reset_state (); |
… | |
… | |
91 | && state == ST_PLAYING |
91 | && state == ST_PLAYING |
92 | && pl->ob->speed_left > 0.f) |
92 | && pl->ob->speed_left > 0.f) |
93 | { |
93 | { |
94 | command &cmd = cmd_queue.front (); |
94 | command &cmd = cmd_queue.front (); |
95 | |
95 | |
96 | if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) |
96 | if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW) |
97 | { |
97 | { |
98 | reset_state (); |
98 | reset_state (); |
99 | send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); |
99 | send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); |
100 | } |
100 | } |
101 | else |
101 | else |
… | |
… | |
123 | * |
123 | * |
124 | */ |
124 | */ |
125 | void |
125 | void |
126 | doeric_server (void) |
126 | doeric_server (void) |
127 | { |
127 | { |
128 | #ifdef CS_LOGSTATS |
|
|
129 | if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) |
|
|
130 | write_cs_stats (); |
|
|
131 | #endif |
|
|
132 | |
|
|
133 | //TODO: should not be done here, either |
128 | //TODO: should not be done here, either |
134 | for (unsigned i = 0; i < clients.size (); ++i) |
129 | for (unsigned i = 0; i < clients.size (); ++i) |
135 | { |
130 | { |
136 | client *ns = clients [i]; |
131 | client *ns = clients [i]; |
137 | |
132 | |
… | |
… | |
162 | draw_client_map (pl); |
157 | draw_client_map (pl); |
163 | |
158 | |
164 | if (update_look) |
159 | if (update_look) |
165 | esrv_draw_look (pl); |
160 | esrv_draw_look (pl); |
166 | |
161 | |
167 | if (askface.empty () && !partial_face_ofs) |
162 | if (ixface.empty () && !partial_face_ofs) |
168 | { |
163 | { |
169 | // regularly send a new face when queue is empty |
164 | // regularly send a new face when queue is empty |
170 | if (bg_scrub && !--bg_scrub && enable_bg_scrub) |
165 | if (bg_scrub && !--bg_scrub && enable_bg_scrub) |
171 | while (scrub_idx < faces.size () - 1) |
166 | while (scrub_idx < faces.size () - 1) |
172 | { |
167 | { |
… | |
… | |
190 | rate_avail = min (max_rate, rate_avail + max_rate); |
185 | rate_avail = min (max_rate, rate_avail + max_rate); |
191 | rate_avail -= ol; |
186 | rate_avail -= ol; |
192 | |
187 | |
193 | int avail = rate_avail; |
188 | int avail = rate_avail; |
194 | |
189 | |
195 | // if we can split images, transfer up to mss packets if possible |
190 | // if we can split images, transfer up to mss-sized packets if possible |
196 | // but never more 768 bytes more. |
191 | // but never 768 bytes more. |
197 | if (fxix) avail += min (768, mss - (ol % mss)); |
192 | if (fxix) avail += min (768, mss - (ol % mss)); |
198 | |
193 | |
199 | bg_scrub = BG_SCRUB_RATE; |
194 | bg_scrub = BG_SCRUB_RATE; |
200 | |
195 | |
201 | while (avail > 0) |
196 | while (avail > 0) |
202 | { |
197 | { |
203 | if (partial_face_ofs) |
198 | if (partial_face_ofs) |
204 | { |
199 | { |
205 | if (facedata *d = face_data (partial_face, faceset)) |
200 | if (facedata *d = face_data (partial_face, faceset)) |
206 | { |
201 | { |
207 | // 9 bytes is enough for fx_FFFOOO, 40 leaves some room |
202 | // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data |
208 | int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs); |
203 | int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs); |
209 | |
204 | |
210 | if (chunk <= 0) |
205 | if (chunk <= 0) |
211 | break; |
206 | break; |
212 | |
207 | |
… | |
… | |
221 | send_packet (sl); |
216 | send_packet (sl); |
222 | } |
217 | } |
223 | else |
218 | else |
224 | partial_face_ofs = 0; |
219 | partial_face_ofs = 0; |
225 | } |
220 | } |
226 | else if (!askface.empty ()) |
221 | else if (!ixface.empty ()) |
227 | { |
222 | { |
228 | // use a lifo to send most recently requested images |
223 | // use a lifo to send most recently requested images |
229 | faceidx facenum = askface.back (); |
224 | faceidx facenum = ixface.back (); |
230 | askface.pop_back (); |
225 | ixface.pop_back (); |
231 | |
226 | |
232 | if (fxix) |
227 | if (fxix) |
233 | { |
228 | { |
234 | if (facedata *d = face_data (facenum, faceset)) |
229 | if (facedata *d = face_data (facenum, faceset)) |
235 | { |
230 | { |