Bitmessage/PyBitmessage-2024-12-01
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Conversation 0 Commits 399 Files Changed 133 +9 -2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 549d91dc68 - Show all commits

2
src/bitmessagemain.py
View File

@ -18,7 +18,6 @@ import singleton
import os import os
import socket import socket
import ctypes import ctypes
from multiprocessing import Process, freeze_support
from struct import pack from struct import pack
import sys import sys
from subprocess import call from subprocess import call
@ -266,7 +265,6 @@ class Main:
return {'address':address,'port':port} return {'address':address,'port':port}
if __name__ == "__main__": if __name__ == "__main__":
freeze_support()
mainprogram = Main() mainprogram = Main()
mainprogram.start() mainprogram.start()

9
src/proofofwork.py
View File

@ -151,6 +151,15 @@ def run(target, initialHash):
return _doCPoW(target, initialHash) return _doCPoW(target, initialHash)
except: except:
pass # fallback 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: try:
return _doFastPoW(target, initialHash) return _doFastPoW(target, initialHash)
except: except: