Add wxFSW_EVENT_UNMOUNT wxFileSystemWatcher flag and implement it for Linux.

This flag generates the corresponding event when the file system containing
the watched directory is unmounted. Currently it is only implemented for
Linux where unmounting now generates this event instead of an error.

Closes #14834.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 9d8f63009378f6e3faab27b75441c1d77861e344..3f18f58fceeadc15f18a87df1dfedbc5b74f1fb3 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -541,7 +541,7 @@ All:
 - Add wxDIR_NO_FOLLOW flag for wxDir traversal (David Hart).
 - Allow testing for symlink/FIFO/socket existence in wxFileName (David Hart).
 - Many important bug fixes in wxFileSystemWatcher (David Hart).
 - Add wxDIR_NO_FOLLOW flag for wxDir traversal (David Hart).
 - Allow testing for symlink/FIFO/socket existence in wxFileName (David Hart).
 - Many important bug fixes in wxFileSystemWatcher (David Hart).

-- Add wxFSW_EVENT_ATTRIB flag support to wxFileSystemWatcher (David Hart).
+- Add new wxFSW_EVENT_ATTRIB and wxFSW_EVENT_UNMOUNT flags (David Hart).

 - Add separate read/written bytes counters and per-direction NOWAIT and WAITALL
   flags to wxSocket (Rob Bresalier).
 - Add wxDir::Close() method (Silverstorm82).
 - Add separate read/written bytes counters and per-direction NOWAIT and WAITALL
   flags to wxSocket (Rob Bresalier).
 - Add wxDir::Close() method (Silverstorm82).

diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h
index cb31a78f53555f39298d5186403e043da9baf678..263e3cd7af58e367fb0d94eaefb727487e09d525 100644 (file)
--- a/include/wx/fswatcher.h
+++ b/include/wx/fswatcher.h
@@ -53,6 +53,9 @@ enum
                          wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
                          wxFSW_EVENT_ACCESS | wxFSW_EVENT_ATTRIB |
                          wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR
                          wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
                          wxFSW_EVENT_ACCESS | wxFSW_EVENT_ATTRIB |
                          wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR

+#ifdef wxHAS_INOTIFY
+    ,wxFSW_EVENT_UNMOUNT = 0x2000
+#endif

 };
 
 // Type of the path watched, used only internally for now.
 };
 
 // Type of the path watched, used only internally for now.

diff --git a/interface/wx/fswatcher.h b/interface/wx/fswatcher.h
index b2981a0e5b532341fc244e3374749bbba45e75af..5857d69260779f2a68faa15b3b94a13db30a1a98 100644 (file)
--- a/interface/wx/fswatcher.h
+++ b/interface/wx/fswatcher.h
@@ -257,6 +257,18 @@ enum wxFSWFlags
      */
     wxFSW_EVENT_ATTRIB = 0x20,
 
      */
     wxFSW_EVENT_ATTRIB = 0x20,
 

+    /**
+        The file system containing a watched item was unmounted.
+
+        wxFSW_EVENT_UNMOUNT cannot be set; unmount events are produced automatically. This flag
+        is therefore not included in wxFSW_EVENT_ALL.
+
+        This event is currently only detected under Linux.
+
+        @since 2.9.5
+    */
+    wxFSW_EVENT_UNMOUNT = 0x2000,
+

     /**
         A warning condition arose.
 
     /**
         A warning condition arose.
 

diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp
index 0c2bdf62ffcd4871626ef10cd9b3e09caa9ee529..37f7c31c0d1d66d7950da2c71cfc263c7fac52d3 100644 (file)
--- a/samples/fswatcher/fswatcher.cpp
+++ b/samples/fswatcher/fswatcher.cpp
@@ -535,8 +535,12 @@ static wxString GetFSWEventChangeTypeName(int changeType)
         return "MODIFY";
     case wxFSW_EVENT_ACCESS:
         return "ACCESS";
         return "MODIFY";
     case wxFSW_EVENT_ACCESS:
         return "ACCESS";

-    case wxFSW_EVENT_ATTRIB: // Currently this is wxGTK-only
+    case wxFSW_EVENT_ATTRIB:  // Currently this is wxGTK-only

         return "ATTRIBUTE";
         return "ATTRIBUTE";

+#ifdef wxHAS_INOTIFY
+    case wxFSW_EVENT_UNMOUNT: // Currently this is wxGTK-only
+        return "UNMOUNT";
+#endif

     case wxFSW_EVENT_WARNING:
         return "WARNING";
     case wxFSW_EVENT_ERROR:
     case wxFSW_EVENT_WARNING:
         return "WARNING";
     case wxFSW_EVENT_ERROR:

diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp
index dfa8730cf3a7c4e95603690705d17a86c5bc77c3..2990795fb6dd3bcd2875e308f7a44741cd0c227c 100644 (file)
--- a/src/common/fswatchercmn.cpp
+++ b/src/common/fswatchercmn.cpp
@@ -42,6 +42,10 @@ static wxString GetFSWEventChangeTypeName(int type)
         return "ACCESS";
     case wxFSW_EVENT_ATTRIB: // Currently this is wxGTK-only
         return "ATTRIBUTE";
         return "ACCESS";
     case wxFSW_EVENT_ATTRIB: // Currently this is wxGTK-only
         return "ATTRIBUTE";

+#ifdef wxHAS_INOTIFY
+    case wxFSW_EVENT_UNMOUNT: // Currently this is wxGTK-only
+        return "UNMOUNT";
+#endif

     case wxFSW_EVENT_WARNING:
         return "WARNING";
     case wxFSW_EVENT_ERROR:
     case wxFSW_EVENT_WARNING:
         return "WARNING";
     case wxFSW_EVENT_ERROR:

diff --git a/src/unix/fswatcher_inotify.cpp b/src/unix/fswatcher_inotify.cpp
index bdc0b34530538009bd380a76b5751ffa54e572a8..f7438727dfdccd0a1ce328f255e417b631376fa9 100644 (file)
--- a/src/unix/fswatcher_inotify.cpp
+++ b/src/unix/fswatcher_inotify.cpp
@@ -265,6 +265,13 @@ protected:
             wxFileSystemWatcherEvent event(flags, errMsg);
             SendEvent(event);
         }
             wxFileSystemWatcherEvent event(flags, errMsg);
             SendEvent(event);
         }

+        // Now IN_UNMOUNT. We must do so here, as it's not in the watch flags
+        if (nativeFlags & IN_UNMOUNT)
+        {
+            wxFileName path = GetEventPath(watch, inevt);
+            wxFileSystemWatcherEvent event(wxFSW_EVENT_UNMOUNT, path, path);
+            SendEvent(event);
+        }

         // filter out ignored events and those not asked for.
         // we never filter out warnings or exceptions
         else if ((flags == 0) || !(flags & watch.GetFlags()))
         // filter out ignored events and those not asked for.
         // we never filter out warnings or exceptions
         else if ((flags == 0) || !(flags & watch.GetFlags()))


@@ -488,12 +495,13 @@ protected:
         }
 
         static const int flag_mapping[][2] = {
         }
 
         static const int flag_mapping[][2] = {

-            { wxFSW_EVENT_ACCESS, IN_ACCESS },
-            { wxFSW_EVENT_MODIFY, IN_MODIFY },
-            { wxFSW_EVENT_ATTRIB, IN_ATTRIB },
-            { wxFSW_EVENT_RENAME, IN_MOVE   },
-            { wxFSW_EVENT_CREATE, IN_CREATE },
-            { wxFSW_EVENT_DELETE, IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF }
+            { wxFSW_EVENT_ACCESS, IN_ACCESS   },
+            { wxFSW_EVENT_MODIFY, IN_MODIFY   },
+            { wxFSW_EVENT_ATTRIB, IN_ATTRIB   },
+            { wxFSW_EVENT_RENAME, IN_MOVE     },
+            { wxFSW_EVENT_CREATE, IN_CREATE   },
+            { wxFSW_EVENT_DELETE, IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF },
+            { wxFSW_EVENT_UNMOUNT, IN_UNMOUNT }

             // wxFSW_EVENT_ERROR/WARNING make no sense here
         };
 
             // wxFSW_EVENT_ERROR/WARNING make no sense here
         };
 


@@ -523,7 +531,7 @@ protected:
             { IN_DELETE_SELF,   wxFSW_EVENT_DELETE },
             { IN_MOVE_SELF,     wxFSW_EVENT_DELETE },
 
             { IN_DELETE_SELF,   wxFSW_EVENT_DELETE },
             { IN_MOVE_SELF,     wxFSW_EVENT_DELETE },
 

-            { IN_UNMOUNT,       wxFSW_EVENT_ERROR  },
+            { IN_UNMOUNT,       wxFSW_EVENT_UNMOUNT},

             { IN_Q_OVERFLOW,    wxFSW_EVENT_WARNING},
 
             // ignored, because this is generated mainly by watcher::Remove()
             { IN_Q_OVERFLOW,    wxFSW_EVENT_WARNING},
 
             // ignored, because this is generated mainly by watcher::Remove()


@@ -549,8 +557,6 @@ protected:
     {
         switch ( flag )
         {
     {
         switch ( flag )
         {

-        case IN_UNMOUNT:
-            return _("File system containing watched object was unmounted");

         case IN_Q_OVERFLOW:
             return _("Event queue overflowed");
         }
         case IN_Q_OVERFLOW:
             return _("Event queue overflowed");
         }