Commit eedf3811 authored by Remi Mommsen's avatar Remi Mommsen
Browse files

references #136: update scripts to latest version from baseline_phosphorus_15

parent 93271da9
......@@ -190,19 +190,13 @@ class ConfigFromFile(Configuration):
for application in c.findall(QN(self.xcns,'Application').text): ## all 'Application's of this context
if ferolsOnly and not application.attrib['class'].startswith(('ferol::','ferol40::')):
continue
if generateAtRU and application.attrib['class'] == "pt::blit::Application":
if application.attrib['class'] == "pt::blit::Application":
continue
properties = self.getProperties(application)
app = Application.Application(application.attrib['class'],application.attrib['instance'],properties)
app.params['network'] = application.attrib['network']
app.params['id'] = application.attrib['id']
if app.params['class'] == 'pt::blit::Application':
app.params['frlHostname'] = context.hostinfo['frlHostname']
for portCount,portNb in enumerate(self.frlPorts):
app.params['frlPort'+str(portCount+1)] = portNb
app.params['maxbulksize'] = self.getBlockSize(app)
elif app.params['class'] == 'pt::ibv::Application':
if app.params['class'] == 'pt::ibv::Application':
app.params['protocol'] = 'ibv'
app.params['i2oHostname'] = context.hostinfo['i2oHostname']
app.params['i2oPort'] = context.hostinfo['i2oPort']
......@@ -222,8 +216,8 @@ class ConfigFromFile(Configuration):
if app.params['class'] == 'evb::EVM':
context.role = 'EVM'
self.evmFedId = self.getEvmFedId(app)
if count != '0':
raise Exception("The EVM must map to RU0, but maps to RU"+str(count))
#if count != '0':
# raise Exception("The EVM must map to RU0, but maps to RU"+str(count))
if maxTriggerRate is not None:
self.setMaxTriggerRate(app,maxTriggerRate)
elif app.params['class'] == 'evb::BU':
......@@ -241,6 +235,7 @@ class ConfigFromFile(Configuration):
self.dropInputData(app,'dropAtStream')
elif fixPorts:
self.fixFerolPorts(app)
self.setDSR(app)
context.applications.append(app)
self.add(context)
......@@ -315,23 +310,6 @@ class ConfigFromFile(Configuration):
app.properties = newProp
def getBlockSize(self,app):
for prop in app.properties:
if prop[0] == 'maxBlockSize':
return prop[2]
return None
def setBlockSize(self,app,maxBlockSize):
newProp = []
for prop in app.properties:
if prop[0] == 'maxBlockSize':
newProp.append(('maxBlockSize','unsignedInt',maxBlockSize))
else:
newProp.append(prop)
app.properties = newProp
def setOperationMode(self,app,ferolMode):
newProp = []
for prop in app.properties:
......@@ -384,6 +362,20 @@ class ConfigFromFile(Configuration):
app.properties = newProp
def setDSR(self,app):
if app.params['class'] in ('evb::EVM','evb::RU'):
newProp = [
('fragmentFIFOCapacity','unsignedInt','128'),
('socketBufferSize','unsignedInt','0x20000'),
('socketPoolSize','unsignedInt','0x500000'),
('ferolPorts','unsignedInt',(60500,60600,60700,60800)),
]
for prop in app.properties:
if prop[0] not in ('socketBufferFIFOCapacity','fragmentFIFOCapacity'):
newProp.append(prop)
app.properties = newProp
def setMaxTriggerRate(self,app,rate):
if app.params['class'] in ('evb::EVM'):
newProp = [('maxTriggerRate','unsignedInt',rate)]
......@@ -438,7 +430,7 @@ class ConfigFromFile(Configuration):
def getPolicyForRUBUonSkylake(self,hostinfo):
policy = [
return [
{'affinity':'5', 'memnode':'1','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::acceptor(.*)/waiting','type':'thread'},
{'affinity':'11','memnode':'1','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::eventworkloop/polling','type':'thread'},
{'affinity':'19','memnode':'1','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::completionworkloopr(.*)/polling','type':'thread'},
......@@ -489,56 +481,68 @@ class ConfigFromFile(Configuration):
{'mempolicy':'onnode','node':'1','package':'numa','pattern':'urn:eventFIFO:alloc','type':'alloc'},
{'mempolicy':'onnode','node':'1','package':'numa','pattern':'urn:eventFragmentFIFO:alloc','type':'alloc'},
]
if 'frlHostname' not in hostinfo:
return policy
else:
return policy + [
{'affinity':'14','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])60500/waiting','type':'thread'},
{'affinity':'14','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])60600/waiting','type':'thread'},
{'affinity':'14','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])60700/waiting','type':'thread'},
{'affinity':'14','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])60800/waiting','type':'thread'},
{'affinity':'6', 'memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])60500/polling','type':'thread'},
{'affinity':'46','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])60600/polling','type':'thread'},
{'affinity':'22','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])60700/polling','type':'thread'},
{'affinity':'30','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])60800/polling','type':'thread'},
{'affinity':'38','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':60500/waiting','type':'thread'},
{'affinity':'2', 'memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':60600/waiting','type':'thread'},
{'affinity':'54','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':60700/waiting','type':'thread'},
{'affinity':'56','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':60800/waiting','type':'thread'},
{'affinity':'16','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-acceptor-dispatcher/(.*)/waiting','type':'thread'},
{'affinity':'33','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-connector-dispatcher/(.*)/waiting','type':'thread'},
{'affinity':'10','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-sender-dispatcher/(.*)/waiting','type':'thread'},
{'affinity':'17','memnode':'0','mempolicy':'onnode','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-workloop/(.*)/polling','type':'thread'},
{'mempolicy':'onnode','node':'0','package':'numa','pattern':'urn:toolbox-mem-allocator-blit-socket(.*)','type':'alloc'},
{'mempolicy':'onnode','node':'0','package':'numa','pattern':'urn:pt-blit-inputpipe-rlist(.*)','type':'alloc'},
{'mempolicy':'onnode','node':'0','package':'numa','pattern':'urn:tcpla-(.*)/'+hostinfo['frlHostname']+'(.*)','type':'alloc'},
]
def getPolicyForRUBUonAMD(self,hostinfo):
policy = [
return [
{'affinity':'15','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::acceptor(.*)/waiting','type':'thread'},
{'affinity':'58','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::completionworkloopr(.*)/polling','type':'thread'},
{'affinity':'22','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::completionworkloops(.*)/polling','type':'thread'},
{'affinity':'45','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::eventworkloop/polling','type':'thread'},
{'affinity':'3', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_0/waiting','type':'thread'},
{'affinity':'21','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_0/waiting','type':'thread'},
{'affinity':'3', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_1/waiting','type':'thread'},
{'affinity':'4', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_2/waiting','type':'thread'},
{'affinity':'49','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_3/waiting','type':'thread'},
{'affinity':'61','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_4/waiting','type':'thread'},
{'affinity':'5', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_5/waiting','type':'thread'},
{'affinity':'60','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_6/waiting','type':'thread'},
{'affinity':'55','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_7/waiting','type':'thread'},
{'affinity':'63','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_8/waiting','type':'thread'},
{'affinity':'46','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_9/waiting','type':'thread'},
{'affinity':'57','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_10/waiting','type':'thread'},
{'affinity':'43','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_11/waiting','type':'thread'},
{'affinity':'28','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_12/waiting','type':'thread'},
{'affinity':'52','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_13/waiting','type':'thread'},
{'affinity':'8', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_14/waiting','type':'thread'},
{'affinity':'11','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_15/waiting','type':'thread'},
{'affinity':'8', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_16/waiting','type':'thread'},
{'affinity':'7', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_17/waiting','type':'thread'},
{'affinity':'24','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_18/waiting','type':'thread'},
{'affinity':'58','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_19/waiting','type':'thread'},
{'affinity':'46','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_20/waiting','type':'thread'},
{'affinity':'49','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_21/waiting','type':'thread'},
{'affinity':'58','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_22/waiting','type':'thread'},
{'affinity':'53','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_23/waiting','type':'thread'},
{'affinity':'46','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_24/waiting','type':'thread'},
{'affinity':'50','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_25/waiting','type':'thread'},
{'affinity':'51','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_26/waiting','type':'thread'},
{'affinity':'54','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_27/waiting','type':'thread'},
{'affinity':'32','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_28/waiting','type':'thread'},
{'affinity':'37','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_29/waiting','type':'thread'},
{'affinity':'18','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_30/waiting','type':'thread'},
{'affinity':'18','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_31/waiting','type':'thread'},
{'affinity':'20','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_32/waiting','type':'thread'},
{'affinity':'32','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_33/waiting','type':'thread'},
{'affinity':'54','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_34/waiting','type':'thread'},
{'affinity':'36','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_35/waiting','type':'thread'},
{'affinity':'44','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_0/waiting','type':'thread'},
{'affinity':'39','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_1/waiting','type':'thread'},
{'affinity':'30','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_2/waiting','type':'thread'},
{'affinity':'16','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_3/waiting','type':'thread'},
{'affinity':'29','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_4/waiting','type':'thread'},
{'affinity':'38','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_5/waiting','type':'thread'},
{'affinity':'8', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_6/waiting','type':'thread'},
{'affinity':'45','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_6/waiting','type':'thread'},
{'affinity':'42','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_7/waiting','type':'thread'},
{'affinity':'20','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:fifo/PeerTransport/waiting','type':'thread'},
{'affinity':'9', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/buPoster/waiting','type':'thread'},
{'affinity':'35','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/buPoster/waiting','type':'thread'},
{'affinity':'55','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/monitoring/waiting','type':'thread'},
{'affinity':'2', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_0/waiting','type':'thread'},
{'affinity':'9', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_0/waiting','type':'thread'},
{'affinity':'18','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_1/waiting','type':'thread'},
{'affinity':'14','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_2/waiting','type':'thread'},
{'affinity':'26','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_3/waiting','type':'thread'},
{'affinity':'12','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_2/waiting','type':'thread'},
{'affinity':'15','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_3/waiting','type':'thread'},
{'affinity':'56','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_4/waiting','type':'thread'},
{'affinity':'40','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_5/waiting','type':'thread'},
{'affinity':'12','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_0/waiting','type':'thread'},
{'affinity':'26','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_0/waiting','type':'thread'},
{'affinity':'27','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_1/waiting','type':'thread'},
{'affinity':'19','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_2/waiting','type':'thread'},
{'affinity':'27','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_3/waiting','type':'thread'},
......@@ -549,29 +553,7 @@ class ConfigFromFile(Configuration):
{'affinity':'23','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/requestFragments/waiting','type':'thread'},
{'affinity':'57','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/fileAccounting/waiting','type':'thread'},
{'affinity':'15','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/resourceMonitor/waiting','type':'thread'},
{'affinity':'2,4,5,9,10,11,15,20,21,24,28,32,36,37,43,46,49,53,54,55,57,58,60,63','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers(.+)/waiting','type':'thread'},
]
if 'frlHostname' not in hostinfo:
return policy
else:
return policy + [
{'affinity':'58','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[0]+'/waiting','type':'thread'},
{'affinity':'36','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[1]+'/waiting','type':'thread'},
{'affinity':'7', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[2]+'/waiting','type':'thread'},
{'affinity':'45','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp-receiver-dispatcher/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[3]+'/waiting','type':'thread'},
{'affinity':'50','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[0]+'/polling','type':'thread'},
{'affinity':'9', 'memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[1]+'/polling','type':'thread'},
{'affinity':'11','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[2]+'/polling','type':'thread'},
{'affinity':'31','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-psp(.*)/'+hostinfo['frlHostname']+'([:/])'+self.frlPorts[3]+'/polling','type':'thread'},
{'affinity':'59','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':'+self.frlPorts[0]+'/waiting','type':'thread'},
{'affinity':'48','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':'+self.frlPorts[1]+'/waiting','type':'thread'},
{'affinity':'54','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':'+self.frlPorts[2]+'/waiting','type':'thread'},
{'affinity':'28','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.*)/Pipe_'+hostinfo['frlHostname']+':'+self.frlPorts[3]+'/waiting','type':'thread'},
{'affinity':'39','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-acceptor-dispatcher/(.*)/waiting','type':'thread'},
{'affinity':'30','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-connector-dispatcher/(.*)/waiting','type':'thread'},
{'affinity':'32','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-sender-dispatcher/(.*)/waiting','type':'thread'},
{'affinity':'51','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:tcpla-ia-workloop/(.*)/polling','type':'thread'},
]
if __name__ == "__main__":
......
......@@ -207,7 +207,6 @@ class RU(Context):
def addRuApplication(self,properties):
properties.append( ('ferolPorts','unsignedInt',(self.hostinfo['frlPort1'],self.hostinfo['frlPort2'])) )
if self.role in ('EVM','EVMBU'):
app = Application.Application('evb::EVM',RU.instance,properties)
app.params['tid'] = '1'
......@@ -220,6 +219,24 @@ class RU(Context):
properties.append(('useLock','boolean','false'));
app.params['network'] = 'evb'
inputSource = app.getInputSource()
if inputSource == "Socket":
self.addPtBlitApplication()
self.applications.append(app)
def addPtBlitApplication(self):
maxBlockSize='0x20000'
properties = [
('maxClients','unsignedInt','64'),
('maxReceiveBuffers','unsignedInt','16'),
('maxBlockSize','unsignedInt',maxBlockSize)
]
app = Application.Application('pt::blit::Application',Context.ptInstance,properties)
Context.ptInstance += 1
app.params['frlHostname'] = self.hostinfo['frlHostname']
app.params['frlPort1'] = self.hostinfo['frlPort1']
app.params['frlPort2'] = self.hostinfo['frlPort2']
app.params['maxbulksize'] = maxBlockSize
self.applications.append(app)
......
......@@ -366,7 +366,7 @@ class TestCase:
('dummyFedSize','unsignedInt',str(dummyFedSize)),
('dummyFedSizeStdDev','unsignedInt',str(dummyFedSizeDev))
) )
return ('fedSourceIds','unsignedInt',fedSourceIds),('ferolSources','Struct',ferolSources)
return [('fedSourceIds','unsignedInt',fedSourceIds),('ferolSources','Struct',ferolSources)]
def getFiles(self,regex,app,instance=None,dir="/tmp"):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment