Re-disable windows SMP frozen support
The recommended workaround didn't work.
This commit is contained in:
parent
1625306be3
commit
549d91dc68
|
@ -18,7 +18,6 @@ import singleton
|
|||
import os
|
||||
import socket
|
||||
import ctypes
|
||||
from multiprocessing import Process, freeze_support
|
||||
from struct import pack
|
||||
import sys
|
||||
from subprocess import call
|
||||
|
@ -266,7 +265,6 @@ class Main:
|
|||
return {'address':address,'port':port}
|
||||
|
||||
if __name__ == "__main__":
|
||||
freeze_support()
|
||||
mainprogram = Main()
|
||||
mainprogram.start()
|
||||
|
||||
|
|
|
@ -151,6 +151,15 @@ def run(target, initialHash):
|
|||
return _doCPoW(target, initialHash)
|
||||
except:
|
||||
pass # fallback
|
||||
if frozen == "macosx_app" or not frozen:
|
||||
# on my (Peter Surda) Windows 10, Windows Defender
|
||||
# does not like this and fights with PyBitmessage
|
||||
# over CPU, resulting in very slow PoW
|
||||
# added on 2015-11-29: multiprocesing.freeze_support() doesn't help
|
||||
try:
|
||||
return _doFastPoW(target, initialHash)
|
||||
except:
|
||||
pass #fallback
|
||||
try:
|
||||
return _doFastPoW(target, initialHash)
|
||||
except:
|
||||
|
|
Loading…
Reference in New Issue
Block a user