vlsi commented on code in PR #712: URL: https://github.com/apache/jmeter/pull/712#discussion_r867881621
########## src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt: ########## @@ -0,0 +1,151 @@ +/* + * 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 + +import com.thoughtworks.xstream.converters.ConversionException +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.swing.Swing +import kotlinx.coroutines.withContext +import kotlinx.coroutines.yield +import org.apache.jmeter.gui.GuiPackage +import org.apache.jmeter.gui.MainFrame +import org.apache.jmeter.gui.action.ActionNames +import org.apache.jmeter.gui.action.ActionRouter +import org.apache.jmeter.gui.action.Load +import org.apache.jmeter.gui.action.LookAndFeelCommand +import org.apache.jmeter.gui.tree.JMeterTreeListener +import org.apache.jmeter.gui.tree.JMeterTreeModel +import org.apache.jmeter.gui.util.FocusRequester +import org.apache.jmeter.save.SaveService +import org.apache.jmeter.services.FileServer +import org.apache.jmeter.util.JMeterUtils +import org.apache.jorphan.collections.HashTree +import org.apache.jorphan.gui.ComponentUtil +import org.apache.jorphan.gui.JMeterUIDefaults +import org.apache.jorphan.gui.ui.KerningOptimizer +import org.slf4j.LoggerFactory +import java.awt.event.ActionEvent +import java.io.File + +public object JMeterGuiLauncher { + private val log = LoggerFactory.getLogger(JMeterGuiLauncher::class.java) + + /** + * Starts up JMeter in GUI mode + */ + @JvmStatic + public fun startGui(testFile: String?) { + println("================================================================================") //NOSONAR + println("Don't use GUI mode for load testing !, only for Test creation and Test debugging.") //NOSONAR + println("For load testing, use CLI Mode (was NON GUI):") //NOSONAR + println(" jmeter -n -t [jmx file] -l [results file] -e -o [Path to web report folder]") //NOSONAR + println("& increase Java Heap to meet your test requirements:") //NOSONAR + println(" Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file") //NOSONAR + println("Check : https://jmeter.apache.org/usermanual/best-practices.html";) //NOSONAR + println("================================================================================") //NOSONAR + + runBlocking { + // See https://github.com/Kotlin/kotlinx.coroutines/blob/master/ui/coroutines-guide-ui.md + launch(Dispatchers.Swing) { + setupLaF() + val splash = SplashScreen() + splash.showScreen() + setProgress(splash, 10) + JMeterUtils.applyHiDPIOnFonts() + setProgress(splash, 20) + startGuiPartTwo(testFile, splash) + } + } + } + + private fun setupLaF() { + KerningOptimizer.INSTANCE.maxTextLengthWithKerning = + JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000) + JMeterUIDefaults.INSTANCE.install() + val jMeterLaf = LookAndFeelCommand.getPreferredLafCommand() + try { + log.info("Setting LAF to: {}", jMeterLaf) + LookAndFeelCommand.activateLookAndFeel(jMeterLaf) + } catch (ex: IllegalArgumentException) { + log.warn("Could not set LAF to: {}", jMeterLaf, ex) + } + } + + private suspend fun startGuiPartTwo(testFile: String?, splash: SplashScreen) { + log.debug("Configure PluginManager") + setProgress(splash, 30) + log.debug("Setup tree") + val treeModel = JMeterTreeModel() + val treeLis = JMeterTreeListener(treeModel) + val instance = ActionRouter.getInstance() + setProgress(splash, 40) + log.debug("populate command map") + instance.populateCommandMap() + setProgress(splash, 60) + treeLis.setActionHandler(instance) + log.debug("init instance") + setProgress(splash, 70) + GuiPackage.initInstance(treeLis, treeModel) + setProgress(splash, 80) + log.debug("constructing main frame") + val main = MainFrame(treeModel, treeLis) + setProgress(splash, 100) + ComponentUtil.centerComponentInWindow(main, 80) + main.setLocationRelativeTo(splash) + main.isVisible = true + main.toFront() + instance.actionPerformed(ActionEvent(main, 1, ActionNames.ADD_ALL)) + if (testFile != null) { + try { + val f: File + val tree: HashTree? + withContext(Dispatchers.Default) { + f = File(testFile) + log.info("Loading file: {}", f) + FileServer.getFileServer().setBaseForScript(f) + tree = SaveService.loadTree(f) + } Review Comment: This is how switching between "regular thread pool" and "Swing event dispatcher" would look like. The code within `withContext(Dispatchers.Default)` is executed outside of the EDT, and then the execution moves back to the EDT. ########## src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt: ########## @@ -0,0 +1,151 @@ +/* + * 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 + +import com.thoughtworks.xstream.converters.ConversionException +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.swing.Swing +import kotlinx.coroutines.withContext +import kotlinx.coroutines.yield +import org.apache.jmeter.gui.GuiPackage +import org.apache.jmeter.gui.MainFrame +import org.apache.jmeter.gui.action.ActionNames +import org.apache.jmeter.gui.action.ActionRouter +import org.apache.jmeter.gui.action.Load +import org.apache.jmeter.gui.action.LookAndFeelCommand +import org.apache.jmeter.gui.tree.JMeterTreeListener +import org.apache.jmeter.gui.tree.JMeterTreeModel +import org.apache.jmeter.gui.util.FocusRequester +import org.apache.jmeter.save.SaveService +import org.apache.jmeter.services.FileServer +import org.apache.jmeter.util.JMeterUtils +import org.apache.jorphan.collections.HashTree +import org.apache.jorphan.gui.ComponentUtil +import org.apache.jorphan.gui.JMeterUIDefaults +import org.apache.jorphan.gui.ui.KerningOptimizer +import org.slf4j.LoggerFactory +import java.awt.event.ActionEvent +import java.io.File + +public object JMeterGuiLauncher { + private val log = LoggerFactory.getLogger(JMeterGuiLauncher::class.java) + + /** + * Starts up JMeter in GUI mode + */ + @JvmStatic + public fun startGui(testFile: String?) { + println("================================================================================") //NOSONAR + println("Don't use GUI mode for load testing !, only for Test creation and Test debugging.") //NOSONAR + println("For load testing, use CLI Mode (was NON GUI):") //NOSONAR + println(" jmeter -n -t [jmx file] -l [results file] -e -o [Path to web report folder]") //NOSONAR + println("& increase Java Heap to meet your test requirements:") //NOSONAR + println(" Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file") //NOSONAR + println("Check : https://jmeter.apache.org/usermanual/best-practices.html";) //NOSONAR + println("================================================================================") //NOSONAR + + runBlocking { + // See https://github.com/Kotlin/kotlinx.coroutines/blob/master/ui/coroutines-guide-ui.md + launch(Dispatchers.Swing) { + setupLaF() + val splash = SplashScreen() + splash.showScreen() + setProgress(splash, 10) + JMeterUtils.applyHiDPIOnFonts() + setProgress(splash, 20) + startGuiPartTwo(testFile, splash) + } + } + } + + private fun setupLaF() { + KerningOptimizer.INSTANCE.maxTextLengthWithKerning = + JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000) + JMeterUIDefaults.INSTANCE.install() + val jMeterLaf = LookAndFeelCommand.getPreferredLafCommand() + try { + log.info("Setting LAF to: {}", jMeterLaf) + LookAndFeelCommand.activateLookAndFeel(jMeterLaf) + } catch (ex: IllegalArgumentException) { + log.warn("Could not set LAF to: {}", jMeterLaf, ex) + } + } + + private suspend fun startGuiPartTwo(testFile: String?, splash: SplashScreen) { + log.debug("Configure PluginManager") + setProgress(splash, 30) + log.debug("Setup tree") + val treeModel = JMeterTreeModel() + val treeLis = JMeterTreeListener(treeModel) + val instance = ActionRouter.getInstance() + setProgress(splash, 40) + log.debug("populate command map") + instance.populateCommandMap() + setProgress(splash, 60) + treeLis.setActionHandler(instance) + log.debug("init instance") + setProgress(splash, 70) + GuiPackage.initInstance(treeLis, treeModel) + setProgress(splash, 80) + log.debug("constructing main frame") + val main = MainFrame(treeModel, treeLis) + setProgress(splash, 100) + ComponentUtil.centerComponentInWindow(main, 80) + main.setLocationRelativeTo(splash) + main.isVisible = true + main.toFront() + instance.actionPerformed(ActionEvent(main, 1, ActionNames.ADD_ALL)) + if (testFile != null) { + try { + val f: File + val tree: HashTree? + withContext(Dispatchers.Default) { + f = File(testFile) + log.info("Loading file: {}", f) + FileServer.getFileServer().setBaseForScript(f) + tree = SaveService.loadTree(f) + } Review Comment: This is what switching between "regular thread pool" and "Swing event dispatcher" would look like. The code within `withContext(Dispatchers.Default)` is executed outside of the EDT, and then the execution moves back to the EDT. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
