Changeset 1182 for trunk


Ignore:
Timestamp:
2012-12-06T09:48:01+01:00 (20 months ago)
Author:
moo
Message:

adds xcache.coredump_type, updated ini example

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/htdocs/diagnosis/index.php

    r1179 r1182  
    381381checking(_T("Extension Compatibility")); // {{{ 
    382382$loadedZendExtensions = get_loaded_extensions(true); 
     383$extensionGood = true; 
    383384if (array_search("Zend Optimizer", $loadedZendExtensions) !== false) { 
    384385    result(N_("info") 
     
    386387        , _T("Optimizer feature of 'Zend Optimizer' is disabled by XCache due to compatibility reason; the Loader of it is still available, encoded files are still supported") 
    387388        ); 
    388 } 
    389 else { 
     389    $extensionGood = false; 
     390} 
     391if (array_search("the ionCube PHP Loader", $loadedZendExtensions) !== false) { 
     392    result(N_("info") 
     393        , _T("the ionCube PHP Loader loaded") 
     394        , _T("Compatibility with this the ionCube PHp Loader' is taken care of; But in case if there's any problem, report to ionCube team and/or XCache devs") 
     395        ); 
     396    $extensionGood = false; 
     397} 
     398if (!$extensionGood) { 
    390399    result(N_("info"), _T("Looks good")); 
    391400} 
  • trunk/xcache-zh-gb2312.ini

    r1117 r1182  
    1616; ÕâÀïµÄ¶àÊýÑ¡Ïî½öÔÚ ini Àï¿ÉÒÔÐÞ¸Ä, ÕâÀïÁгöµÄ¶¼ÊÇĬÈÏÖµ, ³ý·ÇÁíÍâ˵Ã÷ 
    1717 
    18 ; select low level shm/allocator scheme implemenation 
     18; Ñ¡Ôñµ×²ãÄÚ´æ¹²ÏíʵÏÖ·½°¸ 
    1919xcache.shm_scheme =        "mmap" 
    2020; ½ûÓÃ: xcache.size=0 
     
    2323; ½¨ÒéÉèÖÃΪ cpu Êý (cat /proc/cpuinfo |grep -c processor) 
    2424xcache.count =                 1 
    25 ; Ö»ÊǸö²Î¿¼Öµ, Äú¿ÉÒÔ·ÅÐĵش洢¶àÓÚ´ËÊýÁ¿µÄÏîÄ¿(php½Å±¾/±äÁ¿) 
     25; Ö»ÊǸö hash ²Î¿¼Öµ, ʵ¼Ê´æ´¢ÏîÄ¿(php½Å±¾/±äÁ¿)¿É³¬¹ýÕâ¸öÊý×Ö 
    2626xcache.slots =                8K 
    2727; »º´æÏîÄ¿µÄ ttl, 0=ÓÀ¾Ã 
     
    4949 
    5050 
    51 ; ÉèÖÃΪ¿Õ(½ûÓÃ) »òÕßÀàËÆ "/tmp/phpcore/" 
    52 ; ×¢Òâ¸ÃĿ¼Ӧ¸ÃÄܱ» php дÈëÎļþ (¸ú open_basedir ÎÞ¹Ø) 
     51; ½öÔÚ XCache Ò쳣ʱÓÐÓÃ. ÉèÖÃΪ¿Õ(½ûÓÃ) »òÕßÀàËÆ "/tmp/phpcore/" (Äܱ» php дÈëÎļþ) 
    5352xcache.coredump_directory =   "" 
    54 ; disable cache after crash 
     53; ½öÓÃÓÚ Windows. ³ý·Ç XCache ¿ª·¢ÈËÔ±¸æËßÄã, ·ñÔò±£³ÖĬÈÏÖµ 
     54xcache.coredump_type =         0 
     55 
     56; Ò쳣ʱ×Ô¶¯½ûÖ¹»º´æ 
    5557xcache.disable_on_crash =    Off 
    5658 
     
    5860xcache.experimental =        Off 
    5961 
    60 ; per request settings. ¿ÉÒÔ ini_set, .htaccess µÈ 
     62; ÒÔÏÂÊÇ Request ¼¶¿É¸ÄÉèÖÃ. ¿ÉÒÔ ini_set, .htaccess µÈ 
    6163xcache.cacher =               On 
    6264xcache.stat   =               On 
  • trunk/xcache.c

    r1181 r1182  
    3737/* {{{ globals */ 
    3838static char *xc_coredump_dir = NULL; 
     39static zend_bool xc_coredump_type = 0; 
    3940static zend_bool xc_disable_on_crash = 0; 
    4041 
     
    430431    if (fileHandle != INVALID_HANDLE_VALUE) { 
    431432        MINIDUMP_EXCEPTION_INFORMATION exceptionInformation; 
     433        MINIDUMP_TYPE type = xc_coredump_type ? xc_coredump_type : (MiniDumpNormal|MiniDumpWithDataSegs|MiniDumpWithIndirectlyReferencedMemory); 
    432434        BOOL ok; 
    433435 
     
    437439 
    438440        /* write the dump */ 
    439         ok = dbghelp_MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), fileHandle, MiniDumpNormal|MiniDumpWithDataSegs|MiniDumpWithIndirectlyReferencedMemory, &exceptionInformation, NULL, NULL); 
     441        ok = dbghelp_MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), fileHandle, type, &exceptionInformation, NULL, NULL); 
    440442        CloseHandle(fileHandle); 
    441443        if (ok) { 
     
    719721PHP_INI_BEGIN() 
    720722    PHP_INI_ENTRY1     ("xcache.coredump_directory",      "", PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_coredump_dir) 
     723    PHP_INI_ENTRY1     ("xcache.coredump_type",          "0", PHP_INI_SYSTEM, xcache_OnUpdateULong,    &xc_coredump_type) 
    721724    PHP_INI_ENTRY1_EX  ("xcache.disable_on_crash",       "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_disable_on_crash, zend_ini_boolean_displayer_cb) 
    722725    PHP_INI_ENTRY1_EX  ("xcache.test",                   "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_test,             zend_ini_boolean_displayer_cb) 
  • trunk/xcache.ini

    r1147 r1182  
    1616; ini only settings, all the values here is default unless explained 
    1717 
    18 ; select low level shm/allocator scheme implemenation 
     18; select low level shm implemenation 
    1919xcache.shm_scheme =        "mmap" 
    2020; to disable: xcache.size=0 
     
    5555 
    5656 
    57 ; leave it blank(disabled) or "/tmp/phpcore/" 
    58 ; make sure it's writable by php (open_basedir is not checked) 
     57; Useful when XCache crash. leave it blank(disabled) or "/tmp/phpcore/" (writable by php) 
    5958xcache.coredump_directory =   "" 
     59; Windows only. leave it as 0 (default) until you're told by XCache dev 
     60xcache.coredump_type =         0 
     61 
    6062; disable cache after crash 
    6163xcache.disable_on_crash =    Off 
Note: See TracChangeset for help on using the changeset viewer.