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

Temporary workaround for hanging PoW. #313

Closed
fiatflux wants to merge 1 commits from pow_deadlock into master
pull from: pow_deadlock
merge into: Bitmessage:master
Conversation 1 Commits 1 Files Changed 1 +8 -2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 63ac2b7846 - Show all commits

10
src/proofofwork.py
View File

@ -2,10 +2,12 @@
#import time #import time
#from multiprocessing import Pool, cpu_count #from multiprocessing import Pool, cpu_count
import hashlib import hashlib
#import os
from struct import unpack, pack from struct import unpack, pack
import sys import sys
from debug import logger
from shared import config from shared import config
#import os
def _set_idle(): def _set_idle():
if 'linux' in sys.platform: if 'linux' in sys.platform:
@ -52,7 +54,9 @@ def _doFastPoW(target, initialHash):
maxCores = 99999 maxCores = 99999
if pool_size > maxCores: if pool_size > maxCores:
pool_size = maxCores pool_size = maxCores
logger.debug('Creating POW pool with %s workers.' % (pool_size))
pool = Pool(processes=pool_size) pool = Pool(processes=pool_size)
logger.debug('Created POW pool.')
result = [] result = []
for i in range(pool_size): for i in range(pool_size):
result.append(pool.apply_async(_pool_worker, args = (i, initialHash, target, pool_size))) result.append(pool.apply_async(_pool_worker, args = (i, initialHash, target, pool_size)))
@ -72,6 +76,8 @@ def _doFastPoW(target, initialHash):
def run(target, initialHash): def run(target, initialHash):
if 'linux' in sys.platform: if 'linux' in sys.platform:
return _doFastPoW(target, initialHash) logger.debug('calling _doSafePoW as a TEMPORARY fix.')
return _doSafePoW(target, initialHash)
#return _doFastPoW(target, initialHash)
else: else:
return _doSafePoW(target, initialHash) return _doSafePoW(target, initialHash)