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

Add node metrics screen #1375

Merged
merged 12 commits into from Oct 23, 2016
Merged

Add node metrics screen #1375

merged 12 commits into from Oct 23, 2016

Conversation

@str4d
Copy link
Contributor

str4d commented Sep 10, 2016

Continuation of #1336
Closes #1331

@str4d
Copy link
Contributor Author

str4d commented Oct 5, 2016

I have rebased this PR on beta 2.

@zkbot
Copy link
Collaborator

zkbot commented Oct 21, 2016

The latest upstream changes (presumably #1578) made this pull request unmergeable. Please resolve the merge conflicts.

@daira daira force-pushed the str4d:1331-node-metrics branch from 90b9f99 to 5c60ee7 Oct 22, 2016
@daira
Copy link
Contributor

daira commented Oct 22, 2016

I rebased this on current master (post-#1578).

@@ -191,15 +192,20 @@ Value generate(const Array& params, bool fHelp)
std::function<bool(std::vector<unsigned char>)> validBlock =
[&pblock](std::vector<unsigned char> soln) {
pblock->nSolution = soln;
solutionTargetChecks.increment();

This comment has been minimized.

@daira

daira Oct 22, 2016 Contributor

This RPC method is only used for regtest, so it doesn't need any of the increment() calls. Does not block (these calls are harmless, just unnecessary).

@daira
Copy link
Contributor

daira commented Oct 22, 2016

utACK.

@str4d
Copy link
Contributor Author

str4d commented Oct 22, 2016

utACK, looks like @daira added the extra count calls for tromp's solver.

Note that the print statements in tromp's solver will interfere with the metrics screen output. I'll test it now and see if I'd need to fix it (which i can do now).

@daira
Copy link
Contributor

daira commented Oct 22, 2016

It's fine to just comment out those print statements, I think.

@str4d
Copy link
Contributor Author

str4d commented Oct 22, 2016

Yeah, that's what I'll do for now.

@str4d
Copy link
Contributor Author

str4d commented Oct 22, 2016

Okay, it interferes with one of the auto-update lines, but doesn't obscure any information and doesn't break the UI. Still, I'll fix it now :)

str4d added 10 commits Sep 3, 2016
The screen is implemented using ANSI Escape sequences.

Closes #1331
Part of #1422
@str4d
Copy link
Contributor Author

str4d commented Oct 22, 2016

Found a bug: the solver increment call for tromp's solver was added inside the solution for loop, so it is counting every found solution instead of every run. Rebasing on master to fix.

@daira
Copy link
Contributor

daira commented Oct 22, 2016

Oops, should have checked that more carefully.

@str4d
Copy link
Contributor Author

str4d commented Oct 22, 2016

Assigning to @nathan-at-least for a decision, because @zookozcash really really really wants this merged, particularly as we also merged #1578 to include a faster miner (although that is not enabled by default, but everyone is going to use it anyway).

@daira
Copy link
Contributor

daira commented Oct 22, 2016

@nathan-at-least said:

I won't have time today, most likely. I'm comfortable with you deciding. If it still needs my input on Monday I'll look at it early.

My decision is yes, provided it merges and tests cleanly now. @zkbot r+

@zkbot
Copy link
Collaborator

zkbot commented Oct 22, 2016

📌 Commit dccc140 has been approved by daira

@zkbot
Copy link
Collaborator

zkbot commented Oct 22, 2016

Testing commit dccc140 with merge 5562f8d...

zkbot pushed a commit that referenced this pull request Oct 22, 2016
Add node metrics screen

Continuation of #1336
Closes #1331
@daira daira modified the milestones: 1.0.0-rc2, 1.0.1 stabilization Oct 22, 2016
@zkbot
Copy link
Collaborator

zkbot commented Oct 22, 2016

💔 Test failed - zcash

@str4d
Copy link
Contributor Author

str4d commented Oct 22, 2016

@daira:

My decision is yes, provided it merges and tests cleanly now.

I just pushed the one-line fix to get the RPC tests running. Should I re-run?

@str4d
Copy link
Contributor Author

str4d commented Oct 22, 2016

Gonna re-run

@zkbot r+

@zkbot
Copy link
Collaborator

zkbot commented Oct 22, 2016

📌 Commit d6feeef has been approved by str4d

@zkbot
Copy link
Collaborator

zkbot commented Oct 22, 2016

Testing commit d6feeef with merge a884e5f...

zkbot pushed a commit that referenced this pull request Oct 22, 2016
Add node metrics screen

Continuation of #1336
Closes #1331
@daira
Copy link
Contributor

daira commented Oct 22, 2016

@zkbot cancel

Author: Jack Grigg <jack@z.cash>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira daira force-pushed the str4d:1331-node-metrics branch from d6feeef to 02a4ace Oct 23, 2016
@daira daira assigned daira and unassigned nathan-at-least Oct 23, 2016
@daira
Copy link
Contributor

daira commented Oct 23, 2016

Please don't r+ until I've checked something locally. (I want to check how the metrics screen interacts with -printtoconsole.)

@daira
Copy link
Contributor

daira commented Oct 23, 2016

OK, showmetrics is disabled when printtoconsole is enabled. Just doing a smoke test...

@daira
Copy link
Contributor

daira commented Oct 23, 2016

Smoke-tested ACK. @zkbot r+

@zkbot
Copy link
Collaborator

zkbot commented Oct 23, 2016

📌 Commit 02a4ace has been approved by daira

@zkbot
Copy link
Collaborator

zkbot commented Oct 23, 2016

Testing commit 02a4ace with merge a294b26...

zkbot pushed a commit that referenced this pull request Oct 23, 2016
Add node metrics screen

Continuation of #1336
Closes #1331
@zkbot
Copy link
Collaborator

zkbot commented Oct 23, 2016

☀️ Test successful - zcash

@zkbot zkbot merged commit 02a4ace into zcash:master Oct 23, 2016
1 check passed
1 check passed
homu Test successful
Details
@str4d str4d deleted the str4d:1331-node-metrics branch Oct 23, 2016
@lfarkas

This comment has been minimized.

Copy link

lfarkas commented on dccc140 Nov 4, 2016

this commit has a few bug since a few printf was the only one statement in the if condition above. anyway i'm in a process to update zcash's tromp to his current version.

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

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.