summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | Changed zend_smart_str allocation granularity to do the better job together ↵Dmitry Stogov2015-04-161-10/+0
| | | | | | | | | | | | | | | | | | with Zend MM and avoid useless calls to erealloc(). The actual reallocation routiones are seprated from inlined code to reduce code size.
* | | Revert "Changed zend_smart_str allocation granularity to do the better job ↵Dmitry Stogov2015-04-161-0/+10
| | | | | | | | | | | | | | | | | | together with Zend MM and avoid useless calls to erealloc()." That commit significantly increased the code size because of intensive inlining and more expensive reallocation code. This reverts commit 5275e5560bb186bc3950a0dbf15fe0e54ee4c6ec.
* | | Changed zend_smart_str allocation granularity to do the better job together ↵Dmitry Stogov2015-04-161-10/+0
| | | | | | | | | | | | with Zend MM and avoid useless calls to erealloc().
* | | Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlersXinchen Hui2015-03-091-0/+3
| | |
* | | Revert "Fixed memleak while using custom mm"Xinchen Hui2015-03-091-3/+0
| | | | | | | | | | | | This reverts commit 5eabd979ffb2f0edb996baf91100197066a81a09.
* | | Fixed memleak while using custom mmXinchen Hui2015-03-091-0/+3
| | |
* | | Revert "Fixed memleak in alloc_globals_ctor"Xinchen Hui2015-03-091-3/+0
| | | | | | | | | | | | This reverts commit 85316b4bf02f75e6a89efb8b10416a0505a2ae4d.
* | | Minimize copying of HashTable realocationDmitry Stogov2015-03-051-5/+19
| | |
* | | Fixed memleak in alloc_globals_ctorReeze Xia2015-02-281-0/+3
| | | | | | | | | | | | This free operation is missed when new MM was introduced in master.
* | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-1/+1
| | | | | | | | | | | | which also comply with the current semantics for such macros
* | | old_size is already knownDmitry Stogov2015-01-191-1/+0
| | |
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | cleanupAnatol Belski2015-01-141-8/+1
| | |
* | | depending on declaration the tsrm cache pointer might be unavailableAnatol Belski2014-12-161-1/+1
| | | | | | | | | | | | | | | | | | during shutdown when the main thread frees all the other threads resources. Even otherwise, exact resource passed to the dtor should be freed, not the one from the current thread.
* | | second shot on removing TSRMLS_*Anatol Belski2014-12-141-4/+1
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-36/+24
| | |
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-051-6/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (111 commits) Fix zend_fcall_info_arg*() to use ZVAL_COPY Fixed #65213 - cannot cast SplFileInfo to boolean add initial install switch to C travis project instead of PHP use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/) fix TS build add config option to target codegen architectures updated NEWS updated NEWS Fixed bug #55541 errors spawn MessageBox, which blocks test automation Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same). Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*. Fixed __debugInfo() support Update UPGRADING for the new variadic functions, and re-sort. Improved POST INC/DEC make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path Missed closed folder mark Revert "Unecessary assignment" Fixed improper memory release Unecessary assignment ...
| * | | Fixed improper memory releaseDmitry Stogov2014-12-021-1/+3
| | | |
| * | | Support for different CPU page sizesDmitry Stogov2014-12-021-5/+20
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-271-0/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: updated NEWS refactored the mbstring config.w32 Update NEWS Fixed compilation warnings Fixed bug #68504 --with-libmbfl configure option not present on Windows Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody. #68446 is fixed Reimplemented silence operator (@) handling on exceptions. Now each silence region is stored in op_array->brk_cont_array. On exception ZEND_HANDLE_EXCEPTION handler traverse this array and restore original EG(error_reporting) if exception occured inside a "silence" region. remove the NEWS entries for the reverted stuff typo fix go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol) 5.5.21 now New label length test Fix ext/filter/tests/033.phpt Fix filter_list test FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL Conflicts: ext/mbstring/config.w32
| * | | Fixed compilation warningsDmitry Stogov2014-11-271-0/+13
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-201-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (36 commits) NEWS adapt test for error message introduce in fix for #68463 Fix bug #68463 listen.allowed_clients can silently result in no allowed access run a few request in this test fix test fix test added info about some other macro changes added note about toolset and phpize added note about the response files split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1 split formatter_format*.phpt for ICP 54.1 split dateformat_timezone_arg_variations*.phpt for ICU 54.1 split dateformat_get_set_timezone_variant*.phpt for ICU 54.1 fix icu version to test split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1 split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1 split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1 split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1 clone dateformat_calendars_variant3.phpt for ICU 54.1 split collator_get_sort_key_variant3.phpt for icu 54.1 ...
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-191-2/+2
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-181-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32
| * | | fix printf specAnatol Belski2014-11-111-2/+2
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-241-9/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (214 commits) fix datatype mismatch warnings fix datatype mismatches fix datatype mismatches fix datatype mismatches fix datatype mismatch warnings fix datatype mismatch warnings fix datatype mismatch warnings fix datatype mismatch warning fix datatype mismatches fix datatype mismatch warnings Re-add phpdbg to travis Added some NEWS Make xml valid (missing space between attrs) Fix info classes file name in xml Add note about <eval> tag for errors in xml.md Name the tag <eval> if the error id during ev cmd Do not print out xml as PHP print... Fix output to wrong function Fixed parameter order on %.*s Too much copypaste... ...
| * | | fix datatype mismatch warningsAnatol Belski2014-10-241-9/+9
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-161-10/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Fix allocator for 64bit zend_long with 32bit long Use intptr_t for zend_intptr_t typedef Fix format strings in zend_alloc Drop zend_long64 in favor of int64_t Removed deprecated fields NEWS cleanup NEWS removing the NEWS entry as we had to revert this fix for now Revert "Merge branch 'PHP-5.5' into PHP-5.6" Revert "fix TS build" Revert "Merge branch 'PHP-5.4' into PHP-5.5" Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams" Revert "Bug #41631: Fix regression from first attempt (6569db8)" NEWS Fixed Bug #65171 imagescale() fails Fixed bug #68234 Fixed bug #68215 (Behavior of foreach has changed) Revert "Bug #41631: Observe socket read timeouts in SSL streams" PHP-5.6.3 is next update NEWS, 5.6.2 will be a security-only release
| * | | Fix allocator for 64bit zend_long with 32bit longNikita Popov2014-10-161-0/+8
| | | |
| * | | Fix format strings in zend_allocNikita Popov2014-10-161-10/+10
| | | |
* | | | bring back all the TSRMLS_FETCH() stuffAnatol Belski2014-10-151-2/+30
| | | | | | | | | | | | | | | | for better comparability with the mainstream
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-151-14/+159
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (25 commits) Fix return code (merges are hard :( ) fix bad merge Fix bug #68113 (Heap corruption in exif_thumbnail()) Fix bug #68089 - do not accept options with embedded \0 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) Fix bug #68027 - fix date parsing in XMLRPC lib Fix bug #68113 (Heap corruption in exif_thumbnail()) Fix bug #68089 - do not accept options with embedded \0 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) Fix bug #68027 - fix date parsing in XMLRPC lib Fix bug #68113 (Heap corruption in exif_thumbnail()) Fix bug #68089 - do not accept options with embedded \0 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) Fix bug #68027 - fix date parsing in XMLRPC lib Fixed bug #68128 Added API function to retrive current custom heap handlers update NEWS and UPGRADING Allow to substitute storage layer in memory manager. Upated NEWS Address issues raised by @nikic ...
| * | | Added API function to retrive current custom heap handlersDmitry Stogov2014-10-141-0/+24
| | | |
| * | | Allow to substitute storage layer in memory manager.Dmitry Stogov2014-10-141-14/+135
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-061-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: bring back the correct php_version.h fix the empty_strings SAPI shutdown leak in TS build Use fastcall calling convention for heap functions fix leaking the empty_string in TS builds remove successive assignment
| * | | Use fastcall calling convention for heap functionsDmitry Stogov2014-10-061-4/+4
| | | |
* | | | using pointer to the tsrm ls cache instead of a function callAnatol Belski2014-10-011-1/+3
| | | | | | | | | | | | | | | | yet another approach
* | | | revert the local speedup approachAnatol Belski2014-10-011-5/+2
| | | |
* | | | approach local pointers in performance sensitive areaskrakjoe2014-09-271-2/+5
| | | |
* | | | cleanup TSRMLS_FETCHAnatol Belski2014-09-261-30/+1
| | | |
* | | | reworked the patch, less new stuff but workyAnatol Belski2014-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
* | | | native tls initial patchkrakjoe2014-09-201-2/+2
|/ / /
* | | make the return value more logicAnatol Belski2014-09-201-1/+1
| | | | | | | | | | | | as if clz() were returning 32 on empty size
* | | make use of intrinsics available with VS for bitset lookupsAnatol Belski2014-09-201-0/+35
| | |
* | | Expose zend_safe_address() and use it in zend_arena_calloc()Dmitry Stogov2014-09-181-111/+5
| | |
* | | better error messages in ZMM on WindowsAnatol Belski2014-09-161-2/+30
| | |
* | | emalloc() must not return NULLDmitry Stogov2014-09-161-0/+14
| | |
* | | Fixed comments and removed useless code.Dmitry Stogov2014-09-081-2/+1
| | |
* | | Revert "Move safe_address into zend_multiply.h"Nikita Popov2014-09-061-4/+124
| | | | | | | | | | | | | | | | | | | | | This reverts commit 43b02e169c718335a82b8c90c3252194f988659a. I'm getting symbol resolution issues for zend_error_noreturn in the opcache.so, so reverting this for now.
View Lorry Controller Status