Changeset 1195

Timestamp:

01/03/08 02:43:46 (1 year ago)

Author:

shawnw

Message:

First pass at using fam-based monitoring of help.txt and friends.

Isn't actually getting notifications of changes on my linux test box,
even though it never generates any errors. Needs testing on other OSes,
which are more of what the fam target is intended for. inotify is
used instead of fam on linux systems that have both.

Files:

• 1.8.3/branches/devel/config.h.in (modified) (1 diff)
• 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/restart (modified) (1 diff)
• 1.8.3/branches/devel/src/bsd.c (modified) (13 diffs)

1.8.3/branches/devel/config.h.in

@@ -74 +74 @@
-
-#undef HAVE_SYS_INOTIFY_H
+
+#undef HAVE_FAM_H
+
+#undef HAVE_LIBFAM
-
-/* C99ish headers. The first two are really really nice to have. */

1.8.3/branches/devel/configure

@@ -7496 +7496 @@
-
-
-
+
+
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11850 +11851 @@
-fi
-
+
+
+{ echo "$as_me:$LINENO: checking for FAMOpen in -lfam" >&5
+echo $ECHO_N "checking for FAMOpen in -lfam... $ECHO_C" >&6; }
+if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfam  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char FAMOpen ();
+int
+main ()
+{
+return FAMOpen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+     test -z "$ac_c_werror_flag" ||
+     test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_fam_FAMOpen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_cv_lib_fam_FAMOpen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_fam_FAMOpen" >&5
+echo "${ECHO_T}$ac_cv_lib_fam_FAMOpen" >&6; }
+if test $ac_cv_lib_fam_FAMOpen = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBFAM 1
+_ACEOF
+
+  LIBS="-lfam $LIBS"
+
+fi
-
-

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])
-
+ fam.h
-### C language support
-# Only need to check C99 and GNU extensions
@@ -156 +156 @@
-AC_CHECK_LIB(crypt, crypt)
-LIB_SOCKET_NSL
+AC_CHECK_LIB(fam, FAMOpen)
-
-# with_ssl=set

1.8.3/branches/devel/game/restart

@@ -155 +155 @@
-export DATEMSK
-
+export GAMEDIR
+
-LC_ALL=$LANG LANG=$LANG ./netmush $@ $GAMEDIR/$CONF_FILE &

1.8.3/branches/devel/src/bsd.c

@@ -85 +85 @@
-#ifdef HAVE_SYS_INOTIFY_H
-#include <sys/inotify.h>
+#endif
+#ifdef HAVE_FAM_H
+#include <fam.h>
-#endif
-
@@ -388 +391 @@
-static char **saved_argv = NULL;
-
-#ifdef HAVE_INOTIFY
-int file_watch_init(void);
-void file_watch_event(int);
-#endif
-
-#ifndef BOOLEXP_DEBUGGING
@@ -878 +879 @@
-#endif
-  unsigned long input_ready, output_ready;
-#ifdef HAVE_INOTIFY
-  int notify_fd = -1;
-#endif
-
-  if (!restarting) {
@@ -906 +905 @@
-  do_rawlog(LT_ERR, "RESTART FINISHED.");
-
-#ifdef HAVE_INOTIFY
-  notify_fd = file_watch_init();
-#endif
-
-  our_gettimeofday(&then);
@@ -1020 +1017 @@
-    }
-
-#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);
@@ -1110 +1105 @@
-#endif
-#endif
-
+
-      if (notify_fd >= 0 && FD_ISSET(notify_fd, &input_set))
-    file_watch_event(notify_fd);
-
+
-      for (d = descriptor_list; d; d = dnext) {
-        dnext = d->next;
@@ -4722 +4717 @@
-
-
-#ifdef HAVE_INOTIFY
-/* File modification watching code. Linux-specific for now. 
- * Future directions include: kqueue() for BSD, fam for linux, irix, others?
@@ -4735 +4729 @@
-
-static void
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-  int n;
@@ -4747 +4753 @@
-  } while (0)
-      
-
-  do_rawlog(LT_TRACE,
-        "'No such file or directory' errors immediately following are probably harmless.");
@@ -4767 +4772 @@
-}
-
-
-
-
-
-
+
+
-{
-  int fd = inotify_init();
-
+
- if (fd < 0) {
-    penn_perror("file_watch_init:inotify_init");
@@ -4783 +4785 @@
-    maxd = fd + 1;
-
-
+_in
-
-  make_nonblocking(fd);
@@ -4790 +4792 @@
-}
-
-
-
-
-
-
+
+
-{
-  struct inotify_event ev;
@@ -4801 +4800 @@
-    do_rawlog(LT_TRACE, "Got event. Flags: 0x%x", ev.mask);
-    if (ev.mask != IN_IGNORED) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+