[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r17865: {torstatus} Adding prettier debugging and optimizing the update time a b (torstatus/trunk)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] r17865: {torstatus} Adding prettier debugging and optimizing the update time a b (torstatus/trunk)
From: kasimir@xxxxxxxx
Date: Sat, 3 Jan 2009 18:59:30 -0500 (EST)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Sat, 03 Jan 2009 18:59:35 -0500
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

Author: kasimir
Date: 2009-01-03 18:59:30 -0500 (Sat, 03 Jan 2009)
New Revision: 17865

Modified:
   torstatus/trunk/tns_update.pl
Log:
Adding prettier debugging and optimizing the update time a bit

Modified: torstatus/trunk/tns_update.pl
===================================================================
--- torstatus/trunk/tns_update.pl	2009-01-03 23:58:20 UTC (rev 17864)
+++ torstatus/trunk/tns_update.pl	2009-01-03 23:59:30 UTC (rev 17865)
@@ -52,8 +52,12 @@
 use RRDs;
 use Compress::Zlib;
 
-# Temporary Debugging
-$| = 1;
+# Debugging Control
+my $debugging = 0;
+if ($debugging == 1)
+{
+	$| = 1;
+}
 
 # Set the constant to break out of getting the hostnames
 use constant TIMEOUT => 1;
@@ -111,6 +115,11 @@
 # Find the initial time
 my $start_time = time();
 
+if ($debugging == 1)
+{
+	my $curtime = time() - $start_time; print "[$curtime] starting...\n"; # DEBUG
+}
+
 # Initiate a connection to the MySQL server
 $dbh = DBI->connect('DBI:mysql:database='.$config{'SQL_Catalog'}.';host='.$config{'SQL_Server'},$config{'SQL_User'},$config{'SQL_Pass'}, {
 	PrintError => 0,
@@ -181,6 +190,11 @@
 	}
 }
 
+if ($debugging == 1)
+{
+	my $curtime = time() - $start_time; print "[$curtime] mirror?\n"; # DEBUG
+}
+
 # Determine whether or not the mirror list needs to be updated
 if ($updateCounter % 20 == 0)
 {
@@ -235,6 +249,11 @@
 }
 $updateCounter++;
 
+if ($debugging == 1)
+{
+	my $curtime = time() - $start_time; print "[$curtime] connecting to Tor\n"; # DEBUG
+}
+
 # Initiate a connection to the Tor server
 my $torSocket = IO::Socket::INET->new(
 	PeerAddr	=> $config{'LocalTorServerIP'},
@@ -243,6 +262,11 @@
 	Type		=> SOCK_STREAM)
 	or die "Could not connect to Tor server: $!\n";
 
+if ($debugging == 1)
+{
+	my $curtime = time() - $start_time; print "[$curtime] authenticating with Tor\n"; # DEBUG
+}
+
 # Prepare all of the database information, which Descriptor table, make sure
 # database is installed, etc
 $query = "SElECT count(*) AS Count FROM Status;";
@@ -283,6 +307,11 @@
 	die "Unable to authenticate with the Tor server.";
 }
 
+if ($debugging == 1)
+{
+	my $curtime = time() - $start_time; print "[$curtime] starting descriptions\n"; # DEBUG
+}
+
 ############ Updating router descriptions ####################################
 
 # Delete all of the records from the descriptor table that is going to be
@@ -456,6 +485,7 @@
 			my $numtime = $time - $offset;
 			push @readhistory, "$numtime:$num";
 			$offset += $increment;
+			$currentRouter{'bandwidthcounter'} += $num;
 		}
 		$currentRouter{'read'} = join(' ',@readhistory);
 
@@ -465,14 +495,10 @@
 		# Serialize the last part of the data
 		@readhistory = split(/,/,$4);
 		$currentRouter{'ReadHistorySERDATA'} = serialize(\@readhistory);
+		
 		# Add to the observed bandwidth counter
-		foreach my $num (@readhistory)
-		{
-			$currentRouter{'bandwidthcounter'} += $num;
-		}
 		$currentRouter{'rh'} = \@readhistory;
 		$currentRouter{'readnumber'} = scalar(@readhistory);
-
 	}
 
 	# Format for the write-history line
@@ -493,6 +519,7 @@
 			my $numtime = $time - $offset;
 			push @writehistory, "$numtime:$num";
 			$offset += $increment;
+			$currentRouter{'bandwidthcounter'} += $num;
 		}
 		$currentRouter{'write'} = join(' ',@writehistory);
 		
@@ -502,11 +529,8 @@
 		# Serialize the last part of the data
 		@writehistory = split(/,/,$4);
 		$currentRouter{'WriteHistorySERDATA'} = serialize(\@writehistory);
+		
 		# Add to the observed bandwidth counter
-		foreach my $num (@writehistory)
-		{
-			$currentRouter{'bandwidthcounter'} += $num;
-		}
 		$currentRouter{'wh'} = \@writehistory;
 		$currentRouter{'writenumber'} = scalar(@writehistory);
 	}
@@ -588,6 +612,7 @@
 					my $numtime = $time - $offset;
 					push @readhistory, "$numtime:$num";
 					$offset += $increment;
+					$currentRouter{'bandwidthcounter'} += $num;
 				}
 				$currentRouter{'read'} = join(' ',@readhistory);
 			
@@ -597,11 +622,8 @@
 				# Serialize the last part of the data
 				@readhistory = split(/,/,$4);
 				$currentRouter{'ReadHistorySERDATA'} = serialize(\@readhistory);
+				
 				# Add to the observed bandwidth counter
-				foreach my $num (@readhistory)
-				{
-					$currentRouter{'bandwidthcounter'} += $num;
-				}
 				$currentRouter{'rh'} = \@readhistory;
 				$currentRouter{'readnumber'} = scalar(@readhistory);
 			}
@@ -624,6 +646,7 @@
 					my $numtime = $time - $offset;
 					push @writehistory, "$numtime:$num";
 					$offset += $increment;
+					$currentRouter{'bandwidthcounter'} += $num;
 				}
 				$currentRouter{'write'} = join(' ',@writehistory);
 				
@@ -633,11 +656,8 @@
 				# Serialize the last part of the data
 				@writehistory = split(/,/,$4);
 				$currentRouter{'WriteHistorySERDATA'} = serialize(\@writehistory);
+				
 				# Add to the observed bandwidth counter
-				foreach my $num (@writehistory)
-				{
-					$currentRouter{'bandwidthcounter'} += $num;
-				}
 				$currentRouter{'wh'} = \@writehistory;
 				$currentRouter{'writenumber'} = scalar(@writehistory);
 			}
@@ -716,6 +736,11 @@
 	}
 }
 
+if ($debugging == 1)
+{
+	$curtime = time() - $start_time; print "[$curtime] starting status\n"; # DEBUG
+}
+
 ############ Updating network status #########################################
 
 # Geo::IP needs to be loaded - include a built-in cache
@@ -876,6 +901,11 @@
 # Rename the DNSEL table so it is used
 $dbh->do("RENAME TABLE DNSEL TO tmp_table, DNSEL_INACT TO DNSEL, tmp_table TO DNSEL_INACT;");
 
+if ($debugging == 1)
+{
+	$curtime = time() - $start_time; print "[$curtime] starting history\n"; #DEBUG
+}
+
 ################# Tor History #################
 
 if ($config{'TorHistory'} eq "true") {
@@ -962,29 +992,29 @@
 
 # get the values from the database
 # serverflags.rrd
-	$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1'; ";
-	$dbresponse = $dbh->prepare($query);
+$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1'; ";
+$dbresponse = $dbh->prepare($query);
 $dbresponse->execute();
-	my $run = $dbresponse->fetchrow();
-	$dbresponse->finish();
+my $run = $dbresponse->fetchrow();
+$dbresponse->finish();
 
-	$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1' AND FExit = '1' ";
-	$dbresponse = $dbh->prepare($query);
-	$dbresponse->execute();
-	my $runExit = $dbresponse->fetchrow();
-	$dbresponse->finish();
+$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1' AND FExit = '1' ";
+$dbresponse = $dbh->prepare($query);
+$dbresponse->execute();
+my $runExit = $dbresponse->fetchrow();
+$dbresponse->finish();
 
-	$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1' AND FGuard = '1' ";
-	$dbresponse = $dbh->prepare($query);
-	$dbresponse->execute();
-	my $runGuard = $dbresponse->fetchrow();
-	$dbresponse->finish();
+$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1' AND FGuard = '1' ";
+$dbresponse = $dbh->prepare($query);
+$dbresponse->execute();
+my $runGuard = $dbresponse->fetchrow();
+$dbresponse->finish();
 	
-	$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1' AND FFast = '1' ";
-	$dbresponse = $dbh->prepare($query);
-	$dbresponse->execute();
-	my $runFast = $dbresponse->fetchrow();
-	$dbresponse->finish();
+$query = "SELECT count( * ) FROM NetworkStatus${descriptorTable} WHERE FRunning = '1' AND FFast = '1' ";
+$dbresponse = $dbh->prepare($query);
+$dbresponse->execute();
+my $runFast = $dbresponse->fetchrow();
+$dbresponse->finish();
 
 #servernumbers.rrd
 # US
@@ -1095,6 +1125,11 @@
 $dbh->disconnect();
 close($torSocket);
 
+if ($debugging == 1)
+{
+	$curtime = time() - $start_time; print "[$curtime] done\n"; # DEBUG
+}
+
 };
 if ($@) {
 	print "The TorStatus database was not updated properly.  An error has occured.	I will continue to try to update, however.\n";
@@ -1144,7 +1179,7 @@
 	return $temp;
 }
 
-# Takes care of creatin the right graphs ...
+# Takes care of creating the right graphs ...
 sub graph_multiplier {
 	my ($country) = @_;

Prev by Author: [or-cvs] r17853: {torstatus} (ticket:116) Adding support for custom time graphs (torstatus/trunk/cgi-bin/perlgraph)
Next by Author: [or-cvs] r17840: {projects} Make graph containing number of running bridges over time lo (in projects/dir-stats/trunk/bridge-stats: out report)
Previous by thread: [or-cvs] r17864: {website} does this change make the footer even more correct? (website/trunk/en)
Next by thread: [or-cvs] r17866: {tor} List places where the hidden service protocol uses SHA-1. (tor/trunk/doc/spec/proposals/ideas)
Index(es):
- Author
- Thread