Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Commit

Permalink
Merge pull request #929 from golemfactory/iocp_reactor
Browse files Browse the repository at this point in the history
Use IOCP reactor on Windows
  • Loading branch information
badb authored Mar 31, 2017
2 parents 026f9ed + 015231f commit 4aee05d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
7 changes: 5 additions & 2 deletions golem/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from apps.appsmanager import AppsManager
from golem.client import Client
from golem.core.common import is_windows
from golem.network.transport.tcpnetwork import SocketAddress, AddressValueError
from golem.rpc.mapping.core import CORE_METHOD_MAP
from golem.rpc.session import object_method_map, Session
Expand Down Expand Up @@ -55,9 +56,11 @@ def add_tasks(self, tasks):

def run(self, use_rpc=False):
try:
# Import reactor locally because it also installs it and GUI
# requires Qt reactor version.
if is_windows() and 'twisted.internet.reactor' not in sys.modules:
from twisted.internet import iocpreactor
iocpreactor.install()
from twisted.internet import reactor

if use_rpc:
config = self.client.config_desc
reactor.callWhenRunning(self._start_rpc_server,
Expand Down
14 changes: 9 additions & 5 deletions gui/startapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@

from apps.appsmanager import AppsManager
from golem.client import Client
from golem.core.common import config_logging
from golem.core.common import config_logging, is_windows
from golem.core.common import get_golem_path
from golem.core.deferred import install_unhandled_error_logger
from golem.core.processmonitor import ProcessMonitor
from golem.docker.manager import DockerManager
from golem.rpc.mapping.core import CORE_METHOD_MAP
from golem.rpc.router import CrossbarRouter
from golem.rpc.session import Session, object_method_map
from twisted.internet.error import ReactorAlreadyRunning

Expand Down Expand Up @@ -59,9 +56,16 @@ def start_client(start_ranking, datadir=None,
install_unhandled_error_logger()

if not reactor:
if is_windows():
from twisted.internet import iocpreactor
iocpreactor.install()
from twisted.internet import reactor
process_monitor = None

from golem.core.processmonitor import ProcessMonitor
from golem.docker.manager import DockerManager
from golem.rpc.router import CrossbarRouter

process_monitor = None
if not client:
client = Client(datadir=datadir, transaction_system=transaction_system, **config_overrides)

Expand Down

0 comments on commit 4aee05d

Please sign in to comment.