From 4e0b876dbc69fb9802aa14c2206cd68b8b98513e Mon Sep 17 00:00:00 2001
From: wangyikai <wangyikai14@huawei.com>
Date: Mon, 17 Feb 2025 15:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90hdf=5Fcore=E3=80=91SharedMemQueue?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=88=B6=E7=94=A8=E4=BA=8E=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E6=BB=A1=E8=BD=BD/=E7=A9=BA=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangyikai <wangyikai14@huawei.com>
---
 interfaces/inner_api/hdi/base/hdi_smq.h      | 29 ++++++++++----------
 interfaces/inner_api/hdi/base/hdi_smq_meta.h |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/interfaces/inner_api/hdi/base/hdi_smq.h b/interfaces/inner_api/hdi/base/hdi_smq.h
index a5147e1cc..b572ec072 100644
--- a/interfaces/inner_api/hdi/base/hdi_smq.h
+++ b/interfaces/inner_api/hdi/base/hdi_smq.h
@@ -546,23 +546,23 @@ int SharedMemQueue<T>::WriteNonBlocking(const T *data, size_t count)
     auto rOffset = readOffset_->load(std::memory_order_acquire);
     uint64_t newWriteOffset;
     auto qCount = meta_->GetElementCount();
-    if (wOffset + count <= qCount) {
-        if (memcpy_s(queueBuffer_ + (wOffset * sizeof(T)), (qCount - wOffset) * sizeof(T),
+    if (wOffset + count <= (qCount + 1)) {
+        if (memcpy_s(queueBuffer_ + (wOffset * sizeof(T)), (qCount + 1 - wOffset) * sizeof(T),
             data, count * sizeof(T)) != EOK) {
             return HDF_FAILURE;
         };
-        newWriteOffset = (wOffset + count) % qCount;
+        newWriteOffset = (wOffset + count) % (qCount + 1);
     } else {
-        size_t firstPartSize = qCount - wOffset;
-        size_t secParcSize = count - firstPartSize;
-        if (memcpy_s(queueBuffer_ + (wOffset * sizeof(T)), (qCount - wOffset) * sizeof(T),
+        size_t firstPartSize = qCount + 1 - wOffset;
+        size_t secPartSize = count - firstPartSize;
+        if (memcpy_s(queueBuffer_ + (wOffset * sizeof(T)), (qCount + 1 - wOffset) * sizeof(T),
             data, firstPartSize * sizeof(T)) != EOK) {
             return HDF_FAILURE;
         }
-        if (memcpy_s(queueBuffer_, qCount * sizeof(T), data + firstPartSize, secParcSize * sizeof(T)) != EOK) {
+        if (memcpy_s(queueBuffer_, qCount * sizeof(T), data + firstPartSize, secPartSize * sizeof(T)) != EOK) {
             return HDF_FAILURE;
         }
-        newWriteOffset = secParcSize;
+        newWriteOffset = secPartSize;
     }
 
     writeOffset_->store(newWriteOffset, std::memory_order_release);
@@ -585,21 +585,22 @@ int SharedMemQueue<T>::ReadNonBlocking(T *data, size_t count)
 
     auto qCount = meta_->GetElementCount();
     auto rOffset = readOffset_->load(std::memory_order_acquire);
-    if (rOffset + count <= qCount) {
+    if (rOffset + count <= (qCount + 1)) {
         if (memcpy_s(data, count * sizeof(T), queueBuffer_ + (rOffset * sizeof(T)), count * sizeof(T)) != EOK) {
             return HDF_FAILURE;
         }
-        readOffset_->store((rOffset + count) % qCount, std::memory_order_release);
+        readOffset_->store((rOffset + count) % (qCount + 1), std::memory_order_release);
         return 0;
     }
 
-    size_t firstPartSize = qCount - rOffset;
+    size_t firstPartSize = qCount + 1 - rOffset;
     size_t secPartSize = count - firstPartSize;
 
-    if (memcpy_s(data, count * sizeof(T), queueBuffer_ + (rOffset * sizeof(T)), firstPartSize * sizeof(T)) != EOK) {
+    if (memcpy_s(data, firstPartSize * sizeof(T),
+        queueBuffer_ + (rOffset * sizeof(T)), firstPartSize * sizeof(T)) != EOK) {
         return HDF_FAILURE;
     }
-    if (memcpy_s(data + firstPartSize, (count - firstPartSize) * sizeof(T),
+    if (memcpy_s(data + firstPartSize, secPartSize * sizeof(T),
         queueBuffer_, secPartSize * sizeof(T)) != EOK) {
         return HDF_FAILURE;
     };
@@ -619,7 +620,7 @@ size_t SharedMemQueue<T>::GetAvalidReadSize()
 {
     auto wOffset = writeOffset_->load(std::memory_order_acquire);
     auto rOffset = readOffset_->load(std::memory_order_acquire);
-    auto size = wOffset >= rOffset ? (wOffset - rOffset) : (wOffset + meta_->GetElementCount() - rOffset);
+    auto size = wOffset >= rOffset ? (wOffset - rOffset) : (wOffset + meta_->GetElementCount() + 1 - rOffset);
     return size;
 }
 
diff --git a/interfaces/inner_api/hdi/base/hdi_smq_meta.h b/interfaces/inner_api/hdi/base/hdi_smq_meta.h
index 97ede2407..23ad7d6a7 100644
--- a/interfaces/inner_api/hdi/base/hdi_smq_meta.h
+++ b/interfaces/inner_api/hdi/base/hdi_smq_meta.h
@@ -263,7 +263,7 @@ SharedMemQueueMeta<T>::SharedMemQueueMeta(int fd, size_t elementCount, SmqType t
         return;
     }
 
-    size_t dataSize = elementCount_ * elementSize_;
+    size_t dataSize = (elementCount_ + 1) * elementSize_; // one more byte to differentiate empty/full status
     size_t memZoneSize[] = {
         sizeof(uint64_t), // read ptr
         sizeof(uint64_t), // write ptr
-- 
Gitee