isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwtest.js: Don't parse JSON with regexps

Browse Source 
Use JSON.parse() to parse systemd log records, rather than using
regexps.

https://bugzilla.gnome.org/show_bug.cgi?id=732350
This commit is contained in:
Owen W. Taylor 2014-07-16 13:20:15 -04:00
parent c6350aa557
commit 46c86e093c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/perf/hwtest.js
View File

@ -78,7 +78,7 @@ function extractBootTimestamp() {
'MESSAGE_ID=7d4958e842da4a758f6c1cdc7b36dcc5', 'MESSAGE_ID=7d4958e842da4a758f6c1cdc7b36dcc5',
'UNIT=graphical.target', 'UNIT=graphical.target',
'-o', '-o',
'json-pretty'], 'json'],
Gio.SubprocessFlags.STDOUT_PIPE); Gio.SubprocessFlags.STDOUT_PIPE);
let result = null; let result = null;
@ -88,10 +88,8 @@ function extractBootTimestamp() {
if (line === null) if (line === null)
break; break;
let m = /.*"__MONOTONIC_TIMESTAMP".*"([0-9]+)"/.exec(line); let fields = JSON.parse(line);
if (m) { result = Number(fields['__MONOTONIC_TIMESTAMP']);
result = Number(m[1]);
}
} }
datastream.close(null); datastream.close(null);
return result; return result;