Skip to content

Commit

Permalink
Issue #518: Added ZMQ service properties to the PSDD connector
Browse files Browse the repository at this point in the history 
Signed-off-by: Ernesto Posse <eposse.gmail.com>
  • Loading branch information
Ernesto Posse committed Dec 11, 2024
1 parent f3ad471 commit 460fcc2
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 58 deletions.
122 changes: 65 additions & 57 deletions bundles/com.zeligsoft.domain.dds4ccm/src/com/zeligsoft/domain/dds4ccm/utils/DDS4CCMUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,39 @@ public static boolean isUsedSynchronously(Interface intf) {
}


/**
private static EObject getPropertyType(Component containerProcess, PropertyVariable property) {
switch (property) {
case LM_PROCESSNAME:
case LM_CPUAFFINITY:
case LM_PROCESSPRIORITY:
case LOCALITY_ARGUMENTS:
return CORBAUtil.getCORBAPrimitiveType(containerProcess, "CXString"); //$NON-NLS-1$
case ZMQ_SRV_IOTHREADS:
case ZMQ_SRV_POLLINGTHREADS:
case ZMQ_SRV_MAXSOCKETS:
case ZMQ_SRV_THREADPRIO:
case ZMQ_SRV_THREADSCHEDPOLICY:
return CORBAUtil.getCORBAPrimitiveType(containerProcess, "CXULong"); //$NON-NLS-1$
default:
return CORBAUtil.getCORBAPrimitiveType(containerProcess, "CXString"); //$NON-NLS-1$
}
}

private static PropertyVariable[] CONTAINER_PROPERTIES_TO_ADD = {
PropertyVariable.LM_CPUAFFINITY,
PropertyVariable.LM_PROCESSPRIORITY,
PropertyVariable.LOCALITY_ARGUMENTS,
PropertyVariable.ZMQ_SRV_IOTHREADS,
PropertyVariable.ZMQ_SRV_POLLINGTHREADS,
PropertyVariable.ZMQ_SRV_MAXSOCKETS,
PropertyVariable.ZMQ_SRV_THREADPRIO,
PropertyVariable.ZMQ_SRV_THREADSCHEDPOLICY
};

private static PropertyVariable[] CONTAINER_PROPERTIES_TO_REMOVE = {
PropertyVariable.LM_PROCESSNAME
};
/**
*
*
* @param containerProcess
Expand All @@ -149,69 +181,45 @@ public static boolean setupContainerProcessResources(

String modelType = DDS4CCMUtil.getModelType(containerProcess);

final String cpuAffinity = PropertyVariable.LM_CPUAFFINITY.getName(modelType);

final String processName = PropertyVariable.LM_PROCESSNAME.getName(modelType);

final String processPriority = PropertyVariable.LM_PROCESSPRIORITY.getName(modelType);

final String localityArgs = PropertyVariable.LOCALITY_ARGUMENTS.getName(modelType);

EObject corbaStringType = CORBAUtil.getCORBAPrimitiveType(containerProcess, "CXString"); //$NON-NLS-1$
boolean b_containerProcessModified = false;

boolean b_hasAffinity = false;
boolean b_hasProcessName = false;
boolean b_hasProcessPriority = false;
boolean b_hasLocalityArgs = false;
boolean containerProcessModified = false;

if (ZDLUtil.isZDLConcept(containerProcess, CCMNames.CONTAINER_PROCESS)) {
for (Property p : containerProcess.getOwnedAttributes()) {
if (p.getName().matches(cpuAffinity)) {
b_hasAffinity = true;
} else if (p.getName().matches(processName)) {
b_hasProcessName = true;
} else if (p.getName().matches(processPriority)) {
b_hasProcessPriority = true;
} else if (p.getName().matches(localityArgs)) {
b_hasLocalityArgs = true;
for (PropertyVariable p: CONTAINER_PROPERTIES_TO_ADD) {
String name = p.getName(modelType);
boolean hasRequiredProperty = false;
for (Property umlProperty: containerProcess.getOwnedAttributes()) {
if (name.equals(umlProperty.getName())) {
hasRequiredProperty = true;
}
}
if (!hasRequiredProperty) {
containerProcessModified = true;
EObject property = ZDLUtil.createZDLConceptIn(containerProcess,
CCMNames.PROPERTY);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.NAMED_ELEMENT__NAME, name);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.TYPED_ELEMENT__TYPE, getPropertyType(containerProcess, p));
}
}

if (!b_hasAffinity) {
b_containerProcessModified = true;
EObject property = ZDLUtil.createZDLConceptIn(containerProcess,
CCMNames.PROPERTY);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.NAMED_ELEMENT__NAME, cpuAffinity);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.TYPED_ELEMENT__TYPE, corbaStringType);
}
if (b_hasProcessName) {
Command cmd = BaseUtil.getDeleteCommand(Collections.singletonList(containerProcess.getOwnedMember(processName)));
TransactionUtil.getEditingDomain(containerProcess).getCommandStack().execute(cmd);
}
if (!b_hasProcessPriority) {
b_containerProcessModified = true;
EObject property = ZDLUtil.createZDLConceptIn(containerProcess,
CCMNames.PROPERTY);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.NAMED_ELEMENT__NAME, processPriority);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.TYPED_ELEMENT__TYPE, corbaStringType);
}
if (!b_hasLocalityArgs) {
b_containerProcessModified = true;
EObject property = ZDLUtil.createZDLConceptIn(containerProcess,
CCMNames.PROPERTY);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.NAMED_ELEMENT__NAME, localityArgs);
ZDLUtil.setValue(property, CCMNames.PROPERTY,
ZMLMMNames.TYPED_ELEMENT__TYPE, corbaStringType);
for (PropertyVariable p: CONTAINER_PROPERTIES_TO_REMOVE) {
String name = p.getName(modelType);
boolean hasUndesiredProperty = false;
for (Property umlProperty: containerProcess.getOwnedAttributes()) {
if (name.equals(umlProperty.getName())) {
hasUndesiredProperty = true;
break;
}
}
if (hasUndesiredProperty) {
containerProcessModified = true;
Command cmd = BaseUtil.getDeleteCommand(Collections.singletonList(containerProcess.getOwnedMember(name)));
TransactionUtil.getEditingDomain(containerProcess).getCommandStack().execute(cmd);
}
}
}

return b_containerProcessModified;
return containerProcessModified;
}

public static boolean addRegisterNamingProperty(Class zdlClass) {
Expand Down
8 changes: 7 additions & 1 deletion ...com.zeligsoft.domain.dds4ccm/src/com/zeligsoft/domain/dds4ccm/utils/PropertyVariable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ public enum PropertyVariable {
LM_CPUAFFINITY("edu.vanderbilt.dre.DAnCE.LocalityManager.CPUAffinity", "nl.remedy.it.DnCX11.LocalityManager.CPUAffinity"),
LM_PROCESSNAME("edu.vanderbilt.dre.DAnCE.LocalityManager.ProcessName", "nl.remedy.it.DnCX11.LocalityManager.ProcessName"),
LM_PROCESSPRIORITY("edu.vanderbilt.dre.DAnCE.LocalityManager.ProcessPriority", "nl.remedy.it.DnCX11.LocalityManager.ProcessPriority"),
LOCALITY_ARGUMENTS("edu.vanderbilt.dre.DAnCE.LocalityArguments", "nl.remedy.it.DnCX11.LocalityArguments");
LOCALITY_ARGUMENTS("edu.vanderbilt.dre.DAnCE.LocalityArguments", "nl.remedy.it.DnCX11.LocalityArguments"),
ZMQ_SRV_IOTHREADS("nl.remedy.it.PSDD.ZMQ.Service.IOThreads","nl.remedy.it.PSDD.ZMQ.Service.IOThreads"),
ZMQ_SRV_POLLINGTHREADS("nl.remedy.it.PSDD.ZMQ.Service.PollingThreads","nl.remedy.it.PSDD.ZMQ.Service.PollingThreads"),
ZMQ_SRV_MAXSOCKETS("nl.remedy.it.PSDD.ZMQ.Service.MaxSockets","nl.remedy.it.PSDD.ZMQ.Service.MaxSockets"),
ZMQ_SRV_THREADPRIO("nl.remedy.it.PSDD.ZMQ.Service.ThreadPrio","nl.remedy.it.PSDD.ZMQ.Service.ThreadPrio"),
ZMQ_SRV_THREADSCHEDPOLICY("nl.remedy.it.PSDD.ZMQ.Service.ThreadSchedPolicy","nl.remedy.it.PSDD.ZMQ.Service.ThreadSchedPolicy");


private final String axciomaName;
private final String atcdName;
Expand Down

0 comments on commit 460fcc2

Please sign in to comment.