Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added some dummyrunner extra output

Browse source
This commit is contained in:
Griatch 2014-05-12 09:11:11 +02:00
parent cfd2f111f1
commit cdc071981d
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/utils/dummyrunner/dummyrunner.py
View file

@ -113,7 +113,9 @@ DEFAULT_TIMESTEP = 2
CHANCE_OF_ACTION = 0.05 CHANCE_OF_ACTION = 0.05
# Port to use, if not specified on command line # Port to use, if not specified on command line
DEFAULT_PORT = settings.TELNET_PORTS[0] DEFAULT_PORT = settings.TELNET_PORTS[0]
#
NLOGGED_IN = 0
NCLIENTS = 0
#------------------------------------------------------------ #------------------------------------------------------------
# Helper functions # Helper functions
@ -198,9 +200,11 @@ class DummyClient(telnet.StatefulTelnetProtocol):
""" """
if random.random() > CHANCE_OF_ACTION: if random.random() > CHANCE_OF_ACTION:
return return
global NLOGGED_IN
if not self._cmdlist: if not self._cmdlist:
# no cmdlist in store, get a new one # no cmdlist in store, get a new one
if self.istep == 0: if self.istep == 0:
NLOGGED_IN += 1
cfunc = self._actions[0] cfunc = self._actions[0]
else: # random selection using cumulative probabilities else: # random selection using cumulative probabilities
rand = random.random() rand = random.random()
@ -211,7 +215,8 @@ class DummyClient(telnet.StatefulTelnetProtocol):
self._ncmds = len(self._cmdlist) self._ncmds = len(self._cmdlist)
# output # output
if self.istep == 0 and not (self._echo_brief or self._echo_all): if self.istep == 0 and not (self._echo_brief or self._echo_all):
print "client %i %s" % (self.cid, self._report) # only print login
print "client %i %s (%i/%i)" % (self.cid, self._report, NLOGGED_IN, NCLIENTS)
elif self.istep == 0 or self._echo_brief or self._echo_all: elif self.istep == 0 or self._echo_brief or self._echo_all:
print "client %i %s (%i/%i)" % (self.cid, self._report, self._ncmds-(len(self._cmdlist)-1), self._ncmds) print "client %i %s (%i/%i)" % (self.cid, self._report, self._ncmds-(len(self._cmdlist)-1), self._ncmds)
# launch the action by popping the first element from cmdlist (don't hide tracebacks) # launch the action by popping the first element from cmdlist (don't hide tracebacks)
@ -234,6 +239,8 @@ class DummyFactory(protocol.ClientFactory):
def start_all_dummy_clients(actions, nclients=1, timestep=5, telnet_port=4000, verbose=0): def start_all_dummy_clients(actions, nclients=1, timestep=5, telnet_port=4000, verbose=0):
# validating and preparing the action tuple # validating and preparing the action tuple
global NCLIENTS
NCLIENTS = nclients
# make sure the probabilities add up to 1 # make sure the probabilities add up to 1
pratio = 1.0 / sum(tup[0] for tup in actions[2:]) pratio = 1.0 / sum(tup[0] for tup in actions[2:])

4
src/utils/dummyrunner/dummyrunner_actions.py
View file

@ -201,9 +201,9 @@ def c_moves(client):
## "socializing heavy builder" definition ## "socializing heavy builder" definition
ACTIONS = (c_login, ACTIONS = (c_login,
c_logout, c_logout,
(0.1, c_socialize), #(0.1, c_socialize),
(0.1, c_looks), (0.1, c_looks),
(0.1, c_help), (0.2, c_help),
(0.2, c_creates_obj), (0.2, c_creates_obj),
(0.2, c_digs), (0.2, c_digs),
(0.3, c_moves)) (0.3, c_moves))