diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-02-19 06:47:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-02-19 06:47:22 -0800 |
| commit | ff461085e0df5bf232485d67d7deea204dc77c1f (patch) | |
| tree | 390e851ae58dbc5cf013fe811e63ee7aefa26f4e | |
| parent | 341f4cee86dd6d520fc7f3084d84aca523220d6c (diff) | |
| parent | bd4aaf22862e986d54cd829f2e95915ae02141f9 (diff) | |
| download | hardware_qcom_display-ff461085e0df5bf232485d67d7deea204dc77c1f.tar.gz hardware_qcom_display-ff461085e0df5bf232485d67d7deea204dc77c1f.tar.bz2 hardware_qcom_display-ff461085e0df5bf232485d67d7deea204dc77c1f.zip | |
Merge "libmemtrack: Update the parsing of flags field" into dev-2.0
| -rw-r--r-- | libmemtrack/kgsl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmemtrack/kgsl.c b/libmemtrack/kgsl.c index 958859ae7..4ad94ce81 100644 --- a/libmemtrack/kgsl.c +++ b/libmemtrack/kgsl.c @@ -85,7 +85,7 @@ int kgsl_memtrack_get_memory(pid_t pid, enum memtrack_type type, while (1) { unsigned long size; char line_type[7]; - char flags[7]; + char flags[8]; char line_usage[19]; int ret; @@ -95,9 +95,9 @@ int kgsl_memtrack_get_memory(pid_t pid, enum memtrack_type type, /* Format: * gpuaddr useraddr size id flags type usage sglen - * 545ba000 545ba000 4096 1 ----pY gpumem arraybuffer 1 + * 545ba000 545ba000 4096 1 -----pY gpumem arraybuffer 1 */ - ret = sscanf(line, "%*x %*x %lu %*d %6s %6s %18s %*d\n", + ret = sscanf(line, "%*x %*x %lu %*d %7s %6s %18s %*d\n", &size, flags, line_type, line_usage); if (ret != 4) { continue; @@ -105,7 +105,7 @@ int kgsl_memtrack_get_memory(pid_t pid, enum memtrack_type type, if (type == MEMTRACK_TYPE_GL && strcmp(line_type, "gpumem") == 0) { - if (flags[5] == 'Y') + if (flags[6] == 'Y') accounted_size += size; else unaccounted_size += size; |