From 97c8ad25268e7ec022cddc851195e3a7cfb68edb Mon Sep 17 00:00:00 2001
From: john <john@johng.cn>
Date: Tue, 6 Nov 2018 10:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84gfsnotify=20callback=E7=89=B9?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 g/os/gfsnotify/gfsnotify_watcher.go    | 54 +++++++++++++-------------
 geg/os/gfsnotify/gfsnotify.go          |  6 ++-
 geg/os/gfsnotify/gfsnotify_callback.go |  4 +-
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/g/os/gfsnotify/gfsnotify_watcher.go b/g/os/gfsnotify/gfsnotify_watcher.go
index 5328127e5..5d5ce4b13 100644
--- a/g/os/gfsnotify/gfsnotify_watcher.go
+++ b/g/os/gfsnotify/gfsnotify_watcher.go
@@ -32,20 +32,12 @@ func (w *Watcher) addWatch(path string, calbackFunc func(event *Event), parentCa
     defer func() {
         if err == nil {
             if parentCallback == nil {
-                // 只有主callback才记录到id map中，因为子callback是自动管理的
+                // 只有主callback才记录到id map中，因为子callback是自动管理的无需添加到全局id映射map中
                 callbackIdMap.Set(callback.Id, callback)
             }
             if parentCallback != nil {
-                // 需要递归查找到顶级的callback
-                parent := parentCallback
-                for {
-                    if p := parent.parent; p != nil {
-                        parent = p
-                    } else {
-                        break
-                    }
-                }
-                parent.subs.PushFront(callback)
+                // 添加到直属父级的subs属性中，建立关联关系，便于后续删除
+                parentCallback.subs.PushBack(callback)
             }
         }
     }()
@@ -113,7 +105,20 @@ func (w *Watcher) Remove(path string) error {
 
 // 移除对指定文件/目录的所有监听
 func (w *Watcher) removeAll(path string) error {
+    // 首先移除所有该path的回调注册
+    if r := w.callbacks.Get(path); r != nil {
+        list := r.(*glist.List)
+        for {
+            if r := list.PopFront(); r != nil {
+                w.removeCallback(r.(*Callback))
+            } else {
+                break
+            }
+        }
+    }
+    // 其次移除该path的监听注册
     w.callbacks.Remove(path)
+    // 最后移除底层的监听
     return w.watcher.Remove(path)
 }
 
@@ -126,21 +131,7 @@ func (w *Watcher) RemoveCallback(callbackId int) error {
     if callback == nil {
         return errors.New(fmt.Sprintf(`callback for id %d not found`, callbackId))
     }
-    // 首先删除主callback
-    if err := w.removeCallback(callback); err != nil {
-        return err
-    }
-    // 如果存在子级callback，那么也一并删除
-    if callback.subs.Len() > 0 {
-        for {
-            if r := callback.subs.PopBack(); r != nil {
-                w.removeCallback(r.(*Callback))
-            } else {
-                break
-            }
-        }
-        return nil
-    }
+    w.removeCallback(callback)
     return nil
 }
 
@@ -149,6 +140,17 @@ func (w *Watcher) removeCallback(callback *Callback) error {
     if r := w.callbacks.Get(callback.Path); r != nil {
         list := r.(*glist.List)
         list.Remove(callback.elem)
+        // 如果存在子级callback，那么也一并递归删除
+        if callback.subs.Len() > 0 {
+            for {
+                if r := callback.subs.PopFront(); r != nil {
+                    w.removeCallback(r.(*Callback))
+                } else {
+                    break
+                }
+            }
+        }
+        // 如果该文件/目录的所有回调都被删除，那么移除监听
         if list.Len() == 0 {
             return w.watcher.Remove(callback.Path)
         }
diff --git a/geg/os/gfsnotify/gfsnotify.go b/geg/os/gfsnotify/gfsnotify.go
index 12cba7c25..9f378b597 100644
--- a/geg/os/gfsnotify/gfsnotify.go
+++ b/geg/os/gfsnotify/gfsnotify.go
@@ -6,7 +6,9 @@ import (
 )
 
 func main() {
-    _, err := gfsnotify.Add("/home/john/temp", func(event *gfsnotify.Event) {
+    // /home/john/temp 是一个目录，当然也可以指定文件
+    path := "/home/john/temp"
+    _, err := gfsnotify.Add(path, func(event *gfsnotify.Event) {
         if event.IsCreate() {
             glog.Println("创建文件 : ", event.Path)
         }
@@ -24,6 +26,8 @@ func main() {
         }
         glog.Println(event)
     })
+    // 移除对该path的监听
+    gfsnotify.Remove(path)
     if err != nil {
         glog.Fatalln(err)
     } else {
diff --git a/geg/os/gfsnotify/gfsnotify_callback.go b/geg/os/gfsnotify/gfsnotify_callback.go
index 76c02177f..ccb032d36 100644
--- a/geg/os/gfsnotify/gfsnotify_callback.go
+++ b/geg/os/gfsnotify/gfsnotify_callback.go
@@ -20,8 +20,8 @@ func main() {
     if err != nil {
         panic(err)
     }
-    // 3秒后移除c1的回调函数注册，仅剩c2
-    gtime.SetTimeout(3*time.Second, func() {
+    // 5秒后移除c1的回调函数注册，仅剩c2
+    gtime.SetTimeout(5*time.Second, func() {
         gfsnotify.RemoveCallback(c1.Id)
         glog.Println("remove callback c1")
     })