From ab88c7da90b0dc818d8468cf18012b2a1a666846 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 24 May 2024 15:57:07 -0600 Subject: [PATCH 1/4] Name remux threads This gives the threads custom names to easily identify which thread is doing work in tools like htop. --- src/remux/launcher.cpy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/remux/launcher.cpy b/src/remux/launcher.cpy index 047f36d..1c475ae 100644 --- a/src/remux/launcher.cpy +++ b/src/remux/launcher.cpy @@ -462,6 +462,7 @@ class App: public IApp: _ := system("mkdir /run/ 2> /dev/null") _ = system("/usr/bin/mkfifo /run/remux.api 2>/dev/null") self.ipc_thread = new thread([=]() { + prctl(PR_SET_NAME, "fifo\0", 0, 0, 0) fd := open("/run/remux.api", O_RDONLY) string remainder = "" @@ -491,6 +492,7 @@ class App: public IApp: debug "STARTING SUSPEND THREAD" version := util::get_remarkable_version() self.idle_thread = new thread([=]() { + prctl(PR_SET_NAME, "suspend\0", 0, 0, 0) last_wake := 0 while true: now := time(NULL) From 344d5f9e19c3acc6cd9971aefced89be6d736676 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 24 May 2024 15:58:41 -0600 Subject: [PATCH 2/4] Add missing include --- src/remux/launcher.cpy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remux/launcher.cpy b/src/remux/launcher.cpy index 1c475ae..d7ba457 100644 --- a/src/remux/launcher.cpy +++ b/src/remux/launcher.cpy @@ -4,6 +4,7 @@ #include #include +#include #include #include #include From 872211c9d77e986be53dd72f5f40db26fb43dae4 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 24 May 2024 16:15:26 -0600 Subject: [PATCH 3/4] Fix PR action --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 95403de..7437a1e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,8 +14,8 @@ jobs: - name: "Build artifacts" run: | - ARCH=rm make docker - ARCH=kobo make docker + CROSS_TC=arm-kobo-linux-gnueabihf DOCKERFILE=Dockerfile.kobo FBINK=1 TARGET=kobo make docker + TARGET=rm make docker - uses: actions/upload-artifact@v3 with: From b4974e8c95d4c977ad9f933f2b9844a442fc1068 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 24 May 2024 16:17:52 -0600 Subject: [PATCH 4/4] Checkout submodule --- .github/workflows/pr.yml | 4 +++- .github/workflows/stable-release.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7437a1e..6ecb5b4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,9 @@ jobs: steps: - name: "Checkout source" - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + submodules: true - name: "Build artifacts" run: | diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 5cea874..1f1e40a 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -21,7 +21,9 @@ jobs: steps: - name: "Checkout source" - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + submodules: true - name: "Build artifacts"