[GNUnet-SVN] r8997 - GNUnet/contrib/profiling

[gnunet]

Author: nevans
Date: 2009-09-14 13:41:15 -0600 (Mon, 14 Sep 2009)
New Revision: 8997

Modified:
   GNUnet/contrib/profiling/trial.cgi
   GNUnet/contrib/profiling/trialsToRun.cgi
   GNUnet/contrib/profiling/welcome.cgi
Log:
web display changes

Modified: GNUnet/contrib/profiling/trial.cgi
===================================================================
--- GNUnet/contrib/profiling/trial.cgi  2009-09-14 19:14:16 UTC (rev 8996)
+++ GNUnet/contrib/profiling/trial.cgi  2009-09-14 19:41:15 UTC (rev 8997)
@@ -34,6 +34,7 @@
       <td class="inner"><b>Topology</b></td>
       <td class="inner"><b>Topology<br/>Modifier</b></td>
       <td class="inner"><b>Log<br/>Multiplier</b></td>
+      <td class="inner"><b>BPM</b></td>
       <td><b># Puts</b></td><td><b>#Gets</b></td>
       <td class="inner"><b>Concurrent<br/>Requests</b></td>
       <td class="inner"><b>Settle<br/>Time</b></td>
@@ -42,6 +43,7 @@
       <td class="inner"><b>ln(N)<br/>Multiplier</b></td>
       <td class="inner"><b>Messages<br/>Dropped</b></td>
       <td class="inner"><b>Bytes<br/>Dropped</b></td>
+                       <td class="inner"><b>DV Messages<br/>to 
Unknown<br/>Peers</b></td>
       <td class="inner"><b>Trial<br/>Comment</b></td>
     </tr>
 
@@ -66,6 +68,7 @@
   <td class=\"inner\">$topologies{$topology_int}</td>
   <td class=\"inner\">$$data{'topology_modifier'}</td>
   <td class=\"inner\">$$data{'logNMultiplier'}</td>
+       <td class=\"inner\">$$data{'maxnetbps'}</td>
   <td class=\"inner\">$$data{'puts'}</td>
   <td class=\"inner\">$$data{'gets'}</td>
   <td class=\"inner\">$$data{'concurrent'}</td>
@@ -75,6 +78,7 @@
   <td class=\"inner\">" . int(100 * log($$data{'numnodes'}))/100 . "</td>
   <td class=\"inner\">$$data{'totalMessagesDropped'}</td>
   <td class=\"inner\">$$data{'totalBytesDropped'}</td>
+       <td class=\"inner\">$$data{'unknownPeers'}</td>
   <td class=\"inner\">$$data{'message'}</td>
   </tr>";
   print $table_line . "\n";

Modified: GNUnet/contrib/profiling/trialsToRun.cgi
===================================================================
--- GNUnet/contrib/profiling/trialsToRun.cgi    2009-09-14 19:14:16 UTC (rev 
8996)
+++ GNUnet/contrib/profiling/trialsToRun.cgi    2009-09-14 19:41:15 UTC (rev 
8997)
@@ -26,8 +26,9 @@
   my $malicious_putters = $c->param("malicious_putters");
   my $malicious_get_frequency = $c->param("malicious_get_frequency");
   my $malicious_put_frequency = $c->param("malicious_put_frequency");
+       my $maxnetbps = $c->param("maxnetbps");
   my $message = $c->param("message");
-  $sqlinsert = "insert into trialsToRun (numnodes, concurrent, settle_time, 
puts, gets, topology, topology_modifier, logNMultiplier, malicious_getters, 
malicious_get_frequency, malicious_putters, malicious_put_frequency, 
malicious_droppers, message) values (\'$numnodes\', \'$concurrent\', 
\'$settle_time\', \'$puts\', \'$gets\', \'$topology\', \'$topology_modifier\', 
\'$logNMultiplier\', \'$malicious_getters\', \'$malicious_get_frequency\', 
\'$malicious_putters\', \'$malicious_put_frequency\', \'$malicious_droppers\', 
\'$message\')";
+  $sqlinsert = "insert into trialsToRun (numnodes, concurrent, settle_time, 
puts, gets, topology, topology_modifier, logNMultiplier, malicious_getters, 
malicious_get_frequency, malicious_putters, malicious_put_frequency, 
malicious_droppers, maxnetbps, message) values (\'$numnodes\', \'$concurrent\', 
\'$settle_time\', \'$puts\', \'$gets\', \'$topology\', \'$topology_modifier\', 
\'$logNMultiplier\', \'$malicious_getters\', \'$malicious_get_frequency\', 
\'$malicious_putters\', \'$malicious_put_frequency\', \'$malicious_droppers\', 
\'$maxnetbps\', \'$message\')";
   my $rth = $dbh->prepare($sqlinsert);
   $rth->execute();
 
@@ -68,6 +69,7 @@
       <td><b>Malicious Putters</b></td>
       <td><b>Malicious Put Frequency</b></td>
       <td><b>Malicious Droppers</b></td>
+                       <td><b>Maxnetbps</b></td>
       <td><b>Message</b></td>
     </tr>
 
@@ -91,13 +93,14 @@
   <td class=\"inner\">$$data{'malicious_putters'}</td>
   <td class=\"inner\">$$data{'malicious_put_frequency'}</td>
   <td class=\"inner\">$$data{'malicious_droppers'}</td>
+       <td class=\"inner\">$$data{'maxnetbps'}</td>
   <td class=\"inner\">$$data{'message'}</td></tr>";
   print $table_line . "\n";
 }
 print <<ENDHTML;
 <form name="add_row" type=get>
     <tr>
-      <td>----</td><td><input size=3 type="text" 
name="numnodes"/></td><td><select name="topology">
+      <td>----</td><td><input size=3 type="text" name="numnodes" value="100" 
/></td><td><select name="topology">
 ENDHTML
   foreach $key (keys(%topologies))
   { 
@@ -112,17 +115,18 @@
   }
 print <<ENDHTML;
       </select></td>
-      <td><input size=4 type="text" name="topology_modifier"</td>
-      <td><input size=4 type="text" name="logNMultiplier"</td>
-      <td><input size=5 type="text" name="puts" /></td>
-      <td><input size=5 type="text" name="gets"/></td>
-      <td><input size=3 type="text" name="concurrent" /></td>
-      <td><input size=3 type="text" name="settle_time"/></td>
-      <td><input size=3 type="text" name="malicious_getters"/></td>
+      <td><input size=4 type="text" name="topology_modifier" value="1"</td>
+      <td><input size=4 type="text" name="logNMultiplier" value="1"</td>
+      <td><input size=5 type="text" name="puts" value="100" /></td>
+      <td><input size=5 type="text" name="gets" value="100" /></td>
+      <td><input size=3 type="text" name="concurrent" value="20" /></td>
+      <td><input size=3 type="text" name="settle_time" value="5" /></td>
+      <td><input size=3 type="text" name="malicious_getters" value="0" /></td>
       <td><input size=3 type="text" name="malicious_get_frequency"/></td>
-      <td><input size=3 type="text" name="malicious_putters"/></td>
+      <td><input size=3 type="text" name="malicious_putters" value="0" /></td>
       <td><input size=3 type="text" name="malicious_put_frequency"/></td>
-      <td><input size=3 type="text" name="malicious_droppers"/></td>
+      <td><input size=3 type="text" name="malicious_droppers" value="0" /></td>
+                       <td><input size=20 type="text" name="maxnetbps"/></td>
       <td><input type="text" name="message"/></td>
     </tr>
     <tr><td colspan=14 class="inner"><input type="submit" value="Add Trial" 
/></td></tr>

Modified: GNUnet/contrib/profiling/welcome.cgi
===================================================================
--- GNUnet/contrib/profiling/welcome.cgi        2009-09-14 19:14:16 UTC (rev 
8996)
+++ GNUnet/contrib/profiling/welcome.cgi        2009-09-14 19:41:15 UTC (rev 
8997)
@@ -36,7 +36,9 @@
       <td><b>Malicious<br/>Getters</b></td>
       <td><b>Malicious<br/>Putters</b></td>
       <td><b>Malicious<br/>Droppers</b></td>
-      <td><b>Trial<br/>Comment</b></td>
+                       <td><b>Max BPS</b></td>
+                       <td><b>Messages Dropped</b></td>
+      <td style="width:150px"><b>Trial<br/>Comment</b></td>
     </tr>
 
 ENDHTML
@@ -51,7 +53,7 @@
   <td><a 
href=\"trial.cgi?trialuid=$$data{'trialuid'}\">$$data{'trialuid'}</a></td>
   <td>$$data{'numnodes'}</td>
   <td>$topologies{$topology_int}</td>
-  <td class=\"inner\">$$data{'topology_modifier'}</td>
+  <td class=\"inner\">" . (int($$data{'topology_modifier'} * 10000) / 10000) . 
"</td>
   <td class=\"inner\">$$data{'logNMultiplier'}</td>
   <td>$$data{'puts'}</td>
   <td>$$data{'gets'}</td>
@@ -61,7 +63,9 @@
   <td>$$data{'malicious_getters'}</td>
   <td>$$data{'malicious_putters'}</td>
   <td>$$data{'malicious_droppers'}</td>
-  <td>$$data{'message'}</td>
+       <td>$$data{'maxnetbps'}</td>
+       <td>$$data{'totalMessagesDropped'}</td>
+  <td style=\"width:150px\">$$data{'message'}</td>
   </tr>";
   print $table_line . "\n";
 }