openstack/deb-python-eventlet
Code Issues Proposed changes

pools: don't use channel (which is now deprecated) use queue(0) directly

Browse Source
This commit is contained in:
Denis Bilenko
2009-06-12 14:00:01 +07:00
parent 82f2ffd052
commit 4ecc52052b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eventlet/pools.py
View File

@@ -25,7 +25,6 @@ THE SOFTWARE.
import collections import collections
from eventlet import api from eventlet import api
from eventlet import channel
from eventlet import coros from eventlet import coros
class FanFailed(RuntimeError): class FanFailed(RuntimeError):
@@ -75,7 +74,7 @@ class Pool(object):
self.max_size = max_size self.max_size = max_size
self.order_as_stack = order_as_stack self.order_as_stack = order_as_stack
self.current_size = 0 self.current_size = 0
self.channel = channel.channel() self.channel = coros.queue(0)
self.free_items = collections.deque() self.free_items = collections.deque()
for x in xrange(min_size): for x in xrange(min_size):
self.current_size += 1 self.current_size += 1
@@ -90,7 +89,7 @@ class Pool(object):
created = self.create() created = self.create()
self.current_size += 1 self.current_size += 1
return created return created
return self.channel.receive() return self.channel.wait()
def put(self, item): def put(self, item):
"""Put an item back into the pool, when done """Put an item back into the pool, when done
@@ -99,7 +98,7 @@ class Pool(object):
self.current_size -= 1 self.current_size -= 1
return return
if self.channel.balance < 0: if self.channel.sem.balance < 0:
self.channel.send(item) self.channel.send(item)
else: else:
if self.order_as_stack: if self.order_as_stack:
@@ -120,8 +119,8 @@ class Pool(object):
def waiting(self): def waiting(self):
"""Return the number of routines waiting for a pool item. """Return the number of routines waiting for a pool item.
""" """
if self.channel.balance < 0: if self.channel.sem.balance < 0:
return -self.channel.balance return -self.channel.sem.balance
return 0 return 0
def create(self): def create(self):