From b9cc885568683f98e2d10777edf9f35d7380a836 Mon Sep 17 00:00:00 2001
From: mutouyun <mark.lonr@tom.com>
Date: Wed, 4 Mar 2020 13:24:43 +0800
Subject: [PATCH] adjust constant definition

---
 include/def.h               | 4 ++--
 src/ipc.cpp                 | 6 +++---
 src/platform/waiter_linux.h | 4 ++--
 src/platform/waiter_win.h   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/def.h b/include/def.h
index ea2bf65..9732acf 100644
--- a/include/def.h
+++ b/include/def.h
@@ -28,9 +28,9 @@ using uint_t = typename uint<N>::type;
 enum : std::size_t {
     invalid_value   = (std::numeric_limits<std::size_t>::max)(),
     data_length     = 64,
-    small_msg_limit = data_length,
+    large_msg_limit = data_length,
     large_msg_cache = 32,
-    default_timeut  = 100 // ms
+    default_timeout = 100 // ms
 };
 
 enum class relat { // multiplicity of the relationship
diff --git a/src/ipc.cpp b/src/ipc.cpp
index b28244b..3828581 100644
--- a/src/ipc.cpp
+++ b/src/ipc.cpp
@@ -110,7 +110,7 @@ struct cls_info_t {
 };
 
 constexpr std::size_t calc_cls_size(std::size_t size) noexcept {
-    return (((size - 1) / small_msg_limit) + 1) * small_msg_limit;
+    return (((size - 1) / large_msg_limit) + 1) * large_msg_limit;
 }
 
 auto& cls_storage(std::size_t cls_size) {
@@ -402,7 +402,7 @@ static bool send(F&& gen_push, ipc::handle_t h, void const * data, std::size_t s
     }
     auto msg_id   = acc->fetch_add(1, std::memory_order_relaxed);
     auto try_push = std::forward<F>(gen_push)(info_of(h), que, msg_id);
-    if (size > small_msg_limit) {
+    if (size > large_msg_limit) {
         auto   dat = apply_storage(que->conn_count(), size);
         void * buf = dat.second;
         if (buf != nullptr) {
@@ -437,7 +437,7 @@ static bool send(ipc::handle_t h, void const * data, std::size_t size) {
         return [info, que, msg_id](std::int32_t remain, void const * data, std::size_t size) {
             if (!wait_for(info->wt_waiter_, [&] {
                     return !que->push(info->cc_id_, msg_id, remain, data, size);
-                }, que->dis_flag() ? 0 : static_cast<std::size_t>(default_timeut))) {
+                }, que->dis_flag() ? 0 : static_cast<std::size_t>(default_timeout))) {
                 ipc::log("force_push: msg_id = %zd, remain = %d, size = %zd\n", msg_id, remain, size);
                 if (!que->force_push([](void* p) {
                     auto tmp_msg = static_cast<typename queue_t::value_t*>(p);
diff --git a/src/platform/waiter_linux.h b/src/platform/waiter_linux.h
index bf20eff..8a1a78a 100644
--- a/src/platform/waiter_linux.h
+++ b/src/platform/waiter_linux.h
@@ -271,7 +271,7 @@ public:
         if (counter_ > 0) {
             ret = sem_helper::post(std::get<1>(h));
             -- counter_;
-            ret = ret && sem_helper::wait(std::get<2>(h), default_timeut);
+            ret = ret && sem_helper::wait(std::get<2>(h), default_timeout);
         }
         return ret;
     }
@@ -289,7 +289,7 @@ public:
             }
             do {
                 -- counter_;
-                ret = ret && sem_helper::wait(std::get<2>(h), default_timeut);
+                ret = ret && sem_helper::wait(std::get<2>(h), default_timeout);
             } while (counter_ > 0);
         }
         return ret;
diff --git a/src/platform/waiter_win.h b/src/platform/waiter_win.h
index b688320..73a2990 100644
--- a/src/platform/waiter_win.h
+++ b/src/platform/waiter_win.h
@@ -136,7 +136,7 @@ public:
         if (*counter_ > 0) {
             ret = sema_.post();
             -- *counter_;
-            ret = ret && handshake_.wait(default_timeut);
+            ret = ret && handshake_.wait(default_timeout);
         }
         return ret;
     }
@@ -152,7 +152,7 @@ public:
             ret = sema_.post(*counter_);
             do {
                 -- *counter_;
-                ret = ret && handshake_.wait(default_timeut);
+                ret = ret && handshake_.wait(default_timeout);
             } while (*counter_ > 0);
         }
         return ret;