Mercurial > hg > xemacs-beta
view src/filelock.c @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 804517e16990 |
children | a8d8f419b459 |
line wrap: on
line source
/* Copyright (C) 1985, 86, 87, 93, 94, 96 Free Software Foundation, Inc. Copyright (C) 2001 Ben Wing. This file is part of XEmacs. 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. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synced with FSF 20.2 */ #include <config.h> #include "lisp.h" #include "buffer.h" #include <paths.h> #include "sysdir.h" #include "sysfile.h" #include "sysproc.h" /* for qxe_getpid() */ #include "syspwd.h" #include "syssignal.h" /* for kill. */ Lisp_Object Qask_user_about_supersession_threat; Lisp_Object Qask_user_about_lock; int inhibit_clash_detection; #ifdef CLASH_DETECTION /* The strategy: to lock a file FN, create a symlink .#FN in FN's directory, with link data `user@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@hq.ileaf.com. */ /* Here is the structure that stores information about a lock. */ typedef struct { Ibyte *user; Ibyte *host; pid_t pid; } lock_info_type; /* When we read the info back, we might need this much more, enough for decimal representation plus null. */ #define LOCK_PID_MAX (4 * sizeof (pid_t)) /* Free the two dynamically-allocated pieces in PTR. */ #define FREE_LOCK_INFO(i) do { xfree ((i).user); xfree ((i).host); } while (0) /* 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 = (Ibyte *) ALLOCA (XSTRING_LENGTH (file) + 2 + 1), \ fill_in_lock_file_name (lock, file)) static void fill_in_lock_file_name (Ibyte *lockfile, Lisp_Object fn) { Ibyte *file_name = XSTRING_DATA (fn); Ibyte *p; Bytecount dirlen; for (p = file_name + XSTRING_LENGTH (fn) - 1; p > file_name && !IS_ANY_SEP (p[-1]); p--) ; dirlen = p - file_name; memcpy (lockfile, file_name, dirlen); p = lockfile + dirlen; *(p++) = '.'; *(p++) = '#'; memcpy (p, file_name + dirlen, XSTRING_LENGTH (fn) - dirlen + 1); } /* 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. */ static int lock_file_1 (Ibyte *lfname, int force) { /* Does not GC. */ int err; Ibyte *lock_info_str; Ibyte *host_name; Ibyte *user_name = user_login_name (NULL); if (user_name == NULL) user_name = (Ibyte *) ""; if (STRINGP (Vsystem_name)) host_name = XSTRING_DATA (Vsystem_name); else host_name = (Ibyte *) ""; lock_info_str = (Ibyte *) ALLOCA (qxestrlen (user_name) + qxestrlen (host_name) + LOCK_PID_MAX + 5); qxesprintf (lock_info_str, "%s@%s.%d", user_name, host_name, qxe_getpid ()); err = qxe_symlink (lock_info_str, lfname); if (err != 0 && errno == EEXIST && force) { qxe_unlink (lfname); err = qxe_symlink (lock_info_str, lfname); } return err == 0; } /* 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 int current_lock_owner (lock_info_type *owner, Ibyte *lfname) { /* Does not GC. */ int len, ret; int local_owner = 0; Ibyte *at, *dot; Ibyte *lfinfo = 0; int bufsize = 50; /* Read arbitrarily-long contents of symlink. Similar code in file-symlink-p in fileio.c. */ do { bufsize *= 2; lfinfo = (Ibyte *) xrealloc (lfinfo, bufsize); len = qxe_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; } /* 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@HOST.PID. If can't parse, return -1. */ /* The USER is everything before the first @. */ at = qxestrchr (lfinfo, '@'); dot = qxestrrchr (lfinfo, '.'); if (!at || !dot) { xfree (lfinfo); return -1; } len = at - lfinfo; owner->user = (Ibyte *) xmalloc (len + 1); qxestrncpy (owner->user, lfinfo, len); owner->user[len] = 0; /* The PID is everything after the last `.'. */ owner->pid = atoi ((CIbyte *) dot + 1); /* The host is everything in between. */ len = dot - at - 1; owner->host = (Ibyte *) xmalloc (len + 1); qxestrncpy (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 ()) && qxestrcmp (owner->host, XSTRING_DATA (Fsystem_name ())) == 0) { if (owner->pid == qxe_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 (qxe_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) { FREE_LOCK_INFO (*owner); } return ret; } /* 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, Ibyte *lfname) { /* Does not GC. */ if (lock_file_1 ((Ibyte *) lfname, 0) == 0) { int locker; 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, 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 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 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, this calls ask-user-about-lock (a Lisp function) with two arguments, 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. */ void lock_file (Lisp_Object fn) { /* This function can GC. GC checked 7-11-00 ben */ /* 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. */ /* Somebody updated the code in this function and removed the previous comment. -slb */ register Lisp_Object attack, orig_fn; register Ibyte *lfname, *locker; lock_info_type lock_info; struct gcpro gcpro1, gcpro2, gcpro3; Lisp_Object old_current_buffer; Lisp_Object subject_buf; if (inhibit_clash_detection) return; old_current_buffer = wrap_buffer (current_buffer); subject_buf = Qnil; GCPRO3 (fn, subject_buf, old_current_buffer); orig_fn = fn; fn = Fexpand_file_name (fn, Qnil); /* Create the name of the lock-file for file fn */ MAKE_LOCK_NAME (lfname, fn); /* See if this file is visited and has changed on disk since it was visited. */ { 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 (current_buffer != XBUFFER (old_current_buffer) || lock_if_free (&lock_info, lfname) <= 0) /* Return now if we have locked it, or if lock creation failed or current buffer is killed. */ goto done; /* Else consider breaking the lock */ locker = (Ibyte *) ALLOCA (qxestrlen (lock_info.user) + qxestrlen (lock_info.host) + LOCK_PID_MAX + 9); qxesprintf (locker, "%s@%s (pid %d)", 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, build_intstring (locker)); if (!NILP (attack) && current_buffer == XBUFFER (old_current_buffer)) /* User says take the lock */ { lock_file_1 (lfname, 1); goto done; } /* User says ignore the lock */ done: UNGCPRO; } void unlock_file (Lisp_Object fn) { /* This can GC */ register Ibyte *lfname; struct gcpro gcpro1; GCPRO1 (fn); fn = Fexpand_file_name (fn, Qnil); MAKE_LOCK_NAME (lfname, fn); if (current_lock_owner (0, lfname) == 2) qxe_unlink (lfname); UNGCPRO; } void unlock_all_files (void) { register Lisp_Object tail; for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) { struct buffer *b = XBUFFER (XCDR (XCAR (tail))); if (STRINGP (b->file_truename) && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)) unlock_file (b->file_truename); } } DEFUN ("lock-buffer", Flock_buffer, 0, 1, 0, /* Lock FILE, if current buffer is modified. FILE defaults to current buffer's visited file, or else nothing is done if current buffer isn't visiting a file. */ (file)) { if (NILP (file)) file = current_buffer->file_truename; CHECK_STRING (file); if (BUF_SAVE_MODIFF (current_buffer) < BUF_MODIFF (current_buffer) && !NILP (file)) lock_file (file); return Qnil; } DEFUN ("unlock-buffer", Funlock_buffer, 0, 0, 0, /* Unlock the file visited in the current buffer, if it should normally be locked. */ ()) { /* 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 (BUF_SAVE_MODIFF (current_buffer) < BUF_MODIFF (current_buffer) && STRINGP (current_buffer->file_truename)) unlock_file (current_buffer->file_truename); return Qnil; } /* Unlock the file visited in buffer BUFFER. */ void unlock_buffer (struct buffer *buffer) { /* 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 (BUF_SAVE_MODIFF (buffer) < BUF_MODIFF (buffer) && STRINGP (buffer->file_truename)) unlock_file (buffer->file_truename); } DEFUN ("file-locked-p", Ffile_locked_p, 0, 1, 0, /* Return nil if the FILENAME is not locked, t if it is locked by you, else a string of the name of the locker. */ (filename)) { Lisp_Object ret; register Ibyte *lfname; int owner; lock_info_type locker; struct gcpro gcpro1; GCPRO1 (filename); filename = Fexpand_file_name (filename, Qnil); MAKE_LOCK_NAME (lfname, filename); owner = current_lock_owner (&locker, lfname); if (owner <= 0) ret = Qnil; else if (owner == 2) ret = Qt; else ret = build_intstring (locker.user); if (owner > 0) FREE_LOCK_INFO (locker); UNGCPRO; return ret; } /* Initialization functions. */ void syms_of_filelock (void) { /* This function can GC */ DEFSUBR (Funlock_buffer); DEFSUBR (Flock_buffer); DEFSUBR (Ffile_locked_p); DEFSYMBOL (Qask_user_about_supersession_threat); DEFSYMBOL (Qask_user_about_lock); } void vars_of_filelock (void) { DEFVAR_BOOL ("inhibit-clash-detection", &inhibit_clash_detection /* Non-nil inhibits creation of lock file to detect clash. */); inhibit_clash_detection = 0; } #endif /* CLASH_DETECTION */