Changeset 8e4f1d0 in git


Ignore:
Timestamp:
2011-04-18T09:28:09Z (9 years ago)
Author:
Xuefer <xuefer@…>
Parents:
8707055
Message:

tagged 2.0.0-beta1

git-svn-id: svn://svn.lighttpd.net/xcache/tags/2.0.0-beta1@774 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:
9 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r54fe3c7 r8e4f1d0  
    13131.3.2 2011-??-??
    1414========
     15 * adds 30 seconds timeout to "compiling" flag
     16 * decompiler: improves decompiling
    1517 * disassembler: DECLARE_INHERITED_CLASS/DELAYED class not found
    1618 * disassembler: don't dump builtin functions
  • NEWS

    r54fe3c7 r8e4f1d0  
    441.3.2 2011-??-??
    55========
     6 * adds 30 seconds timeout to "compiling" flag
     7 * improves decompiling
    68 * memory leak on recompile
    79 * disassembler fixes and updates for new PHP
  • coverager.c

    r4271653 r8e4f1d0  
    172172    p[1] = covlines;
    173173
    174     ftruncate(fd, 0);
     174    if (ftruncate(fd, 0) != 0) {
     175        goto bailout;
     176    }
    175177    lseek(fd, 0, SEEK_SET);
    176     write(fd, (char *) buf, size);
     178    if (write(fd, (char *) buf, size) != size) {
     179        goto bailout;
     180    }
    177181
    178182bailout:
  • mmap.c

    r907def1 r8e4f1d0  
    187187        }
    188188    }
    189     ftruncate(fd, size);
     189
     190    if (ftruncate(fd, size) != 0 && errno != EINVAL) {
     191        perror(shm->name);
     192        errstr = "Failed to ftruncate the file";
     193        goto err;
     194    }
    190195#endif
    191196
  • processor/head.m4

    r6e4375d r8e4f1d0  
    141141#define C_RELAYLINE , __LINE__
    142142')
    143 static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
     143static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const_zstr const str, long size IFASSERT(`, int relayline')) {
    144144    pushdef(`__LINE__', `relayline')
    145145    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
     
    163163/* {{{ xc_store_string_n */
    164164REDEF(`KIND', `store')
    165 static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
     165static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const_zstr const str, long size IFASSERT(`, int relayline')) {
    166166    pushdef(`__LINE__', `relayline')
    167167    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
  • processor/processor.m4

    rd7a969e r8e4f1d0  
    643643DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
    644644    IFRESTORE(`
    645     const xc_op_array_info_t *op_array_info = &processor->active_op_array_infos_src[processor->active_op_array_index];
     645    const xc_op_array_info_t *op_array_info = &processor->active_op_array_infos_src[processor->active_op_array_index++];
    646646    dnl shadow copy must NOT meet:
    647647    dnl readonly_protection=on
  • utils.c

    rcccdfd6 r8e4f1d0  
    150150#endif
    151151            case ZEND_JMP:
     152                assert(Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last);
    152153                Z_OP(opline->op1).opline_num = Z_OP(opline->op1).jmp_addr - op_array->opcodes;
    153                 assert(Z_OP(opline->op1).opline_num < op_array->last);
    154154                break;
    155155            case ZEND_JMPZ:
     
    160160            case ZEND_JMP_SET:
    161161#endif
     162                assert(Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);
    162163                Z_OP(opline->op2).opline_num = Z_OP(opline->op2).jmp_addr - op_array->opcodes;
    163                 assert(Z_OP(opline->op2).opline_num < op_array->last);
    164164                break;
    165165        }
     
    234234
    235235#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
    236 static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, zend_uchar *op_type, znode_op *op, int type TSRMLS_DC) /* {{{ */
     236static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, Z_OP_TYPEOF_TYPE *op_type, znode_op *op, int type TSRMLS_DC) /* {{{ */
    237237{
    238238#ifdef ZEND_ENGINE_2
  • xcache.c

    re2a871e r8e4f1d0  
    17051705
    17061706    /* stale clogs precheck */
    1707     if (cache->compiling) {
     1707    if (XG(request_time) - cache->compiling < 30) {
    17081708        cache->clogs ++;
    17091709        return old_compile_file(h, type TSRMLS_CC);
     
    17331733            /* miss but compiling */
    17341734            if (!stored_php) {
    1735                 if (cache->compiling) {
     1735                if (XG(request_time) - cache->compiling < 30) {
    17361736                    TRACE("%s", "miss but compiling");
    17371737                    cache->clogs ++;
     
    31563156    xcache_restore_signal_handler();
    31573157    if (xc_coredump_dir && xc_coredump_dir[0]) {
    3158         chdir(xc_coredump_dir);
     3158        if (chdir(xc_coredump_dir) != 0) {
     3159            /* error, but nothing can do about it
     3160             * and should'nt print anything which might SEGV again */
     3161        }
    31593162    }
    31603163    raise(sig);
  • xcache.h

    r8e3a73c r8e4f1d0  
    22#define __XCACHE_H
    33#define XCACHE_NAME       "XCache"
    4 #define XCACHE_VERSION    "2.0.0-dev"
     4#define XCACHE_VERSION    "2.0.0-beta1"
    55#define XCACHE_AUTHOR     "mOo"
    66#define XCACHE_COPYRIGHT  "Copyright (c) 2005-2011"
     
    9797#   define Z_OP_CONSTANT(op) (op).literal->constant
    9898#   define Z_OP_TYPE(op) op##_##type
     99#   define Z_OP_TYPEOF_TYPE zend_uchar
    99100
    100101#   define Z_CLASS_INFO(className) (className).info.user
     
    103104#   define Z_OP_CONSTANT(op) (op).u.constant
    104105#   define Z_OP_TYPE(op) (op).op_type
     106#   define Z_OP_TYPEOF_TYPE int
    105107typedef znode znode_op;
    106108
     
    136138#ifndef IS_UNICODE
    137139typedef char *zstr;
     140typedef const char *const_zstr;
    138141#   define ZSTR_S(s)     (s)
    139142#   define ZSTR_U(s)     (s)
     
    143146#   define ZSTR_PV(s)    (s)
    144147#else
     148typedef const zstr const_zstr;
    145149#   define ZSTR_S(zs)    ((zs).s)
    146150#   define ZSTR_U(zs)    ((zs).u)
Note: See TracChangeset for help on using the changeset viewer.