small init.cpp changes (strings / Winsock init) #2598

Diapolo commented at 4:20 PM on April 30, 2013: none

add a check that requested Winsock version is available
update some strings
remove -gen=0 from help-message as this is default

sipa commented at 4:55 PM on April 30, 2013: member

ACK if pulltester is happy with this.

BitcoinPullTester commented at 6:00 PM on April 30, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/22b0907a7ad099907cff6e0086c5b098a4fc27e2 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

gmaxwell commented at 7:33 PM on April 30, 2013: contributor

On the winsock version check, this isn't creating a gratuitous incompatibility with a "future" version is it?

sipa commented at 7:37 PM on April 30, 2013: member

Winsock 2.2 was released in 1996, and doesn't seem to have changed much. I doubt the version will change much still. The API specifies that if you request a lower version than the latest one supported, you still get the one you requested. So it shouldn't matter much, but it should be safe.

laanwj commented at 8:35 AM on May 1, 2013: member

ACK I don't see this check actually failing in the life of the universe, but better to have too many sanity checks than too few.

Diapolo commented at 8:57 AM on May 1, 2013: none

Just updated the commit-msg:

remove -par=0 from help-message as this is default replaced with remove -genr=0 from help-message as this is default

BitcoinPullTester commented at 9:26 AM on May 1, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/6f7b79d07e4a3772716a1a0d44607ab0244923ed for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

Diapolo commented at 12:54 PM on May 2, 2013: none

@sipa As pulltester is happy, can you merge it, so I can create another translations update :).

in src/init.cpp:None in 6f7b79d07e outdated

 356 | @@ -358,7 +357,7 @@ bool static Bind(const CService &addr, unsigned int flags) {
 357 |          "  -txindex               " + _("Maintain a full transaction index (default: 0)") + "\n" +
 358 |          "  -loadblock=<file>      " + _("Imports blocks from external blk000??.dat file") + "\n" +
 359 |          "  -reindex               " + _("Rebuild block chain index from current blk000??.dat files") + "\n" +
 360 | -        "  -par=N                 " + _("Set the number of script verification threads (up to 16, 0=auto, negative=leave N CPUs free, default: 0)") + "\n" +
 361 | +        "  -par=<n>               " + _("Set the number of script verification threads (up to 16, 0 = auto, negative = leave <n> CPUs free, default: 0)") + "\n" +

sipa commented at 7:08 PM on May 2, 2013:

Technically, that should be "leave -n CPUs free"...

Diapolo commented at 8:45 PM on May 2, 2013:

@sipa I'm not sure if I understand your comment. For -maxreceivebuffer=<n> we have Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000) for example, which seems to be the same format as above?

Perhaps negative should be replaced via <0 = leave <n> CPUs free...

Diapolo commented at 5:05 PM on May 3, 2013:

@sipa ping :)

sipa commented at 5:13 PM on May 3, 2013:

If n is negative, it means that we'll leave -n cores free, not n free (leaving a negative number free is kinda meaningless).

Diapolo commented at 5:17 PM on May 3, 2013:

I don't get it (string wise)... do you consider -n in that case as "minus n" or "dash n"? Anyway ^^, is <0 = leave <-n> CPUs free okay then, so I can update?

sipa commented at 5:27 PM on May 3, 2013:

Minus n. If n is negative, -n is positive, and -n is how many cores we'll leave free. However, I'm sure many people would find it more confusing.

How about "<0 = leave that many cores free"? (cores is more correct than CPUs, by the way).

Diapolo commented at 5:31 PM on May 3, 2013:

I'll go with your suggestion :).

Diapolo commented at 5:43 PM on May 3, 2013:

Updated and final ^^!?

small init.cpp changes (strings / Winsock init)

- add a check that requested Winsock version is available
- update some strings
- remove -gen=0 from help-message as this is default

110257a631

sipa referenced this in commit bcb79a64c9 on May 3, 2013

sipa merged this on May 3, 2013

sipa closed this on May 3, 2013

laudney referenced this in commit 88875259e0 on Mar 19, 2014

DrahtBot locked this on Sep 8, 2021