From 45adea860ceaf23cfabdaf6a22d13c4650550bb3 Mon Sep 17 00:00:00 2001 From: NavaL Date: Thu, 2 Jun 2016 10:51:33 +0200 Subject: Revert "added custom c extension to set mutex locking for openssl rand generation" This reverts commit 6b528c26a05f1c3f969a9896328be408bcfd6064. --- service/pixelated/application.py | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 8b128cd3..ce1e0258 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -40,10 +40,6 @@ from pixelated.resources.root_resource import RootResource log = logging.getLogger(__name__) -from multiprocessing import Lock -from threading import current_thread -import foobar - class ServicesFactory(object): @@ -140,33 +136,8 @@ def _create_service_factory(args): else: return ServicesFactory(UserAgentMode(is_single_user=False)) -CRYPTO_LOCK=1 -CRYPTO_UNLOCK=2 -CRYPTO_READ=4 -CRYPTO_WRITE=8 - - -def idfunc(): - return current_thread().ident - - -locks = [Lock(), Lock(), Lock(), Lock(), Lock(),Lock(), Lock(), Lock(), Lock(), Lock()] - - -def lockfunc(mode, n, file, line): - if mode & CRYPTO_LOCK == CRYPTO_LOCK: - print "acquire lock %d" % n - locks[n].acquire() - elif mode & CRYPTO_UNLOCK == CRYPTO_UNLOCK: - print "release lock %d" % n - locks[n].release() - else: - print "unexpected call with mode %d and n %d" % (mode, n) - def initialize(): - foobar.enable_mutexes(idfunc, lockfunc) - log.info('Starting the Pixelated user agent') args = arguments.parse_user_agent_args() logger.init(debug=args.debug) -- cgit v1.2.3