add missing flag for stdc++fs

Signed-off-by: Ric Li <[email protected]>
OpenVisualCloud · Nov 16, 2023 · 747a6f1 · 747a6f1
1 parent 6bb714a
commit 747a6f1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/lib/src/mt_instance.c b/lib/src/mt_instance.c
@@ -16,7 +16,7 @@ int mt_instance_put_lcore(struct mtl_main_impl* impl, unsigned int lcore_id) {
   int sock = impl->instance_fd;
 
   mtl_message_t msg;
-  msg.header.magic = htonl(IMTL_MAGIC);
+  msg.header.magic = htonl(MTL_MANAGER_MAGIC);
   msg.header.type = htonl(MTL_MSG_TYPE_PUT_LCORE);
   msg.body.lcore_msg.lcore = htons(lcore_id);
   msg.header.body_len = sizeof(msg.body.lcore_msg);
@@ -35,7 +35,7 @@ int mt_instance_get_lcore(struct mtl_main_impl* impl, unsigned int lcore_id) {
   int sock = impl->instance_fd;
 
   mtl_message_t msg;
-  msg.header.magic = htonl(IMTL_MAGIC);
+  msg.header.magic = htonl(MTL_MANAGER_MAGIC);
   msg.header.type = htonl(MTL_MSG_TYPE_GET_LCORE);
   msg.body.lcore_msg.lcore = htons(lcore_id);
   msg.header.body_len = htonl(sizeof(mtl_lcore_message_t));
@@ -48,7 +48,7 @@ int mt_instance_get_lcore(struct mtl_main_impl* impl, unsigned int lcore_id) {
 
   ret = recv(sock, &msg, sizeof(mtl_message_t), 0);
 
-  if (ret < 0 || ntohl(msg.header.magic) != IMTL_MAGIC ||
+  if (ret < 0 || ntohl(msg.header.magic) != MTL_MANAGER_MAGIC ||
       ntohl(msg.header.type) != MTL_MSG_TYPE_RESPONSE) {
     err("%s, recv response fail\n", __func__);
     return -EIO;
@@ -80,7 +80,7 @@ int mt_instance_init(struct mtl_main_impl* impl) {
   struct mt_user_info* u_info = &impl->u_info;
 
   mtl_message_t msg;
-  msg.header.magic = htonl(IMTL_MAGIC);
+  msg.header.magic = htonl(MTL_MANAGER_MAGIC);
   msg.header.type = htonl(MTL_MSG_TYPE_REGISTER);
   msg.header.body_len = sizeof(mtl_register_message_t);
 
@@ -97,7 +97,7 @@ int mt_instance_init(struct mtl_main_impl* impl) {
   }
 
   ret = recv(sock, &msg, sizeof(msg), 0);
-  if (ret < 0 || ntohl(msg.header.magic) != IMTL_MAGIC ||
+  if (ret < 0 || ntohl(msg.header.magic) != MTL_MANAGER_MAGIC ||
       ntohl(msg.header.type) != MTL_MSG_TYPE_RESPONSE) {
     err("%s, recv response fail\n", __func__);
     close(sock);

diff --git a/manager/meson.build b/manager/meson.build
@@ -12,7 +12,7 @@ cpp_c = meson.get_compiler('cpp')
 
 sources = ['mtl_manager.cpp']
 
-cpp_args = ['-std=c++17', '-Wall']
+cpp_args = ['-lstdc++fs', '-std=c++17', '-Wall']
 
 if get_option('buildtype') != 'debug'
   cpp_args += ['-Werror']

diff --git a/manager/mtl_instance.hpp b/manager/mtl_instance.hpp
@@ -29,7 +29,7 @@ class mtl_instance {
   int handle_message_register(mtl_register_message_t* register_msg);
   int send_response(bool success) {
     mtl_message_t msg;
-    msg.header.magic = htonl(IMTL_MAGIC);
+    msg.header.magic = htonl(MTL_MANAGER_MAGIC);
     msg.header.type = (mtl_message_type_t)htonl(MTL_MSG_TYPE_RESPONSE);
     msg.header.body_len = htonl(sizeof(mtl_response_message_t));
     msg.body.response_msg.response = success ? 0 : 1;
@@ -58,7 +58,7 @@ class mtl_instance {
 int mtl_instance::handle_message(const char* buf, int len) {
   if ((size_t)len < sizeof(mtl_message_t)) return -1;
   mtl_message_t* msg = (mtl_message_t*)buf;
-  if (ntohl(msg->header.magic) != IMTL_MAGIC) {
+  if (ntohl(msg->header.magic) != MTL_MANAGER_MAGIC) {
     std::cout << "Invalid magic number" << std::endl;
     return -1;
   }

diff --git a/manager/mtl_mproto.h b/manager/mtl_mproto.h
@@ -15,9 +15,9 @@ extern "C" {
 
 #define MTL_MANAGER_SOCK_PATH "/var/run/imtl/mtl_manager.sock"
 
-#pragma pack(push, 1)
+#define MTL_MANAGER_MAGIC (0x494D544C) /* ASCII representation of "IMTL" */
 
-#define IMTL_MAGIC (0x494D544C) /* ASCII representation of "IMTL" */
+#pragma pack(push, 1)
 
 /* message type */
 typedef enum {