ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vnc-enc-tight: use thread local storage for palette 

currently the color counting palette is allocated from heap, used and destroyed
for each single subrect. Use a static palette per thread for this purpose and
avoid the malloc and free for each update.

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1467280846-9674-1-git-send-email-pl@kamp.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Peter Lieven 2016-06-30 12:00:46 +02:00 committed by Gerd Hoffmann
parent 5a693efda8
commit 095497ffc6
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/vnc-enc-tight.c
View File

@ -349,7 +349,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
tight_fill_palette##bpp(VncState *vs, int x, int y, \ tight_fill_palette##bpp(VncState *vs, int x, int y, \
int max, size_t count, \ int max, size_t count, \
uint32_t *bg, uint32_t *fg, \ uint32_t *bg, uint32_t *fg, \
VncPalette **palette) { \ VncPalette *palette) { \
uint##bpp##_t *data; \ uint##bpp##_t *data; \
uint##bpp##_t c0, c1, ci; \ uint##bpp##_t c0, c1, ci; \
int i, n0, n1; \ int i, n0, n1; \
@ -396,23 +396,23 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
return 0; \ return 0; \
} \ } \
\ \
*palette = palette_new(max, bpp); \ palette_init(palette, max, bpp); \
palette_put(*palette, c0); \ palette_put(palette, c0); \
palette_put(*palette, c1); \ palette_put(palette, c1); \
palette_put(*palette, ci); \ palette_put(palette, ci); \
\ \
for (i++; i < count; i++) { \ for (i++; i < count; i++) { \
if (data[i] == ci) { \ if (data[i] == ci) { \
continue; \ continue; \
} else { \ } else { \
ci = data[i]; \ ci = data[i]; \
if (!palette_put(*palette, (uint32_t)ci)) { \ if (!palette_put(palette, (uint32_t)ci)) { \
return 0; \ return 0; \
} \ } \
} \ } \
} \ } \
\ \
return palette_size(*palette); \ return palette_size(palette); \
} }
DEFINE_FILL_PALETTE_FUNCTION(8) DEFINE_FILL_PALETTE_FUNCTION(8)
@ -421,7 +421,7 @@ DEFINE_FILL_PALETTE_FUNCTION(32)
static int tight_fill_palette(VncState *vs, int x, int y, static int tight_fill_palette(VncState *vs, int x, int y,
size_t count, uint32_t *bg, uint32_t *fg, size_t count, uint32_t *bg, uint32_t *fg,
VncPalette **palette) VncPalette *palette)
{ {
int max; int max;
@ -1457,9 +1457,11 @@ static int send_sub_rect_jpeg(VncState *vs, int x, int y, int w, int h,
} }
#endif #endif
static __thread VncPalette color_count_palette;
static int send_sub_rect(VncState *vs, int x, int y, int w, int h) static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
{ {
VncPalette *palette = NULL; VncPalette *palette = &color_count_palette;
uint32_t bg = 0, fg = 0; uint32_t bg = 0, fg = 0;
int colors; int colors;
int ret = 0; int ret = 0;
@ -1488,7 +1490,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
} }
#endif #endif
colors = tight_fill_palette(vs, x, y, w * h, &bg, &fg, &palette); colors = tight_fill_palette(vs, x, y, w * h, &bg, &fg, palette);
#ifdef CONFIG_VNC_JPEG #ifdef CONFIG_VNC_JPEG
if (allow_jpeg && vs->tight.quality != (uint8_t)-1) { if (allow_jpeg && vs->tight.quality != (uint8_t)-1) {
@ -1501,7 +1503,6 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette); ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette);
#endif #endif
palette_destroy(palette);
return ret; return ret;
} }