Changeset 1187

Timestamp:

01/02/08 06:49:03 (8 months ago)

Author:

shawnw

Message:

#7525: Basic inotify based file tracking.

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (3 diffs)
• 1.8.3/branches/devel/config.h.in (modified) (2 diffs)
• 1.8.3/branches/devel/configure (modified) (2 diffs)
• 1.8.3/branches/devel/configure.in (modified) (2 diffs)
• 1.8.3/branches/devel/game/txt/connect.txt (modified) (1 diff)
• 1.8.3/branches/devel/game/txt/hlp/pennv182.hlp (modified) (1 diff)
• 1.8.3/branches/devel/game/txt/hlp/pennv183.hlp (modified) (3 diffs)
• 1.8.3/branches/devel/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.3/branches/devel/src/bsd.c (modified) (8 diffs)
• 1.8.3/branches/devel/src/conf.c (modified) (2 diffs)

1.8.3/branches/devel/CHANGES.183

@@ -5 +5 @@
-chronological order (most recent first)
-
-
+
+
-[EEH] is Ervin Hearn III, a PennMUSH developer (aka Noltar)
-[GM] is Greg Millam, a PennMUSH developer (aka Walker)
@@ -22 +23 @@
- * Compile with -mdynamic-no-pic on powerpc OS X, resulting in a smaller
-   binary.
+ * On newer Linux systems, detect when various indexed and cached files
+   are changed and automatically reload them instead of waiting for a 
+   @readcache.
+
+Fixes:
+ * Fixes from 1.8.2p9
-
-Version 1.8.3 patchlevel 6                      Jan 01, 2008
@@ -77 +84 @@
- * Fixed some minor bugs detected by running under valgrind.
- * OpenBSD configuration fixes.
+ * Fixes from 1.8.2p8
-
-Version 1.8.3 patchlevel 5                      October 6, 2007

1.8.3/branches/devel/config.h.in

@@ -72 +72 @@
-
-#undef HAVE_SYS_SELECT_H
+
+#undef HAVE_SYS_INOTIFY_H
-
-/* C99ish headers. The first two are really really nice to have. */
@@ -303 +305 @@
-#undef HAVE_FCNTL
-
+#undef HAVE_INOTIFY_INIT
+
+#ifdef HAVE_INOTIFY_INIT
+#define HAVE_INOTIFY
+#endif
+
-/* Variables and defines */
-

1.8.3/branches/devel/configure

@@ -7495 +7495 @@
-
-
-
+
+
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14814 +14815 @@
-
-
-
+
+
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

1.8.3/branches/devel/configure.in

@@ -117 +117 @@
-AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(I_SYS_TYPES)])
-AC_CHECK_HEADERS([sys/un.h ieeefp.h sys/resource.h sys/event.h sys/uio.h])
-
+ sys/inotify.h
-### C language support
-# Only need to check C99 and GNU extensions
@@ -209 +209 @@
-AC_CHECK_FUNCS([cbrt log2 getuid geteuid seteuid getpriority setpriority])
-AC_CHECK_FUNCS([socketpair sigaction sigprocmask imaxdiv valloc writev])
-
+ inotify_init
-
-AC_FUNC_SNPRINTF

1.8.3/branches/devel/game/txt/connect.txt

@@ -9 +9 @@
-Use the WHO command to find out who is online currently.
------------------------------------------------------------------------------
-Yell at your local god to personalize this file!
-

1.8.3/branches/devel/game/txt/hlp/pennv182.hlp

@@ +1 @@
+& 1.8.2p9
+Version 1.8.2 patchlevel 9                     ??? ??, 2008
+
+Functions:
+ * The undocumented (And unusable) orpowers() and andpowers() functions
+   were removed.
+
+Documentation:
+ * andlpowers() and orlpowers() were missing help files. Reported by
+   Parusso.
+
-& 1.8.2p8
-Version 1.8.2 patchlevel 8                     Jan 01, 2008

1.8.3/branches/devel/game/txt/hlp/pennv183.hlp

@@ -1 @@
-6
+7
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.3 patchlevel 7                      ??? ??, 2008
+
+Minor changes:
+ * If compiling with a recent enough version of gcc to support the
+   -fstack-protector option to detect buffer overruns, use it.
+ * Compile with -mdynamic-no-pic on powerpc OS X, resulting in a smaller
+   binary.
+ * On newer Linux systems, detect when various indexed and cached files
+   are changed and automatically reload them instead of waiting for a 
+   @readcache.
+
+Fixes:
+ * Fixes from 1.8.2p9
+
+& 1.8.3p6
-Version 1.8.3 patchlevel 6                      Jan 01, 2008
-
@@ -66 +81 @@
- * Fixed some minor bugs detected by running under valgrind.
- * OpenBSD configuration fixes.
+ * Fixes from 1.8.2p8
-
-& 1.8.3p5

1.8.3/branches/devel/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
-
+, 7
+, 9
-1.8.1: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13

1.8.3/branches/devel/src/bsd.c

@@ -83 +83 @@
-#include <locale.h>
-#include <setjmp.h>
+#ifdef HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+#endif
-
-#include "conf.h"
@@ -103 +106 @@
-#include "mysocket.h"
-#include "ident.h"
+#include "htab.h"
+#include "help.h"
-
-#ifndef WIN32
@@ -383 +388 @@
-static char **saved_argv = NULL;
-
+#ifdef HAVE_INOTIFY
+int file_watch_init(void);
+void file_watch_event(int);
+#endif
+
-#ifndef BOOLEXP_DEBUGGING
-#ifdef WIN32SERVICES
@@ -868 +878 @@
-#endif
-  unsigned long input_ready, output_ready;
+#ifdef HAVE_INOTIFY
+  int notify_fd = -1;
+#endif
-
-  if (!restarting) {
@@ -892 +905 @@
-  do_rawlog(LT_ERR, "%d file descriptors available.", avail_descriptors);
-  do_rawlog(LT_ERR, "RESTART FINISHED.");
+
+#ifdef HAVE_INOTIFY
+  notify_fd = file_watch_init();
+#endif
-
-  our_gettimeofday(&then);
@@ -1002 +1019 @@
-        FD_SET(d->descriptor, &output_set);
-    }
+
+#ifdef HAVE_INOTIFY
+    if (notify_fd >= 0)
+      FD_SET(notify_fd, &input_set);
+#endif
-
-    found = select(maxd, &input_set, &output_set, (fd_set *) 0, &timeout);
@@ -1087 +1109 @@
-      }
-#endif
+#endif
+#ifdef HAVE_INOTIFY
+      if (notify_fd >= 0 && FD_ISSET(notify_fd, &input_set))
+    file_watch_event(notify_fd);
-#endif
-      for (d = descriptor_list; d; d = dnext) {
@@ -4694 +4720 @@
-  exit(1);                      /* Shouldn't ever get here, but just in case... */
-}
+
+
+#ifdef HAVE_INOTIFY
+/* File modification watching code. Linux-specific for now. 
+ * Future directions include: kqueue() for BSD, fam for linux, irix, others?
+ *
+ * The idea to watch help.txt and motd.txt and friends to avoid having
+ * to do a manual @readcache. Rather than figuring out which exact
+ * file was changed, just re-read them all on modification of
+ * any. That will probably change in the future.
+ */
+
+extern HASHTAB help_files;
+
+static void
+watch_files(int fd)
+{
+  int n;
+  help_file *h;
+
+#define WATCH(name) do { \
+    if (inotify_add_watch(fd, (name), IN_MODIFY | IN_DELETE_SELF) < 0) \
+      do_rawlog(LT_TRACE, "file_watch_init:inotify_add_watch(\"%s\"): %s", \
+        (name), strerror(errno)); \
+  } while (0);
+      
+  for (n = 0; n < 2; n++) {
+    WATCH(options.connect_file[n]);
+    WATCH(options.motd_file[n]);
+    WATCH(options.wizmotd_file[n]);
+    WATCH(options.register_file[n]);
+    WATCH(options.quit_file[n]);
+    WATCH(options.down_file[n]);
+    WATCH(options.full_file[n]);
+    WATCH(options.guest_file[n]);
+  }
+  
+  for (h = hash_firstentry(&help_files); h; h = hash_nextentry(&help_files)) 
+    WATCH(h->file);
+
+#undef WATCH
+}
+
+/** Start monitoring various useful files for changes. 
+ * \return descriptor of the notification service, or -1 on error
+ */
+int
+file_watch_init(void)
+{
+  int fd = inotify_init();
+ 
+ if (fd < 0) {
+    penn_perror("file_watch_init:inotify_init");
+    return -1;
+  }
+
+  if (fd >= maxd)
+    maxd = fd + 1;
+
+  watch_files(fd);
+
+  make_nonblocking(fd);
+
+  return fd;
+}
+
+/** Test for modified files and re-read them if indicated. 
+ * \param fd the notification monitorh descriptor
+ */
+void
+file_watch_event(int fd)
+{
+  struct inotify_event ev;
+
+  while (read(fd, &ev, sizeof ev) > 0) {
+    if (ev.mask != IN_IGNORED) {
+      do_rawlog(LT_TRACE,
+        "Reloading help indexes and cached files after detecting a change.");
+      fcache_load(NOTHING);
+      help_reindex(NOTHING);
+      watch_files(fd);
+    }
+  }
+}
+
+#endif

1.8.3/branches/devel/src/conf.c

@@ -1697 +1697 @@
-#endif
-
-  notify(player, T(" BSD sockets networking in use."));
-
-#ifdef HAS_GETDATE
-  notify(player, T(" Extended convtime() is supported."));
@@ -1711 +1709 @@
-#endif
-
-
+
+
+
+
+
+
+
+