From f6738bc22f2c4065f1681d8a5f06bcaf21ff5c46 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 03 四月 2020 13:20:03 +0800
Subject: [PATCH] shmdata 的shmData转内存slice的capacity修改成实际shmdata的长度减去预留32字节记录Len的字段

---
 shmwrap.go |   92 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/shmwrap.go b/shmwrap.go
index 06ee17a..8dad1d7 100644
--- a/shmwrap.go
+++ b/shmwrap.go
@@ -10,29 +10,41 @@
 // NewBlock shm block with size
 func NewBlock(size int, key int) ([]byte, int, error) {
     id, err := shm.Get(key, size, shm.IPC_CREAT|0666)
-    fmt.Println("Get:", id, err)
     if err != nil || id == -1 {
+        fmt.Printf("NewBlock Get:%x, %v\n", key, err)
         return nil, -1, err
     }
 
     data, err2 := shm.At(id, 0, 0)
     if err2 != nil {
+        fmt.Printf("NewBlock At:%x, %v\n", key, err2)
         return nil, -1, err2
     }
 
     return data, id, nil
 }
 
+// NewBlockOnly shm block with size, no attach
+func NewBlockOnly(size int, key int) (int, error) {
+    id, err := shm.Get(key, size, shm.IPC_CREAT|0666)
+    if err != nil || id == -1 {
+        fmt.Printf("NewBlock Get:%x, %v\n", key, err)
+        return -1, err
+    }
+    return id, nil
+}
+
 // AttachBlock attach exist shm
 func AttachBlock(key int) ([]byte, int, error) {
     id, err := shm.Get(key, 0, 0)
-    fmt.Println("Get:", id, err)
     if err != nil || id == -1 { //no exist
+        fmt.Printf("AttachBlock Get:%x, %v\n", key, err)
         return nil, -1, err
     }
 
     data, err2 := shm.At(id, 0, 0)
     if err2 != nil {
+        fmt.Printf("AttachBlock Get:%x, %v\n", key, err2)
         return nil, -1, err2
     }
 
@@ -50,7 +62,6 @@
 // context for quit
 func CreateRawShm(ctx context.Context, size int, key int) ([]byte, int) {
     data, id, err := AttachBlock(key)
-    fmt.Println("err:", err)
     if err != nil {
     loopB:
         for {
@@ -60,8 +71,6 @@
             default:
                 if err == nil {
                     break loopB
-                } else {
-                    fmt.Println("createShm error:", err)
                 }
                 time.Sleep(time.Millisecond)
                 data, id, err = NewBlock(size, key)
@@ -83,8 +92,6 @@
             default:
                 if err == nil {
                     break loopB
-                } else {
-                    fmt.Println("createShm error:", err)
                 }
                 time.Sleep(time.Millisecond)
                 data, id, err = AttachBlock(key)
@@ -92,6 +99,28 @@
         }
     }
     return data, id
+}
+
+// CreateShmOnly create shm block with size, only space, no padding, return id(int)
+// context for quit
+func CreateShmOnly(ctx context.Context, size int, key int) int {
+    id, err := NewBlockOnly(size, key)
+    if err != nil {
+    loopB:
+        for {
+            select {
+            case <-ctx.Done():
+                return -1
+            default:
+                if err == nil {
+                    break loopB
+                }
+                time.Sleep(time.Millisecond)
+                id, err = NewBlockOnly(size, key)
+            }
+        }
+    }
+    return id
 }
 
 // CreatePaddingShm create padding shm block with size, return data-with-padding([]byte), id(int)
@@ -140,12 +169,57 @@
    return shm.Rm(id)
 }
 
-// RemoveShmID Remove shmid
+// RemoveShmKey Remove shmkey
 func RemoveShmKey(shmkey int) error {
-    _, id, err := AttachBlock(shmkey)
+    d, id, err := AttachBlock(shmkey)
     if err != nil {
         return err
     } else {
+        Detach(d)
         return shm.Rm(id)
     }
 }
+
+// DetachShmKey detach shmkey
+func DetachShmKey(shmkey int) error {
+    d, _, err := AttachBlock(shmkey)
+    if err != nil {
+        return err
+    } else {
+        Detach(d)
+        return Detach(d)
+    }
+}
+
+// DetachAndRemoveShmKey detach and Remove shmkey
+func DetachAndRemoveShmKey(shmkey int) error {
+    d, id, err := AttachBlock(shmkey)
+    if err != nil {
+        return err
+    } else {
+        Detach(d)
+        return shm.Rm(id)
+    }
+}
+
+func ShmAttachNum(shmId int) (int,error) {
+    var idDs shm.IdDs
+
+    _, err := shm.Ctl(shmId, shm.IPC_STAT, &idDs)
+    if err != nil {
+        return 0, err
+    }
+
+    return int(idDs.Nattch), nil
+}
+
+func GetKeyById(shmId int) (int,error) {
+    var idDs shm.IdDs
+
+    _, err := shm.Ctl(shmId, shm.IPC_STAT, &idDs)
+    if err != nil {
+        return 0, err
+    }
+
+    return int(idDs.Perm.Key), nil
+}
\ No newline at end of file

--
Gitblit v1.8.0