summaryrefslogtreecommitdiffstats
path: root/tools/memory_inspector
diff options
context:
space:
mode:
Diffstat (limited to 'tools/memory_inspector')
-rw-r--r--tools/memory_inspector/chrome_app/template/manifest.json4
-rw-r--r--tools/memory_inspector/classification_rules/default/mmap-android.py2
-rw-r--r--tools/memory_inspector/memory_inspector/frontends/www_content/index.html4
-rw-r--r--tools/memory_inspector/memory_inspector/frontends/www_content/js/devices.js4
-rw-r--r--tools/memory_inspector/memory_inspector/frontends/www_content/js/processes.js2
-rw-r--r--tools/memory_inspector/memory_inspector/frontends/www_content/js/webservice.js3
6 files changed, 10 insertions, 9 deletions
diff --git a/tools/memory_inspector/chrome_app/template/manifest.json b/tools/memory_inspector/chrome_app/template/manifest.json
index a88b39f..b797fc0 100644
--- a/tools/memory_inspector/chrome_app/template/manifest.json
+++ b/tools/memory_inspector/chrome_app/template/manifest.json
@@ -1,7 +1,7 @@
{
"name": "Memory Inspector",
"description": "Memory inspector tool for Android",
- "version": "0.1.0",
+ "version": "0.1.2",
"manifest_version": 2,
"icons": {
"16": "images/icon_16.png",
@@ -30,6 +30,6 @@
"udp-send-to:*:*"
]
},
- "http://127.0.0.1:*/*"
+ "http://127.0.0.1/*"
]
}
diff --git a/tools/memory_inspector/classification_rules/default/mmap-android.py b/tools/memory_inspector/classification_rules/default/mmap-android.py
index 1a8d0d0..336edfd 100644
--- a/tools/memory_inspector/classification_rules/default/mmap-android.py
+++ b/tools/memory_inspector/classification_rules/default/mmap-android.py
@@ -76,7 +76,7 @@
'children': [
{
'name': 'GPU',
- 'mmap_file': r'(nv)|(mali)',
+ 'mmap_file': r'(nv)|(mali)|(kgsl)',
},
],
},
diff --git a/tools/memory_inspector/memory_inspector/frontends/www_content/index.html b/tools/memory_inspector/memory_inspector/frontends/www_content/index.html
index c3c053d..79388f2 100644
--- a/tools/memory_inspector/memory_inspector/frontends/www_content/index.html
+++ b/tools/memory_inspector/memory_inspector/frontends/www_content/index.html
@@ -87,7 +87,7 @@
</div>
<div>
<label for="ps-tracer-period">Period [s.]</label>
- <input type="text" id="ps-tracer-period" value="20">
+ <input type="text" id="ps-tracer-period" value="10">
</div>
<div>
<label for="ps-tracer-snapshots">Num snapshots</label>
@@ -234,4 +234,4 @@
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/tools/memory_inspector/memory_inspector/frontends/www_content/js/devices.js b/tools/memory_inspector/memory_inspector/frontends/www_content/js/devices.js
index f96a447..9cf6b6a 100644
--- a/tools/memory_inspector/memory_inspector/frontends/www_content/js/devices.js
+++ b/tools/memory_inspector/memory_inspector/frontends/www_content/js/devices.js
@@ -65,8 +65,8 @@ this.onDevicesAjaxResponse_ = function(data) {
if (data.length > 0) {
this.onDeviceSelectionChange_(); // Start monitoring the first device.
} else {
- rootUi.showDialog('No devices could be detected. Check the settings tab ' +
- 'to ensure that the adb path is properly configured.');
+ rootUi.showDialog('No devices detected. Make sure that adb is running on ' +
+ 'the host and check \'adb devices\'.');
}
};
diff --git a/tools/memory_inspector/memory_inspector/frontends/www_content/js/processes.js b/tools/memory_inspector/memory_inspector/frontends/www_content/js/processes.js
index 0e3fa02..75e6021 100644
--- a/tools/memory_inspector/memory_inspector/frontends/www_content/js/processes.js
+++ b/tools/memory_inspector/memory_inspector/frontends/www_content/js/processes.js
@@ -39,7 +39,7 @@ this.onDomReady_ = function() {
// Set-up the tracer dialog.
$('#ps-tracer-dialog').dialog({autoOpen: false, modal: true, width: 400,
buttons: {'Start': this.startTracingSelectedProcess_.bind(this)}});
- $('#ps-tracer-period').spinner({min: 0, step: 20});
+ $('#ps-tracer-period').spinner({min: 0, step: 10});
$('#ps-tracer-snapshots').spinner({min: 1, max: 100});
// Create the process table.
diff --git a/tools/memory_inspector/memory_inspector/frontends/www_content/js/webservice.js b/tools/memory_inspector/memory_inspector/frontends/www_content/js/webservice.js
index 1a62a6d..5f4b8f2 100644
--- a/tools/memory_inspector/memory_inspector/frontends/www_content/js/webservice.js
+++ b/tools/memory_inspector/memory_inspector/frontends/www_content/js/webservice.js
@@ -23,7 +23,8 @@ this.ajaxRequest = function(path, responseCallback, errorCallback, postArgs) {
console.log('AJAX error (req: ' + path + ').');
console.log('HTTP response: ' + xhr.status + ' ' + thrownError);
console.log(xhr.responseText);
- rootUi.showDialog(xhr.responseText || 'Unknown server error');
+ rootUi.showDialog((xhr.responseText || 'Unknown server error.') +
+ ' Check the console for more details.');
if (errorCallback)
errorCallback(xhr.status, xhr.responseText);
if (xhr.readyState < 4 && this_.onServerUnreachableOrTimeout != null)