Lua: Changed latency attribute to lat and others.

- For instance, state_trace is now called state_file, latency_trace = latency_file etc.

diff --git a/examples/lua/console/platform.lua b/examples/lua/console/platform.lua
index be57b8e..fdcc89a 100644 (file)
--- a/examples/lua/console/platform.lua
+++ b/examples/lua/console/platform.lua
@@ -16,7 +16,7 @@ simgrid.platf.host_new{id="Bourassa",power=48492000};
 
 -- create Links
 for i=10,0,-1 do
-    simgrid.platf.link_new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087};
+    simgrid.platf.link_new{id=i,bandwidth=252750+ i*768,lat=0.000270544+i*0.087};
 end
 
 simgrid.platf.route_new{src="Tremblay",dest="Jupiter",links="1"};

diff --git a/examples/platforms/platform.lua b/examples/platforms/platform.lua
index 84db0e2..a77bb23 100644 (file)
--- a/examples/platforms/platform.lua
+++ b/examples/platforms/platform.lua
@@ -92,198 +92,198 @@
    <host id="Fafard" power="137.333Mf"/>
    <host id="Croteau" power="42.917Mf"/>
    <host id="Dodge" power="114.444Mf"/>
-   <link id="127" bandwidth="3.430125MBps" latency="536.941us"/>
-   <link id="32" bandwidth="11.618875MBps" latency="189.98us"/>
-   <link id="90" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="118" bandwidth="1.467625MBps" latency="869.727us"/>
-   <link id="71" bandwidth="8.42725MBps" latency="156.056us"/>
-   <link id="102" bandwidth="4.817MBps" latency="117.352us"/>
-   <link id="18" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="125" bandwidth="5.574625MBps" latency="227.43us"/>
-   <link id="16" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="44" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="55" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="84" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="27" bandwidth="8.015125MBps" latency="35.076518ms"/>
-   <link id="190" bandwidth="1.23025MBps" latency="1.502106ms"/>
-   <link id="161" bandwidth="1.469125MBps" latency="1.114548ms"/>
-   <link id="95" bandwidth="5.7585MBps" latency="4.760145ms"/>
-   <link id="57" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="20" bandwidth="255.228625MBps" latency="7.413073ms"/>
-   <link id="163" bandwidth="2.583375MBps" latency="410.463us"/>
-   <link id="109" bandwidth="1.858MBps" latency="820.952us"/>
-   <link id="151" bandwidth="1.564125MBps" latency="788.956us"/>
-   <link id="89" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="175" bandwidth="1.37675MBps" latency="449.267us"/>
-   <link id="148" bandwidth="578.625kBps" latency="5.473705ms"/>
-   <link id="31" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="35" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="11" bandwidth="118.6825MBps" latency="136.931us"/>
-   <link id="78" bandwidth="27.94625MBps" latency="278.066us"/>
-   <link id="93" bandwidth="2.608MBps" latency="637.001us"/>
-   <link id="106" bandwidth="251.625kBps" latency="4.455826ms"/>
-   <link id="157" bandwidth="274.375kBps" latency="4.669142ms"/>
-   <link id="65" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="29" bandwidth="8.158MBps" latency="270.544us"/>
-   <link id="138" bandwidth="253.125kBps" latency="5.652577ms"/>
-   <link id="114" bandwidth="253.125kBps" latency="5.652577ms"/>
-   <link id="58" bandwidth="21.41475MBps" latency="29.5890617ms"/>
-   <link id="153" bandwidth="4.817MBps" latency="117.352us"/>
-   <link id="15" bandwidth="132.977875MBps" latency="131.098us"/>
-   <link id="137" bandwidth="4.416625MBps" latency="19.773us"/>
-   <link id="81" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="60" bandwidth="21.41475MBps" latency="29.5890617ms"/>
-   <link id="101" bandwidth="290.125kBps" latency="4.522355ms"/>
-   <link id="73" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="86" bandwidth="8.42725MBps" latency="156.056us"/>
-   <link id="76" bandwidth="27.94625MBps" latency="278.066us"/>
-   <link id="62" bandwidth="8.015125MBps" latency="35.076518ms"/>
-   <link id="67" bandwidth="27.94625MBps" latency="278.066us"/>
-   <link id="165" bandwidth="253.125kBps" latency="5.652577ms"/>
-   <link id="139" bandwidth="1.888875MBps" latency="1.081287ms"/>
-   <link id="129" bandwidth="1.467625MBps" latency="869.727us"/>
-   <link id="2" bandwidth="132.977875MBps" latency="131.098us"/>
-   <link id="17" bandwidth="118.6825MBps" latency="136.931us"/>
-   <link id="186" bandwidth="4.39725MBps" latency="677.601us"/>
-   <link id="110" bandwidth="5.574625MBps" latency="227.43us"/>
-   <link id="82" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="147" bandwidth="2.368MBps" latency="9.547561ms"/>
-   <link id="168" bandwidth="1.858MBps" latency="820.952us"/>
-   <link id="184" bandwidth="303.375kBps" latency="4.062241ms"/>
-   <link id="135" bandwidth="1.37675MBps" latency="449.267us"/>
-   <link id="14" bandwidth="118.6825MBps" latency="136.931us"/>
-   <link id="112" bandwidth="4.133375MBps" latency="9.693542ms"/>
-   <link id="69" bandwidth="8.42725MBps" latency="156.056us"/>
-   <link id="191" bandwidth="1.467625MBps" latency="869.727us"/>
-   <link id="172" bandwidth="605kBps" latency="87.981858ms"/>
-   <link id="145" bandwidth="2.583375MBps" latency="410.463us"/>
-   <link id="49" bandwidth="27.94625MBps" latency="278.066us"/>
-   <link id="178" bandwidth="1.469125MBps" latency="1.114548ms"/>
-   <link id="24" bandwidth="10.099625MBps" latency="479.78us"/>
-   <link id="187" bandwidth="1.467625MBps" latency="869.727us"/>
-   <link id="140" bandwidth="1.4655MBps" latency="863.872us"/>
-   <link id="124" bandwidth="556kBps" latency="3.101854ms"/>
-   <link id="104" bandwidth="4.485125MBps" latency="126.045us"/>
-   <link id="131" bandwidth="317.375kBps" latency="4.583831ms"/>
-   <link id="181" bandwidth="4.485125MBps" latency="126.045us"/>
-   <link id="121" bandwidth="4.817MBps" latency="117.352us"/>
-   <link id="79" bandwidth="8.42725MBps" latency="156.056us"/>
-   <link id="154" bandwidth="272.375kBps" latency="5.922616ms"/>
-   <link id="0" bandwidth="255.228625MBps" latency="7.413073ms"/>
-   <link id="23" bandwidth="10.099625MBps" latency="479.78us"/>
-   <link id="96" bandwidth="4.97825MBps" latency="7.164412ms"/>
-   <link id="126" bandwidth="3.9955MBps" latency="678.645us"/>
-   <link id="159" bandwidth="4.817MBps" latency="117.352us"/>
-   <link id="160" bandwidth="274.375kBps" latency="4.669142ms"/>
-   <link id="176" bandwidth="3.1755MBps" latency="472.524us"/>
-   <link id="47" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="8" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="98" bandwidth="556kBps" latency="3.101854ms"/>
-   <link id="37" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="117" bandwidth="1.51525MBps" latency="844.683us"/>
-   <link id="43" bandwidth="27.94625MBps" latency="278.066us"/>
-   <link id="5" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="170" bandwidth="4.485125MBps" latency="126.045us"/>
-   <link id="33" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="21" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="63" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="7" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="26" bandwidth="21.41475MBps" latency="29.5890617ms"/>
-   <link id="80" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="119" bandwidth="317.375kBps" latency="4.583831ms"/>
-   <link id="180" bandwidth="251.625kBps" latency="4.455826ms"/>
-   <link id="99" bandwidth="253.125kBps" latency="5.652577ms"/>
-   <link id="179" bandwidth="5.816375MBps" latency="164.758us"/>
-   <link id="162" bandwidth="556kBps" latency="3.101854ms"/>
-   <link id="72" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="74" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="182" bandwidth="4.416625MBps" latency="19.773us"/>
-   <link id="61" bandwidth="8.015125MBps" latency="35.076518ms"/>
-   <link id="108" bandwidth="990.5kBps" latency="1.742977ms"/>
-   <link id="115" bandwidth="926.625kBps" latency="601.375us"/>
-   <link id="92" bandwidth="1.564125MBps" latency="788.956us"/>
-   <link id="103" bandwidth="472.125kBps" latency="5.161451ms"/>
-   <link id="10" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="113" bandwidth="1.858MBps" latency="820.952us"/>
-   <link id="152" bandwidth="7.20975MBps" latency="1.461517ms"/>
-   <link id="189" bandwidth="251.625kBps" latency="4.455826ms"/>
-   <link id="142" bandwidth="1.62775MBps" latency="278.175us"/>
-   <link id="91" bandwidth="8.42725MBps" latency="156.056us"/>
-   <link id="167" bandwidth="768.75kBps" latency="8.76244ms"/>
-   <link id="48" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="107" bandwidth="1.281875MBps" latency="6.104672ms"/>
-   <link id="87" bandwidth="8.158MBps" latency="270.544us"/>
-   <link id="174" bandwidth="290.875kBps" latency="4.47727ms"/>
-   <link id="77" bandwidth="27.94625MBps" latency="278.066us"/>
-   <link id="133" bandwidth="1.469125MBps" latency="1.114548ms"/>
-   <link id="149" bandwidth="1.04925MBps" latency="9.647856ms"/>
-   <link id="123" bandwidth="3.430125MBps" latency="536.941us"/>
-   <link id="50" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="39" bandwidth="8.015125MBps" latency="35.076518ms"/>
-   <link id="64" bandwidth="21.41475MBps" latency="29.5890617ms"/>
-   <link id="97" bandwidth="7.534MBps" latency="125.428us"/>
-   <link id="12" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="41" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="52" bandwidth="8.42725MBps" latency="156.056us"/>
-   <link id="173" bandwidth="7.534MBps" latency="125.428us"/>
-   <link id="56" bandwidth="21.41475MBps" latency="29.5890617ms"/>
-   <link id="45" bandwidth="8.158MBps" latency="270.544us"/>
-   <link id="66" bandwidth="11.618875MBps" latency="189.98us"/>
-   <link id="19" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="54" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="70" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="188" bandwidth="3.1755MBps" latency="472.524us"/>
-   <link id="68" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="166" bandwidth="3.9955MBps" latency="678.645us"/>
-   <link id="1" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="136" bandwidth="926.625kBps" latency="601.375us"/>
-   <link id="88" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="116" bandwidth="2.368MBps" latency="9.547561ms"/>
-   <link id="144" bandwidth="259.125kBps" latency="4.460898ms"/>
-   <link id="141" bandwidth="472.125kBps" latency="5.161451ms"/>
-   <link id="30" bandwidth="10.099625MBps" latency="479.78us"/>
-   <link id="100" bandwidth="721.625kBps" latency="6.406us"/>
-   <link id="25" bandwidth="8.015125MBps" latency="35.076518ms"/>
-   <link id="128" bandwidth="1.469125MBps" latency="1.114548ms"/>
-   <link id="28" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="120" bandwidth="4.461125MBps" latency="106.949us"/>
-   <link id="156" bandwidth="4.485125MBps" latency="126.045us"/>
-   <link id="134" bandwidth="259.125kBps" latency="4.460898ms"/>
-   <link id="40" bandwidth="21.41475MBps" latency="29.5890617ms"/>
-   <link id="75" bandwidth="11.618875MBps" latency="189.98us"/>
-   <link id="83" bandwidth="10.314625MBps" latency="6.932556ms"/>
-   <link id="59" bandwidth="11.845375MBps" latency="370.788us"/>
-   <link id="177" bandwidth="990.5kBps" latency="1.742977ms"/>
-   <link id="150" bandwidth="4.27025MBps" latency="672.289us"/>
-   <link id="155" bandwidth="1.37675MBps" latency="449.267us"/>
-   <link id="130" bandwidth="4.485125MBps" latency="126.045us"/>
-   <link id="53" bandwidth="11.618875MBps" latency="189.98us"/>
-   <link id="122" bandwidth="1.126875MBps" latency="287.84us"/>
-   <link id="143" bandwidth="7.20975MBps" latency="1.461517ms"/>
-   <link id="158" bandwidth="3.028375MBps" latency="677.908us"/>
-   <link id="42" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="22" bandwidth="11.618875MBps" latency="189.98us"/>
-   <link id="46" bandwidth="8.158MBps" latency="270.544us"/>
-   <link id="13" bandwidth="255.228625MBps" latency="7.413073ms"/>
-   <link id="105" bandwidth="117.125kBps" latency="53.930106ms"/>
-   <link id="6" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="85" bandwidth="15.376875MBps" latency="35.083019ms"/>
-   <link id="185" bandwidth="2.3485MBps" latency="259.761us"/>
-   <link id="36" bandwidth="11.618875MBps" latency="189.98us"/>
-   <link id="3" bandwidth="255.228625MBps" latency="7.413073ms"/>
-   <link id="183" bandwidth="3.9955MBps" latency="678.645us"/>
-   <link id="94" bandwidth="4.485125MBps" latency="126.045us"/>
-   <link id="146" bandwidth="3.37125MBps" latency="666.676us"/>
-   <link id="51" bandwidth="8.42725MBps" latency="156.056us"/>
-   <link id="9" bandwidth="34.285625MBps" latency="514.433us"/>
-   <link id="111" bandwidth="3.275625MBps" latency="658.142us"/>
-   <link id="38" bandwidth="41.279125MBps" latency="59.904us"/>
-   <link id="4" bandwidth="132.977875MBps" latency="131.098us"/>
-   <link id="34" bandwidth="11.845375MBps" latency="370.788us"/>
-   <link id="169" bandwidth="1.37675MBps" latency="449.267us"/>
-   <link id="164" bandwidth="768.75kBps" latency="8.76244ms"/>
-   <link id="132" bandwidth="2.179125MBps" latency="320.114us"/>
-   <link id="171" bandwidth="3.29775MBps" latency="595.883us"/>
+   <link id="127" bandwidth="3.430125MBps" lat="536.941us"/>
+   <link id="32" bandwidth="11.618875MBps" lat="189.98us"/>
+   <link id="90" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="118" bandwidth="1.467625MBps" lat="869.727us"/>
+   <link id="71" bandwidth="8.42725MBps" lat="156.056us"/>
+   <link id="102" bandwidth="4.817MBps" lat="117.352us"/>
+   <link id="18" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="125" bandwidth="5.574625MBps" lat="227.43us"/>
+   <link id="16" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="44" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="55" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="84" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="27" bandwidth="8.015125MBps" lat="35.076518ms"/>
+   <link id="190" bandwidth="1.23025MBps" lat="1.502106ms"/>
+   <link id="161" bandwidth="1.469125MBps" lat="1.114548ms"/>
+   <link id="95" bandwidth="5.7585MBps" lat="4.760145ms"/>
+   <link id="57" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="20" bandwidth="255.228625MBps" lat="7.413073ms"/>
+   <link id="163" bandwidth="2.583375MBps" lat="410.463us"/>
+   <link id="109" bandwidth="1.858MBps" lat="820.952us"/>
+   <link id="151" bandwidth="1.564125MBps" lat="788.956us"/>
+   <link id="89" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="175" bandwidth="1.37675MBps" lat="449.267us"/>
+   <link id="148" bandwidth="578.625kBps" lat="5.473705ms"/>
+   <link id="31" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="35" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="11" bandwidth="118.6825MBps" lat="136.931us"/>
+   <link id="78" bandwidth="27.94625MBps" lat="278.066us"/>
+   <link id="93" bandwidth="2.608MBps" lat="637.001us"/>
+   <link id="106" bandwidth="251.625kBps" lat="4.455826ms"/>
+   <link id="157" bandwidth="274.375kBps" lat="4.669142ms"/>
+   <link id="65" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="29" bandwidth="8.158MBps" lat="270.544us"/>
+   <link id="138" bandwidth="253.125kBps" lat="5.652577ms"/>
+   <link id="114" bandwidth="253.125kBps" lat="5.652577ms"/>
+   <link id="58" bandwidth="21.41475MBps" lat="29.5890617ms"/>
+   <link id="153" bandwidth="4.817MBps" lat="117.352us"/>
+   <link id="15" bandwidth="132.977875MBps" lat="131.098us"/>
+   <link id="137" bandwidth="4.416625MBps" lat="19.773us"/>
+   <link id="81" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="60" bandwidth="21.41475MBps" lat="29.5890617ms"/>
+   <link id="101" bandwidth="290.125kBps" lat="4.522355ms"/>
+   <link id="73" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="86" bandwidth="8.42725MBps" lat="156.056us"/>
+   <link id="76" bandwidth="27.94625MBps" lat="278.066us"/>
+   <link id="62" bandwidth="8.015125MBps" lat="35.076518ms"/>
+   <link id="67" bandwidth="27.94625MBps" lat="278.066us"/>
+   <link id="165" bandwidth="253.125kBps" lat="5.652577ms"/>
+   <link id="139" bandwidth="1.888875MBps" lat="1.081287ms"/>
+   <link id="129" bandwidth="1.467625MBps" lat="869.727us"/>
+   <link id="2" bandwidth="132.977875MBps" lat="131.098us"/>
+   <link id="17" bandwidth="118.6825MBps" lat="136.931us"/>
+   <link id="186" bandwidth="4.39725MBps" lat="677.601us"/>
+   <link id="110" bandwidth="5.574625MBps" lat="227.43us"/>
+   <link id="82" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="147" bandwidth="2.368MBps" lat="9.547561ms"/>
+   <link id="168" bandwidth="1.858MBps" lat="820.952us"/>
+   <link id="184" bandwidth="303.375kBps" lat="4.062241ms"/>
+   <link id="135" bandwidth="1.37675MBps" lat="449.267us"/>
+   <link id="14" bandwidth="118.6825MBps" lat="136.931us"/>
+   <link id="112" bandwidth="4.133375MBps" lat="9.693542ms"/>
+   <link id="69" bandwidth="8.42725MBps" lat="156.056us"/>
+   <link id="191" bandwidth="1.467625MBps" lat="869.727us"/>
+   <link id="172" bandwidth="605kBps" lat="87.981858ms"/>
+   <link id="145" bandwidth="2.583375MBps" lat="410.463us"/>
+   <link id="49" bandwidth="27.94625MBps" lat="278.066us"/>
+   <link id="178" bandwidth="1.469125MBps" lat="1.114548ms"/>
+   <link id="24" bandwidth="10.099625MBps" lat="479.78us"/>
+   <link id="187" bandwidth="1.467625MBps" lat="869.727us"/>
+   <link id="140" bandwidth="1.4655MBps" lat="863.872us"/>
+   <link id="124" bandwidth="556kBps" lat="3.101854ms"/>
+   <link id="104" bandwidth="4.485125MBps" lat="126.045us"/>
+   <link id="131" bandwidth="317.375kBps" lat="4.583831ms"/>
+   <link id="181" bandwidth="4.485125MBps" lat="126.045us"/>
+   <link id="121" bandwidth="4.817MBps" lat="117.352us"/>
+   <link id="79" bandwidth="8.42725MBps" lat="156.056us"/>
+   <link id="154" bandwidth="272.375kBps" lat="5.922616ms"/>
+   <link id="0" bandwidth="255.228625MBps" lat="7.413073ms"/>
+   <link id="23" bandwidth="10.099625MBps" lat="479.78us"/>
+   <link id="96" bandwidth="4.97825MBps" lat="7.164412ms"/>
+   <link id="126" bandwidth="3.9955MBps" lat="678.645us"/>
+   <link id="159" bandwidth="4.817MBps" lat="117.352us"/>
+   <link id="160" bandwidth="274.375kBps" lat="4.669142ms"/>
+   <link id="176" bandwidth="3.1755MBps" lat="472.524us"/>
+   <link id="47" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="8" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="98" bandwidth="556kBps" lat="3.101854ms"/>
+   <link id="37" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="117" bandwidth="1.51525MBps" lat="844.683us"/>
+   <link id="43" bandwidth="27.94625MBps" lat="278.066us"/>
+   <link id="5" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="170" bandwidth="4.485125MBps" lat="126.045us"/>
+   <link id="33" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="21" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="63" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="7" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="26" bandwidth="21.41475MBps" lat="29.5890617ms"/>
+   <link id="80" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="119" bandwidth="317.375kBps" lat="4.583831ms"/>
+   <link id="180" bandwidth="251.625kBps" lat="4.455826ms"/>
+   <link id="99" bandwidth="253.125kBps" lat="5.652577ms"/>
+   <link id="179" bandwidth="5.816375MBps" lat="164.758us"/>
+   <link id="162" bandwidth="556kBps" lat="3.101854ms"/>
+   <link id="72" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="74" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="182" bandwidth="4.416625MBps" lat="19.773us"/>
+   <link id="61" bandwidth="8.015125MBps" lat="35.076518ms"/>
+   <link id="108" bandwidth="990.5kBps" lat="1.742977ms"/>
+   <link id="115" bandwidth="926.625kBps" lat="601.375us"/>
+   <link id="92" bandwidth="1.564125MBps" lat="788.956us"/>
+   <link id="103" bandwidth="472.125kBps" lat="5.161451ms"/>
+   <link id="10" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="113" bandwidth="1.858MBps" lat="820.952us"/>
+   <link id="152" bandwidth="7.20975MBps" lat="1.461517ms"/>
+   <link id="189" bandwidth="251.625kBps" lat="4.455826ms"/>
+   <link id="142" bandwidth="1.62775MBps" lat="278.175us"/>
+   <link id="91" bandwidth="8.42725MBps" lat="156.056us"/>
+   <link id="167" bandwidth="768.75kBps" lat="8.76244ms"/>
+   <link id="48" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="107" bandwidth="1.281875MBps" lat="6.104672ms"/>
+   <link id="87" bandwidth="8.158MBps" lat="270.544us"/>
+   <link id="174" bandwidth="290.875kBps" lat="4.47727ms"/>
+   <link id="77" bandwidth="27.94625MBps" lat="278.066us"/>
+   <link id="133" bandwidth="1.469125MBps" lat="1.114548ms"/>
+   <link id="149" bandwidth="1.04925MBps" lat="9.647856ms"/>
+   <link id="123" bandwidth="3.430125MBps" lat="536.941us"/>
+   <link id="50" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="39" bandwidth="8.015125MBps" lat="35.076518ms"/>
+   <link id="64" bandwidth="21.41475MBps" lat="29.5890617ms"/>
+   <link id="97" bandwidth="7.534MBps" lat="125.428us"/>
+   <link id="12" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="41" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="52" bandwidth="8.42725MBps" lat="156.056us"/>
+   <link id="173" bandwidth="7.534MBps" lat="125.428us"/>
+   <link id="56" bandwidth="21.41475MBps" lat="29.5890617ms"/>
+   <link id="45" bandwidth="8.158MBps" lat="270.544us"/>
+   <link id="66" bandwidth="11.618875MBps" lat="189.98us"/>
+   <link id="19" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="54" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="70" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="188" bandwidth="3.1755MBps" lat="472.524us"/>
+   <link id="68" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="166" bandwidth="3.9955MBps" lat="678.645us"/>
+   <link id="1" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="136" bandwidth="926.625kBps" lat="601.375us"/>
+   <link id="88" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="116" bandwidth="2.368MBps" lat="9.547561ms"/>
+   <link id="144" bandwidth="259.125kBps" lat="4.460898ms"/>
+   <link id="141" bandwidth="472.125kBps" lat="5.161451ms"/>
+   <link id="30" bandwidth="10.099625MBps" lat="479.78us"/>
+   <link id="100" bandwidth="721.625kBps" lat="6.406us"/>
+   <link id="25" bandwidth="8.015125MBps" lat="35.076518ms"/>
+   <link id="128" bandwidth="1.469125MBps" lat="1.114548ms"/>
+   <link id="28" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="120" bandwidth="4.461125MBps" lat="106.949us"/>
+   <link id="156" bandwidth="4.485125MBps" lat="126.045us"/>
+   <link id="134" bandwidth="259.125kBps" lat="4.460898ms"/>
+   <link id="40" bandwidth="21.41475MBps" lat="29.5890617ms"/>
+   <link id="75" bandwidth="11.618875MBps" lat="189.98us"/>
+   <link id="83" bandwidth="10.314625MBps" lat="6.932556ms"/>
+   <link id="59" bandwidth="11.845375MBps" lat="370.788us"/>
+   <link id="177" bandwidth="990.5kBps" lat="1.742977ms"/>
+   <link id="150" bandwidth="4.27025MBps" lat="672.289us"/>
+   <link id="155" bandwidth="1.37675MBps" lat="449.267us"/>
+   <link id="130" bandwidth="4.485125MBps" lat="126.045us"/>
+   <link id="53" bandwidth="11.618875MBps" lat="189.98us"/>
+   <link id="122" bandwidth="1.126875MBps" lat="287.84us"/>
+   <link id="143" bandwidth="7.20975MBps" lat="1.461517ms"/>
+   <link id="158" bandwidth="3.028375MBps" lat="677.908us"/>
+   <link id="42" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="22" bandwidth="11.618875MBps" lat="189.98us"/>
+   <link id="46" bandwidth="8.158MBps" lat="270.544us"/>
+   <link id="13" bandwidth="255.228625MBps" lat="7.413073ms"/>
+   <link id="105" bandwidth="117.125kBps" lat="53.930106ms"/>
+   <link id="6" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="85" bandwidth="15.376875MBps" lat="35.083019ms"/>
+   <link id="185" bandwidth="2.3485MBps" lat="259.761us"/>
+   <link id="36" bandwidth="11.618875MBps" lat="189.98us"/>
+   <link id="3" bandwidth="255.228625MBps" lat="7.413073ms"/>
+   <link id="183" bandwidth="3.9955MBps" lat="678.645us"/>
+   <link id="94" bandwidth="4.485125MBps" lat="126.045us"/>
+   <link id="146" bandwidth="3.37125MBps" lat="666.676us"/>
+   <link id="51" bandwidth="8.42725MBps" lat="156.056us"/>
+   <link id="9" bandwidth="34.285625MBps" lat="514.433us"/>
+   <link id="111" bandwidth="3.275625MBps" lat="658.142us"/>
+   <link id="38" bandwidth="41.279125MBps" lat="59.904us"/>
+   <link id="4" bandwidth="132.977875MBps" lat="131.098us"/>
+   <link id="34" bandwidth="11.845375MBps" lat="370.788us"/>
+   <link id="169" bandwidth="1.37675MBps" lat="449.267us"/>
+   <link id="164" bandwidth="768.75kBps" lat="8.76244ms"/>
+   <link id="132" bandwidth="2.179125MBps" lat="320.114us"/>
+   <link id="171" bandwidth="3.29775MBps" lat="595.883us"/>
    <route src="Jacquelin" dst="Boivin" symmetrical="NO"><link_ctn id="145"/><link_ctn id="59"/><link_ctn id="56"/><link_ctn id="54"/><link_ctn id="17"/><link_ctn id="16"/><link_ctn id="10"/><link_ctn id="11"/><link_ctn id="44"/><link_ctn id="47"/></route>
    <route src="Jacquelin" dst="Jean_Yves" symmetrical="NO"><link_ctn id="145"/><link_ctn id="59"/><link_ctn id="58"/><link_ctn id="63"/><link_ctn id="138"/></route>
    <route src="Jacquelin" dst="TeX" symmetrical="NO"><link_ctn id="145"/><link_ctn id="59"/><link_ctn id="56"/><link_ctn id="54"/><link_ctn id="17"/><link_ctn id="16"/><link_ctn id="10"/><link_ctn id="6"/><link_ctn id="7"/><link_ctn id="19"/><link_ctn id="28"/><link_ctn id="27"/><link_ctn id="30"/><link_ctn id="35"/><link_ctn id="100"/></route>

diff --git a/examples/platforms/routing_cluster.lua b/examples/platforms/routing_cluster.lua
index 2b2826f..f7086b0 100644 (file)
--- a/examples/platforms/routing_cluster.lua
+++ b/examples/platforms/routing_cluster.lua
@@ -8,41 +8,41 @@ simgrid.platf.AS_open{id="AS0",mode="Full"}
     simgrid.platf.router_new{id="router1"}
 
     simgrid.platf.host_new{id="host1",power="1Gf"};
-    simgrid.platf.link_new{id="l1_UP",bandwidth="125MBps",latency="100us"};
-    simgrid.platf.link_new{id="l1_DOWN",bandwidth="125MBps",latency="100us"};
+    simgrid.platf.link_new{id="l1_UP",bandwidth="125MBps",lat="100us"};
+    simgrid.platf.link_new{id="l1_DOWN",bandwidth="125MBps",lat="100us"};
     simgrid.platf.host_link_new{id="host1",up="l1_UP",down="l1_DOWN"};
 
     simgrid.platf.host_new{id="host2",power="1Gf"};
-    simgrid.platf.link_new{id="l2",bandwidth="125MBps",latency="100us",sharing_policy="FULLDUPLEX"};
+    simgrid.platf.link_new{id="l2",bandwidth="125MBps",lat="100us",sharing_policy="FULLDUPLEX"};
     simgrid.platf.host_link_new{id="host2",up="l2_UP",down="l2_DOWN"};
 
     simgrid.platf.host_new{id="host3",power="1Gf"};
-    simgrid.platf.link_new{id="l3",bandwidth="125MBps",latency="100us"};
+    simgrid.platf.link_new{id="l3",bandwidth="125MBps",lat="100us"};
     simgrid.platf.host_link_new{id="host3",up="l3",down="l3"};
 
-    simgrid.platf.backbone_new{id="backbone1",bandwidth="2.25GBps",latency="500us"};
+    simgrid.platf.backbone_new{id="backbone1",bandwidth="2.25GBps",lat="500us"};
 
   simgrid.platf.AS_close()
   simgrid.platf.AS_open{id="my_cluster2",mode="Cluster"}
     simgrid.platf.router_new{id="router2"}
 
     simgrid.platf.host_new{id="host4",power="1Gf"};
-    simgrid.platf.link_new{id="l4_UP",bandwidth="125MBps",latency="100us"};
-    simgrid.platf.link_new{id="l4_DOWN",bandwidth="125MBps",latency="100us"};
+    simgrid.platf.link_new{id="l4_UP",bandwidth="125MBps",lat="100us"};
+    simgrid.platf.link_new{id="l4_DOWN",bandwidth="125MBps",lat="100us"};
     simgrid.platf.host_link_new{id="host4",up="l4_UP",down="l4_DOWN"};
 
     simgrid.platf.host_new{id="host5",power="1Gf"};
-    simgrid.platf.link_new{id="l5",bandwidth="125MBps",latency="100us",sharing_policy="FULLDUPLEX"};
+    simgrid.platf.link_new{id="l5",bandwidth="125MBps",lat="100us",sharing_policy="FULLDUPLEX"};
     simgrid.platf.host_link_new{id="host5",up="l5_UP",down="l5_DOWN"};
 
     simgrid.platf.host_new{id="host6",power="1Gf"};
-    simgrid.platf.link_new{id="l6",bandwidth="125MBps",latency="100us"};
+    simgrid.platf.link_new{id="l6",bandwidth="125MBps",lat="100us"};
     simgrid.platf.host_link_new{id="host6",up="l6",down="l6"};
 
-    simgrid.platf.backbone_new{id="backbone2",bandwidth="2.25GBps",latency="500us"}
+    simgrid.platf.backbone_new{id="backbone2",bandwidth="2.25GBps",lat="500us"}
 
   simgrid.platf.AS_close()
-  simgrid.platf.link_new{id="link1-2",bandwidth="2.25GBps",latency="500us"};
+  simgrid.platf.link_new{id="link1-2",bandwidth="2.25GBps",lat="500us"};
 
   simgrid.platf.ASroute_new{src="my_cluster1", dst="my_cluster2",
                             gw_src="router1", gw_dst="router2", links="link1-2",symmetrical="YES"}

diff --git a/examples/platforms/small_platform.lua b/examples/platforms/small_platform.lua
index d38facf..ef22c73 100644 (file)
--- a/examples/platforms/small_platform.lua
+++ b/examples/platforms/small_platform.lua
@@ -19,17 +19,17 @@
   simgrid.platf.host_new{AS="AS0",id="Bourassa",power=48492000};
 
   -- create Links
-  simgrid.platf.link_new{AS="AS0",id=0,bandwidth=41279125,latency=0.000059904};
-  simgrid.platf.link_new{AS="AS0",id=1,bandwidth=34285625,latency=0.000514433};
-  simgrid.platf.link_new{AS="AS0",id=2,bandwidth=118682500,latency=0.000136931};
-  simgrid.platf.link_new{AS="AS0",id=3,bandwidth=34285625,latency=0.000514433};
-  simgrid.platf.link_new{AS="AS0",id=4,bandwidth=10099625,latency=0.00047978};
-  simgrid.platf.link_new{AS="AS0",id=5,bandwidth=27946250,latency=0.000278066};
-  simgrid.platf.link_new{AS="AS0",id=6,bandwidth=41279125,latency=0.000059904};
-  simgrid.platf.link_new{AS="AS0",id=7,bandwidth=11618875,latency=0.00018998};
-  simgrid.platf.link_new{AS="AS0",id=8,bandwidth=8158000,latency=0.000270544};
-  simgrid.platf.link_new{AS="AS0",id=9,bandwidth=7209750,latency=0.001461517};
-  simgrid.platf.link_new{AS="AS0",id="loopback",bandwidth=498000000,latency=0.000015,sharing_policy="FATPIPE"};
+  simgrid.platf.link_new{AS="AS0",id=0,bandwidth=41279125,lat=0.000059904};
+  simgrid.platf.link_new{AS="AS0",id=1,bandwidth=34285625,lat=0.000514433};
+  simgrid.platf.link_new{AS="AS0",id=2,bandwidth=118682500,lat=0.000136931};
+  simgrid.platf.link_new{AS="AS0",id=3,bandwidth=34285625,lat=0.000514433};
+  simgrid.platf.link_new{AS="AS0",id=4,bandwidth=10099625,lat=0.00047978};
+  simgrid.platf.link_new{AS="AS0",id=5,bandwidth=27946250,lat=0.000278066};
+  simgrid.platf.link_new{AS="AS0",id=6,bandwidth=41279125,lat=0.000059904};
+  simgrid.platf.link_new{AS="AS0",id=7,bandwidth=11618875,lat=0.00018998};
+  simgrid.platf.link_new{AS="AS0",id=8,bandwidth=8158000,lat=0.000270544};
+  simgrid.platf.link_new{AS="AS0",id=9,bandwidth=7209750,lat=0.001461517};
+  simgrid.platf.link_new{AS="AS0",id="loopback",bandwidth=498000000,lat=0.000015,sharing_policy="FATPIPE"};
 
   -- Register loopback links
   for i=1,5,1 do

diff --git a/examples/simdag/platform_script.lua b/examples/simdag/platform_script.lua
index f72f9b3..8aaea89 100644 (file)
--- a/examples/simdag/platform_script.lua
+++ b/examples/simdag/platform_script.lua
@@ -16,7 +16,7 @@ require "simgrid"
 
     -- create Links
   for i=0,11 do
-    simgrid.link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087};   
+    simgrid.link.new{id=i,bandwidth=252750+ i*768,lat=0.000270544+i*0.087};   
   end
   -- simgrid.route.new(src_id,des_id,links_nb,links_list)
    simgrid.route.new("Tremblay","Jupiter",{"1"});

diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c
index f286729..9e71141 100644 (file)
--- a/src/bindings/lua/lua_platf.c
+++ b/src/bindings/lua/lua_platf.c
@@ -92,7 +92,7 @@ int console_add_backbone(lua_State *L) {
   link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1));
   lua_pop(L, 1);
 
-  lua_pushstring(L, "latency");
+  lua_pushstring(L, "lat");
   lua_gettable(L, -2);
   link.latency = surf_parse_get_time(lua_tostring(L, -1));
   lua_pop(L, 1);
@@ -183,20 +183,20 @@ int console_add_host(lua_State *L) {
   lua_pop(L, 1);
 
   //get power_scale
-  lua_pushstring(L, "power_scale");
+  lua_pushstring(L, "availability");
   lua_gettable(L, -2);
   if(!lua_isnumber(L,-1)) host.power_scale = 1;// Default value
   else host.power_scale = lua_tonumber(L, -1);
   lua_pop(L, 1);
 
   //get power_trace
-  lua_pushstring(L, "power_trace");
+  lua_pushstring(L, "availability_file");
   lua_gettable(L, -2);
   host.power_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get state initial
-  lua_pushstring(L, "state_initial");
+  lua_pushstring(L, "state");
   lua_gettable(L, -2);
   if(!lua_isnumber(L,-1)) state = 1;// Default value
   else state = lua_tonumber(L, -1);
@@ -208,7 +208,7 @@ int console_add_host(lua_State *L) {
     host.initial_state = SURF_RESOURCE_OFF;
 
   //get trace state
-  lua_pushstring(L, "state_trace");
+  lua_pushstring(L, "state_file");
   lua_gettable(L, -2);
   host.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
@@ -242,7 +242,7 @@ int  console_add_link(lua_State *L) {
   lua_pop(L, 1);
 
   //get latency value
-  lua_pushstring(L, "latency");
+  lua_pushstring(L, "lat");
   lua_gettable(L, -2);
   link.latency = surf_parse_get_time(lua_tostring(L, -1));
   lua_pop(L, 1);
@@ -250,25 +250,25 @@ int  console_add_link(lua_State *L) {
   /*Optional Arguments  */
 
   //get bandwidth_trace value
-  lua_pushstring(L, "bandwidth_trace");
+  lua_pushstring(L, "bandwidth_file");
   lua_gettable(L, -2);
   link.bandwidth_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get latency_trace value
-  lua_pushstring(L, "latency_trace");
+  lua_pushstring(L, "latency_file");
   lua_gettable(L, -2);
   link.latency_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get state_trace value
-  lua_pushstring(L, "state_trace");
+  lua_pushstring(L, "state_file");
   lua_gettable(L, -2);
   link.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get state_initial value
-  lua_pushstring(L, "state_initial");
+  lua_pushstring(L, "state");
   lua_gettable(L, -2);
   if (!lua_isnumber(L,-1) || lua_tonumber(L, -1))
     link.state = SURF_RESOURCE_ON;