changes to thread code (directly use boost::thread)#2553
changes to thread code (directly use boost::thread)#2553jgarzik merged 1 commit intobitcoin:masterfrom Diapolo:threads
Conversation
|
@BitcoinPullTester Error seems unrelated to my changes! Exception in thread "main" java.lang.reflect.InvocationTargetException
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:616)
at org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader.main(JarRsrcLoader.java:58)
Caused by: java.lang.OutOfMemoryError: Java heap space
at com.google.bitcoin.core.FullBlockTestGenerator.getBlocksToTest(FullBlockTestGenerator.java:1335)
at com.google.bitcoin.core.BitcoindComparisonTool.(BitcoindComparisonTool.java:77)
at com.google.bitcoin.core.BitcoindComparisonTool.main(BitcoindComparisonTool.java:50)
... 5 more
|
|
Oops, false-positive, sorry, retesting... |
src/rpcwallet.cpp
Outdated
There was a problem hiding this comment.
cast isn't necessary, pnSleepTime is already an int64*
There was a problem hiding this comment.
Also, the code would be simpler if an int64 was passed instead of an int64* -- the only reason a pointer was passed before was because NewThread was dumb and could only pass one pointer.
There was a problem hiding this comment.
I updated ThreadCleanWalletPassphrase() to use an int64, can you have another look?
|
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/7df7cf51daf0ac9b491a356222f7217f296b0ace for binaries and test log. |
|
Any further comments on this? |
|
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/7796fe9da178a92108682f05e9ac037012326cd9 for binaries and test log. |
src/rpcwallet.cpp
Outdated
There was a problem hiding this comment.
nit: remove the p in the name (I don't care much for the type-prefixes in variable names, but when you use them, they should be correct).
|
@sipa Fixed your nit ;) and you were absolutely right. |
|
Automatic sanity-testing: FAILED MERGE, see http://jenkins.bluematt.me/pull-tester/1f52db4fdd3641e2c0ebbc2355ccc27547eaded7 for test log. This pull does not merge cleanly onto current master |
|
|
|
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/f810bac189c3f12de043026257adda7e76f27adf for binaries and test log. |
|
ACK |
|
The wallet passphrase bits of this are unnecessary after #2625 |
|
@gavinandresen I will update after your patch was merged or you just merge this an rebase your pull :). That way the other changes in this pull can get in now. As #2625 seems a little controversial, what is your oppinion on this now Gavin? |
|
Needs rebase as #2625 was merged |
|
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/0ab7a2d0f0adb7020b0a75fb3a2426f29e61b943 for binaries and test log. |
- removes our NewThread() function an replaces remaining calls with boost::thread with our TraceThread template - remove ExitThread() function - fix THREAD_PRIORITY_ABOVE_NORMAL for non Windows OSes
changes to thread code (directly use boost::thread)
7 participants
boost::thread with our TraceThread template