[0.13] Fix wake from sleep issue with Boost 1.59.0 #8899

pull fanquake wants to merge 1 commits into bitcoin:0.13 from fanquake:backport-boost-windows-patch changing 2 files +33 −0

fanquake commented at 11:13 AM on October 7, 2016: member

Patch Boost for the Windows "wake from sleep" issue which was fixed in 1.60.0. 0.13.0 depends is using 1.59.0 and @laanwj advised against an entire Boost bump.

This is already fixed in master as Boost was bumped to 1.61.0 in #8819.

Can someone on a Windows machines, maybe @drake127 or @achow101, test that it's working?

Closes #8806
Fix wake from sleep issue with Boost 1.59.0 49be9f0c88
fanquake added the label Windows on Oct 7, 2016
fanquake added the label Utils and libraries on Oct 7, 2016
fanquake added the label Backport on Oct 7, 2016
fanquake added this to the milestone 0.13.1 on Oct 7, 2016
luke-jr commented at 11:18 AM on October 7, 2016: member

Concept ACK.
MarcoFalke commented at 11:57 AM on October 7, 2016: member

Concept ACK

Can someone on a Windows machines, maybe @drake127 or @achow101, test that it's working?

Maybe @jonasschnelli can trigger a gitian nightly build if it helps testing?
drake127 commented at 1:18 PM on October 7, 2016: none

If you give me compiled binary, I can certainly try.

jonasschnelli commented at 3:24 PM on October 7, 2016: contributor

Gitian build failed with:

packages/boost.mk:5: *** missing separator (did you 
mean TAB instead of 8 spaces?).  Stop.
make: Leaving directory '/home/gitian/bitcoin/depend
s'

droark commented at 9:28 AM on October 9, 2016: contributor

Concept ACK. Compared the original patch to this one. Looks the same. Can't test as I won't have access to a Windows PC or VM for awhile, unfortunately.
MarcoFalke renamed this:
~~Fix wake from sleep issue with Boost 1.59.0~~
[0.13] Fix wake from sleep issue with Boost 1.59.0
on Oct 9, 2016
MarcoFalke commented at 12:09 PM on October 9, 2016: member

Build Style PR was merged on top of current master

Is the reason why https://bitcoin.jonasschnelli.ch/pulls/8899/ failed.
fanquake commented at 12:40 PM on October 9, 2016: member

Good spot. @jonasschnelli Could you restart the build, using 0.13 instead of master?
achow101 commented at 12:56 PM on October 10, 2016: member

Can someone get me a build of this? Cross compiling doesn't work on Ubuntu 16.04.
jonasschnelli commented at 1:59 PM on October 10, 2016: contributor

Just started a Gitian build: https://bitcoin.jonasschnelli.ch/pulls/8899/
achow101 commented at 4:31 PM on October 10, 2016: member

Managed to get it built myself.

Looks like it works, at least it didn't wake within a few minutes automatically.

ACK 49be9f0c88b2bb8d1409c138f92e0cf753807353
jonasschnelli commented at 4:36 PM on October 10, 2016: contributor

Gitian build was successfull. ACK
drake127 commented at 5:48 PM on October 10, 2016: none

Tried 49be9f0. Looks good to me.
in depends/patches/boost/fix-win-wake-from-sleep.patch:None in 49be9f0c88
```
   0 | @@ -0,0 +1,31 @@
   1 | +--- old/libs/thread/src/win32/thread.cpp
   2 | ++++ new/libs/thread/src/win32/thread.cpp
   3 | +@@ -645,7 +645,7 @@
   4 | +                     } Detailed;
   5 | +                 } Reason;
   6 | +             } REASON_CONTEXT, *PREASON_CONTEXT;
   7 | +-            static REASON_CONTEXT default_reason_context={0/*POWER_REQUEST_CONTEXT_VERSION*/, 0x00000001/*POWER_REQUEST_CONTEXT_SIMPLE_STRING*/, (LPWSTR)L"generic"};
   8 | ++            //static REASON_CONTEXT default_reason_context={0/*POWER_REQUEST_CONTEXT_VERSION*/, 0x00000001/*POWER_REQUEST_CONTEXT_SIMPLE_STRING*/, (LPWSTR)L"generic"};
```
sipa commented at 12:50 PM on October 11, 2016:

Is it intentional that a line is just commented out, rather than replaced (as is the case with the 2 other hunks)?

laanwj commented at 12:57 PM on October 11, 2016:

There's a different patch here: https://github.com/boostorg/thread/pull/67 that doesn't have the commenting at all. I think that's the one that eventually went in?

laanwj commented at 12:58 PM on October 11, 2016:

No, I'm wrong. Also this has been tested by people on windows now, so I'd prefer to keep it like this.

MarcoFalke commented at 2:33 PM on October 11, 2016:

Jup, this patch is from https://github.com/boostorg/thread/commit/9ac736a4c4214cdb01caaa84a1121b3846dc87b4
jtimon commented at 6:31 PM on October 13, 2016: contributor

concept ACK
laanwj merged this on Oct 13, 2016
laanwj closed this on Oct 13, 2016
laanwj referenced this in commit 4ed2627734 on Oct 13, 2016
fanquake deleted the branch on Oct 14, 2016
DrahtBot locked this on Sep 8, 2021