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.

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

Cputime #132

Merged
merged 1 commit into from Nov 17, 2013
Merged

Cputime #132

merged 1 commit into from Nov 17, 2013

Conversation

@lloyd
Copy link
Contributor

@lloyd lloyd commented Nov 14, 2013

depends on pull request #130

Would display CPU time utilized per process in seconds (user + system time).

like this:

                           |    megabytes    |
           NAME PID CPU(s) NICE  USS  PSS  RSS VSIZE OOM_ADJ USER   
            b2g 112   43.1    0 48.6 52.4 64.3 158.1       0 root   
         (Nuwa) 249    1.1    1  4.4 10.2 23.4  51.6       2 root   
          Usage 352    1.6   18 11.8 15.1 26.3  66.0      10 app_352
     Homescreen 391    3.3   18 15.2 18.9 30.4  70.7       8 app_391
(Preallocated a 455    0.1   18  2.9  6.9 14.3  55.6      10 root   
@dhylands
Copy link
Contributor

@dhylands dhylands commented Nov 15, 2013

I already applied pull request #130, so this one conflicts now. You'll need to rebase.

@lloyd
Copy link
Contributor Author

@lloyd lloyd commented Nov 16, 2013

rebased. git needed a human to resolve the order of two new fields in b2g-info output. should merge cleanly if desired now.

@dhylands
Copy link
Contributor

@dhylands dhylands commented Nov 17, 2013

It still shows as non-mergable by github.

There are two commits being included in this pull request. The first one (ac1b69c) is the "handle parens" which was already merged by PR #130 and the second one is the cputime.

So I don't think that you're fully rebased (or something)

@lloyd
Copy link
Contributor Author

@lloyd lloyd commented Nov 17, 2013

sorry, sloppy of me. I hadn't actually pushed the rebased branch. Give it another look.

dhylands added a commit that referenced this pull request Nov 17, 2013
@dhylands dhylands merged commit 4d6ae51 into mozilla-b2g:master Nov 17, 2013
@lloyd
Copy link
Contributor Author

@lloyd lloyd commented Nov 17, 2013

🍺

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants