Changeset 1151


Ignore:
Timestamp:
2012-10-10T14:15:34+02:00 (23 months ago)
Author:
moo
Message:

s/my_/xc_/g

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/mod_cacher/xc_cacher.c

    r1150 r1151  
    763763    ALLOCA_FLAG(use_heap) 
    764764    /* new ptr which is stored inside CG(class_table) */ 
    765     xc_cest_t **new_cest_ptrs = (xc_cest_t **)my_do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt, use_heap); 
     765    xc_cest_t **new_cest_ptrs = (xc_cest_t **)xc_do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt, use_heap); 
    766766#endif 
    767767 
     
    829829 
    830830#ifndef ZEND_ENGINE_2 
    831     my_free_alloca(new_cest_ptrs, use_heap); 
     831    xc_free_alloca(new_cest_ptrs, use_heap); 
    832832#endif 
    833833    CG(active_op_array) = old_active_op_array; 
     
    950950 
    951951    size = strlen(PG(include_path)) + 1; 
    952     paths = (char *)my_do_alloca(size, use_heap); 
     952    paths = (char *)xc_do_alloca(size, use_heap); 
    953953    memcpy(paths, PG(include_path), size); 
    954954 
     
    985985 
    986986finish: 
    987     my_free_alloca(paths, use_heap); 
     987    xc_free_alloca(paths, use_heap); 
    988988 
    989989    return ret; 
     
    25492549    name##_buffer.alloca_size = xc_var_buffer_alloca_size(name TSRMLS_CC); \ 
    25502550    name##_buffer.buffer = name##_buffer.alloca_size \ 
    2551         ? my_do_alloca(name##_buffer.alloca_size, name##_buffer.useheap) \ 
     2551        ? xc_do_alloca(name##_buffer.alloca_size, name##_buffer.useheap) \ 
    25522552        : UNISW(Z_STRVAL_P(name), Z_TYPE(name) == IS_UNICODE ? Z_USTRVAL_P(name) : Z_STRVAL_P(name)); \ 
    25532553    if (name##_buffer.alloca_size) xc_var_buffer_init(name##_buffer.buffer, name TSRMLS_CC); 
     
    25552555#define VAR_BUFFER_FREE(name) \ 
    25562556    if (name##_buffer.alloca_size) { \ 
    2557         my_free_alloca(name##_buffer.buffer, name##_buffer.useheap); \ 
     2557        xc_free_alloca(name##_buffer.buffer, name##_buffer.useheap); \ 
    25582558    } 
    25592559 
  • trunk/mod_coverager/xc_coverager.c

    r1118 r1151  
    4747 
    4848    TRACE("mkdirs %s %d %s %d", root, rootlen, path, pathlen); 
    49     fullpath = my_do_alloca(rootlen + pathlen + 1, use_heap); 
     49    fullpath = xc_do_alloca(rootlen + pathlen + 1, use_heap); 
    5050    memcpy(fullpath, root, rootlen); 
    5151    memcpy(fullpath + rootlen, path, pathlen); 
     
    6868#endif 
    6969    } 
    70     my_free_alloca(fullpath, use_heap); 
     70    xc_free_alloca(fullpath, use_heap); 
    7171} 
    7272/* }}} */ 
  • trunk/mod_optimizer/xc_optimizer.c

    r1112 r1151  
    392392    ALLOCA_FLAG(use_heap_catchbbids) 
    393393    ALLOCA_FLAG(use_heap_markbbhead) 
    394     bbid_t *bbids          = my_do_alloca(count * sizeof(bbid_t),    use_heap_bbids); 
    395 #ifdef ZEND_ENGINE_2 
    396     bbid_t *catchbbids     = my_do_alloca(count * sizeof(bbid_t),    use_heap_catchbbids); 
    397 #endif 
    398     zend_bool *markbbhead  = my_do_alloca(count * sizeof(zend_bool), use_heap_markbbhead); 
     394    bbid_t *bbids          = xc_do_alloca(count * sizeof(bbid_t),    use_heap_bbids); 
     395#ifdef ZEND_ENGINE_2 
     396    bbid_t *catchbbids     = xc_do_alloca(count * sizeof(bbid_t),    use_heap_catchbbids); 
     397#endif 
     398    zend_bool *markbbhead  = xc_do_alloca(count * sizeof(zend_bool), use_heap_markbbhead); 
    399399 
    400400    /* {{{ mark jmpin/jumpout */ 
     
    503503    /* }}} */ 
    504504 
    505     my_free_alloca(markbbhead, use_heap_markbbhead); 
    506 #ifdef ZEND_ENGINE_2 
    507     my_free_alloca(catchbbids, use_heap_catchbbids); 
    508 #endif 
    509     my_free_alloca(bbids,      use_heap_bbids); 
     505    xc_free_alloca(markbbhead, use_heap_markbbhead); 
     506#ifdef ZEND_ENGINE_2 
     507    xc_free_alloca(catchbbids, use_heap_catchbbids); 
     508#endif 
     509    xc_free_alloca(bbids,      use_heap_bbids); 
    510510    return SUCCESS; 
    511511} 
  • trunk/xcache/xc_compatibility.h

    r1044 r1151  
    3838 
    3939#ifdef do_alloca_with_limit 
    40 #   define my_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap) 
    41 #   define my_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap) 
     40#   define xc_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap) 
     41#   define xc_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap) 
    4242#elif defined(ALLOCA_FLAG) 
    43 #   define my_do_alloca(size, use_heap) do_alloca(size, use_heap) 
    44 #   define my_free_alloca(size, use_heap) free_alloca(size, use_heap) 
    45 #else 
    46 #   define my_do_alloca(size, use_heap) do_alloca(size) 
    47 #   define my_free_alloca(size, use_heap) free_alloca(size) 
     43#   define xc_do_alloca(size, use_heap) do_alloca(size, use_heap) 
     44#   define xc_free_alloca(size, use_heap) free_alloca(size, use_heap) 
     45#else 
     46#   define xc_do_alloca(size, use_heap) do_alloca(size) 
     47#   define xc_free_alloca(size, use_heap) free_alloca(size) 
    4848#   define ALLOCA_FLAG(x) 
    4949#endif 
     
    6868/* {{{ dirty fix for PHP 6 */ 
    6969#ifdef add_assoc_long_ex 
    70 static inline void my_add_assoc_long_ex(zval *arg, char *key, uint key_len, long value) 
     70static inline void xc_add_assoc_long_ex(zval *arg, char *key, uint key_len, long value) 
    7171{ 
    7272    add_assoc_long_ex(arg, key, key_len, value); 
    7373} 
    7474#   undef add_assoc_long_ex 
    75 #   define add_assoc_long_ex my_add_assoc_long_ex 
     75#   define add_assoc_long_ex xc_add_assoc_long_ex 
    7676#endif 
    7777#ifdef add_assoc_bool_ex 
    78 static inline void my_add_assoc_bool_ex(zval *arg, char *key, uint key_len, zend_bool value) 
     78static inline void xc_add_assoc_bool_ex(zval *arg, char *key, uint key_len, zend_bool value) 
    7979{ 
    8080    add_assoc_bool_ex(arg, key, key_len, value); 
    8181} 
    8282#   undef add_assoc_bool_ex 
    83 #   define add_assoc_bool_ex my_add_assoc_bool_ex 
     83#   define add_assoc_bool_ex xc_add_assoc_bool_ex 
    8484#endif 
    8585#ifdef add_assoc_null_ex 
    86 static inline void my_add_assoc_null_ex(zval *arg, char *key, uint key_len) 
     86static inline void xc_add_assoc_null_ex(zval *arg, char *key, uint key_len) 
    8787{ 
    8888    add_assoc_null_ex(arg, key, key_len); 
    8989} 
    9090#   undef add_assoc_null_ex 
    91 #   define add_assoc_null_ex my_add_assoc_null_ex 
     91#   define add_assoc_null_ex xc_add_assoc_null_ex 
    9292#endif 
    9393/* }}} */ 
Note: See TracChangeset for help on using the changeset viewer.