From 66aba1fd2a98bf404307e4e586e66b6e36292e09 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Thu, 4 Sep 2008 20:50:28 +0000 Subject: [PATCH] + memcached test (buggy on Windows at least) all min_extras apps use the cache path and lib location specified in min/config.php --- min_extras/ab_tests/minify/test_Files.php | 2 +- .../ab_tests/minify/test_Files_Memcache.php | 18 +++++++++++++- min_extras/ab_tests/minify/test_Groups.php | 2 +- min_extras/ab_tests/minify/test_Version1.php | 1 + min_extras/ab_tests/minify/test_memcache.php | 19 +++++++++++++++ min_extras/ab_tests/test_memcache.bat | 12 +++++----- min_extras/config.php | 24 +++++++++---------- min_extras/tools/encodeFile.php | 4 +++- min_extras/tools/minifyFile.php | 9 +++---- 9 files changed, 62 insertions(+), 29 deletions(-) create mode 100644 min_extras/ab_tests/minify/test_memcache.php diff --git a/min_extras/ab_tests/minify/test_Files.php b/min_extras/ab_tests/minify/test_Files.php index f9cae9c..3fe0737 100644 --- a/min_extras/ab_tests/minify/test_Files.php +++ b/min_extras/ab_tests/minify/test_Files.php @@ -4,7 +4,7 @@ require '../../config.php'; require 'Minify.php'; -// give an explicit path to avoid having to load Solar/Dir.php +// set in /min/config.php Minify::setCache($minifyCachePath); Minify::serve('Files', array( diff --git a/min_extras/ab_tests/minify/test_Files_Memcache.php b/min_extras/ab_tests/minify/test_Files_Memcache.php index 59abcd1..d96d30f 100644 --- a/min_extras/ab_tests/minify/test_Files_Memcache.php +++ b/min_extras/ab_tests/minify/test_Files_Memcache.php @@ -6,9 +6,25 @@ require 'Minify.php'; require 'Minify/Cache/Memcache.php'; $mc = new Memcache; -if (! $mc->connect('localhost', 11211)) { +if (! @$mc->connect('localhost', 11211)) { + file_put_contents( + dirname(__FILE__) . '/../memcached_stats.txt' + ,"\nFailed connection.\n" + ,FILE_APPEND + ); die(); } + +if (0 == rand(0, 19)) { + $stats = $mc->getStats(); + file_put_contents( + dirname(__FILE__) . '/../memcached_stats.txt' + ,$stats['curr_connections'] . "\n" + ,FILE_APPEND + ); +} + + Minify::setCache(new Minify_Cache_Memcache($mc)); Minify::serve('Files', array( diff --git a/min_extras/ab_tests/minify/test_Groups.php b/min_extras/ab_tests/minify/test_Groups.php index cdeccc0..3158d46 100644 --- a/min_extras/ab_tests/minify/test_Groups.php +++ b/min_extras/ab_tests/minify/test_Groups.php @@ -4,7 +4,7 @@ require '../../config.php'; require 'Minify.php'; -// give an explicit path to avoid having to load Solar/Dir.php +// set in /min/config.php Minify::setCache($minifyCachePath); Minify::serve('Groups', array( diff --git a/min_extras/ab_tests/minify/test_Version1.php b/min_extras/ab_tests/minify/test_Version1.php index 43ba632..c572bb2 100644 --- a/min_extras/ab_tests/minify/test_Version1.php +++ b/min_extras/ab_tests/minify/test_Version1.php @@ -5,6 +5,7 @@ require '../../config.php'; define('MINIFY_BASE_DIR', realpath( dirname(__FILE__) . '/../minify' )); +// set in /min/config.php define('MINIFY_CACHE_DIR', $minifyCachePath); require 'Minify.php'; diff --git a/min_extras/ab_tests/minify/test_memcache.php b/min_extras/ab_tests/minify/test_memcache.php new file mode 100644 index 0000000..edf1191 --- /dev/null +++ b/min_extras/ab_tests/minify/test_memcache.php @@ -0,0 +1,19 @@ +connect('localhost', 11211)) { + file_put_contents( + dirname(__FILE__) . '/../memcached_stats.txt' + ,"Fail\n" + ,FILE_APPEND | LOCK_EX + ); + die(); +} + +$stats = $mc->getStats(); +file_put_contents( + dirname(__FILE__) . '/../memcached_stats.txt' + ,$stats['curr_connections'] . "\n" + ,FILE_APPEND | LOCK_EX +); + diff --git a/min_extras/ab_tests/test_memcache.bat b/min_extras/ab_tests/test_memcache.bat index ba664fb..51f53f8 100644 --- a/min_extras/ab_tests/test_memcache.bat +++ b/min_extras/ab_tests/test_memcache.bat @@ -1,13 +1,13 @@ -@SET PATH=%PATH%;C:\xampp\apache\bin +@SET PATH=%PATH%;C:\xampp\apache\bin;C:\Program Files\GnuWin32\bin -@SET DOMAIN=http://mc.dev +@SET DOMAIN=http://localhost/minify @SET ABTESTS=%DOMAIN%/min_extras/ab_tests -ab -d -S -c 1 -n 2 -H "Accept-Encoding: deflate, gzip" %ABTESTS%/minify/test_Files_Memcache.php - DEL results.txt -ab -d -S -c 100 -n 1000 -H "Accept-Encoding: deflate, gzip" %ABTESTS%/minify/test_Files_Memcache.php >> results.txt +DEL memcached_stats.txt -START "C:\Program Files\Notepad++\notepad++.exe" results.txt \ No newline at end of file +ab -d -S -c 100 -n 1000 %ABTESTS%/minify/test_memcache.php >> results.txt + +START "C:\Program Files\Notepad++\notepad++.exe" memcached_stats.txt \ No newline at end of file diff --git a/min_extras/config.php b/min_extras/config.php index 3ad3d55..ec9cc4f 100644 --- a/min_extras/config.php +++ b/min_extras/config.php @@ -1,17 +1,15 @@ file_get_contents($_FILES['subject']['tmp_name']) ,'method' => $_POST['method'] diff --git a/min_extras/tools/minifyFile.php b/min_extras/tools/minifyFile.php index a2f5a1a..6644f1f 100644 --- a/min_extras/tools/minifyFile.php +++ b/min_extras/tools/minifyFile.php @@ -3,12 +3,9 @@ if (isset($_FILES['subject']['name']) && preg_match('/\\.(js|css|x?html?)$/', $_FILES['subject']['name'], $m) ) { - ini_set('include_path', - dirname(__FILE__) . '/../../min/lib' - . PATH_SEPARATOR . ini_get('include_path') - ); - - // eh why not + require '../config.php'; + + // easier to just require them all require 'Minify/HTML.php'; require 'Minify/CSS.php'; require 'Minify/Javascript.php';