Changeset 14674

Timestamp:

Jan 25, 2016, 9:48:58 PM (6 years ago)

Author:

mikedld

Message:

Make it possible to force generic watchdir implementation in runtime

Location:

trunk

Files:

• daemon/daemon.c (modified) (1 diff)
• libtransmission/CMakeLists.txt (modified) (1 diff)
• libtransmission/Makefile.am (modified) (2 diffs)
• libtransmission/watchdir-test.c (modified) (7 diffs)
• libtransmission/watchdir.c (modified) (2 diffs)
• libtransmission/watchdir.h (modified) (1 diff)

trunk/daemon/daemon.c

@@ -560 +560 @@
 
     /* maybe add a watchdir */
+    if (tr_variantDictFindBool (settings, TR_KEY_watch_dir_enabled, &boolVal) && boolVal)
     {
         const char * dir;
 
-        if (tr_variantDictFindBool (settings, TR_KEY_watch_dir_enabled, &boolVal)
-            && boolVal
-            && tr_variantDictFindStr (settings, TR_KEY_watch_dir, &dir, NULL)
-            && dir
-            && *dir)
+        if (tr_variantDictFindStr (settings, TR_KEY_watch_dir, &dir, NULL) && dir != NULL && *dir != '\0')
         {
             tr_logAddInfo ("Watching \"%s\" for new .torrent files", dir);
-            if ((watchdir = tr_watchdir_new (dir, &onFileAdded, mySession, ev_base)) == NULL)
+            if ((watchdir = tr_watchdir_new (dir, &onFileAdded, mySession, ev_base, false)) == NULL)
                 goto cleanup;
         }

trunk/libtransmission/CMakeLists.txt

@@ -260 +260 @@
     set(crypto-test_ADD_SOURCES crypto-test-ref.h)
 
+    set(watchdir@generic-test_DEFINITIONS WATCHDIR_TEST_FORCE_GENERIC)
+
     foreach(T bitfield blocklist clients crypto error file history json magnet metainfo move peer-msgs quark rename rpc session
-              tr-getopt utils variant watchdir)
+              tr-getopt utils variant watchdir watchdir@generic)
         set(TP ${TR_NAME}-test-${T})
-        add_executable(${TP} ${T}-test.c ${${T}-test_ADD_SOURCES})
+        if(T MATCHES "^([^@]+)@.+$")
+            string(REPLACE "@" "_" TP "${TP}")
+            set(${TP}_TEST_BASENAME "${CMAKE_MATCH_1}")
+        else()
+            set(${TP}_TEST_BASENAME "${T}")
+        endif()
+        add_executable(${TP} ${${TP}_TEST_BASENAME}-test.c ${${T}-test_ADD_SOURCES})
         target_link_libraries(${TP} ${TR_NAME} ${TR_NAME}-test)
+        if(DEFINED ${T}-test_DEFINITIONS)
+            target_compile_definitions(${TP} PRIVATE ${${T}-test_DEFINITIONS})
+        endif()
         add_test(NAME ${T} COMMAND ${TP})
         set_property(TARGET ${TP} PROPERTY FOLDER "UnitTests")

trunk/libtransmission/Makefile.am

@@ -189 +189 @@
   utils-test \
   variant-test \
-  watchdir-test
+  watchdir-test \
+  watchdir-generic-test
 
 noinst_PROGRAMS = $(TESTS)
@@ -290 +291 @@
 watchdir_test_LDFLAGS = ${apps_ldflags}
 
+watchdir_generic_test_SOURCES = watchdir-test.c $(TEST_SOURCES)
+watchdir_generic_test_LDADD = ${apps_ldadd}
+watchdir_generic_test_LDFLAGS = ${apps_ldflags}
+watchdir_generic_test_CPPFLAGS = -DWATCHDIR_TEST_FORCE_GENERIC $(AM_CPPFLAGS)
+
 rename_test_SOURCES = rename-test.c $(TEST_SOURCES)
 rename_test_LDADD = ${apps_ldadd}

trunk/libtransmission/watchdir-test.c

@@ -98 +98 @@
 }
 
+tr_watchdir_t
+create_watchdir (const char        * path,
+                 tr_watchdir_cb      callback,
+                 void              * callback_user_data,
+                 struct event_base * event_base)
+{
+#ifdef WATCHDIR_TEST_FORCE_GENERIC
+  const bool force_generic = true;
+#else
+  const bool force_generic = false;
+#endif
+
+  return tr_watchdir_new (path, callback, callback_user_data, event_base, force_generic);
+}
+
 /***
 ****
@@ -110 +125 @@
   ev_base = event_base_new();
 
-  wd = tr_watchdir_new (test_dir, &callback, NULL, ev_base);
+  wd = create_watchdir (test_dir, &callback, NULL, ev_base);
   check (wd != NULL);
   check (tr_sys_path_is_same (test_dir, tr_watchdir_get_path (wd), NULL));
@@ -137 +152 @@
     reset_callback_data (&wd_data, TR_WATCHDIR_ACCEPT);
 
-    tr_watchdir_t wd = tr_watchdir_new (test_dir, &callback, &wd_data, ev_base);
+    tr_watchdir_t wd = create_watchdir (test_dir, &callback, &wd_data, ev_base);
     check (wd != NULL);
 
@@ -154 +169 @@
     reset_callback_data (&wd_data, TR_WATCHDIR_ACCEPT);
 
-    tr_watchdir_t wd = tr_watchdir_new (test_dir, &callback, &wd_data, ev_base);
+    tr_watchdir_t wd = create_watchdir (test_dir, &callback, &wd_data, ev_base);
     check (wd != NULL);
 
@@ -185 +200 @@
 
   reset_callback_data (&wd_data, TR_WATCHDIR_ACCEPT);
-  wd = tr_watchdir_new (test_dir, &callback, &wd_data, ev_base);
+  wd = create_watchdir (test_dir, &callback, &wd_data, ev_base);
   check (wd != NULL);
 
@@ -240 +255 @@
 
   reset_callback_data (&wd1_data, TR_WATCHDIR_ACCEPT);
-  wd1 = tr_watchdir_new (dir1, &callback, &wd1_data, ev_base);
+  wd1 = create_watchdir (dir1, &callback, &wd1_data, ev_base);
   check (wd1 != NULL);
 
   reset_callback_data (&wd2_data, TR_WATCHDIR_ACCEPT);
-  wd2 = tr_watchdir_new (dir2, &callback, &wd2_data, ev_base);
+  wd2 = create_watchdir (dir2, &callback, &wd2_data, ev_base);
   check (wd2 != NULL);
 
@@ -348 +363 @@
 
   reset_callback_data (&wd_data, TR_WATCHDIR_RETRY);
-  wd = tr_watchdir_new (test_dir, &callback, &wd_data, ev_base);
+  wd = create_watchdir (test_dir, &callback, &wd_data, ev_base);
   check (wd != NULL);
 

trunk/libtransmission/watchdir.c

@@ -233 +233 @@
                  tr_watchdir_cb      callback,
                  void              * callback_user_data,
-                 struct event_base * event_base)
+                 struct event_base * event_base,
+                 bool                force_generic)
 {
   tr_watchdir_t handle;
@@ -244 +245 @@
   tr_watchdir_retries_init (&handle->active_retries);
 
+  if (!force_generic)
+    {
 #ifdef WITH_INOTIFY
-  if (handle->backend == NULL)
-    handle->backend = tr_watchdir_inotify_new (handle);
+      if (handle->backend == NULL)
+        handle->backend = tr_watchdir_inotify_new (handle);
 #endif
 #ifdef WITH_KQUEUE
-  if (handle->backend == NULL)
-    handle->backend = tr_watchdir_kqueue_new (handle);
+      if (handle->backend == NULL)
+        handle->backend = tr_watchdir_kqueue_new (handle);
 #endif
 #ifdef _WIN32
-  if (handle->backend == NULL)
-    handle->backend = tr_watchdir_win32_new (handle);
+      if (handle->backend == NULL)
+        handle->backend = tr_watchdir_win32_new (handle);
 #endif
+    }
 
   if (handle->backend == NULL)

trunk/libtransmission/watchdir.h

@@ -36 +36 @@
                                       tr_watchdir_cb      callback,
                                       void              * callback_user_data,
-                                      struct event_base * event_base);
+                                      struct event_base * event_base,
+                                      bool                force_generic);
 
 void            tr_watchdir_free     (tr_watchdir_t       handle);