Changeset 568 for trunk

Timestamp:

Sep 5, 2021, 12:23:19 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #458 (inotify issue).

Location:

trunk

Files:

• include/slib.h (modified) (1 diff)
• src/sh_fInotify.c (modified) (1 diff)
• src/sh_inotify.c (modified) (1 diff)
• src/slib.c (modified) (3 diffs)

trunk/include/slib.h

@@ -440 +440 @@
                           size_t count, int timeout, int is_nonblocking);
 
+  int sl_read_timeout_fd_once (int fd, void * buf, 
+                               size_t count, int timeout, int is_nonblocking);
+
   int sl_read_timeout (SL_TICKET ticket, void * buf, 
                        size_t count, int timeout, int is_nonblocking);

trunk/src/sh_fInotify.c

@@ -197 +197 @@
   /* Blocking read from inotify file descriptor.
    */
-  len = sh_inotify_read_timeout(buffer, 16384, 1);
+  len = sh_inotify_read_timeout (buffer, 16384, 1);
   
   if (len > 0)
     {
       struct inotify_event *event;
-      int i = 0;
-      
+      long i = 0;
+
       while (i < len) 
         {

trunk/src/sh_inotify.c

@@ -236 +236 @@
   int     ifd = sh_inotify_getfd();
 
-  len = sl_read_timeout_fd (ifd, buffer, count, timeout, S_FALSE);
+  len = sl_read_timeout_fd_once (ifd, buffer, count, timeout, S_FALSE);
 
   return len;

trunk/src/slib.c

@@ -2634 +2634 @@
 
 
-int sl_read_timeout_fd (int fd, void * buf_in, size_t count, 
-                        int timeout, int is_nonblocking)
+static int sl_read_timeout_fd_int (int fd, void * buf_in, size_t count, 
+                                   int timeout, int is_nonblocking, int once)
 {
   int sflags = 0;
@@ -2684 +2684 @@
               bytes += byteread; count -= byteread;
               buf += byteread;
-              if (count == 0)
+              if (count == 0 || once == S_TRUE)
                 break;
             }  
@@ -2768 +2768 @@
 }
 
+int sl_read_timeout_fd (int fd, void * buf_in, size_t count, 
+                        int timeout, int is_nonblocking)
+{
+  return sl_read_timeout_fd_int (fd, buf_in, count, timeout, is_nonblocking, S_FALSE);
+}
+
+int sl_read_timeout_fd_once (int fd, void * buf_in, size_t count, 
+                        int timeout, int is_nonblocking)
+{
+  return sl_read_timeout_fd_int (fd, buf_in, count, timeout, is_nonblocking, S_TRUE);
+}
+
 int sl_read_timeout (SL_TICKET ticket, void * buf_in, size_t count, 
                      int timeout, int is_nonblocking)