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

macos: use /tmp instead of /dev/shm #635

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

macos: use /tmp instead of /dev/shm #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b9ffb
More shm updates for macos
devtekve Nov 24, 2024
8102aff
define SHM_PATH on top of the file and reuse it to avoid many ifdefs
devtekve Dec 6, 2024
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
6 changes: 5 additions & 1 deletion msgq/event.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
void event_state_shm_mmap(std::string endpoint, std::string identifier, char **shm_mem, std::string *shm_path) {
const char* op_prefix = std::getenv("OPENPILOT_PREFIX");

std::string full_path = "/dev/shm/";
#ifdef __APPLE__
std::string full_path = "/tmp/";
#else
std::string full_path = "/dev/shm/";
#endif
Comment on lines +24 to +28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be pulled out

if (op_prefix) {
full_path += std::string(op_prefix) + "/";
}
Expand Down
6 changes: 5 additions & 1 deletion msgq/msgq.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ int msgq_new_queue(msgq_queue_t * q, const char * path, size_t size){
assert(size < 0xFFFFFFFF); // Buffer must be smaller than 2^32 bytes
std::signal(SIGUSR2, sigusr2_handler);

std::string full_path = "/dev/shm/";
#ifdef __APPLE__
std::string full_path = "/tmp/";
#else
std::string full_path = "/dev/shm/";
Comment on lines +90 to +93
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

#endif
const char* prefix = std::getenv("OPENPILOT_PREFIX");
if (prefix) {
full_path += std::string(prefix) + "/";
Expand Down
31 changes: 19 additions & 12 deletions msgq/msgq_tests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
#include "catch2/catch.hpp"
#include "msgq/msgq.h"

// Define queue path based on platform
#ifdef __APPLE__
#define SHM_PATH "/tmp/test_queue"
#else
#define SHM_PATH "/dev/shm/test_queue"
#endif

TEST_CASE("ALIGN")
{
REQUIRE(ALIGN(0) == 0);
Expand Down Expand Up @@ -43,7 +50,7 @@ TEST_CASE("msgq_msg_init_data")

TEST_CASE("msgq_init_subscriber")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t q;
msgq_new_queue(&q, "test_queue", 1024);
REQUIRE(*q.num_readers == 0);
Expand All @@ -63,7 +70,7 @@ TEST_CASE("msgq_init_subscriber")

TEST_CASE("msgq_msg_send first message")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t q;
msgq_new_queue(&q, "test_queue", 1024);
msgq_init_publisher(&q);
Expand Down Expand Up @@ -100,7 +107,7 @@ TEST_CASE("msgq_msg_send first message")

TEST_CASE("msgq_msg_send test wraparound")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t q;
msgq_new_queue(&q, "test_queue", 1024);
msgq_init_publisher(&q);
Expand Down Expand Up @@ -132,7 +139,7 @@ TEST_CASE("msgq_msg_send test wraparound")

TEST_CASE("msgq_msg_recv test wraparound")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t q_pub, q_sub;
msgq_new_queue(&q_pub, "test_queue", 1024);
msgq_new_queue(&q_sub, "test_queue", 1024);
Expand Down Expand Up @@ -178,7 +185,7 @@ TEST_CASE("msgq_msg_recv test wraparound")

TEST_CASE("msgq_msg_send test invalidation")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t q_pub, q_sub;
msgq_new_queue(&q_pub, "test_queue", 1024);
msgq_new_queue(&q_sub, "test_queue", 1024);
Expand Down Expand Up @@ -214,7 +221,7 @@ TEST_CASE("msgq_msg_send test invalidation")

TEST_CASE("msgq_init_subscriber init 2 subscribers")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t q1, q2;
msgq_new_queue(&q1, "test_queue", 1024);
msgq_new_queue(&q2, "test_queue", 1024);
Expand All @@ -237,7 +244,7 @@ TEST_CASE("msgq_init_subscriber init 2 subscribers")

TEST_CASE("Write 1 msg, read 1 msg", "[integration]")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
const size_t msg_size = 128;
msgq_queue_t writer, reader;

Expand Down Expand Up @@ -273,7 +280,7 @@ TEST_CASE("Write 1 msg, read 1 msg", "[integration]")

TEST_CASE("Write 2 msg, read 2 msg - conflate = false", "[integration]")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
const size_t msg_size = 128;
msgq_queue_t writer, reader;

Expand Down Expand Up @@ -310,7 +317,7 @@ TEST_CASE("Write 2 msg, read 2 msg - conflate = false", "[integration]")

TEST_CASE("Write 2 msg, read 2 msg - conflate = true", "[integration]")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
const size_t msg_size = 128;
msgq_queue_t writer, reader;

Expand Down Expand Up @@ -348,7 +355,7 @@ TEST_CASE("Write 2 msg, read 2 msg - conflate = true", "[integration]")

TEST_CASE("1 publisher, 1 slow subscriber", "[integration]")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t writer, reader;

msgq_new_queue(&writer, "test_queue", 1024);
Expand Down Expand Up @@ -383,15 +390,15 @@ TEST_CASE("1 publisher, 1 slow subscriber", "[integration]")
msgq_msg_close(&msg1);
}
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this

// TODO: verify these numbers by hand
REQUIRE(n_received == 8572);
REQUIRE(n_skipped == 1428);
}

TEST_CASE("1 publisher, 2 subscribers", "[integration]")
{
remove("/dev/shm/test_queue");
remove(SHM_PATH);
msgq_queue_t writer, reader1, reader2;

msgq_new_queue(&writer, "test_queue", 1024);
Expand Down
Loading