Skip to content

Commit

Permalink
TRotaryIDGenerator has been translated and refactored. Fix #6, fix #4,
Browse files Browse the repository at this point in the history 
fix #2
  • Loading branch information
@manolodd
manolodd committed Jun 15, 2018
1 parent 1668d72 commit 7ed03e5
Show file tree
Hide file tree
Showing 19 changed files with 218 additions and 217 deletions.
2 changes: 1 addition & 1 deletion src/com/manolodominguez/opensimmpls/hardware/dmgp/TDMGP.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ private TDMGPFlowEntry createFlow(TAbstractPDU packet) {
if (octectsToBeAssigned > 0) {
this.totalAssignedOctects += octectsToBeAssigned;
this.totalAvailablePercentage -= percentageToBeAssigned;
dmgpFlowEntry = new TDMGPFlowEntry(this.idGenerator.getNextID());
dmgpFlowEntry = new TDMGPFlowEntry(this.idGenerator.getNextIdentifier());
dmgpFlowEntry.setFlowID(flowID);
dmgpFlowEntry.setAssignedPercentage(percentageToBeAssigned);
dmgpFlowEntry.setAssignedOctects(octectsToBeAssigned);
Expand Down
4 changes: 2 additions & 2 deletions src/com/manolodominguez/opensimmpls/hardware/dmgp/TDMGPFlowEntry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,14 @@ public void addPacket(TMPLSPDU packet) {
this.monitor.lock();
int availableOctects = this.assignedOctects - this.usedOctects;
if (availableOctects >= packet.getSize()) {
TDMGPEntry dmgpEntry = new TDMGPEntry(idGenerator.getNextID());
TDMGPEntry dmgpEntry = new TDMGPEntry(idGenerator.getNextIdentifier());
dmgpEntry.setPacket(packet);
this.usedOctects += packet.getSize();
this.entries.add(dmgpEntry);
} else {
if (usedOctects >= packet.getSize()) {
releaseMemory(packet.getSize());
TDMGPEntry dmgpEntry = new TDMGPEntry(idGenerator.getNextID());
TDMGPEntry dmgpEntry = new TDMGPEntry(idGenerator.getNextIdentifier());
dmgpEntry.setPacket(packet);
this.usedOctects += packet.getSize();
this.entries.add(dmgpEntry);
Expand Down
2 changes: 1 addition & 1 deletion src/com/manolodominguez/opensimmpls/hardware/dmgp/TGPSRPRequestsMatrix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void removeEntriesMatchingOutgoingPort(int oldOutgoingPort) {
*/
public TGPSRPRequestEntry addEntry(TMPLSPDU mplsPacket, int incomingPort) {
this.monitor.lock();
TGPSRPRequestEntry gpsrpRequestEntry = new TGPSRPRequestEntry(this.idGenerator.getNextID());
TGPSRPRequestEntry gpsrpRequestEntry = new TGPSRPRequestEntry(this.idGenerator.getNextIdentifier());
gpsrpRequestEntry.setOutgoingPort(incomingPort);
gpsrpRequestEntry.setFlowID(mplsPacket.getIPv4Header().getOriginIPv4Address().hashCode());
gpsrpRequestEntry.setPacketID(mplsPacket.getIPv4Header().getGoSGlobalUniqueIdentifier());
Expand Down
12 changes: 6 additions & 6 deletions src/com/manolodominguez/opensimmpls/hardware/ports/TActivePort.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,8 @@ public void addPacket(TAbstractPDU packet) {
int packetOrder = 0;
int priority = this.loadPacketPriority(packet);
try {
eventID = parentNode.eventIdentifierGenerator.getNextID();
packetOrder = this.rotaryIdentifierGenerator.getNextID();
eventID = parentNode.eventIdentifierGenerator.getNextIdentifier();
packetOrder = this.rotaryIdentifierGenerator.getNextIdentifier();
} catch (Exception ex) {
ex.printStackTrace();
}
Expand Down Expand Up @@ -492,8 +492,8 @@ public boolean runEarlyPacketCatchAndDiscard(TAbstractPDU packet) {
int packetPriority = this.loadPacketPriority(packet);
TNode parentNode = this.parentPortSet.getParentNode();
try {
eventID = parentNode.eventIdentifierGenerator.getNextID();
packetOrder = this.rotaryIdentifierGenerator.getNextID();
eventID = parentNode.eventIdentifierGenerator.getNextIdentifier();
packetOrder = this.rotaryIdentifierGenerator.getNextIdentifier();
} catch (Exception ex) {
ex.printStackTrace();
}
Expand Down Expand Up @@ -660,8 +660,8 @@ public void reEnqueuePacket(TAbstractPDU packet) {
int packetOrder = 0;
int packetPriority = this.loadPacketPriority(packet);
try {
eventID = parentNode.eventIdentifierGenerator.getNextID();
packetOrder = this.rotaryIdentifierGenerator.getNextID();
eventID = parentNode.eventIdentifierGenerator.getNextIdentifier();
packetOrder = this.rotaryIdentifierGenerator.getNextIdentifier();
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
4 changes: 2 additions & 2 deletions src/com/manolodominguez/opensimmpls/hardware/ports/TFIFOPort.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void addPacket(TAbstractPDU packet) {
TNode parentNode = this.parentPortSet.getParentNode();
long eventID = 0;
try {
eventID = parentNode.eventIdentifierGenerator.getNextID();
eventID = parentNode.eventIdentifierGenerator.getNextIdentifier();
} catch (Exception e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -136,7 +136,7 @@ public void reEnqueuePacket(TAbstractPDU packet) {
TNode parentNode = this.parentPortSet.getParentNode();
long eventID = 0;
try {
eventID = parentNode.eventIdentifierGenerator.getNextID();
eventID = parentNode.eventIdentifierGenerator.getNextIdentifier();
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
6 changes: 3 additions & 3 deletions src/com/manolodominguez/opensimmpls/hardware/timer/TTimer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ private void generateTimerEvent() {
}
}
try {
TTimerEvent timerEvent = new TTimerEvent(this, this.longIdentifierGenerator.getNextID(), startOfSimulationInterval, endOfSimulationInterval);
TTimerEvent timerEvent = new TTimerEvent(this, this.longIdentifierGenerator.getNextIdentifier(), startOfSimulationInterval, endOfSimulationInterval);
nodeAux.receiveTimerEvent(timerEvent);
} catch (EIDGeneratorOverflow e) {
e.printStackTrace();
Expand All @@ -282,7 +282,7 @@ private void generateTimerEvent() {
}
}
try {
linkAux.receiveTimerEvent(new TTimerEvent(this, this.longIdentifierGenerator.getNextID(), startOfSimulationInterval, endOfSimulationInterval));
linkAux.receiveTimerEvent(new TTimerEvent(this, this.longIdentifierGenerator.getNextIdentifier(), startOfSimulationInterval, endOfSimulationInterval));
} catch (EIDGeneratorOverflow e) {
e.printStackTrace();
}
Expand All @@ -305,7 +305,7 @@ public void generateProgressEvent() {
}
try {
if (this.progressEventListener != null) {
this.progressEventListener.receiveProgressEvent(new TProgressEvent(this, this.longIdentifierGenerator.getNextID(), computedProgress));
this.progressEventListener.receiveProgressEvent(new TProgressEvent(this, this.longIdentifierGenerator.getNextIdentifier(), computedProgress));
}
} catch (EIDGeneratorOverflow e) {
e.printStackTrace();
Expand Down
28 changes: 14 additions & 14 deletions src/com/manolodominguez/opensimmpls/io/osm/TOSMLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,62 +118,62 @@ private void loadTopology(String topologyString) {
TTrafficSinkNode receiver = new TTrafficSinkNode(0, "10.0.0.1", this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (receiver.unMarshall(topologyString)) {
this.scenario.getTopology().addNode(receiver);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(receiver.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setValueIfGreater(receiver.getIPv4Address());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(receiver.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setIPv4AddressIfGreater(receiver.getIPv4Address());
}
receiver = null;
} else if (topologyString.startsWith("#Emisor#")) {
TTrafficGeneratorNode sender = new TTrafficGeneratorNode(0, "10.0.0.1", this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (sender.unMarshall(topologyString)) {
this.scenario.getTopology().addNode(sender);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(sender.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setValueIfGreater(sender.getIPv4Address());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(sender.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setIPv4AddressIfGreater(sender.getIPv4Address());
}
sender = null;
} else if (topologyString.startsWith("#LER#")) {
TLERNode ler = new TLERNode(0, "10.0.0.1", this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (ler.unMarshall(topologyString)) {
this.scenario.getTopology().addNode(ler);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(ler.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setValueIfGreater(ler.getIPv4Address());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(ler.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setIPv4AddressIfGreater(ler.getIPv4Address());
}
ler = null;
} else if (topologyString.startsWith("#LERA#")) {
TActiveLERNode activeLER = new TActiveLERNode(0, "10.0.0.1", this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (activeLER.unMarshall(topologyString)) {
this.scenario.getTopology().addNode(activeLER);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(activeLER.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setValueIfGreater(activeLER.getIPv4Address());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(activeLER.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setIPv4AddressIfGreater(activeLER.getIPv4Address());
}
activeLER = null;
} else if (topologyString.startsWith("#LSR#")) {
TLSRNode lsr = new TLSRNode(0, "10.0.0.1", this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (lsr.unMarshall(topologyString)) {
this.scenario.getTopology().addNode(lsr);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(lsr.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setValueIfGreater(lsr.getIPv4Address());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(lsr.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setIPv4AddressIfGreater(lsr.getIPv4Address());
}
lsr = null;
} else if (topologyString.startsWith("#LSRA#")) {
TActiveLSRNode activeLSR = new TActiveLSRNode(0, "10.0.0.1", this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (activeLSR.unMarshall(topologyString)) {
this.scenario.getTopology().addNode(activeLSR);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(activeLSR.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setValueIfGreater(activeLSR.getIPv4Address());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(activeLSR.getNodeID());
this.scenario.getTopology().getIPv4AddressGenerator().setIPv4AddressIfGreater(activeLSR.getIPv4Address());
}
activeLSR = null;
} else if (topologyString.startsWith("#EnlaceExterno#")) {
TExternalLink externalLink = new TExternalLink(0, this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (externalLink.unMarshall(topologyString)) {
this.scenario.getTopology().addLink(externalLink);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(externalLink.getID());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(externalLink.getID());
}
externalLink = null;
} else if (topologyString.startsWith("#EnlaceInterno#")) {
TInternalLink internalLink = new TInternalLink(0, this.scenario.getTopology().getEventIDGenerator(), this.scenario.getTopology());
if (internalLink.unMarshall(topologyString)) {
this.scenario.getTopology().addLink(internalLink);
this.scenario.getTopology().getElementsIDGenerator().setIDIfGreater(internalLink.getID());
this.scenario.getTopology().getElementsIDGenerator().setIdentifierIfGreater(internalLink.getID());
}
internalLink = null;
}
Expand Down
4 changes: 2 additions & 2 deletions src/com/manolodominguez/opensimmpls/protocols/TMPLSLabelStack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public int getSize() {
*/
public void pushTop(TMPLSLabel mplsLabel) {
try {
mplsLabel.setID(this.idGenerator.getNew());
mplsLabel.setID(this.idGenerator.getNextIdentifier());
} catch (EIDGeneratorOverflow e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -102,7 +102,7 @@ public void popTop() {
public void swapTop(TMPLSLabel mplsLabel) {
this.popTop();
try {
mplsLabel.setID(this.idGenerator.getNew());
mplsLabel.setID(this.idGenerator.getNextIdentifier());
} catch (EIDGeneratorOverflow e) {
e.printStackTrace();
}
Expand Down
1 change: 1 addition & 0 deletions src/com/manolodominguez/opensimmpls/resources/translations/AvailableBundles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public enum AvailableBundles {
IMAGE_BROKER("com/manolodominguez/opensimmpls/resources/translations/translations"),
E_ID_GENERATOR_OVERFLOW("com/manolodominguez/opensimmpls/resources/translations/translations"),
E_IPV4_ADDRESS_GENERATOR_OVERFLOW("com/manolodominguez/opensimmpls/resources/translations/translations");

private final String bundlePath;

/**
Expand Down
Loading

0 comments on commit 7ed03e5

Please sign in to comment.