Changeset 371 for trunk/include

Timestamp:

Oct 31, 2011, 9:42:22 PM (13 years ago)

Author:

katerina

Message:

Patch for ticket #265 (inotify support).

Location:

trunk/include

Files:

• sh_files.h (modified) (1 diff)
• sh_inotify.h (modified) (1 diff)
• sh_pthread.h (modified) (1 diff)

trunk/include/sh_files.h

@@ -46 +46 @@
 int sh_files_hle_reg (const char * str);
 
-/* Check for new files matching configured glob patterns.
+/* Check for new files/dirs matching configured glob patterns.
  */
 void sh_files_check_globPatterns();
+
+/* Check for new files (only) matching configured glob patterns.
+ */
+void sh_files_check_globFilePatterns();
 
 /* check the setup

trunk/include/sh_inotify.h

@@ -43 +43 @@
                               int * class, unsigned long * check_mask);
 ssize_t sh_inotify_read(char * buffer, size_t count);
+ssize_t sh_inotify_read_timeout(char * buffer, size_t count, int timeout);
 int sh_inotify_recheck_watches (sh_watches * watches, sh_watches * save);
 

trunk/include/sh_pthread.h

@@ -34 +34 @@
                 pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldtype);  \
                 pthread_cleanup_push(sh_pthread_mutex_unlock, (void*)&(M));\
-                pthread_mutex_trylock(&(M));                               \
-                executeStack = 1
+                if (0 == pthread_mutex_trylock(&(M))) {                    \
+                  executeStack = 1
+
+#define SH_MUTEX_TRYLOCK_UNLOCK(M)                                         \
+                }                                                          \
+                pthread_cleanup_pop(executeStack);                         \
+                pthread_setcanceltype(oldtype, NULL);                      \
+        } while (0)
 
 #define SH_MUTEX_UNLOCK(M)                                                 \