Commit: cbc774723a14b523e54552860e9cf93a85eb7869 Author: krakjoe <joe.watk...@live.co.uk> Sun, 1 Dec 2013 08:34:17 +0000 Parents: 8a826dc07b0f6e4eb1e8402e24705517c0ac5788 Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cbc774723a14b523e54552860e9cf93a85eb7869 Log: add info memory Changed paths: M Changelog.md M phpdbg_info.c M phpdbg_info.h M phpdbg_prompt.c Diff: diff --git a/Changelog.md b/Changelog.md index 97aa1e9..adb4759 100644 --- a/Changelog.md +++ b/Changelog.md @@ -11,6 +11,7 @@ Version 0.2.0 2013-00-00 4. .phpdbginit now searched in (additional) ini dirs 5. Added source command - load additional .phpdbginit script during session 6. Added remote console mode +7. Added info memory command Version 0.1.0 2013-11-23 ------------------------ diff --git a/phpdbg_info.c b/phpdbg_info.c index f44d192..12852fc 100644 --- a/phpdbg_info.c +++ b/phpdbg_info.c @@ -225,6 +225,26 @@ PHPDBG_INFO(literal) /* {{{ */ return SUCCESS; } /* }}} */ +PHPDBG_INFO(memory) /* {{{ */ +{ + if (is_zend_mm(TSRMLS_C)) { + phpdbg_notice("Memory Manager Information"); + phpdbg_notice("Current"); + phpdbg_writeln("|-------> Used:\t%.3f kB", + (float) (zend_memory_usage(0 TSRMLS_CC)/1024)); + phpdbg_writeln("|-------> Real:\t%.3f kB", + (float) (zend_memory_usage(1 TSRMLS_CC)/1024)); + phpdbg_notice("Peak"); + phpdbg_writeln("|-------> Used:\t%.3f kB", + (float) (zend_memory_peak_usage(0 TSRMLS_CC)/1024)); + phpdbg_writeln("|-------> Real:\t%.3f kB", + (float) (zend_memory_peak_usage(1 TSRMLS_CC)/1024)); + } else { + phpdbg_error("Memory Manager Disabled !"); + } + return SUCCESS; +} /* }}} */ + static inline void phpdbg_print_class_name(zend_class_entry **ce TSRMLS_DC) /* {{{ */ { phpdbg_write( diff --git a/phpdbg_info.h b/phpdbg_info.h index 8b0f117..49ad73e 100644 --- a/phpdbg_info.h +++ b/phpdbg_info.h @@ -31,15 +31,17 @@ PHPDBG_INFO(funcs); PHPDBG_INFO(error); PHPDBG_INFO(vars); PHPDBG_INFO(literal); +PHPDBG_INFO(memory); static const phpdbg_command_t phpdbg_info_commands[] = { - PHPDBG_COMMAND_D_EX(break, "show breakpoints", 'b', info_break, NULL, 0), - PHPDBG_COMMAND_D_EX(files, "lists included files", 'F', info_files, NULL, 0), - PHPDBG_COMMAND_D_EX(classes, "lists loaded classes", 'c', info_classes, NULL, 0), - PHPDBG_COMMAND_D_EX(funcs, "lists loaded classes", 'f', info_funcs, NULL, 0), - PHPDBG_COMMAND_D_EX(error, "show the last error", 'e', info_error, NULL, 0), + PHPDBG_COMMAND_D_EX(break, "show breakpoints", 'b', info_break, NULL, 0), + PHPDBG_COMMAND_D_EX(files, "show included files", 'F', info_files, NULL, 0), + PHPDBG_COMMAND_D_EX(classes, "show loaded classes", 'c', info_classes, NULL, 0), + PHPDBG_COMMAND_D_EX(funcs, "show loaded classes", 'f', info_funcs, NULL, 0), + PHPDBG_COMMAND_D_EX(error, "show last error", 'e', info_error, NULL, 0), PHPDBG_COMMAND_D_EX(vars, "show active variables", 'v', info_vars, NULL, 0), PHPDBG_COMMAND_D_EX(literal, "show active literal constants", 'l', info_literal, NULL, 0), + PHPDBG_COMMAND_D_EX(memory, "show memory manager stats", 'm', info_memory, NULL, 0), PHPDBG_END_COMMAND }; diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index b5a93a6..2589a24 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -769,11 +769,7 @@ PHPDBG_COMMAND(print) /* {{{ */ phpdbg_writeln("Functions\t%d", zend_hash_num_elements(EG(function_table))); phpdbg_writeln("Constants\t%d", zend_hash_num_elements(EG(zend_constants))); phpdbg_writeln("Included\t%d", zend_hash_num_elements(&EG(included_files))); - phpdbg_writeln( - "Memory\t\t%.3f/%.3f (kB)", - (float) (zend_memory_usage(1 TSRMLS_CC)/1024), - (float) (zend_memory_usage(0 TSRMLS_CC)/1024)); - + phpdbg_writeln(SEPARATE); } break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
