mpExperienceDITG: add constant rate

This commit is contained in:
Quentin De Coninck 2016-06-08 16:45:50 +02:00
parent 040a8229e7
commit 7c6d22e38b
2 changed files with 8 additions and 0 deletions

View File

@ -41,6 +41,7 @@ class MpExperienceDITG(MpExperience):
""" """
self.kbytes = self.xpParam.getParam(MpParamXp.DITGKBYTES) self.kbytes = self.xpParam.getParam(MpParamXp.DITGKBYTES)
self.mean_poisson_packets_sec = self.xpParam.getParam(MpParamXp.DITGMEANPOISSONPACKETSSEC) self.mean_poisson_packets_sec = self.xpParam.getParam(MpParamXp.DITGMEANPOISSONPACKETSSEC)
self.constant_packets_sec = self.xpParam.getParam(MpParamXp.DITGCONSTANTPACKETSSEC)
self.bursts_on_packets_sec = self.xpParam.getParam(MpParamXp.DITGBURSTSONPACKETSSEC) self.bursts_on_packets_sec = self.xpParam.getParam(MpParamXp.DITGBURSTSONPACKETSSEC)
self.bursts_off_packets_sec = self.xpParam.getParam(MpParamXp.DITGBURSTSOFFPACKETSSEC) self.bursts_off_packets_sec = self.xpParam.getParam(MpParamXp.DITGBURSTSOFFPACKETSSEC)
@ -56,6 +57,8 @@ class MpExperienceDITG(MpExperience):
if self.mean_poisson_packets_sec != "0": if self.mean_poisson_packets_sec != "0":
s += " -O " + self.mean_poisson_packets_sec s += " -O " + self.mean_poisson_packets_sec
elif self.constant_packets_sec != "0":
s += " -C " + self.constant_packets_sec
elif self.bursts_on_packets_sec != "0" and self.bursts_off_packets_sec != "0": elif self.bursts_on_packets_sec != "0" and self.bursts_off_packets_sec != "0":
s += " -B C " + self.bursts_on_packets_sec + " C " + self.bursts_off_packets_sec s += " -B C " + self.bursts_on_packets_sec + " C " + self.bursts_off_packets_sec

View File

@ -52,6 +52,7 @@ class MpParamXp(MpParam):
VLCTIME = "vlcTime" VLCTIME = "vlcTime"
DITGKBYTES = "ditgKBytes" DITGKBYTES = "ditgKBytes"
DITGMEANPOISSONPACKETSSEC = "ditgMeanPoissonPacketsSec" DITGMEANPOISSONPACKETSSEC = "ditgMeanPoissonPacketsSec"
DITGCONSTANTPACKETSSEC = "ditgConstantPacketsSec"
DITGBURSTSONPACKETSSEC = "ditgBurstsOnPacketsSec" DITGBURSTSONPACKETSSEC = "ditgBurstsOnPacketsSec"
DITGBURSTSOFFPACKETSSEC = "ditgBurstsOffPacketsSec" DITGBURSTSOFFPACKETSSEC = "ditgBurstsOffPacketsSec"
PRIOPATH0 = "prioPath0" PRIOPATH0 = "prioPath0"
@ -59,6 +60,7 @@ class MpParamXp(MpParam):
BACKUPPATH0 = "backupPath0" BACKUPPATH0 = "backupPath0"
BACKUPPATH1 = "backupPath1" BACKUPPATH1 = "backupPath1"
EXPIRATION = "expiration" EXPIRATION = "expiration"
BUFFERAUTOTUNING = "bufferAutotuning"
METRIC = "metric" METRIC = "metric"
@ -72,6 +74,7 @@ class MpParamXp(MpParam):
sysctlKey[AUTOCORK] = "net.ipv4.tcp_autocorking" sysctlKey[AUTOCORK] = "net.ipv4.tcp_autocorking"
sysctlKey[EARLYRETRANS] = "net.ipv4.tcp_early_retrans" sysctlKey[EARLYRETRANS] = "net.ipv4.tcp_early_retrans"
sysctlKey[EXPIRATION] = "net.mptcp.mptcp_sched_expiration" sysctlKey[EXPIRATION] = "net.mptcp.mptcp_sched_expiration"
sysctlKey[BUFFERAUTOTUNING] = "net.ipv4.tcp_moderate_rcvbuf"
sysctlKeyClient = {} sysctlKeyClient = {}
@ -95,6 +98,7 @@ class MpParamXp(MpParam):
defaultValue[AUTOCORK] = "1" defaultValue[AUTOCORK] = "1"
defaultValue[EARLYRETRANS] = "3" defaultValue[EARLYRETRANS] = "3"
defaultValue[EXPIRATION] = "300" defaultValue[EXPIRATION] = "300"
defaultValue[BUFFERAUTOTUNING] = "1"
defaultValue[METRIC] = "-1" defaultValue[METRIC] = "-1"
defaultValue[CLIENTPCAP] = "no" defaultValue[CLIENTPCAP] = "no"
@ -132,6 +136,7 @@ class MpParamXp(MpParam):
defaultValue[VLCTIME] = "0" defaultValue[VLCTIME] = "0"
defaultValue[DITGKBYTES] = "10000" defaultValue[DITGKBYTES] = "10000"
defaultValue[DITGMEANPOISSONPACKETSSEC] = "0" defaultValue[DITGMEANPOISSONPACKETSSEC] = "0"
defaultValue[DITGCONSTANTPACKETSSEC] = "0"
defaultValue[DITGBURSTSONPACKETSSEC] = "0" defaultValue[DITGBURSTSONPACKETSSEC] = "0"
defaultValue[DITGBURSTSOFFPACKETSSEC] = "0" defaultValue[DITGBURSTSOFFPACKETSSEC] = "0"
defaultValue[PRIOPATH0] = "0" defaultValue[PRIOPATH0] = "0"