Commit: 456f9622e1c1ccdbf72a8ff1a44f007f582dae30
Author: Matt Ficken <v-maf...@microsoft.com> Thu, 28 Mar 2013
23:00:07 -0700
Parents: 0e298f9d4a5d2d4bbff55cc381633dfd74297d94
Branches: master
Link:
http://git.php.net/?p=pftt2.git;a=commitdiff;h=456f9622e1c1ccdbf72a8ff1a44f007f582dae30
Log:
sped up builtin_web scenario and install opcache for 5.3 and 5.4
Former-commit-id: fef6af305e65b8d9fc9aec5a4e923e322b10d5b1
Changed paths:
D app/wordpress-3.5.zip
D bin/SetACL.exe
D conf/app/xdebug.groovy
D conf/op.groovy
D src/com/mostc/pftt/main/AutomatedFBCReport.groovy
D src/com/mostc/pftt/main/PfttAuto.java
D src/com/mostc/pftt/model/ui/IUITestRunner.java
D src/com/mostc/pftt/results/UBCReportGen.groovy
D src/com/mostc/pftt/scenario/OptimizerPlusScenario.java
diff --git a/app/wordpress-3.5.zip b/app/wordpress-3.5.zip
deleted file mode 100644
index 9995f98..0000000
Binary files a/app/wordpress-3.5.zip and /dev/null differ
diff --git a/bin/SetACL.exe b/bin/SetACL.exe
deleted file mode 100644
index 0ac0dfb..0000000
Binary files a/bin/SetACL.exe and /dev/null differ
diff --git a/conf/app/xdebug.groovy b/conf/app/xdebug.groovy
deleted file mode 100644
index 5d4d46e..0000000
--- a/conf/app/xdebug.groovy
+++ /dev/null
@@ -1,4 +0,0 @@
-
-def scenarios() {
- new XDebugScenario()
-}
diff --git a/conf/op.groovy b/conf/op.groovy
deleted file mode 100644
index 88ab1b8..0000000
--- a/conf/op.groovy
+++ /dev/null
@@ -1,4 +0,0 @@
-
-def scenarios() {
- new OptimizerPlusScenario()
-}
diff --git a/src/com/mostc/pftt/main/AutomatedFBCReport.groovy
b/src/com/mostc/pftt/main/AutomatedFBCReport.groovy
deleted file mode 100644
index 70aa47c..0000000
--- a/src/com/mostc/pftt/main/AutomatedFBCReport.groovy
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mostc.pftt.main
-
-/** Script executed through PfttMain that downloads snapshot builds, tests
them (with PHPTs), archives and uploads
- * telemetry and generates an FBC report to upload and email
- *
- * @see `pftt exec` command
- * @author Matt Ficken
- *
- */
-
-import com.mostc.pftt.model.core.EBuildBranch;
-import com.mostc.pftt.model.core.EBuildType;
-import com.mostc.pftt.model.smoke.RequiredExtensionsSmokeTest;
-import com.mostc.pftt.model.smoke.RequiredFeaturesSmokeTest;
-
-
-PfttMain pftt;
-
-for (EBuildBranch branch : [EBuildBranch.PHP_5_3, EBuildBranch.PHP_5_4]) {
- for (EBuildType build_type: EBuildType.values()) {
- pair = pftt.get_latest_snapshot_build_test_pack(branch,
build_type);
-
- email('No snapshot build found')
-
- download()
- test()
- archive_telem()
- fbc_report()
- upload_telem()
- upload_report()
- email_report()
- }
-}
diff --git a/src/com/mostc/pftt/main/PfttAuto.java
b/src/com/mostc/pftt/main/PfttAuto.java
deleted file mode 100644
index 149138e..0000000
--- a/src/com/mostc/pftt/main/PfttAuto.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mostc.pftt.main;
-
-public class PfttAuto {
- public static void main(String[] args) {
- /*PfttMain pftt = new PfttMain();
- pftt.cmd_release_get(cm, overwrite, host, url);
- pftt.cmd_core_all(rt, cm, config, build, test_pack);*/
- }
-}
diff --git a/src/com/mostc/pftt/model/ui/IUITestRunner.java
b/src/com/mostc/pftt/model/ui/IUITestRunner.java
deleted file mode 100644
index 2303d65..0000000
--- a/src/com/mostc/pftt/model/ui/IUITestRunner.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mostc.pftt.model.ui;
-
-import com.mostc.pftt.model.ui.UITestRunner.UIAccount;
-import com.mostc.pftt.model.ui.UITestRunner.UITest;
-
-public interface IUITestRunner {
- IUITestRunner test(UITest test);
- IUITestRunner test(UIAccount account, UITest test);
- EUITestStatus status();
- UIAccount getUserAccount();
- boolean isDummy();
-}
diff --git a/src/com/mostc/pftt/results/UBCReportGen.groovy
b/src/com/mostc/pftt/results/UBCReportGen.groovy
deleted file mode 100644
index 4aee9af..0000000
--- a/src/com/mostc/pftt/results/UBCReportGen.groovy
+++ /dev/null
@@ -1 +0,0 @@
-package com.mostc.pftt.results
diff --git a/src/com/mostc/pftt/scenario/OptimizerPlusScenario.java
b/src/com/mostc/pftt/scenario/OptimizerPlusScenario.java
deleted file mode 100644
index 6492127..0000000
--- a/src/com/mostc/pftt/scenario/OptimizerPlusScenario.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.mostc.pftt.scenario;
-
-import com.github.mattficken.io.StringUtil;
-import com.mostc.pftt.host.Host;
-import com.mostc.pftt.model.core.EAcceleratorType;
-import com.mostc.pftt.model.core.PhpBuild;
-import com.mostc.pftt.model.core.PhpIni;
-import com.mostc.pftt.results.ConsoleManager;
-import com.mostc.pftt.results.ConsoleManager.EPrintType;
-
-import java.util.Date;
-
-/** The Optimizer+ provides faster PHP execution through opcode caching and
optimization.
- * It improves PHP performance by storing precompiled script bytecode in the
shared memory. This
- * eliminates the stages of reading code from the disk and compiling it on
future access. In
- * addition, it applies a few bytecode optimization patterns that make code
execution faster.
- *
- * Formerly known as Zend Optimizer+, often abbreviated as o+ or zo+ or
Optimizer Plus
- *
- * @see http://windows.php.net/downloads/pecl/snaps/Optimizer/7.0.0-dev/
- * @see https://github.com/zend-dev/ZendOptimizerPlus
- * @see https://github.com/OSTC/ZendOptimizerPlus - fork for Windows/PHP on
Windows
- *
- */
-
-public class OptimizerPlusScenario extends AbstractCodeCacheScenario {
- private String version;
-
- @Override
- public String getNameWithVersionInfo() {
- // this will return the PHP Version the DLL was build for (ex:
5.4.10)
- // (Get-Item
C:\php-sdk\php-5.4-ts-windows-vc9-x86-r064c62e\ext\php_ZendOptimizerPlus.dll).VersionInfo
-
- return "OptimizerPlus-" + (version==null?"Missing":version);
- }
-
- @Override
- public boolean isSupported(ConsoleManager cm, Host host, PhpBuild
build, ScenarioSet scenario_set) {
- String ext_dir = build.getDefaultExtensionDir();
- boolean found = false;
- if (host.isWindows()) {
- found = host.exists(ext_dir +
"/php_ZendOptimizerPlus.dll") ||
- host.exists(ext_dir +
"/php_ZendOptimizerPlus.dont_load");
-
- } else {
- found = host.exists(ext_dir +
"/php_ZendOptimizerPlus.so") ||
- host.exists(ext_dir +
"/php_ZendOptimizerPlus.dont_load");
- }
- if (found) {
- if (cm!=null)
- cm.println(EPrintType.CLUE, getClass(), "Found
OptimizerPlus in: "+ext_dir);
- return true;
- } else {
- if (cm!=null)
- cm.println(EPrintType.CLUE, getClass(), "Unable
to find OptimizerPlus in: "+ext_dir);
- return false;
- }
- } // end public boolean isSupported
-
- @Override
- public EAcceleratorType getAcceleratorType() {
- return EAcceleratorType.OPTIMIZER_PLUS;
- }
-
- @Override
- public boolean setup(ConsoleManager cm, Host host, PhpBuild build,
PhpIni ini) {
- if (host.isWindows()) {
- // IMPORTANT: delete any (memory mapped files|file
mapping objects|mapped files) that
- // Optimizer+ left behind from previous test run
- //
- // in temp directory. name is like:
ZendOptimizer+.MemoryBase@matt
- // @see shared_alloc_win32.c
(https://github.com/zend-dev/ZendOptimizerPlus/blob/master/shared_alloc_win32.c)
-
host.deleteIfExists(host.getTempDir()+"\\ZendOptimizer+.MemoryBase@"+host.getUsername());
- }
-
-
- // assume SO is in same directory as PHP extensions
- String dll_path;
- try {
- // seems that PHP will load O+ if dll is there even
though its not in INI
- //
- // NoCodeCacheScenario may have renamed file to
*.dont_load, UNDO that here
- String ext_dir = ini.getExtensionDir();
- if (StringUtil.isEmpty(ext_dir))
- ext_dir = build.getDefaultExtensionDir();
- if (host.isWindows()) {
- dll_path = host.fixPath(ext_dir +
"/php_ZendOptimizerPlus.dll");
-
- if (host.exists(dll_path.replace(".dll",
".dont_load")))
-
host.moveElevated(dll_path.replace(".dll", ".dont_load"), dll_path);
- } else {
- dll_path = host.fixPath(ext_dir +
"/php_ZendOptimizerPlus.so");
-
- if (host.exists(dll_path.replace(".so",
".dont_load")))
-
host.moveElevated(dll_path.replace(".so", ".dont_load"), dll_path);
- }
- } catch ( Exception ex ) {
- cm.addGlobalException(EPrintType.CLUE, "setup", ex,
"couldn't make sure OptimizerPlus was enabled");
-
- return false;
- }
- //
-
- if (!host.exists(dll_path)) {
- version = null;
-
- return true;
- }
-
- //
- {
- Date date = new Date(host.getMTime(dll_path));
-
- version = ((date.getYear()+1900) +
- "-" +
- (date.getMonth()+1) +
- "-" +
- date.getDate() +
- "-" +
- date.getHours() +
- "h" +
- date.getMinutes()) +
- "m";
- }
- //
-
- // must be absolute path to ZendOptimizerPlus.so
- ini.putMulti("zend_extension", dll_path);
-
- // CRITICAL: for CliScenario
- ini.putSingle("zend_optimizerplus.enable_cli", 1);
-
- // recommended settings, @see
https://github.com/zend-dev/ZendOptimizerPlus
- // (recommended settings differ from some of the documented
default settings)
- ini.putSingle("zend_optimizerplus.memory_consumption", 128);
- ini.putSingle("zend_optimizerplus.interned_strings_buffer", 8);
- ini.putSingle("zend_optimizerplus.max_accelerated_files", 4000);
- ini.putSingle("zend_optimizerplus.revalidate_freq", 60);
- ini.putSingle("zend_optimizerplus.save_comments", 0);
- ini.putSingle("zend_optimizerplus.fast_shutdown", 1);
- ini.putSingle("zend_optimizerplus.enable_file_override", 1);
-
-
- // TODO
- // by default all passes are run, turn off some
- /*ini.putSingle("zend_optimizerplus.optimization_level",
- ZEND_OPTIMIZER_PASS_3
- |ZEND_OPTIMIZER_PASS_10
- //|ZEND_OPTIMIZER_PASS_4
- //|ZEND_OPTIMIZER_PASS_6
- //|ZEND_OPTIMIZER_PASS_7
- //|ZEND_OPTIMIZER_PASS_8
- //|ZEND_OPTIMIZER_PASS_1
- //|ZEND_OPTIMIZER_PASS_2
-
- // pass5 and pass9 seem to break reflection
- //|ZEND_OPTIMIZER_PASS_5
- //|ZEND_OPTIMIZER_PASS_9
- );*/
-
- return true;
- } // end public boolean setup
-
- // @see Optimizer/zend_optimizer.h
- public static final int ZEND_OPTIMIZER_PASS_1 = (1<<0); /* CSE, STRING
construction */
- public static final int ZEND_OPTIMIZER_PASS_2 = (1<<1); /* Constant
conversion and jums */
- public static final int ZEND_OPTIMIZER_PASS_3 = (1<<2); /* ++, +=,
series of jumps */
- public static final int ZEND_OPTIMIZER_PASS_4 = (1<<3);
- public static final int ZEND_OPTIMIZER_PASS_5 = (1<<4); /* CFG based
optimization */
- public static final int ZEND_OPTIMIZER_PASS_6 = (1<<5);
- public static final int ZEND_OPTIMIZER_PASS_7 = (1<<6);
- public static final int ZEND_OPTIMIZER_PASS_8 = (1<<7);
- public static final int ZEND_OPTIMIZER_PASS_9 = (1<<8); /* TMP VAR
usage */
- public static final int ZEND_OPTIMIZER_PASS_10 = (1<<9); /* NOP removal
*/
- public static final int ZEND_OPTIMIZER_PASS_11 = (1<<10);
- public static final int ZEND_OPTIMIZER_PASS_12 = (1<<11);
- public static final int ZEND_OPTIMIZER_PASS_13 = (1<<12);
- public static final int ZEND_OPTIMIZER_PASS_14 = (1<<13);
-
- @Override
- public String getName() {
- // use 'plus' instead of + symbol which may cause problems (ex:
on certain filesystems)
- return "OptimizerPlus";
- }
-
- @Override
- public boolean isImplemented() {
- return true;
- }
-
-} // end public class ZendOptimizerPlusScenario
