Feature/gui

.github/workflows/config.yml

@@ -3,20 +3,53 @@ name: Build project
 on: [push]
 
 jobs:
-  build-project:
+  build-mac:
+    runs-on: macos-14
+    steps:
+    - uses: actions/checkout@v1
+    - name: "build mac"
+      run: |
+        brew install glfw svg2png
+        git submodule update --init --recursive
+        mkdir build
+        cd build
+        bash -c 'cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON -DBUILD_GUI=ON ..'
+        make
+    - name: Upload macos
+      uses: actions/upload-artifact@v4
+      with:
+        name: Farbart macos
+        path: build/Farbart.tar.gz
+
+  build-linux:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: "build project"
+    - name: "build linux"
       run: |
+        sudo apt-get update
+        sudo apt-get install --no-install-recommends -y libglfw3-dev libsdl2-dev gcc-multilib g++-multilib libfreetype6-dev libvulkan-dev
         git submodule update --init --recursive
         mkdir build
         cd build
-        bash -c 'cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON ..'
+        bash -c 'cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON -DBUILD_GUI=ON ..'
         make
+    - name: Upload linux
+      uses: actions/upload-artifact@v4
+      with:
+        name: Farbart linux x64-86
+        path: build/symmetri/gui/Farbart
 
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
     - name: "tests with ASAN"
       run: |
+        sudo apt-get update
+        sudo apt-get install --no-install-recommends -y libglfw3-dev libsdl2-dev gcc-multilib g++-multilib libfreetype6-dev libvulkan-dev
+        git submodule update --init --recursive
+        mkdir build
         cd build
         bash -c 'cmake  -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DASAN_BUILD=ON -DTSAN_BUILD=OFF ..'
         make
@@ -25,6 +58,7 @@ jobs:
     - name: "tests with TSAN"
       run: |
         cd build
+        make clean
         bash -c 'cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DASAN_BUILD=OFF -DTSAN_BUILD=ON ..'
         make
         ctest -VV

.github/workflows/macos/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleGetInfoString</key>
+  <string>Farbart</string>
+  <key>CFBundleExecutable</key>
+  <string>Farbart</string>
+  <key>CFBundleIdentifier</key>
+  <string>www.symmetri.net</string>
+  <key>CFBundleName</key>
+  <string>Farbart</string>
+  <key>CFBundleIconFile</key>
+  <string>farbart.icns</string>
+  <key>CFBundleShortVersionString</key>
+  <string>0.01</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>IFMajorVersion</key>
+  <integer>0</integer>
+  <key>IFMinorVersion</key>
+  <integer>1</integer>
+</dict>
+</plist>

.github/workflows/macos/create_app_bundle.sh

@@ -0,0 +1,11 @@
+#/bin/bash
+
+./symmetri/gui/generate_icon $(echo $((1 + $RANDOM % 9))) icon.svg
+source ../.github/workflows/macos/create_icons.sh
+svg_to_icns icon.svg
+rm -r Farbart.app
+mkdir -p Farbart.app/Contents Farbart.app/Contents/MacOS Farbart.app/Contents/Resources
+cp icons/icon.icns Farbart.app/Contents/Resources/farbart.icns
+cp ../.github/workflows/macos/Info.plist Farbart.app/Contents/Info.plist
+cp symmetri/gui/Farbart Farbart.app/Contents/MacOS/Farbart
+tar -czf Farbart.tar.gz Farbart.app

.github/workflows/macos/create_icons.sh

@@ -0,0 +1,31 @@
+# taken from
+# https://gist.github.com/adriansr/1da9b18a8076b0f8a977a5eea0ae41ef
+
+function svg_to_icns(){
+    local RESOLUTIONS=(
+        16,16x16
+        32,16x16@2x
+        32,32x32
+        64,32x32@2x
+        128,128x128
+        256,128x128@2x
+        256,256x256
+        512,256x256@2x
+        512,512x512
+        1024,512x512@2x
+    )
+
+    for SVG in $@; do
+      BASE=$(basename "$SVG" | sed 's/\.[^\.]*$//')
+        ICONSET="$BASE.iconset"
+        ICONSET_DIR="./icons/$ICONSET"
+        mkdir -p "$ICONSET_DIR"
+        for RES in ${RESOLUTIONS[@]}; do
+            SIZE=$(echo $RES | cut -d, -f1)
+            LABEL=$(echo $RES | cut -d, -f2)
+            svg2png -w $SIZE -h $SIZE "$SVG" "$ICONSET_DIR"/icon_$LABEL.png
+        done
+
+        iconutil -c icns "$ICONSET_DIR"
+    done
+}

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "submodules/tinyxml2"]
 	path = symmetri/submodules/tinyxml2
 	url = https://github.com/leethomason/tinyxml2.git
+[submodule "symmetri/gui/imgui"]
+	path = symmetri/gui/imgui
+	url = https://github.com/ocornut/imgui.git

CMakeLists.txt

@@ -21,6 +21,10 @@ if(BUILD_TESTING)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address,undefined -fno-omit-frame-pointer -O0")
   elseif(TSAN_BUILD AND NOT ASAN_BUILD)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=thread -fno-omit-frame-pointer -O0")
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tsan")
+    endif()
+
   else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=auto -O3")
   endif()

examples/combinations/DualProcessWorker.pnml

@@ -13,45 +13,45 @@
 			<place id="TaskBucket">
 				<name>
 					<graphics>
-						<offset x="0" y="15"/>
+						<offset x="0" y="15" />
 					</graphics>
 					<text>TaskBucket</text>
 				</name>
 				<graphics>
-					<position x="80" y="120"/>
+					<position x="80" y="120" />
 				</graphics>
 			</place>
 			<place id="TaskResult">
 				<name>
 					<graphics>
-						<offset x="0" y="15"/>
+						<offset x="0" y="15" />
 					</graphics>
 					<text>TaskResult</text>
 				</name>
 				<graphics>
-					<position x="290" y="120"/>
+					<position x="290" y="120" />
 				</graphics>
 			</place>
 			<place id="IntermediateState">
 				<name>
 					<graphics>
-						<offset x="0" y="15"/>
+						<offset x="0" y="15" />
 					</graphics>
 					<text>IntermediateState</text>
 				</name>
 				<graphics>
-					<position x="190" y="120"/>
+					<position x="190" y="120" />
 				</graphics>
 			</place>
 			<place id="ResourceDualProcessor">
 				<name>
 					<graphics>
-						<offset x="0" y="15"/>
+						<offset x="0" y="15" />
 					</graphics>
 					<text>ResourceDualProcessor</text>
 				</name>
 				<graphics>
-					<position x="130" y="60"/>
+					<position x="130" y="60" />
 				</graphics>
 				<initialMarking>
 					<text>1</text>
@@ -60,90 +60,94 @@
 			<place id="P0">
 				<name>
 					<graphics>
-						<offset x="0" y="15"/>
+						<offset x="0" y="15" />
 					</graphics>
 					<text>P0</text>
 				</name>
 				<graphics>
-					<position x="130" y="190"/>
+					<position x="130" y="190" />
 				</graphics>
+				<initialMarking>
+					<text>6</text>
+				</initialMarking>
+
 			</place>
 			<place id="SuccessfulTasks">
 				<name>
 					<graphics>
-						<offset x="0" y="15"/>
+						<offset x="0" y="15" />
 					</graphics>
 					<text>SuccessfulTasks</text>
 				</name>
 				<graphics>
-					<position x="190" y="10"/>
+					<position x="190" y="10" />
 				</graphics>
 			</place>
 			<!-- List of transitions -->
 			<transition id="StepOne">
 				<name>
 					<graphics>
-						<offset x="0" y="-15"/>
+						<offset x="0" y="-15" />
 					</graphics>
 					<text>StepOne</text>
 				</name>
 				<graphics>
-					<position x="135" y="120"/>
+					<position x="135" y="120" />
 				</graphics>
 			</transition>
 			<transition id="returnFailedTasksTwo">
 				<name>
 					<graphics>
-						<offset x="0" y="-15"/>
+						<offset x="0" y="-15" />
 					</graphics>
 					<text>returnFailedTasksTwo</text>
 				</name>
 				<graphics>
-					<position x="195" y="210"/>
+					<position x="195" y="210" />
 				</graphics>
 			</transition>
 			<transition id="StepTwo">
 				<name>
 					<graphics>
-						<offset x="0" y="-15"/>
+						<offset x="0" y="-15" />
 					</graphics>
 					<text>StepTwo</text>
 				</name>
 				<graphics>
-					<position x="245" y="120"/>
+					<position x="245" y="120" />
 				</graphics>
 			</transition>
 			<transition id="returnFailedTasksOne">
 				<name>
 					<graphics>
-						<offset x="0" y="-15"/>
+						<offset x="0" y="-15" />
 					</graphics>
 					<text>returnFailedTasksOne</text>
 				</name>
 				<graphics>
-					<position x="195" y="170"/>
+					<position x="195" y="170" />
 				</graphics>
 			</transition>
 			<transition id="releaseResourceAfterFail">
 				<name>
 					<graphics>
-						<offset x="0" y="-15"/>
+						<offset x="0" y="-15" />
 					</graphics>
 					<text>releaseResourceAfterFail</text>
 				</name>
 				<graphics>
-					<position x="55" y="190"/>
+					<position x="55" y="190" />
 				</graphics>
 			</transition>
 			<transition id="releaseResourceAfterSuccess">
 				<name>
 					<graphics>
-						<offset x="0" y="-15"/>
+						<offset x="0" y="-15" />
 					</graphics>
 					<text>releaseResourceAfterSuccess</text>
 				</name>
 				<graphics>
-					<position x="195" y="60"/>
+					<position x="195" y="60" />
 				</graphics>
 			</transition>
 			<!-- List of arcs -->
@@ -165,19 +169,19 @@
 			</arc>
 			<arc id="id9" source="releaseResourceAfterFail" target="ResourceDualProcessor">
 				<graphics>
-					<position x="60" y="70"/>
+					<position x="60" y="70" />
 				</graphics>
 			</arc>
 			<arc id="id10" source="releaseResourceAfterSuccess" target="ResourceDualProcessor">
 			</arc>
 			<arc id="id11" source="TaskResult" target="releaseResourceAfterSuccess">
 				<graphics>
-					<position x="300" y="70"/>
+					<position x="300" y="70" />
 				</graphics>
 			</arc>
 			<arc id="id12" source="TaskResult" target="returnFailedTasksTwo" color="Red">
 				<graphics>
-					<position x="300" y="220"/>
+					<position x="300" y="220" />
 				</graphics>
 			</arc>
 			<arc id="id13" source="ResourceDualProcessor" target="StepOne">

examples/flight/flight.cc

@@ -59,8 +59,8 @@ int main(int, char *argv[]) {
   Marking sub_goal_marking = {{"P2", Success}};
   std::set<std::string> pnmls = {pnml1, pnml2};
   PetriNet subnet(pnmls, "SubNet", pool, sub_goal_marking);
-  subnet.registerCallback("T0", Foo("SubFoo"));
-  subnet.registerCallback("T1", Foo("SubBar"));
+  subnet.registerCallbackInPlace<Foo>("T0", "SubFoo");
+  subnet.registerCallbackInPlace<Foo>("T1", "SubBar");
 
   // We create another PetriNet by flatly composing all three petri nets.
   // Again we have 2 Foo-transitions, and the first transition (T0) is the
@@ -72,8 +72,8 @@ int main(int, char *argv[]) {
                               {"P3", Success}};
   PetriNet bignet({pnml1, pnml2, pnml3}, "RootNet", pool, big_goal_marking);
   bignet.registerCallback("T0", subnet);
-  bignet.registerCallback("T1", Foo("Bar"));
-  bignet.registerCallback("T2", Foo("Foo"));
+  bignet.registerCallbackInPlace<Foo>("T1", "Bar");
+  bignet.registerCallbackInPlace<Foo>("T2", "Foo");
   // a flag to check if we are running
   std::atomic<bool> running(true);
 

examples/flight/transition.hpp

@@ -22,13 +22,13 @@ class Foo {
 
  public:
   Foo(std::string m, unsigned count = 5, int s = 1)
-      : name(m), count(count), interval(s), cancel_(false), is_paused_(false) {}
-  Foo(const Foo &o)
-      : name(o.name),
-        count(o.count),
-        interval(o.interval),
-        cancel_(false),
-        is_paused_(false) {}
+      : name(m), count(count), interval(s), cancel_(false), is_paused_(false) {
+    printf("ctor %s\n", m.c_str());
+  }
+  Foo(Foo&& f) = delete;
+  Foo(const Foo& o) = delete;
+  Foo& operator=(Foo&& other) = delete;
+  Foo& operator=(const Foo& other) = delete;
 
   bool fire() const {
     cancel_.store(false);

examples/performance/performance.cpp

@@ -37,7 +37,7 @@ int main(int argc, char *argv[]) {
           {"Pb", Success}, {"Pb", Success}, {"Pc", Success}, {"Pc", Success}};
 
       PetriNet petri(net, "benchmark", pool, initial_marking, goal_marking);
-      petri.registerCallback("t0", Simple{});
+      petri.registerCallbackInPlace<Simple>("t0");
       petri.registerCallback("t1", Simple{});
       return petri;
     }