jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

frame ack fix change, cleanup

Browse Source
This commit is contained in:
Jay Sorg 2017-03-01 21:30:54 -08:00 committed by jsorg71
parent 30a7a947b1
commit 3b056ec052
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xrdp/xrdp_encoder.c
View File

@ -136,6 +136,9 @@ xrdp_encoder_create(struct xrdp_mm *mm)
g_snprintf(buf, 1024, "xrdp_%8.8x_encoder_term", pid); g_snprintf(buf, 1024, "xrdp_%8.8x_encoder_term", pid);
self->xrdp_encoder_term = g_create_wait_obj(buf); self->xrdp_encoder_term = g_create_wait_obj(buf);
self->max_compressed_bytes = client_info->max_fastpath_frag_bytes & ~15; self->max_compressed_bytes = client_info->max_fastpath_frag_bytes & ~15;
self->frames_in_flight = client_info->max_unacknowledged_frame_count;
/* make sure frames_in_flight is at least 1 */
self->frames_in_flight = MAX(self->frames_in_flight, 1);
/* create thread to process messages */ /* create thread to process messages */
tc_thread_create(proc_enc_msg, self); tc_thread_create(proc_enc_msg, self);

1
xrdp/xrdp_encoder.h
View File

@ -26,6 +26,7 @@ struct xrdp_encoder
int frame_id_client; /* last frame id received from client */ int frame_id_client; /* last frame id received from client */
int frame_id_server; /* last frame id received from Xorg */ int frame_id_server; /* last frame id received from Xorg */
int frame_id_server_sent; int frame_id_server_sent;
int frames_in_flight;
}; };
/* used when scheduling tasks in xrdp_encoder.c */ /* used when scheduling tasks in xrdp_encoder.c */

8
xrdp/xrdp_mm.c
View File

@ -2274,6 +2274,7 @@ xrdp_mm_check_wait_objs(struct xrdp_mm *self)
if (enc_done->last) if (enc_done->last)
{ {
LLOGLN(10, ("xrdp_mm_check_wait_objs: last set")); LLOGLN(10, ("xrdp_mm_check_wait_objs: last set"));
self->encoder->frame_id_server = enc_done->enc->frame_id;
if (use_frame_acks == 0) if (use_frame_acks == 0)
{ {
self->mod->mod_frame_ack(self->mod, self->mod->mod_frame_ack(self->mod,
@ -2282,7 +2283,7 @@ xrdp_mm_check_wait_objs(struct xrdp_mm *self)
} }
else else
{ {
ex = self->wm->client_info->max_unacknowledged_frame_count; ex = self->encoder->frames_in_flight;
if (self->encoder->frame_id_client + ex > self->encoder->frame_id_server) if (self->encoder->frame_id_client + ex > self->encoder->frame_id_server)
{ {
if (self->encoder->frame_id_server > self->encoder->frame_id_server_sent) if (self->encoder->frame_id_server > self->encoder->frame_id_server_sent)
@ -2323,9 +2324,9 @@ xrdp_mm_frame_ack(struct xrdp_mm *self, int frame_id)
{ {
return 1; return 1;
} }
ex = self->wm->client_info->max_unacknowledged_frame_count; ex = self->encoder->frames_in_flight;
/* make sure we won't have too many in-flight frames */ /* make sure we won't have too many in-flight frames */
if (self->encoder->frame_id_client + ex >= self->encoder->frame_id_server) if (self->encoder->frame_id_client + ex > self->encoder->frame_id_server)
{ {
if (self->encoder->frame_id_server > self->encoder->frame_id_server_sent) if (self->encoder->frame_id_server > self->encoder->frame_id_server_sent)
{ {
@ -2597,7 +2598,6 @@ server_paint_rects(struct xrdp_mod* mod, int num_drects, short *drects,
enc_data->height = height; enc_data->height = height;
enc_data->flags = flags; enc_data->flags = flags;
enc_data->frame_id = frame_id; enc_data->frame_id = frame_id;
mm->encoder->frame_id_server = frame_id;
if (width == 0 || height == 0) if (width == 0 || height == 0)
{ {
LLOGLN(10, ("server_paint_rects: error")); LLOGLN(10, ("server_paint_rects: error"));