diff options
author | Fred Drake <fdrake@acm.org> | 2000-10-23 17:22:08 (GMT) |
---|---|---|
committer | Fred Drake <fdrake@acm.org> | 2000-10-23 17:22:08 (GMT) |
commit | 004d5e6880940ddbb38460986ac62ee0f1bae97d (patch) | |
tree | 682e75e743f5c22206a65ac0262c03ce37e4fbee /Lib/test/test_thread.py | |
parent | 2e6d25c5bbf3e2d4f18191c0836b5ed8f94dc850 (diff) | |
download | cpython-004d5e6880940ddbb38460986ac62ee0f1bae97d.zip cpython-004d5e6880940ddbb38460986ac62ee0f1bae97d.tar.gz cpython-004d5e6880940ddbb38460986ac62ee0f1bae97d.tar.bz2 |
Make reindent.py happy (convert everything to 4-space indents!).
Diffstat (limited to 'Lib/test/test_thread.py')
-rw-r--r-- | Lib/test/test_thread.py | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 710fb89..02da94e 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -16,98 +16,98 @@ done.acquire() numtasks = 10 def task(ident): - global running - rmutex.acquire() - delay = random.random() * numtasks - rmutex.release() - if verbose: - print 'task', ident, 'will run for', round(delay, 1), 'sec' - time.sleep(delay) - if verbose: - print 'task', ident, 'done' - mutex.acquire() - running = running - 1 - if running == 0: - done.release() - mutex.release() + global running + rmutex.acquire() + delay = random.random() * numtasks + rmutex.release() + if verbose: + print 'task', ident, 'will run for', round(delay, 1), 'sec' + time.sleep(delay) + if verbose: + print 'task', ident, 'done' + mutex.acquire() + running = running - 1 + if running == 0: + done.release() + mutex.release() next_ident = 0 def newtask(): - global next_ident, running - mutex.acquire() - next_ident = next_ident + 1 - if verbose: - print 'creating task', next_ident - thread.start_new_thread(task, (next_ident,)) - running = running + 1 - mutex.release() + global next_ident, running + mutex.acquire() + next_ident = next_ident + 1 + if verbose: + print 'creating task', next_ident + thread.start_new_thread(task, (next_ident,)) + running = running + 1 + mutex.release() for i in range(numtasks): - newtask() + newtask() print 'waiting for all tasks to complete' done.acquire() print 'all tasks done' class barrier: - def __init__(self, n): - self.n = n - self.waiting = 0 - self.checkin = thread.allocate_lock() - self.checkout = thread.allocate_lock() - self.checkout.acquire() + def __init__(self, n): + self.n = n + self.waiting = 0 + self.checkin = thread.allocate_lock() + self.checkout = thread.allocate_lock() + self.checkout.acquire() - def enter(self): - checkin, checkout = self.checkin, self.checkout + def enter(self): + checkin, checkout = self.checkin, self.checkout - checkin.acquire() - self.waiting = self.waiting + 1 - if self.waiting == self.n: - self.waiting = self.n - 1 - checkout.release() - return - checkin.release() + checkin.acquire() + self.waiting = self.waiting + 1 + if self.waiting == self.n: + self.waiting = self.n - 1 + checkout.release() + return + checkin.release() - checkout.acquire() - self.waiting = self.waiting - 1 - if self.waiting == 0: - checkin.release() - return - checkout.release() + checkout.acquire() + self.waiting = self.waiting - 1 + if self.waiting == 0: + checkin.release() + return + checkout.release() numtrips = 3 def task2(ident): - global running - for i in range(numtrips): - if ident == 0: - # give it a good chance to enter the next - # barrier before the others are all out - # of the current one - delay = 0.001 - else: - rmutex.acquire() - delay = random.random() * numtasks - rmutex.release() - if verbose: - print 'task', ident, 'will run for', round(delay, 1), 'sec' - time.sleep(delay) - if verbose: - print 'task', ident, 'entering barrier', i - bar.enter() - if verbose: - print 'task', ident, 'leaving barrier', i - mutex.acquire() - running = running - 1 - if running == 0: - done.release() - mutex.release() + global running + for i in range(numtrips): + if ident == 0: + # give it a good chance to enter the next + # barrier before the others are all out + # of the current one + delay = 0.001 + else: + rmutex.acquire() + delay = random.random() * numtasks + rmutex.release() + if verbose: + print 'task', ident, 'will run for', round(delay, 1), 'sec' + time.sleep(delay) + if verbose: + print 'task', ident, 'entering barrier', i + bar.enter() + if verbose: + print 'task', ident, 'leaving barrier', i + mutex.acquire() + running = running - 1 + if running == 0: + done.release() + mutex.release() print '\n*** Barrier Test ***' if done.acquire(0): - raise ValueError, "'done' should have remained acquired" + raise ValueError, "'done' should have remained acquired" bar = barrier(numtasks) running = numtasks for i in range(numtasks): - thread.start_new_thread(task2, (i,)) + thread.start_new_thread(task2, (i,)) done.acquire() print 'all tasks done' |