summaryrefslogtreecommitdiffstats
path: root/xrdp
diff options
context:
space:
mode:
authorLaxmikant Rashinkar <LK.Rashinkar@gmail.com>2014-03-16 11:08:13 -0700
committerLaxmikant Rashinkar <LK.Rashinkar@gmail.com>2014-03-16 11:08:13 -0700
commit40ec8a1714c0772c436db09e0678cc02000bd36f (patch)
treec13bf3796166096ca42b53fa5315b0ebc07b2615 /xrdp
parent9470b031aaf27e58b9eeb8df90574c30ac55935e (diff)
parent8f05bee2389c08dd2abd630941b544425c5ba7f1 (diff)
downloadxrdp-proprietary-40ec8a1714c0772c436db09e0678cc02000bd36f.tar.gz
xrdp-proprietary-40ec8a1714c0772c436db09e0678cc02000bd36f.zip
Merge branch 'devel' of github.com:/neutrinolabs/xrdp into devel
Diffstat (limited to 'xrdp')
-rw-r--r--xrdp/xrdp.h6
-rw-r--r--xrdp/xrdp_bitmap.c244
-rw-r--r--xrdp/xrdp_cache.c346
-rw-r--r--xrdp/xrdp_painter.c5
-rw-r--r--xrdp/xrdp_types.h21
5 files changed, 421 insertions, 201 deletions
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h
index 5dc20ecd..0812a74f 100644
--- a/xrdp/xrdp.h
+++ b/xrdp/xrdp.h
@@ -26,6 +26,7 @@
#include "parse.h"
#include "trans.h"
#include "list.h"
+#include "list16.h"
#include "libxrdpinc.h"
#include "xrdp_constants.h"
#include "xrdp_types.h"
@@ -206,6 +207,8 @@ xrdp_bitmap_copy_box(struct xrdp_bitmap* self,
struct xrdp_bitmap* dest,
int x, int y, int cx, int cy);
int APP_CC
+xrdp_bitmap_hash_crc(struct xrdp_bitmap *self);
+int APP_CC
xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap* self,
struct xrdp_bitmap* dest,
int x, int y, int cx, int cy);
@@ -213,9 +216,6 @@ int APP_CC
xrdp_bitmap_compare(struct xrdp_bitmap* self,
struct xrdp_bitmap* b);
int APP_CC
-xrdp_bitmap_compare_with_crc(struct xrdp_bitmap* self,
- struct xrdp_bitmap* b);
-int APP_CC
xrdp_bitmap_invalidate(struct xrdp_bitmap* self, struct xrdp_rect* rect);
int APP_CC
xrdp_bitmap_def_proc(struct xrdp_bitmap* self, int msg,
diff --git a/xrdp/xrdp_bitmap.c b/xrdp/xrdp_bitmap.c
index 46fb6401..49750221 100644
--- a/xrdp/xrdp_bitmap.c
+++ b/xrdp/xrdp_bitmap.c
@@ -23,9 +23,22 @@
#include "xrdp.h"
#include "log.h"
-
-static int g_crc_seed = 0xffffffff;
-static int g_crc_table[256] =
+#include "crc16.h"
+
+#define LLOG_LEVEL 1
+#define LLOGLN(_level, _args) \
+ do \
+ { \
+ if (_level < LLOG_LEVEL) \
+ { \
+ g_write("xrdp:xrdp_bitmap [%10.10u]: ", g_time3()); \
+ g_writeln _args ; \
+ } \
+ } \
+ while (0)
+
+
+static const int g_crc_table[256] =
{
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
@@ -72,10 +85,10 @@ static int g_crc_table[256] =
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
-#define CRC_START(in_crc) (in_crc) = g_crc_seed
+#define CRC_START(in_crc) (in_crc) = 0xFFFFFFFF
#define CRC_PASS(in_pixel, in_crc) \
(in_crc) = g_crc_table[((in_crc) ^ (in_pixel)) & 0xff] ^ ((in_crc) >> 8)
-#define CRC_END(in_crc) (in_crc) = ((in_crc) ^ g_crc_seed)
+#define CRC_END(in_crc) (in_crc) = ((in_crc) ^ 0xFFFFFFFF)
/*****************************************************************************/
struct xrdp_bitmap *APP_CC
@@ -716,11 +729,17 @@ xrdp_bitmap_copy_box(struct xrdp_bitmap *self,
struct xrdp_bitmap *dest,
int x, int y, int cx, int cy)
{
- int i = 0;
- int j = 0;
- int destx = 0;
- int desty = 0;
- int pixel = 0;
+ int i;
+ int destx;
+ int desty;
+ int incs;
+ int incd;
+ tui8 *s8;
+ tui8 *d8;
+ tui16 *s16;
+ tui16 *d16;
+ tui32 *s32;
+ tui32 *d32;
if (self == 0)
{
@@ -762,35 +781,54 @@ xrdp_bitmap_copy_box(struct xrdp_bitmap *self,
if (self->bpp == 24)
{
+ s32 = ((tui32 *)(self->data)) + (self->width * y + x);
+ d32 = ((tui32 *)(dest->data)) + (dest->width * desty + destx);
+ incs = self->width - cx;
+ incd = dest->width - cx;
+
for (i = 0; i < cy; i++)
{
- for (j = 0; j < cx; j++)
- {
- pixel = GETPIXEL32(self->data, j + x, i + y, self->width);
- SETPIXEL32(dest->data, j + destx, i + desty, dest->width, pixel);
- }
+ g_memcpy(d32, s32, cx * 4);
+ s32 += cx;
+ d32 += cx;
+
+ s32 += incs;
+ d32 += incd;
}
+
}
else if (self->bpp == 15 || self->bpp == 16)
{
+ s16 = ((tui16 *)(self->data)) + (self->width * y + x);
+ d16 = ((tui16 *)(dest->data)) + (dest->width * desty + destx);
+ incs = self->width - cx;
+ incd = dest->width - cx;
+
for (i = 0; i < cy; i++)
{
- for (j = 0; j < cx; j++)
- {
- pixel = GETPIXEL16(self->data, j + x, i + y, self->width);
- SETPIXEL16(dest->data, j + destx, i + desty, dest->width, pixel);
- }
+ g_memcpy(d16, s16, cx * 2);
+ s16 += cx;
+ d16 += cx;
+
+ s16 += incs;
+ d16 += incd;
}
}
else if (self->bpp == 8)
{
+ s8 = ((tui8 *)(self->data)) + (self->width * y + x);
+ d8 = ((tui8 *)(dest->data)) + (dest->width * desty + destx);
+ incs = self->width - cx;
+ incd = dest->width - cx;
+
for (i = 0; i < cy; i++)
{
- for (j = 0; j < cx; j++)
- {
- pixel = GETPIXEL8(self->data, j + x, i + y, self->width);
- SETPIXEL8(dest->data, j + destx, i + desty, dest->width, pixel);
- }
+ g_memcpy(d8, s8, cx);
+ s8 += cx;
+ d8 += cx;
+
+ s8 += incs;
+ d8 += incd;
}
}
else
@@ -802,6 +840,51 @@ xrdp_bitmap_copy_box(struct xrdp_bitmap *self,
}
/*****************************************************************************/
+int APP_CC
+xrdp_bitmap_hash_crc(struct xrdp_bitmap *self)
+{
+ void *hash;
+ int bytes;
+ int crc;
+ int index;
+ char hash_data[16];
+
+ if (self->bpp == 24)
+ {
+ bytes = self->width * self->height * 4;
+ }
+ else if (self->bpp == 15 || self->bpp == 16)
+ {
+ bytes = self->width * self->height * 2;
+ }
+ else if (self->bpp == 8)
+ {
+ bytes = self->width * self->height;
+ }
+ else
+ {
+ return 1;
+ }
+ hash = ssl_md5_info_create();
+ ssl_md5_transform(hash, self->data, bytes);
+ ssl_md5_complete(hash, hash_data);
+ ssl_md5_info_delete(hash);
+ CRC_START(crc);
+ CRC_PASS(self->width, crc);
+ CRC_PASS(self->width >> 8, crc);
+ CRC_PASS(self->height, crc);
+ CRC_PASS(self->height >> 8, crc);
+ for (index = 0; index < 16; index++)
+ {
+ CRC_PASS(hash_data[index], crc);
+ }
+ CRC_END(crc);
+ self->crc32 = crc;
+ self->crc16 = self->crc32 & 0xffff;
+ return 0;
+}
+
+/*****************************************************************************/
/* copy part of self at x, y to 0, 0 in dest */
/* returns error */
int APP_CC
@@ -809,20 +892,20 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
struct xrdp_bitmap *dest,
int x, int y, int cx, int cy)
{
- int i = 0;
- int j = 0;
- int destx = 0;
- int desty = 0;
- int pixel = 0;
- int crc = 0;
- int incs = 0;
- int incd = 0;
- unsigned char *s8 = (unsigned char *)NULL;
- unsigned char *d8 = (unsigned char *)NULL;
- unsigned short *s16 = (unsigned short *)NULL;
- unsigned short *d16 = (unsigned short *)NULL;
- unsigned int *s32;
- unsigned int *d32;
+ int i;
+ int j;
+ int destx;
+ int desty;
+ int pixel;
+ int crc;
+ int incs;
+ int incd;
+ tui8 *s8;
+ tui8 *d8;
+ tui16 *s16;
+ tui16 *d16;
+ tui32 *s32;
+ tui32 *d32;
if (self == 0)
{
@@ -864,47 +947,54 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
CRC_START(crc);
+ CRC_PASS(self->width, crc);
+ CRC_PASS(self->width >> 8, crc);
+
+ CRC_PASS(self->height, crc);
+ CRC_PASS(self->height >> 8, crc);
+
if (self->bpp == 24)
{
- s32 = ((unsigned int *)(self->data)) + (self->width * y + x);
- d32 = ((unsigned int *)(dest->data)) + (dest->width * desty + destx);
+ s32 = ((tui32 *)(self->data)) + (self->width * y + x);
+ d32 = ((tui32 *)(dest->data)) + (dest->width * desty + destx);
incs = self->width - cx;
incd = dest->width - cx;
for (i = 0; i < cy; i++)
{
j = 0;
+
while (j < cx - 4)
{
pixel = *s32;
+ *d32 = pixel;
CRC_PASS(pixel, crc);
CRC_PASS(pixel >> 8, crc);
CRC_PASS(pixel >> 16, crc);
- *d32 = pixel;
s32++;
d32++;
pixel = *s32;
+ *d32 = pixel;
CRC_PASS(pixel, crc);
CRC_PASS(pixel >> 8, crc);
CRC_PASS(pixel >> 16, crc);
- *d32 = pixel;
s32++;
d32++;
pixel = *s32;
+ *d32 = pixel;
CRC_PASS(pixel, crc);
CRC_PASS(pixel >> 8, crc);
CRC_PASS(pixel >> 16, crc);
- *d32 = pixel;
s32++;
d32++;
pixel = *s32;
+ *d32 = pixel;
CRC_PASS(pixel, crc);
CRC_PASS(pixel >> 8, crc);
CRC_PASS(pixel >> 16, crc);
- *d32 = pixel;
s32++;
d32++;
@@ -913,10 +1003,10 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
while (j < cx)
{
pixel = *s32;
+ *d32 = pixel;
CRC_PASS(pixel, crc);
CRC_PASS(pixel >> 8, crc);
CRC_PASS(pixel >> 16, crc);
- *d32 = pixel;
s32++;
d32++;
@@ -929,8 +1019,8 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
}
else if (self->bpp == 15 || self->bpp == 16)
{
- s16 = ((unsigned short *)(self->data)) + (self->width * y + x);
- d16 = ((unsigned short *)(dest->data)) + (dest->width * desty + destx);
+ s16 = ((tui16 *)(self->data)) + (self->width * y + x);
+ d16 = ((tui16 *)(dest->data)) + (dest->width * desty + destx);
incs = self->width - cx;
incd = dest->width - cx;
@@ -939,9 +1029,9 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
for (j = 0; j < cx; j++)
{
pixel = *s16;
+ *d16 = pixel;
CRC_PASS(pixel, crc);
CRC_PASS(pixel >> 8, crc);
- *d16 = pixel;
s16++;
d16++;
}
@@ -952,8 +1042,8 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
}
else if (self->bpp == 8)
{
- s8 = ((unsigned char *)(self->data)) + (self->width * y + x);
- d8 = ((unsigned char *)(dest->data)) + (dest->width * desty + destx);
+ s8 = ((tui8 *)(self->data)) + (self->width * y + x);
+ d8 = ((tui8 *)(dest->data)) + (dest->width * desty + destx);
incs = self->width - cx;
incd = dest->width - cx;
@@ -962,8 +1052,8 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
for (j = 0; j < cx; j++)
{
pixel = *s8;
- CRC_PASS(pixel, crc);
*d8 = pixel;
+ CRC_PASS(pixel, crc);
s8++;
d8++;
}
@@ -978,7 +1068,14 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap *self,
}
CRC_END(crc);
- dest->crc = crc;
+ dest->crc32 = crc;
+ dest->crc16 = dest->crc32 & 0xffff;
+
+ LLOGLN(10, ("xrdp_bitmap_copy_box_with_crc: crc16 0x%4.4x",
+ dest->crc16));
+ LLOGLN(10, ("xrdp_bitmap_copy_box_with_crc: width %d height %d",
+ dest->width, dest->height));
+
return 0;
}
@@ -988,45 +1085,8 @@ int APP_CC
xrdp_bitmap_compare(struct xrdp_bitmap *self,
struct xrdp_bitmap *b)
{
- if (self == 0)
- {
- return 0;
- }
-
- if (b == 0)
- {
- return 0;
- }
+ LLOGLN(10, ("xrdp_bitmap_compare:"));
- if (self->bpp != b->bpp)
- {
- return 0;
- }
-
- if (self->width != b->width)
- {
- return 0;
- }
-
- if (self->height != b->height)
- {
- return 0;
- }
-
- if (g_memcmp(self->data, b->data, b->height * b->line_size) == 0)
- {
- return 1;
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-/* returns true if they are the same, else returns false */
-int APP_CC
-xrdp_bitmap_compare_with_crc(struct xrdp_bitmap *self,
- struct xrdp_bitmap *b)
-{
if (self == 0)
{
return 0;
@@ -1052,7 +1112,7 @@ xrdp_bitmap_compare_with_crc(struct xrdp_bitmap *self,
return 0;
}
- if (self->crc == b->crc)
+ if (g_memcmp(self->data, b->data, b->height * b->line_size) == 0)
{
return 1;
}
diff --git a/xrdp/xrdp_cache.c b/xrdp/xrdp_cache.c
index 22bbea3c..9c8098f6 100644
--- a/xrdp/xrdp_cache.c
+++ b/xrdp/xrdp_cache.c
@@ -20,6 +20,7 @@
#include "xrdp.h"
#include "log.h"
+#include "crc16.h"
#define LLOG_LEVEL 1
#define LLOGLN(_level, _args) \
@@ -34,6 +35,59 @@
while (0)
/*****************************************************************************/
+static int APP_CC
+xrdp_cache_reset_lru(struct xrdp_cache *self)
+{
+ int index;
+ int jndex;
+ struct xrdp_lru_item *lru;
+
+ for (index = 0; index < XRDP_MAX_BITMAP_CACHE_ID; index++)
+ {
+ /* fist item */
+ lru = &(self->bitmap_lrus[index][0]);
+ lru->next = 1;
+ lru->prev = -1;
+ /* middle items */
+ for (jndex = 1; jndex < XRDP_MAX_BITMAP_CACHE_IDX - 1; jndex++)
+ {
+ lru = &(self->bitmap_lrus[index][jndex]);
+ lru->next = jndex + 1;
+ lru->prev = jndex - 1;
+ }
+ /* last item */
+ lru = &(self->bitmap_lrus[index][XRDP_MAX_BITMAP_CACHE_IDX - 1]);
+ lru->next = -1;
+ lru->prev = XRDP_MAX_BITMAP_CACHE_IDX - 2;
+
+ self->lru_head[index] = 0;
+ self->lru_tail[index] = XRDP_MAX_BITMAP_CACHE_IDX - 1;
+
+ self->lru_reset[index] = 1;
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+xrdp_cache_reset_crc(struct xrdp_cache *self)
+{
+ int index;
+ int jndex;
+
+ for (index = 0; index < XRDP_MAX_BITMAP_CACHE_ID; index++)
+ {
+ for (jndex = 0; jndex < 64 * 1024; jndex++)
+ {
+ /* it's ok it deinit a zero'ed out struct list16 */
+ list16_deinit(&(self->crc16[index][jndex]));
+ list16_init(&(self->crc16[index][jndex]));
+ }
+ }
+ return 0;
+}
+
+/*****************************************************************************/
struct xrdp_cache *APP_CC
xrdp_cache_create(struct xrdp_wm *owner,
struct xrdp_session *session,
@@ -65,6 +119,8 @@ xrdp_cache_create(struct xrdp_wm *owner,
self->bitmap_cache_version = client_info->bitmap_cache_version;
self->pointer_cache_entries = client_info->pointer_cache_entries;
self->xrdp_os_del_list = list_create();
+ xrdp_cache_reset_lru(self);
+ xrdp_cache_reset_crc(self);
LLOGLN(10, ("xrdp_cache_create: 0 %d 1 %d 2 %d",
self->cache1_entries, self->cache2_entries, self->cache3_entries));
return self;
@@ -108,6 +164,15 @@ xrdp_cache_delete(struct xrdp_cache *self)
list_delete(self->xrdp_os_del_list);
+ /* free all crc lists */
+ for (i = 0; i < XRDP_MAX_BITMAP_CACHE_ID; i++)
+ {
+ for (j = 0; j < 64 * 1024; j++)
+ {
+ list16_deinit(&(self->crc16[i][j]));
+ }
+ }
+
g_free(self);
}
@@ -157,157 +222,228 @@ xrdp_cache_reset(struct xrdp_cache *self,
self->bitmap_cache_persist_enable = client_info->bitmap_cache_persist_enable;
self->bitmap_cache_version = client_info->bitmap_cache_version;
self->pointer_cache_entries = client_info->pointer_cache_entries;
+ xrdp_cache_reset_lru(self);
+ xrdp_cache_reset_crc(self);
return 0;
}
-#define COMPARE_WITH_CRC(_b1, _b2) \
- ((_b1 != 0) && (_b2 != 0) && (_b1->crc == _b2->crc) && \
+#define COMPARE_WITH_CRC32(_b1, _b2) \
+ ((_b1 != 0) && (_b2 != 0) && (_b1->crc32 == _b2->crc32) && \
(_b1->bpp == _b2->bpp) && \
(_b1->width == _b2->width) && (_b1->height == _b2->height))
/*****************************************************************************/
-/* returns cache id */
-int APP_CC
-xrdp_cache_add_bitmap(struct xrdp_cache *self, struct xrdp_bitmap *bitmap,
- int hints)
+static int APP_CC
+xrdp_cache_update_lru(struct xrdp_cache *self, int cache_id, int lru_index)
{
- int i = 0;
- int j = 0;
- int oldest = 0;
- int cache_id = 0;
- int cache_idx = 0;
- int bmp_size = 0;
- int e = 0;
- int Bpp = 0;
+ int tail_index;
+ struct xrdp_lru_item *nextlru;
+ struct xrdp_lru_item *prevlru;
+ struct xrdp_lru_item *thislru;
+ struct xrdp_lru_item *taillru;
+
+ LLOGLN(10, ("xrdp_cache_update_lru: lru_index %d", lru_index));
+ if ((lru_index < 0) || (lru_index >= XRDP_MAX_BITMAP_CACHE_IDX))
+ {
+ LLOGLN(0, ("xrdp_cache_update_lru: error"));
+ return 1;
+ }
+ if (self->lru_tail[cache_id] == lru_index)
+ {
+ /* nothing to do */
+ return 0;
+ }
+ else if (self->lru_head[cache_id] == lru_index)
+ {
+ /* moving head item to tail */
- e = bitmap->width % 4;
+ thislru = &(self->bitmap_lrus[cache_id][lru_index]);
+ nextlru = &(self->bitmap_lrus[cache_id][thislru->next]);
+ tail_index = self->lru_tail[cache_id];
+ taillru = &(self->bitmap_lrus[cache_id][tail_index]);
- if (e != 0)
+ /* unhook old */
+ nextlru->prev = -1;
+
+ /* set head to next */
+ self->lru_head[cache_id] = thislru->next;
+
+ /* move to tail and hook up */
+ taillru->next = lru_index;
+ thislru->prev = tail_index;
+ thislru->next = -1;
+
+ /* update tail */
+ self->lru_tail[cache_id] = lru_index;
+
+ }
+ else
{
- e = 4 - e;
+ /* move middle item */
+
+ thislru = &(self->bitmap_lrus[cache_id][lru_index]);
+ prevlru = &(self->bitmap_lrus[cache_id][thislru->prev]);
+ nextlru = &(self->bitmap_lrus[cache_id][thislru->next]);
+ tail_index = self->lru_tail[cache_id];
+ taillru = &(self->bitmap_lrus[cache_id][tail_index]);
+
+ /* unhook old */
+ prevlru->next = thislru->next;
+ nextlru->prev = thislru->prev;
+
+ /* move to tail and hook up */
+ taillru->next = lru_index;
+ thislru->prev = tail_index;
+ thislru->next = -1;
+
+ /* update tail */
+ self->lru_tail[cache_id] = lru_index;
}
+ return 0;
+}
+
+/*****************************************************************************/
+/* returns cache id */
+int APP_CC
+xrdp_cache_add_bitmap(struct xrdp_cache *self, struct xrdp_bitmap *bitmap,
+ int hints)
+{
+ int index;
+ int jndex;
+ int cache_id;
+ int cache_idx;
+ int bmp_size;
+ int e;
+ int Bpp;
+ int crc16;
+ int iig;
+ int found;
+ int cache_entries;
+ int lru_index;
+ struct list16 *ll;
+ struct xrdp_bitmap *lbm;
+ struct xrdp_lru_item *llru;
+
+ LLOGLN(10, ("xrdp_cache_add_bitmap:"));
+ LLOGLN(10, ("xrdp_cache_add_bitmap: crc16 0x%4.4x",
+ bitmap->crc16));
+
+ e = (4 - (bitmap->width % 4)) & 3;
+ found = 0;
+ cache_id = 0;
+ cache_entries = 0;
+ /* client Bpp, bmp_size */
Bpp = (bitmap->bpp + 7) / 8;
bmp_size = (bitmap->width + e) * bitmap->height * Bpp;
self->bitmap_stamp++;
- /* look for match */
if (bmp_size <= self->cache1_size)
{
- i = 0;
-
- for (j = 0; j < self->cache1_entries; j++)
- {
-#ifdef USE_CRC
- if (COMPARE_WITH_CRC(self->bitmap_items[i][j].bitmap, bitmap))
-#else
- if (xrdp_bitmap_compare(self->bitmap_items[i][j].bitmap, bitmap))
-#endif
- {
- self->bitmap_items[i][j].stamp = self->bitmap_stamp;
- LLOGLN(10, ("found bitmap at %d %d", i, j));
- xrdp_bitmap_delete(bitmap);
- return MAKELONG(j, i);
- }
- }
+ cache_id = 0;
+ cache_entries = self->cache1_entries;
}
else if (bmp_size <= self->cache2_size)
{
- i = 1;
-
- for (j = 0; j < self->cache2_entries; j++)
- {
-#ifdef USE_CRC
- if (COMPARE_WITH_CRC(self->bitmap_items[i][j].bitmap, bitmap))
-#else
- if (xrdp_bitmap_compare(self->bitmap_items[i][j].bitmap, bitmap))
-#endif
- {
- self->bitmap_items[i][j].stamp = self->bitmap_stamp;
- LLOGLN(10, ("found bitmap at %d %d", i, j));
- xrdp_bitmap_delete(bitmap);
- return MAKELONG(j, i);
- }
- }
+ cache_id = 1;
+ cache_entries = self->cache2_entries;
}
else if (bmp_size <= self->cache3_size)
{
- i = 2;
-
- for (j = 0; j < self->cache3_entries; j++)
- {
-#ifdef USE_CRC
- if (COMPARE_WITH_CRC(self->bitmap_items[i][j].bitmap, bitmap))
-#else
- if (xrdp_bitmap_compare(self->bitmap_items[i][j].bitmap, bitmap))
-#endif
- {
- self->bitmap_items[i][j].stamp = self->bitmap_stamp;
- LLOGLN(10, ("found bitmap at %d %d", i, j));
- xrdp_bitmap_delete(bitmap);
- return MAKELONG(j, i);
- }
- }
+ cache_id = 2;
+ cache_entries = self->cache3_entries;
}
else
{
- log_message(LOG_LEVEL_ERROR,"error in xrdp_cache_add_bitmap, too big(%d) bpp %d", bmp_size, bitmap->bpp);
+ log_message(LOG_LEVEL_ERROR, "error in xrdp_cache_add_bitmap, "
+ "too big(%d) bpp %d", bmp_size, bitmap->bpp);
+ return 0;
}
- /* look for oldest */
- cache_id = 0;
- cache_idx = 0;
- oldest = 0x7fffffff;
-
- if (bmp_size <= self->cache1_size)
+ crc16 = bitmap->crc16;
+ ll = &(self->crc16[cache_id][crc16]);
+ for (jndex = 0; jndex < ll->count; jndex++)
{
- i = 0;
-
- for (j = 0; j < self->cache1_entries; j++)
+ cache_idx = list16_get_item(ll, jndex);
+ if (COMPARE_WITH_CRC32
+ (self->bitmap_items[cache_id][cache_idx].bitmap, bitmap))
{
- if (self->bitmap_items[i][j].stamp < oldest)
- {
- oldest = self->bitmap_items[i][j].stamp;
- cache_id = i;
- cache_idx = j;
- }
+ LLOGLN(10, ("found bitmap at %d %d", index, jndex));
+ found = 1;
+ break;
}
}
- else if (bmp_size <= self->cache2_size)
+ if (found)
{
- i = 1;
+ lru_index = self->bitmap_items[cache_id][cache_idx].lru_index;
+ self->bitmap_items[cache_id][cache_idx].stamp = self->bitmap_stamp;
+ xrdp_bitmap_delete(bitmap);
- for (j = 0; j < self->cache2_entries; j++)
- {
- if (self->bitmap_items[i][j].stamp < oldest)
- {
- oldest = self->bitmap_items[i][j].stamp;
- cache_id = i;
- cache_idx = j;
- }
- }
+ /* update lru to end */
+ xrdp_cache_update_lru(self, cache_id, lru_index);
+
+ return MAKELONG(cache_idx, cache_id);
}
- else if (bmp_size <= self->cache3_size)
+
+ /* find lru */
+
+ /* check for reset */
+ if (self->lru_reset[cache_id])
{
- i = 2;
+ self->lru_reset[cache_id] = 0;
+ LLOGLN(0, ("xrdp_cache_add_bitmap: reset detected cache_id %d",
+ cache_id));
+ self->lru_tail[cache_id] = cache_entries - 1;
+ index = self->lru_tail[cache_id];
+ llru = &(self->bitmap_lrus[cache_id][index]);
+ llru->next = -1;
+ }
+
+ /* lru is item at head */
+ lru_index = self->lru_head[cache_id];
+ cache_idx = lru_index;
+
+ /* update lru to end */
+ xrdp_cache_update_lru(self, cache_id, lru_index);
+
+ LLOGLN(10, ("xrdp_cache_add_bitmap: oldest %d %d", cache_id, cache_idx));
+
+ LLOGLN(10, ("adding bitmap at %d %d old ptr %p new ptr %p",
+ cache_id, cache_idx,
+ self->bitmap_items[cache_id][cache_idx].bitmap,
+ bitmap));
- for (j = 0; j < self->cache3_entries; j++)
+ /* remove old, about to be deleted, from crc16 list */
+ lbm = self->bitmap_items[cache_id][cache_idx].bitmap;
+ if (lbm != 0)
+ {
+ crc16 = lbm->crc16;
+ ll = &(self->crc16[cache_id][crc16]);
+ iig = list16_index_of(ll, cache_idx);
+ if (iig == -1)
{
- if (self->bitmap_items[i][j].stamp < oldest)
- {
- oldest = self->bitmap_items[i][j].stamp;
- cache_id = i;
- cache_idx = j;
- }
+ LLOGLN(0, ("xrdp_cache_add_bitmap: error removing cache_idx"));
}
+ LLOGLN(10, ("xrdp_cache_add_bitmap: removing index %d from crc16 %d",
+ iig, crc16));
+ list16_remove_item(ll, iig);
+ xrdp_bitmap_delete(lbm);
}
- LLOGLN(10, ("adding bitmap at %d %d ptr %p", cache_id, cache_idx,
- self->bitmap_items[cache_id][cache_idx].bitmap));
/* set, send bitmap and return */
- xrdp_bitmap_delete(self->bitmap_items[cache_id][cache_idx].bitmap);
+
self->bitmap_items[cache_id][cache_idx].bitmap = bitmap;
self->bitmap_items[cache_id][cache_idx].stamp = self->bitmap_stamp;
+ self->bitmap_items[cache_id][cache_idx].lru_index = lru_index;
+
+ /* add to crc16 list */
+ crc16 = bitmap->crc16;
+ ll = &(self->crc16[cache_id][crc16]);
+ list16_add_item(ll, cache_idx);
+ if (ll->count > 1)
+ {
+ LLOGLN(10, ("xrdp_cache_add_bitmap: count %d", ll->count));
+ }
if (self->use_bitmap_comp)
{
diff --git a/xrdp/xrdp_painter.c b/xrdp/xrdp_painter.c
index fd583ff2..88d69b1d 100644
--- a/xrdp/xrdp_painter.c
+++ b/xrdp/xrdp_painter.c
@@ -850,7 +850,12 @@ xrdp_painter_copy(struct xrdp_painter *self,
w = MIN(64, ((srcx + cx) - i));
h = MIN(64, ((srcy + cy) - j));
b = xrdp_bitmap_create(w, h, src->bpp, 0, self->wm);
+#if 1
xrdp_bitmap_copy_box_with_crc(src, b, i, j, w, h);
+#else
+ xrdp_bitmap_copy_box(src, b, i, j, w, h);
+ xrdp_bitmap_hash_crc(b);
+#endif
bitmap_id = xrdp_cache_add_bitmap(self->wm->cache, b, self->wm->hints);
cache_id = HIWORD(bitmap_id);
cache_idx = LOWORD(bitmap_id);
diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h
index b824f176..00cf435f 100644
--- a/xrdp/xrdp_types.h
+++ b/xrdp/xrdp_types.h
@@ -178,9 +178,16 @@ struct xrdp_palette_item
struct xrdp_bitmap_item
{
int stamp;
+ int lru_index;
struct xrdp_bitmap* bitmap;
};
+struct xrdp_lru_item
+{
+ int next;
+ int prev;
+};
+
struct xrdp_os_bitmap_item
{
int id;
@@ -226,6 +233,17 @@ struct xrdp_cache
int bitmap_stamp;
struct xrdp_bitmap_item bitmap_items[XRDP_MAX_BITMAP_CACHE_ID]
[XRDP_MAX_BITMAP_CACHE_IDX];
+
+ /* lru optimize */
+ struct xrdp_lru_item bitmap_lrus[XRDP_MAX_BITMAP_CACHE_ID]
+ [XRDP_MAX_BITMAP_CACHE_IDX];
+ int lru_head[XRDP_MAX_BITMAP_CACHE_ID];
+ int lru_tail[XRDP_MAX_BITMAP_CACHE_ID];
+ int lru_reset[XRDP_MAX_BITMAP_CACHE_ID];
+
+ /* crc optimize */
+ struct list16 crc16[XRDP_MAX_BITMAP_CACHE_ID][64 * 1024];
+
int use_bitmap_comp;
int cache1_entries;
int cache1_size;
@@ -461,7 +479,8 @@ struct xrdp_bitmap
struct xrdp_bitmap* popped_from;
int item_height;
/* crc */
- int crc;
+ int crc32;
+ int crc16;
};
#define NUM_FONTS 0x4e00