From 36783b898396fbe62e01929c7175944d0c1e39de Mon Sep 17 00:00:00 2001 From: witekfl Date: Fri, 15 Sep 2006 18:16:37 +0000 Subject: [PATCH] - filemtime info cached (speedup) - commented out outdated ac and ra logs --- obsolete/buildlogs/index.php | 58 ++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/obsolete/buildlogs/index.php b/obsolete/buildlogs/index.php index d2979eb..fca7eca 100644 --- a/obsolete/buildlogs/index.php +++ b/obsolete/buildlogs/index.php @@ -20,7 +20,7 @@ $addr = array( "/ac/alpha", "/ac/ppc", "/ac/sparc", - "/ac/sparc64", + "/ac/sparc64"/*, "/ra/i386", "/ra/i586", "/ra/i686", @@ -31,6 +31,7 @@ $addr = array( "/nest/i686", "/nest/alpha", "/nest/ppc" +*/ ); $qa_addr = array( "http://ftp.pld-linux.org/dists/th/.stat/builder/th/rpmqa-SRPMS.txt", @@ -51,7 +52,7 @@ $qa_addr = array( "http://ftp.pld-linux.org/dists/ac/.stat/builder/ac/rpmqa-alpha.txt", "http://ftp.pld-linux.org/dists/ac/.stat/builder/ac/rpmqa-ppc.txt", "http://ftp.pld-linux.org/dists/ac/.stat/builder/ac/rpmqa-sparc.txt", - "http://ftp.pld-linux.org/dists/ac/.stat/builder/ac/rpmqa-sparc64.txt", + "http://ftp.pld-linux.org/dists/ac/.stat/builder/ac/rpmqa-sparc64.txt"/*, "http://ftp.pld-linux.org/dists/ra/.stat/builder/liniowiec/rpmqa-ra-i386.txt", "http://ftp.pld-linux.org/dists/ra/.stat/builder/liniowiec/rpmqa-ra-i586.txt", "http://ftp.pld-linux.org/dists/ra/.stat/builder/liniowiec/rpmqa-ra-i686.txt", @@ -62,6 +63,7 @@ $qa_addr = array( "http://ftp.nest.pld-linux.org/.stat/builder/kenny/rpmqa-nest-i686.txt", "http://ftp.nest.pld-linux.org/.stat/builder/alpha/rpmqa-nest-alpha.txt", "http://ftp.nest.pld-linux.org/.stat/builder/an2/rpmqa-nest-ppc.txt" +*/ ); $local = 1; /* $local=0 for FTP */ $root_directory = "/home/services/ftp/pub/pld-buildlogs"; @@ -273,7 +275,7 @@ function directory_list($pidx="",$pok="") $list = array (); while ($file = readdir($dir)) { if (($file != ".") && ($file != "..")) { - $list[$i] = "$a/$file"; + $list[$i] = array("$a/$file", filemtime("$root_directory$a/$file")); $i++; } } @@ -316,27 +318,32 @@ function list_logs() function cmp($f1, $f2) { global $ftp_conn, $root_directory, $local; if ($local) - return filemtime("$root_directory$f2") - filemtime("$root_directory$f1"); + return $f2[1] - $f1[1];//filemtime("$root_directory$f2") - filemtime("$root_directory$f1"); return ftp_mdtm($ftp_conn, $f2) - ftp_mdtm($ftp_conn, $f1); } + function cmp2($f1, $f2) { + return strcmp($f1[0], $f2[0]); + } + if ($ns != 1) { $ns = 0; usort($list, "cmp"); } else { - sort($list); + usort($list, "cmp2"); } $now = time(); for ($i = $off; $i < $cnt + $off; $i++) { - if (!isset($list[$i])) + $filename = $list[$i][0]; + if (!isset($filename)) continue; - $h = bin2hex(mhash(MHASH_MD5, $list[$i])); - $f = preg_replace("/.*\/([^\/]*)$/", "\\1", $list[$i]); + $h = bin2hex(mhash(MHASH_MD5, $filename)); + $f = preg_replace("/.*\/([^\/]*)$/", "\\1", $filename); $f = preg_replace("/\.(bz2|gz)$/", "", $f); if ($local) { - $s = filesize("$root_directory$list[$i]"); - $t = $now - filemtime("$root_directory$list[$i]"); + $s = filesize("$root_directory$filename"); + $t = $now - $list[$i][1]; } else { $s = ftp_size($ftp_conn, $list[$i]); $t = $now - ftp_mdtm($ftp_conn, $list[$i]); @@ -426,9 +433,9 @@ function file_name() $f = false; for ($i = 0; $i < count($list); $i++) { - $h = bin2hex(mhash(MHASH_MD5, $list[$i])); + $h = bin2hex(mhash(MHASH_MD5, $list[$i][0])); if ($h == $id) { - $f = $list[$i]; + $f = $list[$i][0]; } } @@ -629,7 +636,7 @@ function list_archs() "alt=\""._("Powered by PLD Linux")."\" border=\"0\" />
\n" . "(c) 2002 ". "PLD Team
\n". - '$Revision: 1.86 $'. + '$Revision: 1.87 $'. "\n"; # smile ;) @@ -817,10 +824,10 @@ function adv_search() { while (list($k,$name)=each($tmp_list)) { - $s = filesize("$root_directory$name"); - $t = $now - filemtime("$root_directory$name"); + $s = filesize("$root_directory$name[0]"); + $t = $now - $name[1]; $t/=(24*3600); - if (($_POST["name"]!="") && (!preg_match("/".$_POST["name"]."/i",$name)))continue; + if (($_POST["name"]!="") && (!preg_match("/".$_POST["name"]."/i",$name[0])))continue; if (($_POST["age1"]) && ($_POST["age1"]>$t))continue; if (($_POST["age2"]) && ($_POST["age2"]<$t))continue; @@ -853,14 +860,14 @@ function adv_search() function cmp1($f1, $f2) { global $ftp_conn, $root_directory, $local; if ($local) - return filemtime("$root_directory$f2") - filemtime("$root_directory$f1"); + return $f2[1] - $f1[1]; return ftp_mdtm($ftp_conn, $f2) - ftp_mdtm($ftp_conn, $f1); } function cmp2($f1, $f2) { - list($p11,$p12,$p13)=explode("_",$f1); - list($p21,$p22,$p23)=explode("_",$f2); - return strcmp($f2,$f1); + list($p11,$p12,$p13)=explode("_",$f1[0]); + list($p21,$p22,$p23)=explode("_",$f2[0]); + return strcmp($f1[0],$f2[0]); } if ($ns == 1) @@ -885,13 +892,14 @@ function adv_search() $counter++; list($i,$j,$k)=explode("_",$k); + $filename = $name[0]; - $h = bin2hex(mhash(MHASH_MD5, $name)); - $f = preg_replace("/.*\/([^\/]*)$/", "\\1", $name); + $h = bin2hex(mhash(MHASH_MD5, $filename)); + $f = preg_replace("/.*\/([^\/]*)$/", "\\1", $filename); $f = preg_replace("/\.(bz2|gz)$/", "", $f); if ($local) { - $s = filesize("$root_directory$name"); - $t = $now - filemtime("$root_directory$name"); + $s = filesize("$root_directory$filename"); + $t = $now - $name[1]; } else { $s = ftp_size($ftp_conn, $list[$i]); $t = $now - ftp_mdtm($ftp_conn, $list[$i]); @@ -985,7 +993,7 @@ function welcome() . ;)

-

Version: $Id: index.php,v 1.86 2005/11/24 12:15:59 ankry Exp $

+

Version: $Id: index.php,v 1.87 2006/01/28 20:59:43 ankry Exp $