Merge remote-tracking branch 'gh-hiddenalpha/master'

3 files changed, 101 insertions, 138 deletions

diff --git a/src/main/paisa-nonslim/README.txt b/src/main/paisa-nonslim/README.txt
index bb7efb8..21af56c 100644
--- a/src/main/paisa-nonslim/README.txt
+++ b/src/main/paisa-nonslim/README.txt
@@ -71,31 +71,6 @@ Evtl für diese services den jssc als "provided" angeben.
      done \
 
 
-## TaskQueue
-
-- await feedback for "pobble" from sandro due to "flanian artifact missing"
-- await feedback for "thor" from sandro (20240919)
-- await feedback for "rob" from sandro (20240919)
-
-
-## Installation
-
-{
-  "timestamp": "2024-08-06T16:54:42.042+02:00",
-  "hostname": "eddie00849",
-  "instanceName": "default",
-  "eaglePort": 7012,
-  "activations": {
-    "SDCISA-15648-1722955735781-legacy": "2024-07-01T00:04:00.000Z",
-    "SDCISA-15648-1722955733398-noslim": "2024-07-01T00:03:00.000Z",
-    "bundle-sw_4011-data_3997": "2024-07-29T11:49:53.152Z",
-    "bundle-sw_4012-data_3997": "2024-07-25T02:00:00.000Z",
-    "bundle-sw_4012-data_4005": "2024-07-16T23:00:00.000Z"
-  }
-}
-
-
-
 ## Measurements
 
   && while true; do ssh donner -oRemoteCommand='true \
@@ -108,6 +83,13 @@ Evtl für diese services den jssc als "provided" angeben.
        ;done' | tee -a donner-perf/donner-perf-$(date -u +%Y%m%d-%H%M%SZ).log \
      && sleep 5 || break; done \
 
+  && THELOG="donner-perf-20240927-131453Z.log" \
+  && cat "${THELOG:?}" \
+      | sed -E 's_^([0-9]+) +([0-9:]+) .+age: ([0-9.]+), ([0-9.]+), ([0-9.]+) +( Mem: .*).*$_\1;\2;\3;\4;\5\6_' \
+      | sed -E 's_^(.+) Mem: +([0-9]+) +([0-9]+) +([0-9]+) +([0-9]+) +([0-9]+) +([0-9]+).*$_\1;\2;\3;\4;\5;\6_' \
+      > "${THELOG:?}.csv" \
+
+
 Boot ab KassenTaster, login mit RFID, vorgeschlagene Fahrt anmelden, warten.
 
 2024-07-31 (begin-): isa ausschalten, backups erstellen.
@@ -128,8 +110,10 @@ When+0200;version;LoginScreen[sec];FahrtGewaehlt[sec];
 2024-08-09T__:__;noslim;___;___;
 
 
+## Performance smoketest from remote at 27sep2024
 
-
+1313Z umschalten auf "new" (aka NoSlim) dann reboot mit messung.
+1338Z umschalten auf "alt" (aka "bundle-sw_4098-data_4110") dann reboot mit messung.
 
 
 
diff --git a/src/main/paisa-nonslim/patches/allitnil.patch b/src/main/paisa-nonslim/patches/allitnil.patch
new file mode 100644
index 0000000..38ae4bf
--- /dev/null
+++ b/src/main/paisa-nonslim/patches/allitnil.patch
@@ -0,0 +1,48 @@
+
+  [SDCISA-15648] Just look what happens when we remove this
+
+  No idea why this lib got loaded. Comments do NOT tell anything useful. Also
+  the relevant jira issue (ISAVF-2413) is of no use, as it is no longer available.
+
+
+--- a/allitnil-domain/src/main/java/ch/post/it/paisa/allitnil/domain/printer/extendo/ExtendoNativeDriverLinux.java
++++ b/allitnil-domain/src/main/java/ch/post/it/paisa/allitnil/domain/printer/extendo/ExtendoNativeDriverLinux.java
+@@ -18,7 +18,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+ 
+   private static final Logger LOGGER = LoggerFactory.getLogger(ExtendoNativeDriverLinux.class);
+ 
+-  public static final String LIB_PATH_LIBRT = "/native-64/librt.so.1";
+   public static final String LIB_PATH_LIBEXOTB = "/native-64/libExoTb.so.1.0";
+   public static final String LIB_PATH_LIBEXOAPI = "/native-64/libExoApi.so.1.0";
+ 
+@@ -27,15 +26,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+   private String printerPath;
+   private int printerHandle = 0;
+ 
+-  /**
+-   * Library dependency deklarieren. Veranlasst das laden von libRt unter Linux.
+-   *
+-   * @see <a
+-   *     href="http://refspecs.linuxbase.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/librt.html">libRt
+-   *     - POSIX.1b Realtime Extensions library</a>
+-   */
+-  private interface LibRt extends Library {}
+-
+   /**
+    * Library dependency deklarieren. Veranlasst das laden von libRt unter Linux.
+    *
+@@ -47,7 +37,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+ 
+   static {
+     try {
+-      Native.load(LIB_PATH_LIBRT, LibRt.class);
+       Native.load(LIB_PATH_LIBEXOTB, LibExoTb.class);
+       driver = Native.load(LIB_PATH_LIBEXOAPI, ExtendoNativeLibraryLinux.class);
+     } catch (Exception e) {
+
+
+  TODO rm allitnil-domain/src/main/resources/native-32/librt.so.1
+
+  TODO rm allitnil-domain/src/main/resources/native-64/librt.so.1
+
+
diff --git a/src/main/paisa-nonslim/patches/platform.patch b/src/main/paisa-nonslim/patches/platform.patch
index 1257896..6eb8c6e 100644
--- a/src/main/paisa-nonslim/patches/platform.patch
+++ b/src/main/paisa-nonslim/patches/platform.patch
@@ -16,120 +16,51 @@
          <groupId>ch.post.it.paisa</groupId>
 
 
---- a/poms/service/paisa-service-superpom/pom.xml
-+++ b/poms/service/paisa-service-superpom/pom.xml
-@@ -271,6 +271,54 @@
-                 <groupId>org.jfrog.buildinfo</groupId>
-                 <artifactId>artifactory-maven-plugin</artifactId>
-             </plugin>
-+
-+            <plugin>
-+                <groupId>org.codehaus.gmaven</groupId>
-+                <artifactId>groovy-maven-plugin</artifactId>
-+                <version>2.1.1</version>
-+                <executions>
-+                    <execution>
-+                        <phase>prepare-package</phase>
-+                        <goals>
-+                            <goal>execute</goal>
-+                        </goals>
-+                        <configuration>
-+                            <properties>
-+                                <!--
-+                                    Don't you DARE add slf4j here. If you do, the services in a
-+                                    constellation won't start up! So be mindful and DON'T add it.
-+                                -->
-+                                <slimArtifacts>
-+                                    io.github.java-native:jssc
-+                                </slimArtifacts>
-+                            </properties>
-+                            <source>
-+                                import java.nio.file.*
-+
-+                                Path slimLibPath = Paths.get(project.build.directory + "/lib/");
-+                                slimLibPath.toFile().mkdirs();
-+
-+                                def slimArtifacts = properties.slimArtifacts.split("\\s+");
-+                                println("Group:Artefacts to be SLIMmed: " + slimArtifacts)
-+                                project.artifacts.each { af -&gt;
-+                                    def key = af.groupId + ":" + af.artifactId
-+                                    printf("SLIMmed? %-70s", key)
-+                                    if (slimArtifacts.contains(key)) {
-+                                        println(" --&gt; yes (set scope to 'provided' and copy JAR to target/lib/)")
-+                                        af.scope = "provided"
-+                                        Path copyFrom = af.file.toPath();
-+                                        Path copyTo = slimLibPath.resolve(af.file.name);
-+                                        //println(copyFrom.toString() + " --&gt; " + copyTo.toString())
-+                                        Files.copy(copyFrom, copyTo, StandardCopyOption.REPLACE_EXISTING);
-+                                    } else {
-+                                        println(" --&gt; no")
-+                                    }
-+                                }
-+                            </source>
-+                        </configuration>
-+                    </execution>
-+                </executions>
-+            </plugin>
-         </plugins>
+  Mit mario debugging herausgefunden
+
+--- a/alice/alice-docker/alice-docker-service-base/Dockerfile
++++ b/alice/alice-docker/alice-docker-service-base/Dockerfile
+@@ -17,7 +17,7 @@ COPY install/jetty/             ${JETTY_HOME}/
+ # copy slimmed libraries, generated in alice-docker-service-base pom
+ COPY target/jetty/              ${JETTY_HOME}/
+ 
+-RUN chmod 755 /usr/lib64/libmscan_api.so /usr/lib64/libmdis_api.so
++RUN chmod 755 /usr/lib/libmscan_api.so /usr/lib/libmdis_api.so
+ RUN sed -i -e "s|platform_version|${PROJECT_VERSION}|g"  ${JETTY_HOME}/modules/AllowNullPathInfo.mod
+ WORKDIR ${JETTY_HOME}
+ 
+@@ -26,12 +26,18 @@
+         pulseaudio pulseaudio-utils                         \
+         libncurses5                                         \
+         i2c-tools sudo vim gzip procps psmisc tar socat     \
++        libusb-1.0-0 `# used by allitnil/caveman`           \
+         tcpdump lsof telnet net-tools                       && \
+     apt-get clean all                                       && \
+     # TODO: may be unused
+     chmod +x ./bin/jetty.sh                                 && \
+-    chmod +x ./bin/start-jetty.sh                                 && \
+-    chmod u+s /usr/bin/tcpdump
++    chmod +x ./bin/start-jetty.sh                           && \
++    chmod u+s /usr/bin/tcpdump                              && \
++    # needed for tty devices (add to base-jetty)
++    groupmod -g 18 dialout                                  && \
++    groupmod -g 63 audio                                    && \
++    # remove as soon as it is fixed in base-jetty
++    usermod -a -G 5,7,18,63,jetty,2001,2002 jetty
  
-         <pluginManagement>
+ # switch back to non-root
+ USER jetty
 
 
---- a/poms/service/paisa-service-superpom/pom.xml
-+++ b/poms/service/paisa-service-superpom/pom.xml
-@@ -882,53 +930,6 @@
-             <id>slim</id>
-             <build>
-                 <plugins>
--                    <plugin>
--                        <groupId>org.codehaus.gmaven</groupId>
--                        <artifactId>groovy-maven-plugin</artifactId>
--                        <version>2.1.1</version>
--                        <executions>
--                            <execution>
--                                <phase>prepare-package</phase>
--                                <goals>
--                                    <goal>execute</goal>
--                                </goals>
--                                <configuration>
--                                    <properties>
--                                        <!--
--                                            Don't you DARE add slf4j here. If you do, the services in a
--                                            constellation won't start up! So be mindful and DON'T add it.
--                                        -->
--                                        <slimArtifacts>
--                                            io.github.java-native:jssc
--                                        </slimArtifacts>
--                                    </properties>
--                                    <source>
--                                        import java.nio.file.*
--
--                                        Path slimLibPath = Paths.get(project.build.directory + "/lib/");
--                                        slimLibPath.toFile().mkdirs();
--
--                                        def slimArtifacts = properties.slimArtifacts.split("\\s+");
--                                        println("Group:Artefacts to be SLIMmed: " + slimArtifacts)
--                                        project.artifacts.each { af -&gt;
--                                            def key = af.groupId + ":" + af.artifactId
--                                            printf("SLIMmed? %-70s", key)
--                                            if (slimArtifacts.contains(key)) {
--                                                println(" --&gt; yes (set scope to 'provided' and copy JAR to target/lib/)")
--                                                af.scope = "provided"
--                                                Path copyFrom = af.file.toPath();
--                                                Path copyTo = slimLibPath.resolve(af.file.name);
--                                                //println(copyFrom.toString() + " --&gt; " + copyTo.toString())
--                                                Files.copy(copyFrom, copyTo, StandardCopyOption.REPLACE_EXISTING);
--                                            } else {
--                                                println(" --&gt; no")
--                                            }
--                                        }
--                                    </source>
--                                </configuration>
--                            </execution>
--                        </executions>
--                    </plugin>
-                 </plugins>
-             </build>
-         </profile>
+diff --git a/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmdis_api.so b/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmdis_api.so
+similarity index 100%
+rename from alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmdis_api.so
+rename to alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmdis_api.so
+
+
+diff --git a/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmscan_api.so b/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmscan_api.so
+similarity index 100%
+rename from alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmscan_api.so
+rename to alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmscan_api.so