Browse Source

updated relocate impl

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1448 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
master
Xuefer 8 years ago
parent
commit
45e2bfe79d
  1. 2
      mod_cacher/xc_cacher.c
  2. 29
      processor/foot.m4

2
mod_cacher/xc_cacher.c

@ -181,7 +181,7 @@ static xc_entry_data_php_t *xc_php_store_unlocked(xc_cache_t *cache, xc_entry_da
xc_entry_data_php_t *p = malloc(stored_php->size);
fprintf(stderr, "%lu\n", stored_php->size);
memcpy(p, stored_php, stored_php->size);
xc_processor_relocate_xc_entry_data_php_t(p, stored_php, p TSRMLS_CC);
xc_processor_relocate_xc_entry_data_php_t(p, stored_php, 0, p TSRMLS_CC);
}
#endif
if (stored_php) {

29
processor/foot.m4

@ -135,28 +135,21 @@ EXPORTED_FUNCTION(`zval *xc_processor_restore_zval(zval *dst, const zval *src, z
return dst;
}
dnl }}}
#define ptradd(type, ptr, ptrdiff) ((type) ((char *) (ptr) + (ptrdiff)))
#define ptrsub(ptr1, ptr2) ((char *) (ptr1) - (char *)(ptr2))
define(`DEFINE_RELOCATE_API', `
EXPORTED_FUNCTION(`void xc_processor_relocate_$1($1 *src, $1 *old_start, $1 *new_start TSRMLS_DC)') dnl {{{
EXPORTED_FUNCTION(`void xc_processor_relocate_$1($1 *old_src, $1 *old_start, $1 *new_src, $1 *new_start TSRMLS_DC)') dnl {{{
{
/*
$1 *xc_addressof(offset) {
return (char *) offset + (ptrdiff_t) old_start;
}
*/
ptrdiff_t ptrdiff = /* offset + */ (ptrdiff_t) old_start;
/*
ptrdiff_t *xc_offsetof(offset) {
return (char *) xc_addressof(offset) - src;
}
ptrdiff_t offset_from_old_start = 0; /* unkown X used later */
$1 *const old_address = ptradd($1 *, offset_from_old_start, (ptrdiff_t) old_start);
ptrdiff_t offset = ptrsub(old_address, old_src);
$1 *const new_address = ptradd($1 *, new_src, offset);
$1 *xc_newoffset(offset) {
return new_start + xc_offsetof(offset);
}
*/
ptrdiff_t relocatediff = new_start + (/* offset + */ ptrdiff - (ptrdiff_t) src);
/* diff to new_ptr */
ptrdiff_t ptrdiff = (ptrdiff_t) new_address;
ptrdiff_t relocatediff = (ptrdiff_t) ptradd($1 *, new_start, offset);
xc_relocate_$1(src, ptrdiff, relocatediff TSRMLS_CC);
xc_relocate_$1(new_src, ptrdiff, relocatediff TSRMLS_CC);
}
dnl }}}
')

Loading…
Cancel
Save