[True patch] FSF 20.x style clash detection.
26 years, 6 months
Jan Vroonhof
Jan Vroonhof
XEmacs hacking is too addictive. I came back after training and
finished it.
This is now tested. It still needs looking over by somebody with more
XEmacs C experience. It still won't work on 'msw.
I have also have mode one inspection round through the code and it
seems all OK to me now.
I have brought over our GCPROing of some variables since that seems
needed and it is always good to be on the safe side. Likewise the
code now uses callx_in_buffer like our old code did.
Jan
P.S. Should I replace GNU Emacs by XEmacs in the copyright statements?
1998-05-14 Jan Vroonhof <vroonhof(a)math.ethz.ch>
* emacs.c (main_1): Removed references to *vars_of_filelock.
* lisp.h: Added Fsystem_name.
* filelock.c: Replaced by version from FSF 20.2. Now implements
locking by using symlinks which is NFS safe. However keep the
GCPRO's in lock_file and the calls to callx_in_buffer like our old
version (and of course use ansi C, acessor macros, etc).
Index: src/emacs.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/emacs.c,v
retrieving revision 1.77
diff -u -r1.77 emacs.c
--- emacs.c 1998/05/14 04:46:24 1.77
+++ emacs.c 1998/05/15 03:42:38
＠＠ -1269,9 +1269,6 ＠＠
vars_of_extents ();
vars_of_faces ();
vars_of_fileio ();
-#ifdef CLASH_DETECTION
- vars_of_filelock ();
-#endif
vars_of_floatfns ();
vars_of_font_lock ();
vars_of_frame ();
＠＠ -1522,10 +1519,6 ＠＠
/* These two might call Ffile_name_as_directory(), which
might depend on all sorts of things; I'm not sure. */
complex_vars_of_emacs ();
-
-#ifdef CLASH_DETECTION
- complex_vars_of_filelock ();
-#endif /* CLASH_DETECTION */
/* This creates a couple of basic keymaps and depends on Lisp
hashtables and Ffset() (both of which depend on some variables
Index: src/filelock.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/filelock.c,v
retrieving revision 1.9
diff -u -r1.9 filelock.c
--- filelock.c 1998/03/31 20:11:41 1.9
+++ filelock.c 1998/05/15 03:42:39
＠＠ -1,24 +1,23 ＠＠
-/* Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994
- Free Software Foundation, Inc.
+/* Copyright (C) 1985, 86, 87, 93, 94, 96 Free Software Foundation, Inc.
-This file is part of XEmacs.
+This file is part of GNU Emacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
+along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* Synched up with: FSF 19.30. */
+/* Synced with FSF 20.2 */
#include <config.h>
#include "lisp.h"
＠＠ -31,186 +30,284 ＠＠
#include "syspwd.h"
#include "syssignal.h" /* for kill */
-#ifndef CLASH_DETECTION
-#error CLASH_DETECTION is not defined??
-#endif
+Lisp_Object Qask_user_about_supersession_threat;
+Lisp_Object Qask_user_about_lock;
-/* FSFmacs uses char *lock_dir and char *superlock_file instead of
- the Lisp variables we use. */
-/* The name of the directory in which we keep lock files, with a '/'
- appended. */
-Lisp_Object Vlock_directory, Vconfigure_lock_directory;
-
-#if 0 /* FSFmacs */
-/* Look in startup.el */
-/* The name of the file in the lock directory which is used to
- arbitrate access to the entire directory. */
-#define SUPERLOCK_NAME "!!!SuperLock!!!"
-#endif
+#ifdef CLASH_DETECTION
+
+/* The strategy: to lock a file FN, create a symlink .#FN in FN's
+ directory, with link data `user(a)host.pid'. This avoids a single
+ mount (== failure) point for lock files.
+
+ When the host in the lock data is the current host, we can check if
+ the pid is valid with kill.
+
+ Otherwise, we could look at a separate file that maps hostnames to
+ reboot times to see if the remote pid can possibly be valid, since we
+ don't want Emacs to have to communicate via pipes or sockets or
+ whatever to other processes, either locally or remotely; rms says
+ that's too unreliable. Hence the separate file, which could
+ theoretically be updated by daemons running separately -- but this
+ whole idea is unimplemented; in practice, at least in our
+ environment, it seems such stale locks arise fairly infrequently, and
+ Emacs' standard methods of dealing with clashes suffice.
+
+ We use symlinks instead of normal files because (1) they can be
+ stored more efficiently on the filesystem, since the kernel knows
+ they will be small, and (2) all the info about the lock can be read
+ in a single system call (readlink). Although we could use regular
+ files to be useful on old systems lacking symlinks, nowadays
+ virtually all such systems are probably single-user anyway, so it
+ didn't seem worth the complication.
+
+ Similarly, we don't worry about a possible 14-character limit on
+ file names, because those are all the same systems that don't have
+ symlinks.
+
+ This is compatible with the locking scheme used by Interleaf (which
+ has contributed this implementation for Emacs), and was designed by
+ Ethan Jacobson, Kimbo Mundy, and others.
+
+ --karl＠cs.umb.edu/karl(a)hq.ileaf.com. */
+
+
+/* Here is the structure that stores information about a lock. */
-/* The name of the superlock file. This is SUPERLOCK_NAME appended to
- Vlock_directory. */
-Lisp_Object Vsuperlock_file, Vconfigure_superlock_file;
+typedef struct
+{
+ char *user;
+ char *host;
+ unsigned long pid;
+} lock_info_type;
-Lisp_Object Qask_user_about_supersession_threat;
-Lisp_Object Qask_user_about_lock;
+/* When we read the info back, we might need this much more,
+ enough for decimal representation plus null. */
+#define LOCK_PID_MAX (4 * sizeof (unsigned long))
+
+/* Free the two dynamically-allocated pieces in PTR. */
+#define FREE_LOCK_INFO(i) do { xfree ((i).user); xfree ((i).host); } while (0)
-static void lock_superlock (CONST char *lfname);
-static int lock_file_1 (CONST char *lfname, int mode);
-static int lock_if_free (CONST char *lfname);
-static int current_lock_owner (CONST char *);
-static int current_lock_owner_1 (CONST char *);
-
-/* Set LOCK to the name of the lock file for the filename FILE.
- char *LOCK; Lisp_Object FILE;
-
- MAKE_LOCK_NAME assumes you have already verified that Vlock_directory
- is a string. */
-
-#ifndef HAVE_LONG_FILE_NAMES
-
-#define MAKE_LOCK_NAME(lock, file) \
- (lock = (char *) alloca (14 + XSTRING_LENGTH (Vlock_directory) + 1), \
- fill_in_lock_short_file_name (lock, (file)))
+
+/* Write the name of the lock file for FN into LFNAME. Length will be
+ that of FN plus two more for the leading `.#' plus one for the null. */
+#define MAKE_LOCK_NAME(lock, file) \
+ (lock = (char *) alloca (XSTRING_LENGTH(file) + 2 + 1), \
+ fill_in_lock_file_name (lock, (file)))
static void
-fill_in_lock_short_file_name (REGISTER char *lockfile, REGISTER Lisp_Object fn)
-{
- REGISTER union
- {
- unsigned int word [2];
- unsigned char byte [8];
- } crc;
- REGISTER unsigned char *p, new;
+fill_in_lock_file_name (lockfile, fn)
+ register char *lockfile;
+ register Lisp_Object fn;
+{
+ register char *p;
+
+ strcpy (lockfile, XSTRING_DATA(fn));
+
+ /* Shift the nondirectory part of the file name (including the null)
+ right two characters. Here is one of the places where we'd have to
+ do something to support 14-character-max file names. */
+ for (p = lockfile + strlen (lockfile); p != lockfile && *p != '/'; p--)
+ p[2] = *p;
+
+ /* Insert the `.#'. */
+ p[1] = '.';
+ p[2] = '#';
+}
- CHECK_STRING (Vlock_directory);
+/* Lock the lock file named LFNAME.
+ If FORCE is nonzero, we do so even if it is already locked.
+ Return 1 if successful, 0 if not. */
- /* 7-bytes cyclic code for burst correction on byte-by-byte basis.
- the used polynomial is D^7 + D^6 + D^3 +1. pot(a)cnuce.cnr.it */
+static int
+lock_file_1 (char *lfname,int force)
+{
+ register int err;
+ char *user_name;
+ char *host_name;
+ char *lock_info_str;
- crc.word[0] = crc.word[1] = 0;
+ if (STRINGP (Fuser_login_name (Qnil)))
+ user_name = (char *)XSTRING_DATA((Fuser_login_name (Qnil)));
+ else
+ user_name = "";
+ if (STRINGP (Fsystem_name ()))
+ host_name = (char *)XSTRING_DATA((Fsystem_name ()));
+ else
+ host_name = "";
+ lock_info_str = (char *)alloca (strlen (user_name) + strlen (host_name)
+ + LOCK_PID_MAX + 5);
+
+ sprintf (lock_info_str, "%s(a)%s.%lu", user_name, host_name,
+ (unsigned long) getpid ());
- for (p = XSTRING_DATA (fn); new = *p++; )
+ err = symlink (lock_info_str, lfname);
+ if (errno == EEXIST && force)
{
- new += crc.byte[6];
- crc.byte[6] = crc.byte[5] + new;
- crc.byte[5] = crc.byte[4];
- crc.byte[4] = crc.byte[3];
- crc.byte[3] = crc.byte[2] + new;
- crc.byte[2] = crc.byte[1];
- crc.byte[1] = crc.byte[0];
- crc.byte[0] = new;
+ unlink (lfname);
+ err = symlink (lock_info_str, lfname);
}
- {
- int need_slash = 0;
-
- /* in case lock-directory doesn't end in / */
- if (XSTRING_BYTE (Vlock_directory,
- XSTRING_LENGTH (Vlock_directory) - 1) != '/')
- need_slash = 1;
-
- sprintf (lockfile, "%s%s%.2x%.2x%.2x%.2x%.2x%.2x%.2x",
- (char *) XSTRING_DATA (Vlock_directory),
- need_slash ? "/" : "",
- crc.byte[0], crc.byte[1], crc.byte[2], crc.byte[3],
- crc.byte[4], crc.byte[5], crc.byte[6]);
- }
+ return err == 0;
}
-#else /* defined HAVE_LONG_FILE_NAMES */
-/* +2 for terminating null and possible extra slash */
-#define MAKE_LOCK_NAME(lock, file) \
- (lock = (char *) alloca (XSTRING_LENGTH (file) + \
- XSTRING_LENGTH (Vlock_directory) + 2), \
- fill_in_lock_file_name (lock, (file)))
+
+/* Return 0 if nobody owns the lock file LFNAME or the lock is obsolete,
+ 1 if another process owns it (and set OWNER (if non-null) to info),
+ 2 if the current process owns it,
+ or -1 if something is wrong with the locking mechanism. */
-static void
-fill_in_lock_file_name (REGISTER char *lockfile, REGISTER Lisp_Object fn)
- /* fn must be a Lisp_String! */
+static int
+current_lock_owner (lock_info_type *owner, char *lfname)
{
- REGISTER char *p;
-
- CHECK_STRING (Vlock_directory);
-
- strcpy (lockfile, (char *) XSTRING_DATA (Vlock_directory));
-
- p = lockfile + strlen (lockfile);
-
- if (p == lockfile /* lock-directory is empty?? */
- || *(p - 1) != '/') /* in case lock-directory doesn't end in / */
+#ifndef index
+ extern char *rindex (), *index ();
+#endif
+ int o, p, len, ret;
+ int local_owner = 0;
+ char *at, *dot;
+ char *lfinfo = 0;
+ int bufsize = 50;
+ /* Read arbitrarily-long contents of symlink. Similar code in
+ file-symlink-p in fileio.c. */
+ do
{
- *p = '/';
- p++;
+ bufsize *= 2;
+ lfinfo = (char *) xrealloc (lfinfo, bufsize);
+ len = readlink (lfname, lfinfo, bufsize);
+ }
+ while (len >= bufsize);
+
+ /* If nonexistent lock file, all is well; otherwise, got strange error. */
+ if (len == -1)
+ {
+ xfree (lfinfo);
+ return errno == ENOENT ? 0 : -1;
}
- strcpy (p, (char *) XSTRING_DATA (fn));
-
- for (; *p; p++)
+ /* Link info exists, so `len' is its length. Null terminate. */
+ lfinfo[len] = 0;
+
+ /* Even if the caller doesn't want the owner info, we still have to
+ read it to determine return value, so allocate it. */
+ if (!owner)
+ {
+ owner = (lock_info_type *) alloca (sizeof (lock_info_type));
+ local_owner = 1;
+ }
+
+ /* Parse USER(a)HOST.PID. If can't parse, return -1. */
+ /* The USER is everything before the first ＠. */
+ at = index (lfinfo, '＠');
+ dot = rindex (lfinfo, '.');
+ if (!at || !dot) {
+ xfree (lfinfo);
+ return -1;
+ }
+ len = at - lfinfo;
+ owner->user = (char *) xmalloc (len + 1);
+ strncpy (owner->user, lfinfo, len);
+ owner->user[len] = 0;
+
+ /* The PID is everything after the last `.'. */
+ owner->pid = atoi (dot + 1);
+
+ /* The host is everything in between. */
+ len = dot - at - 1;
+ owner->host = (char *) xmalloc (len + 1);
+ strncpy (owner->host, at + 1, len);
+ owner->host[len] = 0;
+
+ /* We're done looking at the link info. */
+ xfree (lfinfo);
+
+ /* On current host? */
+ if (STRINGP (Fsystem_name ())
+ && strcmp (owner->host, XSTRING_DATA(Fsystem_name ())) == 0)
+ {
+ if (owner->pid == getpid ())
+ ret = 2; /* We own it. */
+ else if (owner->pid > 0
+ && (kill (owner->pid, 0) >= 0 || errno == EPERM))
+ ret = 1; /* An existing process on this machine owns it. */
+ /* The owner process is dead or has a strange pid (<=0), so try to
+ zap the lockfile. */
+ else if (unlink (lfname) < 0)
+ ret = -1;
+ else
+ ret = 0;
+ }
+ else
+ { /* If we wanted to support the check for stale locks on remote machines,
+ here's where we'd do it. */
+ ret = 1;
+ }
+
+ /* Avoid garbage. */
+ if (local_owner || ret <= 0)
{
- if (*p == '/')
- *p = '!';
+ FREE_LOCK_INFO (*owner);
}
+ return ret;
}
-#endif /* !defined HAVE_LONG_FILE_NAMES */
-static Lisp_Object
-lock_file_owner_name (CONST char *lfname)
+
+/* Lock the lock named LFNAME if possible.
+ Return 0 in that case.
+ Return positive if some other process owns the lock, and info about
+ that process in CLASHER.
+ Return -1 if cannot lock for any other reason. */
+
+static int
+lock_if_free (lock_info_type *clasher, char *lfname)
{
- struct stat s;
- struct passwd *the_pw = 0;
+ if (lock_file_1 (lfname, 0) == 0)
+ {
+ int locker;
- if (lstat (lfname, &s) == 0)
- the_pw = getpwuid (s.st_uid);
- return (the_pw == 0 ? Qnil : build_string (the_pw->pw_name));
-}
+ if (errno != EEXIST)
+ return -1;
+
+ locker = current_lock_owner (clasher, lfname);
+ if (locker == 2)
+ {
+ FREE_LOCK_INFO (*clasher);
+ return 0; /* We ourselves locked it. */
+ }
+ else if (locker == 1)
+ return 1; /* Someone else has it. */
+ return -1; /* Something's wrong. */
+ }
+ return 0;
+}
-/* lock_file locks file fn,
+/* lock_file locks file FN,
meaning it serves notice on the world that you intend to edit that file.
This should be done only when about to modify a file-visiting
buffer previously unmodified.
- Do not (normally) call lock_buffer for a buffer already modified,
+ Do not (normally) call this for a buffer already modified,
as either the file is already locked, or the user has already
decided to go ahead without locking.
- When lock_buffer returns, either the lock is locked for us,
+ When this returns, either the lock is locked for us,
or the user has said to go ahead without locking.
- If the file is locked by someone else, lock_buffer calls
+ If the file is locked by someone else, this calls
ask-user-about-lock (a Lisp function) with two arguments,
- the file name and the name of the user who did the locking.
+ the file name and info about the user who did the locking.
This function can signal an error, or return t meaning
take away the lock, or return nil meaning ignore the lock. */
-/* The lock file name is the file name with "/" replaced by "!"
- and put in the Emacs lock directory. */
-/* (ie., /ka/king/junk.tex -> /!/!ka!king!junk.tex). */
-
-/* If HAVE_LONG_FILE_NAMES is not defined, the lock file name is the hex
- representation of a 14-bytes CRC generated from the file name
- and put in the Emacs lock directory (not very nice, but it works).
- (ie., /ka/king/junk.tex -> /!/12a82c62f1c6da). */
-
void
lock_file (Lisp_Object fn)
{
- /* This function can GC. */
- /* dmoore - and can destroy current_buffer and all sorts of other
- mean nasty things with pointy teeth. If you call this make sure
- you protect things right. */
-
- REGISTER Lisp_Object attack, orig_fn;
- REGISTER char *lfname;
- struct gcpro gcpro1, gcpro2;
- Lisp_Object subject_buf = Qnil;
-
- if (NILP (Vlock_directory) || NILP (Vsuperlock_file))
- return;
- CHECK_STRING (fn);
- CHECK_STRING (Vlock_directory);
+ register Lisp_Object attack, orig_fn;
+ register char *lfname, *locker;
+ lock_info_type lock_info;
+ struct gcpro gcpro1,gcpro2;
+ Lisp_Object subject_buf;
GCPRO2 (fn, subject_buf);
orig_fn = fn;
＠＠ -221,29 +318,34 ＠＠
/* See if this file is visited and has changed on disk since it was
visited. */
- subject_buf = Fget_file_buffer (fn);
- if (!NILP (subject_buf)
- && NILP (Fverify_visited_file_modtime (subject_buf))
- && !NILP (Ffile_exists_p (fn)))
- call1_in_buffer (XBUFFER (subject_buf),
- Qask_user_about_supersession_threat, fn);
+ {
+ subject_buf = get_truename_buffer (orig_fn);
+ if (!NILP (subject_buf)
+ && NILP (Fverify_visited_file_modtime (subject_buf))
+ && !NILP (Ffile_exists_p (fn)))
+ call1_in_buffer (XBUFFER(subject_buf),
+ Qask_user_about_supersession_threat, fn);
+ }
/* Try to lock the lock. */
- if (lock_if_free (lfname) <= 0)
- /* Return now if we have locked it, or if lock dir does not exist */
+ if (lock_if_free (&lock_info, lfname) <= 0)
+ /* Return now if we have locked it, or if lock creation failed */
goto done;
/* Else consider breaking the lock */
+ locker = (char *) alloca (strlen (lock_info.user) + strlen (lock_info.host)
+ + LOCK_PID_MAX + 9);
+ sprintf (locker, "%s＠%s (pid %lu)", lock_info.user, lock_info.host,
+ lock_info.pid);
+ FREE_LOCK_INFO (lock_info);
+
attack = call2_in_buffer (BUFFERP (subject_buf) ? XBUFFER (subject_buf) :
- current_buffer, Qask_user_about_lock, fn,
- lock_file_owner_name (lfname));
+ current_buffer, Qask_user_about_lock , fn,
+ build_string (locker));
if (!NILP (attack))
/* User says take the lock */
{
- CHECK_STRING (Vsuperlock_file);
- lock_superlock (lfname);
- lock_file_1 (lfname, O_WRONLY);
- unlink ((char *) XSTRING_DATA (Vsuperlock_file));
+ lock_file_1 (lfname, 1);
goto done;
}
/* User says ignore the lock */
＠＠ -251,197 +353,46 ＠＠
UNGCPRO;
}
-
-/* Lock the lock file named LFNAME.
- If MODE is O_WRONLY, we do so even if it is already locked.
- If MODE is O_WRONLY | O_EXCL | O_CREAT, we do so only if it is free.
- Return 1 if successful, 0 if not. */
-
-static int
-lock_file_1 (CONST char *lfname, int mode)
-{
- REGISTER int fd;
- char buf[20];
-
- if ((fd = open (lfname, mode, 0666)) >= 0)
- {
-#if defined(WINDOWSNT)
- chmod(lfname, _S_IREAD|_S_IWRITE);
-#elif defined(USG)
- chmod (lfname, 0666);
-#else
- fchmod (fd, 0666);
-#endif
- sprintf (buf, "%ld ", (long) getpid ());
- write (fd, buf, strlen (buf));
- close (fd);
- return 1;
- }
- else
- return 0;
-}
-
-/* Lock the lock named LFNAME if possible.
- Return 0 in that case.
- Return positive if lock is really locked by someone else.
- Return -1 if cannot lock for any other reason. */
-
-static int
-lock_if_free (CONST char *lfname)
-{
- REGISTER int clasher;
-
- while (lock_file_1 (lfname, O_WRONLY | O_EXCL | O_CREAT) == 0)
- {
- if (errno != EEXIST)
- return -1;
- clasher = current_lock_owner (lfname);
- if (clasher != 0)
- if (clasher != getpid ())
- return (clasher);
- else return (0);
- /* Try again to lock it */
- }
- return 0;
-}
-
-/* Return the pid of the process that claims to own the lock file LFNAME,
- or 0 if nobody does or the lock is obsolete,
- or -1 if something is wrong with the locking mechanism. */
-
-static int
-current_lock_owner (CONST char *lfname)
-{
- int owner = current_lock_owner_1 (lfname);
- if (owner == 0 && errno == ENOENT)
- return (0);
- /* Is it locked by a process that exists? */
- if (owner != 0 && (kill (owner, 0) >= 0 || errno == EPERM))
- return (owner);
- if (unlink (lfname) < 0)
- return (-1);
- return (0);
-}
-
-static int
-current_lock_owner_1 (CONST char *lfname)
-{
- REGISTER int fd;
- char buf[20];
- int tem;
-
- fd = open (lfname, O_RDONLY, 0666);
- if (fd < 0)
- return 0;
- tem = read (fd, buf, sizeof buf);
- close (fd);
- return (tem <= 0 ? 0 : atoi (buf));
-}
-
-
void
unlock_file (Lisp_Object fn)
{
- /* This function can GC. */
- /* dmoore - and can destroy current_buffer and all sorts of other
- mean nasty things with pointy teeth. If you call this make sure
- you protect things right. */
-
- REGISTER char *lfname;
- if (NILP (Vlock_directory) || NILP (Vsuperlock_file)) return;
- CHECK_STRING (fn);
- CHECK_STRING (Vlock_directory);
- CHECK_STRING (Vsuperlock_file);
+ register char *lfname;
fn = Fexpand_file_name (fn, Qnil);
MAKE_LOCK_NAME (lfname, fn);
- lock_superlock (lfname);
-
- if (current_lock_owner_1 (lfname) == getpid ())
+ if (current_lock_owner (0, lfname) == 2)
unlink (lfname);
-
- unlink ((char *) XSTRING_DATA (Vsuperlock_file));
-}
-
-static void
-lock_superlock (CONST char *lfname)
-{
- REGISTER int i, fd;
- DIR *lockdir;
-
- for (i = -20; i < 0 &&
- (fd = open ((char *) XSTRING_DATA (Vsuperlock_file),
- O_WRONLY | O_EXCL | O_CREAT, 0666)) < 0;
- i++)
- {
- if (errno != EEXIST)
- return;
-
- /* This seems to be necessary to prevent Emacs from hanging when the
- competing process has already deleted the superlock, but it's still
- in the NFS cache. So we force NFS to synchronize the cache. */
- lockdir = opendir ((char *) XSTRING_DATA (Vlock_directory));
- if (lockdir)
- closedir (lockdir);
-
- emacs_sleep (1);
- }
- if (fd >= 0)
- {
-#if defined(WINDOWSNT)
- chmod(lfname, _S_IREAD|_S_IWRITE);
-#elif defined(USG)
- chmod ((char *) XSTRING_DATA (Vsuperlock_file), 0666);
-#else
- fchmod (fd, 0666);
-#endif
- write (fd, lfname, strlen (lfname));
- close (fd);
- }
}
void
-unlock_all_files (void)
+unlock_all_files ()
{
- /* This function can GC. */
-
- Lisp_Object tail;
- REGISTER struct buffer *b;
- struct gcpro gcpro1;
+ register Lisp_Object tail;
+ register struct buffer *b;
- GCPRO1 (tail);
- for (tail = Vbuffer_alist; GC_CONSP (tail);
- tail = XCDR (tail))
+ for (tail = Vbuffer_alist; GC_CONSP (tail); tail = XCDR (tail))
{
b = XBUFFER (XCDR (XCAR (tail)));
- if (STRINGP (b->file_truename) &&
- BUF_SAVE_MODIFF (b) < BUF_MODIFF (b))
+ if (STRINGP (b->file_truename) && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b))
unlock_file (b->file_truename);
}
- UNGCPRO;
}
-
-DEFUN ("lock-buffer", Flock_buffer, 0, 1, 0, /*
-Lock FILE, if current buffer is modified.
-FILE defaults to current buffer's visited file,
+DEFUN ("lock-buffer", Flock_buffer, 0, 1, 0, /*
+ Lock FILE, if current buffer is modified.\n\
+FILE defaults to current buffer's visited file,\n\
or else nothing is done if current buffer isn't visiting a file.
*/
- (fn))
+ (file))
{
- /* This function can GC */
- /* dmoore - and can destroy current_buffer and all sorts of other
- mean nasty things with pointy teeth. If you call this make sure
- you protect things right. */
-
- if (NILP (fn))
- fn = current_buffer->file_truename;
- CHECK_STRING (fn);
+ if (NILP (file))
+ file = current_buffer->file_truename;
+ CHECK_STRING (file);
if (BUF_SAVE_MODIFF (current_buffer) < BUF_MODIFF (current_buffer)
- && !NILP (fn))
- lock_file (fn);
+ && !NILP (file))
+ lock_file (file);
return Qnil;
}
＠＠ -462,9 +413,9 ＠＠
return Qnil;
}
-
/* Unlock the file visited in buffer BUFFER. */
+
void
unlock_buffer (struct buffer *buffer)
{
＠＠ -478,32 +429,37 ＠＠
}
DEFUN ("file-locked-p", Ffile_locked_p, 0, 1, 0, /*
-Return nil if the FILENAME is not locked,
+ Return nil if the FILENAME is not locked,\n\
t if it is locked by you, else a string of the name of the locker.
*/
- (fn))
+ (filename))
{
- /* This function can GC */
- REGISTER char *lfname;
+ Lisp_Object ret;
+ register char *lfname;
int owner;
+ lock_info_type locker;
- if (NILP (Vlock_directory) || NILP (Vsuperlock_file))
- return Qnil;
- CHECK_STRING (Vlock_directory);
+ filename = Fexpand_file_name (filename, Qnil);
- fn = Fexpand_file_name (fn, Qnil);
+ MAKE_LOCK_NAME (lfname, filename);
- MAKE_LOCK_NAME (lfname, fn);
-
- owner = current_lock_owner (lfname);
+ owner = current_lock_owner (&locker, lfname);
if (owner <= 0)
- return Qnil;
- else if (owner == getpid ())
- return Qt;
+ ret = Qnil;
+ else if (owner == 2)
+ ret = Qt;
+ else
+ ret = build_string (locker.user);
- return lock_file_owner_name (lfname);
+ if (owner > 0)
+ FREE_LOCK_INFO (locker);
+
+ return ret;
}
+
+/* Initialization functions. */
+
void
syms_of_filelock (void)
{
＠＠ -517,40 +473,5 ＠＠
defsymbol (&Qask_user_about_lock, "ask-user-about-lock");
}
-void
-vars_of_filelock (void)
-{
- DEFVAR_LISP ("lock-directory", &Vlock_directory /*
-Don't change this
-*/ );
- Vlock_directory = Qnil;
- DEFVAR_LISP ("superlock-file", &Vsuperlock_file /*
-Don't change this
-*/ );
- Vsuperlock_file = Qnil;
-}
-void
-complex_vars_of_filelock (void)
-{
- DEFVAR_LISP ("configure-lock-directory", &Vconfigure_lock_directory /*
-For internal use by the build procedure only.
-configure's idea of what LOCK-DIRECTORY will be.
-*/ );
-#ifdef PATH_LOCK
- Vconfigure_lock_directory =
- Ffile_name_as_directory (build_string (PATH_LOCK));
-#else
- Vconfigure_lock_directory = Qnil;
-#endif
- DEFVAR_LISP ("configure-superlock-file", &Vconfigure_superlock_file /*
-For internal use by the build procedure only.
-configure's idea of what SUPERLOCK-FILE will be.
-*/ );
-#ifdef PATH_SUPERLOCK
- Vconfigure_superlock_file = build_string (PATH_SUPERLOCK);
-#else
- Vconfigure_superlock_file = Qnil;
-#endif
- /* All the rest done dynamically by startup.el */
-}
+#endif /* CLASH_DETECTION */
Index: src/lisp.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/lisp.h,v
retrieving revision 1.32
diff -u -r1.32 lisp.h
--- lisp.h 1998/05/12 01:06:47 1.32
+++ lisp.h 1998/05/15 03:42:41
＠＠ -2684,6 +2684,7 ＠＠
EXFUN (Fsymbol_name, 1);
EXFUN (Fsymbol_plist, 1);
EXFUN (Fsymbol_value, 1);
+EXFUN (Fsystem_name, 0);
EXFUN (Fthrow, 2);
EXFUN (Ftimes, MANY);
EXFUN (Ftruncate, 1);
- 1 participants
- 0 comments
Re: enable-clash-detection
26 years, 6 months
William M. Perry
William M. Perry
Georg Nikodym <georgn(a)canada.sun.com> writes:
> >>>>> "Hrvoje" == Hrvoje Niksic <hniksic(a)srce.hr> writes:
>
> Hrvoje> SL Baur <steve(a)xemacs.org> writes:
> >> > 2. Is the default (disabled) intentional?
> >>
> >> I vaguely remember it being intentional. There are definitely
> >> problems with the implementation.
>
> Yup. I started it and Martin hacked it into configure.
>
> Hrvoje> I think we should reenable the clash detection by default,
> Hrvoje> and fix the problems if/when they arise.
>
> Clash detection is an incredible fucking drag in an environment such as
> the one here. The environment is many machines with a a bunch of NFS
> servers. In order for clash detection (in its current design) to have
> any value whatsoever the lock-directory needs to be a common NFS
> directory. Now everybody in the group (which here is 75 engineers)
> serializes on NFS creation (exclusive) of !!SUPERLOCK!! in the lock
> directory. It's really hard to explain to the spoiled bastard that has a
> 4 CPU ultra that he has to wait for an NFS server to listen to him before
> he can to a find-file on a local disk path!
>
> Sorry, but I feel pretty strongly about this one.
Well, obviously you need to find someone in marketing/development to
provide 4 CPU ultras to all the main XEmacs developers so that they can
feel this incredible pain and be just that much more inclined to fix the
problem. Because we all know problems we are getting bit by get first
priority. :)
Then they just need a public NFS server that they could put their lock
directory on from the various areas of the country. then they would
_REALLY_ fix it quick. :)
-Bill P.
- 2 participants
- 1 comments
RE: 21.0-b40-pre4: Wierdness in about page on NT
26 years, 6 months
Damon Lipparelli
Damon Lipparelli
Under Solaris, the cursor is displayed the same size on every line.
-lipp
>>>> -----Original Message-----
>>>> From: Kirill M. Katsnelson [mailto:kkm＠kis.ru]
>>>> Sent: Thursday, May 14, 1998 11:41 AM
>>>> To: xemacs-beta(a)xemacs.org
>>>> Subject: Re: 21.0-b40-pre4: Wierdness in about page on NT
>>>>
>>>>
>>>> Some time ago, Damon Lipparelli wrote...
>>>> |+
>>>> | With the NT native build, including native XPM support:
>>>> In the "about"
>>>> | page, when next to the XEmacs logo, the cursor is the
>>>> height of the
>>>> | logo.
>>>> |
>>>> | Has anyone else seen this?
>>>> |-
>>>>
>>>> Yes I have. To be absolutely honest, it was me who
>>>> implemented this.
>>>> Do you have any ideas on how a cursor should look over a
>>>> picture glyph?
>>>> In X, it is drawn as a bar on top of an image, full image width.
>>>> This is weird as well. We need a bright idea on how this
>>>> hould be done.
>>>>
>>>> Kirill
>>>>
>>>>
- 1 participants
- 0 comments
Fonts screwed up by Netscape
26 years, 6 months
Samuel Tardieu
Samuel Tardieu
If I launch Netscape before launching Gnus, I get ugly fonts in the
*Summary* buffer, while they are just fine (similar to the ones used
in the *Article* buffer) if Netscape is launched after XEmacs.
Here is an example of ugly fonts:
Does anyone have an idea of where it could come from? (using 21.0
Pygmy on Linux/x86/XFree86 3.3.2)
Sam
--
Samuel Tardieu -- sam(a)inf.enst.fr
- 1 participants
- 0 comments
Re: size of XEmacs binary under Sparc/Solaris 2
26 years, 6 months
Didier Verna
Didier Verna
Georg Nikodym <georgn(a)canada.sun.com> writes:
> Some points on this thread:
Thanks for these clarifications. Linkage is less of a mystery to me
now ... indeed, libXm.so (in my X11R6 dir) contains links to openwin X libs,
which explains the lib replication.
--
/ / _ _ Didier Verna http://www.inf.enst.fr/~verna/
- / / - / / /_/ / E.N.S.T. INF C214 mailto:verna＠inf.enst.fr
/_/ / /_/ / /__ / 46 rue Barrault Tel. (33) 01 45 81 80 72
75634 Paris cedex 13 Fax. (33) 01 45 81 31 19
- 1 participants
- 0 comments
Re: size of XEmacs binary under Sparc/Solaris 2
26 years, 6 months
Raymond Toy
Raymond Toy
Didier Verna <verna(a)inf.enst.fr> writes:
> Olivier Galibert <galibert(a)pobox.com> writes:
>
> > Including two different versions on the same library can be quite
> > dangerous.
>
> My solaris xemacs binray has duplicate libs too (mainly openwin and
> X11R6). It's not the only one ... nearly all of the apps I write have this too
> ! I've never understood why, and how this can work at all:
Me too! I had always just assumed that the first one listed won. (Or
was it the last one listed?) You can't possibly use both can you? I
mean the function names don't have version numbers in them, so only
one lib would be used. Or would the choice of lib be random for each
function?
The scary thing is that everything appears to be working just fine.
>
> libXt.so.5.0 => /usr/X11/lib/libXt.so.5.0
> libXt.so.4 => /usr/openwin/lib/libXt.so.4
>
> libXext.so.5.0 => /usr/X11/lib/libXext.so.5.0
> libXext.so.0 => /usr/openwin/lib/libXext.so.0
>
> libX11.so.5.0 => /usr/X11/lib/libX11.so.5.0
> libX11.so.4 => /usr/openwin/lib/libX11.so.4
>
> Can somebody give me an explanation ?
I think the openwin libs come from libXm. If you do an ldd on libXm,
you'll see links to openwin. I checked my config, and the link phase
definitely does not use openwin.
I'm thinking that for all of my future builds, I'm just going to
forget about X11R6 and just use the openwin stuff, if I can convince
my setup and config to do so.
Ray
- 2 participants
- 1 comments
Re: [Q] mirroring the xemacs CVS archive ?
26 years, 6 months
Didier Verna
Didier Verna
While we're at it .... sorry to ask those stupid questions, but I
`cvs checkout' xemacs for the first time today:
- it's called xemacs-20 not 21 ?
- what's in there seems pretty different from what's in the tarballs. For
instance, there's much more stuff in the lisp dir that seems to conflict
with the packages.
- After `configure'ing and `gmake'ing, I got a full bunch of messages like:
"error: dumped file nyanya.elc does not exist", and then it failed
completely saying "mule-charset not found".
bear with me my friends...
--
/ / _ _ Didier Verna http://www.inf.enst.fr/~verna/
- / / - / / /_/ / E.N.S.T. INF C214 mailto:verna＠inf.enst.fr
/_/ / /_/ / /__ / 46 rue Barrault Tel. (33) 01 45 81 80 72
75634 Paris cedex 13 Fax. (33) 01 45 81 31 19
- 1 participants
- 0 comments
Re: MULE & fonts
26 years, 6 months
William M. Perry
William M. Perry
"Stephen J. Turnbull" <turnbull(a)sk.tsukuba.ac.jp> writes:
> >>>>> "Glynn" == Glynn Clements <glynn(a)sensei.co.uk> writes:
>
> Glynn> Olivier Galibert wrote:
>
> >> Anyone has the slightest idea on how we should handle font
> >> selection in XEmacs ? The Emacs fontset approach looks very
> >> difficult to use, and you have to provide one for each size you
> >> want your characters in. If someday we add truetype support
> >> either in the redisplay engine or the X server, the fontset
> >> concept explodes.
>
> Glynn> Would Motif's XmString/XmFontList approach work?
>
> A naive implementation would suffer from the same problems as far as I
> can tell; an XmFontList seems to based on an XFontSet, and defaults to
> rendering X Compound Text using the current locale. A more sophisticated
> implementation using tags would require that we add those semantics to
> non-Motif X font handling and all Windose font handling. Yuck.
>
> I think we need to decide the semantics we want, redesign it from the
> ground up, and then figure out ways to implement on all platforms: TTY,
> X, Motif, Windose.
>
> I like the three-dimensional approach in the Options menu (family, size,
> weight) for the default; we might want to allow more flexible
> specification if the font descriptions will support it (sans- v. serif),
> for example. And it would be nice to implement a way to prevent the
> server (as much as possible, this being X) from returning scaled versions
> of bitmap fonts.
>
> As much as possible, we should make it easier for users and programmers
> to select font schemes (so that font sizes and so on can be specified
> relative to the buffer's default face) than individual fonts.
>
> Maybe model it on HTML style sheets? Bill Perry has already written code
> for dealing with those.
The stuff in font.el that Emacs/W3 and custom-face use is not dependent
on style sheet stuff at all. I wrote that with the intention of eventually
moving it over into C and part of the core redisplay stuff, but I just
haven't had the time.
The problem would be merging properties, ie: you have 2 overlapping
extents, one with 'family=arial', and 'bold' set, the other with 'italic'
and 'size=28pt' set... but I guess we could cache all that somehow. Each
device would have a 'getfont' method that we could pass in an 'EmacsFont'
instance to, and it would just return the closest it could find.
Anybody want to hack on this? i'm not going to have any time for a
while, but I can still throw ideas out. :)
-Bill P.
- 1 participants
- 0 comments
FSF/Interleaf style clash detection
26 years, 6 months
Jan Vroonhof
Jan Vroonhof
[It is probably abuse of xemacs-patches to send in tentative stuff
like this but I am not sure and the feature deadline is close.]
As I am writing this an XEmacs is building that passed compiling the
attached filelock.c file without much trouble
(--with-clash-detectio=yes).
This file is a naive port of the FSF 20.2 version of filelock.c that
implements the new link base file locking.
It still needs
1. Testing
2. Looking over by somebody for which this is not the largest C
contribution to XEmacs ever.
3. Looking over by the NT folk since they don't have symlynk
4. Changelogs.
5. Check that I didn't loose XEmacs improvements.
(The old file used call1_in_buffer)
Unfortunately my time is up (I need to be off to Rugby training in -20
minutes). I am hoping somebody can finish this before the deadline.
Jan
P.S. You need to add Fsystem_name to lisp.h
- 1 participants
- 0 comments
Saanen-pre4 and news
26 years, 6 months
Michael Harnois
Michael Harnois
Damn. Just a quick message as I go out the door: I just built
Saanen-pre4 from CVS and Gnus won't open my news server. Is there
anything that changed that could possibly cause this, or is it
coincidental with something else I could have done? I can telnet to
the server from this machine ...
--
Michael D. Harnois, Redeemer Lutheran Church, Washburn, IA
mharnois(a)sbt.net aa0bt(a)aa0bt.ampr.org
Everything I did in my life that was worthwhile,
I caught hell for. -- Earl Warren
- 1 participants
- 0 comments