Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ChipMainLoopWork_WorkSchedule.cpp work on darwin #30425

Merged
merged 5 commits into from
Nov 13, 2023
Merged

Make ChipMainLoopWork_WorkSchedule.cpp work on darwin #30425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd77940
It turns out that darwin returns ENOSYS on sem_init.
andreilitvin Nov 10, 2023
b1669c0
restyle
andreilitvin Nov 10, 2023
9c9da0a
Also fix java
andreilitvin Nov 10, 2023
3a2de9b
Merge branch 'master' into fix_worker_mac
andy31415 Nov 13, 2023
1abd3bd
Remove empty constructor/destructor
andy31415 Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/app/server/java/ChipThreadWork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

#include "ChipThreadWork.h"
#include <platform/CHIPDeviceLayer.h>
#include <semaphore.h>

#include <condition_variable>
#include <mutex>

namespace chip {
namespace ThreadWork {
Expand All @@ -26,12 +28,21 @@ namespace {
struct WorkData
{
WorkCallback callback;
sem_t done;
std::mutex mux;
std::condition_variable cond;
bool done = false;

WorkData() { sem_init(&done, 0 /* shared */, 0); }
~WorkData() { sem_destroy(&done); }
void Post() { sem_post(&done); }
void Wait() { sem_wait(&done); }
void Post()
{
std::unique_lock lock(mux);
done = true;
cond.notify_all();
}
void Wait()
{
std::unique_lock lock(mux);
cond.wait(lock, [&] { return done; });
}
};

void PerformWork(intptr_t arg)
Expand Down
22 changes: 16 additions & 6 deletions src/controller/python/chip/native/ChipMainLoopWork_WorkSchedule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
*/
#include "ChipMainLoopWork.h"

#include <condition_variable>
#include <mutex>
#include <platform/CHIPDeviceLayer.h>
#include <semaphore.h>

namespace chip {
namespace MainLoopWork {
Expand All @@ -27,12 +28,21 @@ namespace {
struct WorkData
{
std::function<void()> callback;
sem_t done;
std::mutex mux;
std::condition_variable cond;
bool done = false;

WorkData() { sem_init(&done, 0 /* shared */, 0); }
~WorkData() { sem_destroy(&done); }
void Post() { sem_post(&done); }
void Wait() { sem_wait(&done); }
void Post()
{
std::unique_lock lock(mux);
done = true;
cond.notify_all();
}
void Wait()
{
std::unique_lock lock(mux);
cond.wait(lock, [&] { return done; });
}
};

void PerformWork(intptr_t arg)
Expand Down
2 changes: 1 addition & 1 deletion third_party/imgui/repo
Open in desktop
Submodule repo updated 24 files
+3 −3 backends/imgui_impl_allegro5.cpp
+3 −3 backends/imgui_impl_dx10.cpp
+3 −3 backends/imgui_impl_dx11.cpp
+3 −3 backends/imgui_impl_dx12.cpp
+3 −3 backends/imgui_impl_metal.mm
+3 −3 backends/imgui_impl_opengl2.cpp
+3 −4 backends/imgui_impl_opengl3.cpp
+2 −3 backends/imgui_impl_opengl3_loader.h
+4 −4 backends/imgui_impl_sdlrenderer2.cpp
+4 −4 backends/imgui_impl_sdlrenderer3.cpp
+39 −106 backends/imgui_impl_vulkan.cpp
+2 −2 backends/imgui_impl_vulkan.h
+3 −3 backends/imgui_impl_wgpu.cpp
+5 −48 docs/CHANGELOG.txt
+30 −0 examples/example_glfw_vulkan/main.cpp
+30 −0 examples/example_sdl2_vulkan/main.cpp
+1 −1 imconfig.h
+73 −99 imgui.cpp
+22 −49 imgui.h
+8 −34 imgui_demo.cpp
+4 −4 imgui_draw.cpp
+1 −3 imgui_internal.h
+11 −23 imgui_tables.cpp
+3 −4 imgui_widgets.cpp
2 changes: 1 addition & 1 deletion third_party/mbedtls/repo
Open in desktop
Submodule repo updated from e44be6 to d6d43e
2 changes: 1 addition & 1 deletion third_party/nanopb/repo
Open in desktop
Submodule repo updated 19 files
+0 −71 .github/workflows/cmake.yml
+0 −6 .github/workflows/codeql-buildscript.sh
+0 −126 .github/workflows/codeql.yml
+0 −34 .github/workflows/fail_on_error.py
+2 −16 AUTHORS.txt
+0 −19 CHANGELOG.txt
+40 −75 CMakeLists.txt
+1 −1 conanfile.py
+1 −17 docs/migration.md
+1 −1 extra/bazel/nanopb_cc_proto_library.bzl
+1 −1 extra/poetry/pyproject.toml
+0 −24 extra/script_wrappers/nanopb_generator.py.in
+0 −0 generator/__init__.py
+0 −7 generator/nanopb_generator
+0 −5 generator/nanopb_generator.bat
+1 −1 generator/nanopb_generator.py
+1 −1 library.json
+1 −1 pb.h
+0 −2 requirements.txt
2 changes: 1 addition & 1 deletion third_party/pigweed/repo
Open in desktop
Submodule repo updated 333 files
Loading