sm/smbinterp
1
0
Fork 0
Code Issues Pull Requests Activity

renamed slave to minion

Browse Source 
--HG--
rename : bin/slave.py => bin/minion.py
This commit is contained in:
Stephen Mardson McQuay 2011-05-08 13:36:06 -06:00
parent a84c7fda4e
commit 88520ffe33
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/iqmgr.py
View File

@ -18,7 +18,7 @@ if sys.argv[1].startswith("st"):
print " tasksq : %d" % tq.qsize() print " tasksq : %d" % tq.qsize()
print " resultsq : %d" % rq.qsize() print " resultsq : %d" % rq.qsize()
print " masterq : %d" % mq.qsize() print " masterq : %d" % mq.qsize()
print " slavesq : %d" % sq.qsize() print " minionsq : %d" % sq.qsize()
if sys.argv[1] == 'add': if sys.argv[1] == 'add':
for i in xrange(int(sys.argv[2])): for i in xrange(int(sys.argv[2])):

6
bin/master.py
View File

@ -57,7 +57,7 @@ if __name__ == '__main__':
m = QueueManager(address=(server, options.port), authkey='asdf') m = QueueManager(address=(server, options.port), authkey='asdf')
m.connect() m.connect()
tasksq, resultsq, masterq, slavesq = get_qs(m) tasksq, resultsq, masterq, minionsq = get_qs(m)
if not options.participants: if not options.participants:
print "wait on all announced participants" print "wait on all announced participants"
@ -91,7 +91,7 @@ if __name__ == '__main__':
for i in xrange(participants): for i in xrange(participants):
print "sending worker %d start message" % (i+1,) print "sending worker %d start message" % (i+1,)
slavesq.put("start") minionsq.put("start")
receive_start = time.time() receive_start = time.time()
widgets = ['interpolate: ', Percentage(), ' ', Bar(), ' ', ETA()] widgets = ['interpolate: ', Percentage(), ' ', Bar(), ' ', ETA()]
@ -109,7 +109,7 @@ if __name__ == '__main__':
# shut down all participants # shut down all participants
for i in xrange(participants): for i in xrange(participants):
if options.last: if options.last:
slavesq.put("teardown") minionsq.put("teardown")
# post processing # post processing
stats = {} stats = {}

4
bin/slave.py → bin/minion.py
View File

@ -46,7 +46,7 @@ if __name__ == '__main__':
m = QueueManager(address=(server, options.port), authkey='asdf') m = QueueManager(address=(server, options.port), authkey='asdf')
m.connect() m.connect()
tasksq, resultsq, masterq, slavesq = get_qs(m) tasksq, resultsq, masterq, minionsq = get_qs(m)
g = ggrid(input_file) g = ggrid(input_file)
g.q = np.array([exact(x) for x in g.verts]) g.q = np.array([exact(x) for x in g.verts])
@ -60,7 +60,7 @@ if __name__ == '__main__':
# indicate that I am loaded up, and ready for workload # indicate that I am loaded up, and ready for workload
masterq.put(myname) masterq.put(myname)
# wait for master's start signal # wait for master's start signal
action = slavesq.get() action = minionsq.get()
if action == "teardown": if action == "teardown":
# I take it back; I'm not ready! # I take it back; I'm not ready!
masterq.get() masterq.get()

6
interp/cluster/__init__.py
View File

@ -3,7 +3,7 @@ import Queue
tasks_q = Queue.Queue() tasks_q = Queue.Queue()
results_q = Queue.Queue() results_q = Queue.Queue()
slaves_q = Queue.Queue() minions_q = Queue.Queue()
master_q = Queue.Queue() master_q = Queue.Queue()
class QueueManager(BaseManager): class QueueManager(BaseManager):
@ -11,11 +11,11 @@ class QueueManager(BaseManager):
QueueManager.register('get_tasks_q', callable=lambda:tasks_q ) QueueManager.register('get_tasks_q', callable=lambda:tasks_q )
QueueManager.register('get_results_q', callable=lambda:results_q) QueueManager.register('get_results_q', callable=lambda:results_q)
QueueManager.register('get_slaves_q', callable=lambda:slaves_q ) QueueManager.register('get_minions_q', callable=lambda:minions_q )
QueueManager.register('get_master_q', callable=lambda:master_q ) QueueManager.register('get_master_q', callable=lambda:master_q )
def get_qs(m): def get_qs(m):
""" """
returns all relevant queues returns all relevant queues
""" """
return (m.get_tasks_q(), m.get_results_q(), m.get_master_q(), m.get_slaves_q()) return (m.get_tasks_q(), m.get_results_q(), m.get_master_q(), m.get_minions_q())