[patch] New patch, I forget one file

AddTimer.patch (text/plain), 23.22 KB, created by mchassagneux on 2015-07-21 14:25:50 UTC

(hide)

Description: New patch, I forget one file

Filename:

MIME Type:

Creator: mchassagneux

Created: 2015-07-21 14:25:50 UTC

Size: 23.22 KB

patch

obsolete

>diff C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/engine/DistributedRunner.java C:/perso_max/workspace/JMeter/src/core/org/apache/jmeter/engine/DistributedRunner.java >1,292c1,272 >< /* >< * Licensed to the Apache Software Foundation (ASF) under one or more >< * contributor license agreements. See the NOTICE file distributed with >< * this work for additional information regarding copyright ownership. >< * The ASF licenses this file to You under the Apache License, Version 2.0 >< * (the "License"); you may not use this file except in compliance with >< * the License. You may obtain a copy of the License at >< * >< * http://www.apache.org/licenses/LICENSE-2.0 >< * >< * Unless required by applicable law or agreed to in writing, software >< * distributed under the License is distributed on an "AS IS" BASIS, >< * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. >< * See the License for the specific language governing permissions and >< * limitations under the License. >< * >< */ >< >< package org.apache.jmeter.engine; >< >< import java.io.IOException; >< import java.io.OutputStream; >< import java.io.PrintStream; >< import java.net.MalformedURLException; >< import java.rmi.NotBoundException; >< import java.rmi.RemoteException; >< import java.util.Collection; >< import java.util.Date; >< import java.util.HashMap; >< import java.util.LinkedList; >< import java.util.List; >< import java.util.Map; >< import java.util.Properties; >< >< import org.apache.jmeter.util.JMeterUtils; >< import org.apache.jorphan.collections.HashTree; >< import org.apache.jorphan.logging.LoggingManager; >< import org.apache.log.Logger; >< >< /** >< * This class serves all responsibility of starting and stopping distributed tests. >< * It was refactored from JMeter and RemoteStart classes to unify retry behavior. >< * >< * @see org.apache.jmeter.JMeter >< * @see org.apache.jmeter.gui.action.RemoteStart >< */ >< public class DistributedRunner { >< private static final Logger log = LoggingManager.getLoggerForClass(); >< >< public static final String RETRIES_NUMBER = "client.tries"; // $NON-NLS-1$ >< public static final String RETRIES_DELAY = "client.retries_delay"; // $NON-NLS-1$ >< public static final String CONTINUE_ON_FAIL = "client.continue_on_fail"; // $NON-NLS-1$ >< >< private final Properties remoteProps; >< private final boolean continueOnFail; >< private final int retriesDelay; >< private final int retriesNumber; >< private PrintStream stdout = new PrintStream(new SilentOutputStream()); >< private PrintStream stderr = new PrintStream(new SilentOutputStream()); >< private final Map<String, JMeterEngine> engines = new HashMap<String, JMeterEngine>(); >< >< >< public DistributedRunner() { >< this(new Properties()); >< } >< >< public DistributedRunner(Properties props) { >< remoteProps = props; >< retriesNumber = JMeterUtils.getPropDefault(RETRIES_NUMBER, 1); >< continueOnFail = JMeterUtils.getPropDefault(CONTINUE_ON_FAIL, false); >< retriesDelay = JMeterUtils.getPropDefault(RETRIES_DELAY, 5000); >< } >< >< public void init(List<String> addresses, HashTree tree) { >< // converting list into mutable version >< List<String> addrs = new LinkedList<String>(addresses); >< >< for (int tryNo = 0; tryNo < retriesNumber; tryNo++) { >< if (tryNo > 0) { >< println("Following remote engines will retry configuring: " + addrs); >< println("Pausing before retry for " + retriesDelay + "ms"); >< try { >< Thread.sleep(retriesDelay); >< } catch (InterruptedException e) { >< throw new RuntimeException("Interrupted while initializing remote", e); >< } >< } >< >< int idx = 0; >< while (idx < addrs.size()) { >< String address = addrs.get(idx); >< println("Configuring remote engine: " + address); >< JMeterEngine engine = getClientEngine(address.trim(), tree); >< if (engine != null) { >< engines.put(address, engine); >< addrs.remove(address); >< } else { >< println("Failed to configure " + address); >< idx++; >< } >< } >< >< if (addrs.size() == 0) { >< break; >< } >< } >< >< if (addrs.size() > 0) { >< String msg = "Following remote engines could not be configured:" + addrs; >< if (!continueOnFail || engines.size() == 0) { >< stop(); >< throw new RuntimeException(msg); >< } else { >< println(msg); >< println("Continuing without failed engines..."); >< } >< } >< } >< >< /** >< * Starts a remote testing engines >< * >< * @param addresses list of the DNS names or IP addresses of the remote testing engines >< */ >< public void start(List<String> addresses) { >< println("Starting remote engines"); >< long now = System.currentTimeMillis(); >< >< >< println("Starting the test @ " + new Date(now) + " (" + now + ")"); >< >< GuiPackage gp =GuiPackage.getInstance(); >< if (gp != null) {// check there is a GUI >< gp.getMainFrame().startTimer(); >< } >< >< for (String address : addresses) { >< try { >< if (engines.containsKey(address)) { >< engines.get(address).runTest(); >< } else { >< log.warn("Host not found in list of active engines: " + address); >< } >< } catch (IllegalStateException | JMeterEngineException e) { >< JMeterUtils.reportErrorToUser(e.getMessage(), JMeterUtils.getResString("remote_error_starting")); // $NON-NLS-1$ >< } >< } >< println("Remote engines have been started"); >< } >< >< /** >< * Start all engines that were previously initiated >< */ >< public void start() { >< List<String> addresses = new LinkedList<String>(); >< addresses.addAll(engines.keySet()); >< start(addresses); >< } >< >< public void stop(List<String> addresses) { >< println("Stopping remote engines"); >< GuiPackage gp =GuiPackage.getInstance(); >< if (gp != null) {// check there is a GUI >< gp.getMainFrame().stopTimer(); >< } >< for (String address : addresses) { >< try { >< if (engines.containsKey(address)) { >< engines.get(address).stopTest(true); >< } else { >< log.warn("Host not found in list of active engines: " + address); >< } >< } catch (RuntimeException e) { >< errln("Failed to stop test on " + address, e); >< } >< } >< println("Remote engines have been stopped"); >< } >< >< /** >< * Stop all engines that were previously initiated >< */ >< public void stop() { >< List<String> addresses = new LinkedList<String>(); >< addresses.addAll(engines.keySet()); >< stop(addresses); >< } >< >< public void shutdown(List<String> addresses) { >< println("Shutting down remote engines"); >< GuiPackage gp =GuiPackage.getInstance(); >< if (gp != null) {// check there is a GUI >< gp.getMainFrame().stopTimer(); >< } >< for (String address : addresses) { >< try { >< if (engines.containsKey(address)) { >< engines.get(address).stopTest(false); >< } else { >< log.warn("Host not found in list of active engines: " + address); >< } >< >< } catch (RuntimeException e) { >< errln("Failed to shutdown test on " + address, e); >< } >< } >< println("Remote engines have been shut down"); >< } >< >< public void exit(List<String> addresses) { >< println("Exiting remote engines"); >< GuiPackage gp =GuiPackage.getInstance(); >< if (gp != null) {// check there is a GUI >< gp.getMainFrame().stopTimer(); >< } >< for (String address : addresses) { >< try { >< if (engines.containsKey(address)) { >< engines.get(address).exit(); >< } else { >< log.warn("Host not found in list of active engines: " + address); >< } >< } catch (RuntimeException e) { >< errln("Failed to exit on " + address, e); >< } >< } >< println("Remote engines have been exited"); >< } >< >< private JMeterEngine getClientEngine(String address, HashTree testTree) { >< JMeterEngine engine; >< try { >< engine = createEngine(address); >< engine.configure(testTree); >< if (!remoteProps.isEmpty()) { >< engine.setProperties(remoteProps); >< } >< return engine; >< } catch (Exception ex) { >< log.error("Failed to create engine at " + address, ex); >< JMeterUtils.reportErrorToUser(ex.getMessage(), >< JMeterUtils.getResString("remote_error_init") + ": " + address); // $NON-NLS-1$ $NON-NLS-2$ >< return null; >< } >< } >< >< /** >< * A factory method that might be overridden for unit testing >< * >< * @param address address for engine >< * @return engine instance >< * @throws RemoteException >< * @throws NotBoundException >< * @throws MalformedURLException >< */ >< protected JMeterEngine createEngine(String address) throws RemoteException, NotBoundException, MalformedURLException { >< return new ClientJMeterEngine(address); >< } >< >< private void println(String s) { >< log.info(s); >< stdout.println(s); >< } >< >< private void errln(String s, Exception e) { >< log.error(s, e); >< stderr.println(s + ": "); >< e.printStackTrace(stderr); >< } >< >< public void setStdout(PrintStream stdout) { >< this.stdout = stdout; >< } >< >< public void setStdErr(PrintStream stdErr) { >< this.stderr = stdErr; >< } >< >< private static class SilentOutputStream extends OutputStream { >< @Override >< public void write(int b) throws IOException { >< // enjoy the silence >< } >< } >< >< /** >< * @return {@link Collection} of {@link JMeterEngine} >< */ >< public Collection<? extends JMeterEngine> getEngines() { >< return engines.values(); >< } >< } >--- >> /* >> * Licensed to the Apache Software Foundation (ASF) under one or more >> * contributor license agreements. See the NOTICE file distributed with >> * this work for additional information regarding copyright ownership. >> * The ASF licenses this file to You under the Apache License, Version 2.0 >> * (the "License"); you may not use this file except in compliance with >> * the License. You may obtain a copy of the License at >> * >> * http://www.apache.org/licenses/LICENSE-2.0 >> * >> * Unless required by applicable law or agreed to in writing, software >> * distributed under the License is distributed on an "AS IS" BASIS, >> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. >> * See the License for the specific language governing permissions and >> * limitations under the License. >> * >> */ >> >> package org.apache.jmeter.engine; >> >> import java.io.IOException; >> import java.io.OutputStream; >> import java.io.PrintStream; >> import java.net.MalformedURLException; >> import java.rmi.NotBoundException; >> import java.rmi.RemoteException; >> import java.util.Collection; >> import java.util.Date; >> import java.util.HashMap; >> import java.util.LinkedList; >> import java.util.List; >> import java.util.Map; >> import java.util.Properties; >> >> import org.apache.jmeter.util.JMeterUtils; >> import org.apache.jorphan.collections.HashTree; >> import org.apache.jorphan.logging.LoggingManager; >> import org.apache.log.Logger; >> >> /** >> * This class serves all responsibility of starting and stopping distributed tests. >> * It was refactored from JMeter and RemoteStart classes to unify retry behavior. >> * >> * @see org.apache.jmeter.JMeter >> * @see org.apache.jmeter.gui.action.RemoteStart >> */ >> public class DistributedRunner { >> private static final Logger log = LoggingManager.getLoggerForClass(); >> >> public static final String RETRIES_NUMBER = "client.tries"; // $NON-NLS-1$ >> public static final String RETRIES_DELAY = "client.retries_delay"; // $NON-NLS-1$ >> public static final String CONTINUE_ON_FAIL = "client.continue_on_fail"; // $NON-NLS-1$ >> >> private final Properties remoteProps; >> private final boolean continueOnFail; >> private final int retriesDelay; >> private final int retriesNumber; >> private PrintStream stdout = new PrintStream(new SilentOutputStream()); >> private PrintStream stderr = new PrintStream(new SilentOutputStream()); >> private final Map<String, JMeterEngine> engines = new HashMap<String, JMeterEngine>(); >> >> >> public DistributedRunner() { >> this(new Properties()); >> } >> >> public DistributedRunner(Properties props) { >> remoteProps = props; >> retriesNumber = JMeterUtils.getPropDefault(RETRIES_NUMBER, 1); >> continueOnFail = JMeterUtils.getPropDefault(CONTINUE_ON_FAIL, false); >> retriesDelay = JMeterUtils.getPropDefault(RETRIES_DELAY, 5000); >> } >> >> public void init(List<String> addresses, HashTree tree) { >> // converting list into mutable version >> List<String> addrs = new LinkedList<String>(addresses); >> >> for (int tryNo = 0; tryNo < retriesNumber; tryNo++) { >> if (tryNo > 0) { >> println("Following remote engines will retry configuring: " + addrs); >> println("Pausing before retry for " + retriesDelay + "ms"); >> try { >> Thread.sleep(retriesDelay); >> } catch (InterruptedException e) { >> throw new RuntimeException("Interrupted while initializing remote", e); >> } >> } >> >> int idx = 0; >> while (idx < addrs.size()) { >> String address = addrs.get(idx); >> println("Configuring remote engine: " + address); >> JMeterEngine engine = getClientEngine(address.trim(), tree); >> if (engine != null) { >> engines.put(address, engine); >> addrs.remove(address); >> } else { >> println("Failed to configure " + address); >> idx++; >> } >> } >> >> if (addrs.size() == 0) { >> break; >> } >> } >> >> if (addrs.size() > 0) { >> String msg = "Following remote engines could not be configured:" + addrs; >> if (!continueOnFail || engines.size() == 0) { >> stop(); >> throw new RuntimeException(msg); >> } else { >> println(msg); >> println("Continuing without failed engines..."); >> } >> } >> } >> >> /** >> * Starts a remote testing engines >> * >> * @param addresses list of the DNS names or IP addresses of the remote testing engines >> */ >> public void start(List<String> addresses) { >> println("Starting remote engines"); >> long now = System.currentTimeMillis(); >> println("Starting the test @ " + new Date(now) + " (" + now + ")"); >> for (String address : addresses) { >> try { >> if (engines.containsKey(address)) { >> engines.get(address).runTest(); >> } else { >> log.warn("Host not found in list of active engines: " + address); >> } >> } catch (IllegalStateException | JMeterEngineException e) { >> JMeterUtils.reportErrorToUser(e.getMessage(), JMeterUtils.getResString("remote_error_starting")); // $NON-NLS-1$ >> } >> } >> println("Remote engines have been started"); >> } >> >> /** >> * Start all engines that were previously initiated >> */ >> public void start() { >> List<String> addresses = new LinkedList<String>(); >> addresses.addAll(engines.keySet()); >> start(addresses); >> } >> >> public void stop(List<String> addresses) { >> println("Stopping remote engines"); >> for (String address : addresses) { >> try { >> if (engines.containsKey(address)) { >> engines.get(address).stopTest(true); >> } else { >> log.warn("Host not found in list of active engines: " + address); >> } >> } catch (RuntimeException e) { >> errln("Failed to stop test on " + address, e); >> } >> } >> println("Remote engines have been stopped"); >> } >> >> /** >> * Stop all engines that were previously initiated >> */ >> public void stop() { >> List<String> addresses = new LinkedList<String>(); >> addresses.addAll(engines.keySet()); >> stop(addresses); >> } >> >> public void shutdown(List<String> addresses) { >> println("Shutting down remote engines"); >> for (String address : addresses) { >> try { >> if (engines.containsKey(address)) { >> engines.get(address).stopTest(false); >> } else { >> log.warn("Host not found in list of active engines: " + address); >> } >> >> } catch (RuntimeException e) { >> errln("Failed to shutdown test on " + address, e); >> } >> } >> println("Remote engines have been shut down"); >> } >> >> public void exit(List<String> addresses) { >> println("Exiting remote engines"); >> for (String address : addresses) { >> try { >> if (engines.containsKey(address)) { >> engines.get(address).exit(); >> } else { >> log.warn("Host not found in list of active engines: " + address); >> } >> } catch (RuntimeException e) { >> errln("Failed to exit on " + address, e); >> } >> } >> println("Remote engines have been exited"); >> } >> >> private JMeterEngine getClientEngine(String address, HashTree testTree) { >> JMeterEngine engine; >> try { >> engine = createEngine(address); >> engine.configure(testTree); >> if (!remoteProps.isEmpty()) { >> engine.setProperties(remoteProps); >> } >> return engine; >> } catch (Exception ex) { >> log.error("Failed to create engine at " + address, ex); >> JMeterUtils.reportErrorToUser(ex.getMessage(), >> JMeterUtils.getResString("remote_error_init") + ": " + address); // $NON-NLS-1$ $NON-NLS-2$ >> return null; >> } >> } >> >> /** >> * A factory method that might be overridden for unit testing >> * >> * @param address address for engine >> * @return engine instance >> * @throws RemoteException >> * @throws NotBoundException >> * @throws MalformedURLException >> */ >> protected JMeterEngine createEngine(String address) throws RemoteException, NotBoundException, MalformedURLException { >> return new ClientJMeterEngine(address); >> } >> >> private void println(String s) { >> log.info(s); >> stdout.println(s); >> } >> >> private void errln(String s, Exception e) { >> log.error(s, e); >> stderr.println(s + ": "); >> e.printStackTrace(stderr); >> } >> >> public void setStdout(PrintStream stdout) { >> this.stdout = stdout; >> } >> >> public void setStdErr(PrintStream stdErr) { >> this.stderr = stdErr; >> } >> >> private static class SilentOutputStream extends OutputStream { >> @Override >> public void write(int b) throws IOException { >> // enjoy the silence >> } >> } >> >> /** >> * @return {@link Collection} of {@link JMeterEngine} >> */ >> public Collection<? extends JMeterEngine> getEngines() { >> return engines.values(); >> } >> } >diff C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/gui/MainFrame.java C:/perso_max/workspace/JMeter/src/core/org/apache/jmeter/gui/MainFrame.java >45,46d44 >< import java.text.SimpleDateFormat; >< import java.util.Date; >176,177d173 >< >< private JLabel timeRun; >193,199d188 >< >< private javax.swing.Timer timer = new javax.swing.Timer(1000, new java.awt.event.ActionListener() >< { >< public void actionPerformed(java.awt.event.ActionEvent e) { >< CalculTime(); >< } >< }); >215,216d203 >< >< timeRun = new JLabel("00:00:00"); >398,421d384 >< // Calcul et display time off the loadtest >< public void startTimer() { >< timer.start(); >< } >< >< public void stopTimer() { >< timer.stop(); >< } >< >< public void CalculTime() { >< long currentTime = System.currentTimeMillis(); >< long startTime = JMeterContextService.getTestStartTime(); >< if (startTime == 0) >< timer.stop(); >< else >< { >< long elapse_time_ms = (currentTime - startTime); >< Date elapse_date = new Date(elapse_time_ms); >< SimpleDateFormat df = new java.text.SimpleDateFormat("HH:mm:ss"); >< df.setTimeZone(java.util.TimeZone.getTimeZone("GMT")); >< timeRun.setText(df.format(elapse_date)); >< } >< } >< >595,598d557 >< >< toolPanel.add(new JLabel(" ")); >< toolPanel.add(timeRun); >< toolPanel.add(new JLabel(" ")); >diff C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java C:/perso_max/workspace/JMeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java >343,345d316 >< >< >< >351,356d321 >< >< GuiPackage gp =GuiPackage.getInstance(); >< if (gp != null) {// check there is a GUI >< gp.getMainFrame().startTimer(); >< } >< >414d378 >< >485,488c449 >< >< if (gp != null) {// check there is a GUI >< gp.getMainFrame().stopTimer(); >< } >--- >> JMeterContextService.endTest(); View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]