Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add value field #29

Closed
wants to merge 1 commit into from
Closed

add value field #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions extension/meminfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "ext/standard/info.h"
#include "ext/standard/php_string.h"
#include "ext/json/php_json.h"

#include "zend_extensions.h"
#include "zend_exceptions.h"
Expand Down Expand Up @@ -435,6 +436,7 @@ void meminfo_hash_dump(php_stream *stream, HashTable *ht, zend_bool is_object, H
void meminfo_zval_dump(php_stream * stream, char * frame_label, char * symbol_name, zval * zv, HashTable *visited_items, int *first_element)
{
char zval_id[16];
smart_str buf = {0};
char *char_buf;
sprintf(zval_id, "%p", zv);

Expand All @@ -452,6 +454,12 @@ void meminfo_zval_dump(php_stream * stream, char * frame_label, char * symbol_na
php_stream_printf(stream TSRMLS_CC, " \"type\" : \"%s\",\n", zend_get_type_by_const(Z_TYPE_P(zv)));
php_stream_printf(stream TSRMLS_CC, " \"size\" : \"%ld\",\n", meminfo_get_element_size(zv));

php_json_encode(&buf, zv, (int)0);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid this only works if the JSON extension is loaded, which is not guaranteed.

php_stream_printf(stream TSRMLS_CC, " \"value\" : ");
php_stream_write(stream TSRMLS_CC,buf.c,buf.len);
php_stream_printf(stream TSRMLS_CC, ",\n");
smart_str_free(&buf);

if (frame_label) {
if (symbol_name) {
char_buf = meminfo_escape_for_json(symbol_name);
Expand Down