diff --git a/src/mpExperienceDITG.py b/src/mpExperienceDITG.py index 4b411c0..4b8f3aa 100644 --- a/src/mpExperienceDITG.py +++ b/src/mpExperienceDITG.py @@ -38,17 +38,18 @@ class MpExperienceDITG(MpExperience): """ todo : param LD_PRELOAD ?? """ - self.bytes = self.xpParam.getParam(MpParamXp.DITGBYTES) + self.kbytes = self.xpParam.getParam(MpParamXp.DITGKBYTES) self.mean_poisson_packets_sec = self.xpParam.getParam(MpParamXp.DITGMEANPOISSONPACKETSSEC) def prepare(self): MpExperience.prepare(self) - self.mpTopo.commandTo(self.mpConfig.client, "rm " + MpExperienceDITG.IPERF_LOG) - self.mpTopo.commandTo(self.mpConfig.server, "rm " + MpExperienceDITG.SERVER_LOG) + self.mpTopo.commandTo(self.mpConfig.client, "rm " + MpExperienceDITG.DITG_LOG) + self.mpTopo.commandTo(self.mpConfig.server, "rm " + MpExperienceDITG.DITG_SERVER_LOG) + self.mpTopo.commandTo(self.mpConfig.client, "rm " + MpExperienceDITG.DITG_TEMP_LOG) def getClientCmd(self): s = MpExperienceDITG.ITGSEND_BIN + " -a " + self.mpConfig.getServerIP() + \ - " -T TCP -k " + self.bytes + " -O " + self.mean_poisson_packets_sec + " -l " + MpExperienceDITG.DITG_TEMP_LOG + " && " + \ + " -T TCP -k " + self.kbytes + " -O " + self.mean_poisson_packets_sec + " -l " + MpExperienceDITG.DITG_TEMP_LOG + " && " + \ MpExperienceDITG.ITGDEC_BIN + " " + MpExperienceDITG.DITG_TEMP_LOG + " &> " + MpExperienceDITG.DITG_LOG print(s) return s diff --git a/src/mpParamXp.py b/src/mpParamXp.py index 4bbfddf..7bffd1f 100644 --- a/src/mpParamXp.py +++ b/src/mpParamXp.py @@ -50,7 +50,7 @@ class MpParamXp(MpParam): SIRIBUFFERSIZE = "siriBufferSize" VLCFILE = "vlcFile" VLCTIME = "vlcTime" - DITGBYTES = "ditgBytes" + DITGKBYTES = "ditgKBytes" DITGMEANPOISSONPACKETSSEC = "ditgMeanPoissonPacketsSec" PRIOPATH0 = "prioPath0" PRIOPATH1 = "prioPath1" @@ -126,7 +126,7 @@ class MpParamXp(MpParam): defaultValue[SIRIBUFFERSIZE] = "9" defaultValue[VLCFILE] = "bunny_ibmff_360.mpd" defaultValue[VLCTIME] = "0" - defaultValue[DITGBYTES] = "10000" + defaultValue[DITGKBYTES] = "10000" defaultValue[DITGMEANPOISSONPACKETSSEC] = "1500" defaultValue[PRIOPATH0] = "0" defaultValue[PRIOPATH1] = "0"