Merge branch 'dev' of gitlab.com:caosdb/caosdb-server into dev

doc/devel/Benchmarking.md

+# Profiling #
+
+If the server is started with the `run-debug-single` make target, it will expose
+the JMX interface, by default on port 9090.  Using a profiler such as VisualVM,
+one can then connect to the CaosDB server and profile execution times.
+
+## Example settings for VisualVM ##
+
+In the sampler settings, you may want to add these expressions to the blocked
+packages: `org.restlet.**, com.mysql.**`.  Branches on the call tree which are
+entirely inside the blacklist, will become leaves.  Alternatively, specify a
+whitelist, for example with `caosdb.server.database.backend.implementation.**`,
+if you only want to see the time spent for certain MySQL calls.
+
 # Manual Java-side benchmarking #
 
 Benchmarking can be done using the `TransactionBenchmark` class (in package

makefile

@@ -25,6 +25,7 @@
 
 SHELL:=/bin/bash
 JPDA_PORT ?= 9000
+JMX_PORT ?= 9090
 
 compile: easy-units
 	mvn compile
@@ -39,7 +40,7 @@ run-debug: jar
 	java -Xrunjdwp:transport=dt_socket,address=0.0.0.0:$(JPDA_PORT),server=y,suspend=n -Dcaosdb.debug=true -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
 
 run-debug-single:
-	java -Xrunjdwp:transport=dt_socket,address=0.0.0.0:$(JPDA_PORT),server=y,suspend=n -Dcaosdb.debug=true -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
+	java -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$(JMX_PORT) -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Xrunjdwp:transport=dt_socket,address=0.0.0.0:$(JPDA_PORT),server=y,suspend=n -Dcaosdb.debug=true -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
 
 run-single:
 	java -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar