xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	b2472a1930f2
children	ca9a9ec9c1c1

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 #include "syssignal.h" /* Always include before systty.h */
 #include "systty.h"
 #include "sysfile.h"
 #include "systime.h"
+#ifdef HAVE_SHLIB
+#include "sysdll.h"
+#endif
 #if defined (HAVE_LOCALE_H) && \
 (defined (I18N2) || defined (I18N3) || defined (I18N4))
 #include <locale.h>
 #endif
 #if defined (WINDOWSNT)
 #include <windows.h>
 #endif
 /* For PATH_EXEC */
-#include "paths.h"
+#include <paths.h>
-extern void memory_warnings (void *, void (*warnfun) (CONST char *));
 #if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC
 extern void *(*__malloc_hook)(size_t);
 extern void *(*__realloc_hook)(void *, size_t);
 extern void (*__free_hook)(void *);
 #ifdef DOUG_LEA_MALLOC
 # include <malloc.h>
 /* Preserves a pointer to the memory allocated that copies that
 static data inside glibc's malloc.  */
-void *malloc_state_ptr;
+static void *malloc_state_ptr;
-#endif
+#endif /* DOUG_LEA_MALLOC */
+# ifdef REL_ALLOC
+void r_alloc_reinit (void);
+# endif
 /* Variable whose value is symbol giving operating system type. */
 Lisp_Object Vsystem_type;
 /* Variable whose value is string giving configuration built for.  */
 variable. */
 CONST char *display_use;
 /* If non-zero, then the early error handler will only print the error
 message and exit. */
-int suppress_early_backtrace;
+int suppress_early_error_handler_backtrace;
 /* An address near the bottom of the stack.
 Tells GC how to save a copy of the stack.  */
 char *stack_bottom;
 * does; it was provided by NeXT, and it presumable makes NS's mallocator
 * work with dumping.  But malloc_jumpstart() and malloc_freezedry() in
 * unexnext.c are both completely undocumented, even in NS header files!
 * But hey, it solves all NS related memory problems, so who's
 * complaining? */
-if (initialized)
+if (initialized && malloc_jumpstart (malloc_cookie) != 0)
-if (malloc_jumpstart (malloc_cookie) != 0)
+fprintf (stderr, "malloc jumpstart failed!\n");
-printf ("malloc jumpstart failed!\n");
 #endif /* NeXT */
 /*
 #if defined (GNU_MALLOC) && \
 defined (ERROR_CHECK_MALLOC) && \
 syms_of_lread ();
 syms_of_macros ();
 syms_of_marker ();
 syms_of_md5 ();
 #ifdef HAVE_DATABASE
-syms_of_dbm ();
+syms_of_database ();
 #endif
 #ifdef HAVE_MENUBARS
 syms_of_menubar ();
 #endif
 syms_of_minibuf ();
 syms_of_objects_x ();
 #ifdef HAVE_MENUBARS
 syms_of_menubar_x ();
 #endif
 syms_of_xselect ();
-#ifdef EPOCH
-syms_of_epoch ();
-#endif
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
 syms_of_gui_x ();
 #endif
 #endif /* HAVE_X_WINDOWS */
 vars_of_lread ();
 vars_of_lstream ();
 vars_of_macros ();
 vars_of_md5 ();
 #ifdef HAVE_DATABASE
-vars_of_dbm ();
+vars_of_database ();
 #endif
 #ifdef HAVE_MENUBARS
 vars_of_menubar ();
 #endif
 vars_of_minibuf ();
 #ifdef HAVE_MENUBARS
 vars_of_menubar_x ();
 #endif
 vars_of_objects_x ();
 vars_of_xselect ();
-#ifdef EPOCH
-vars_of_epoch ();
-#endif
 #ifdef HAVE_SCROLLBARS
 vars_of_scrollbar_x ();
 #endif
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
 vars_of_gui_x ();
 static JMP_BUF run_temacs_catch;
 static int run_temacs_argc;
 static char **run_temacs_argv;
 static char *run_temacs_args;
-static int run_temacs_argv_size;
+static size_t run_temacs_argv_size;
-static int run_temacs_args_size;
+static size_t run_temacs_args_size;
-extern int gc_in_progress;
 DEFUN ("running-temacs-p", Frunning_temacs_p, 0, 0, 0, /*
 True if running temacs.  This means we are in the dumping stage.
 This is false during normal execution of the `xemacs' program, and
 becomes false once `run-emacs-from-temacs' is run.
 #ifdef QUANTIFY
 quantify_stop_recording_data ();
 quantify_clear_data ();
 #endif /* QUANTIFY */
-suppress_early_backtrace = 0;
+suppress_early_error_handler_backtrace = 0;
 lim_data = 0; /* force reinitialization of this variable */
 /* Lisp_Object must fit in a word; check VALBITS and GCTYPEBITS */
 assert (sizeof (Lisp_Object) == sizeof (void *));
 	  environ=_environ;
 }
 #endif /* _SCO_DS */
 vol_envp = environ;
 }
 #ifdef RUN_TIME_REMAP
 else
 /* obviously no-one uses this because where it was before initalized was
 *always* true */
 run_time_remap (argv[0]);
 #endif
 #ifdef DOUG_LEA_MALLOC
 if (initialized && (malloc_state_ptr != NULL))
 {
-malloc_set_state (malloc_state_ptr);
+int rc = malloc_set_state (malloc_state_ptr);
+if (rc != 0)
+	{
+	  fprintf (stderr, "malloc_set_state failed, rc = %d\n", rc);
+	  abort ();
+	}
 #if 0
 free (malloc_state_ptr);
 #endif
 /* mmap works in glibc-2.1, glibc-2.0 (Non-Mule only) and Linux libc5 */
 #if (defined(__GLIBC__) && __GLIBC_MINOR__ >= 1) || \
 #endif
 #ifdef REL_ALLOC
 r_alloc_reinit ();
 #endif
 }
-#endif
+#endif /* DOUG_LEA_MALLOC */
 run_temacs_argc = -1;
 main_1 (vol_argc, vol_argv, vol_envp, restarted);
 return 0; /* unreached */
 }
+/* Dumping apparently isn't supported by versions of GCC >= 2.8. */
+/* The following needs conditionalization on whether either XEmacs or */
+/* various system shared libraries have been built and linked with */
+/* GCC >= 2.8.  -slb */
+#if defined(GNU_MALLOC)
+static void
+voodoo_free_hook(void *mem)
+{
+/* Disable all calls to free() when XEmacs is exiting and it doesn't */
+/* matter. */
+__free_hook = voodoo_free_hook;
+}
+#endif
 DEFUN ("kill-emacs", Fkill_emacs, 0, 1, "P", /*
 Exit the XEmacs job and kill it.  Ask for confirmation, without argument.
 If ARG is an integer, return ARG as the exit program code.
 If ARG is a string, stuff it as keyboard input.
 }
 UNGCPRO;
 shut_down_emacs (0, ((STRINGP (arg)) ? arg : Qnil));
+#if defined(GNU_MALLOC)
+__free_hook = voodoo_free_hook;
+#endif
 exit ((INTP (arg)) ? XINT (arg) : 0);
 /* NOTREACHED */
 return Qnil; /* I'm sick of the compiler warning */
 }
 return Qnil;
 }
 #else /* not HAVE_SHM */
+extern void disable_free_hook (void);
 DEFUN ("dump-emacs", Fdump_emacs, 2, 2, 0, /*
 Dump current state of XEmacs into executable file FILENAME.
 Take symbols from SYMFILE (presumably the file you executed to run XEmacs).
 This is used in the file `loadup.el' when building XEmacs.
 #ifdef FREE_CHECKING
 Freally_free (Qnil);
 /* When we're dumping, we can't use the debugging free() */
-disable_free_hook ();
+#endif
+#if 1 /* martin */
 #endif
 CHECK_STRING (intoname);
 intoname = Fexpand_file_name (intoname, Qnil);
 if (!NILP (symname))
 close (fd);
 }
 }
 #else /* not MSDOS and EMX */
 {
-CONST char *intoname_ext;
+char *intoname_ext;
-CONST char *symname_ext;
+char *symname_ext;
 GET_C_STRING_FILENAME_DATA_ALLOCA (intoname, intoname_ext);
 if (STRINGP (symname))
 GET_C_STRING_FILENAME_DATA_ALLOCA (symname, symname_ext);
 else
 symname_ext = 0;
+garbage_collect_1 ();
 #ifdef DOUG_LEA_MALLOC
 malloc_state_ptr = malloc_get_state ();
 #endif
-/* here we break our rule that the filename conversion should
+#ifdef ERROR_CHECK_MALLOC
-be performed at the actual time that the system call is made.
+disable_free_hook ();
-It's a whole lot easier to do the conversion here than to
+#endif
-modify all the unexec routines to ensure that filename
+/* here we break our rule that the filename conversion should
-conversion is applied everywhere.  Don't worry about memory
+be performed at the actual time that the system call is made.
-leakage because this call only happens once. */
+It's a whole lot easier to do the conversion here than to
-unexec ((char *) intoname_ext, (char *) symname_ext,
+modify all the unexec routines to ensure that filename
-	    (uintptr_t) my_edata,
+conversion is applied everywhere.  Don't worry about memory
-	    0, 0);
+leakage because this call only happens once. */
+unexec (intoname_ext, symname_ext, (uintptr_t) my_edata, 0, 0);
 #ifdef DOUG_LEA_MALLOC
 free (malloc_state_ptr);
 #endif
 }
 #endif /* not MSDOS and EMX */
 #ifndef SEPCHAR
 #define SEPCHAR ':'
 #endif
 DEFUN ("decode-path-internal", Fdecode_path_internal, 1, 1, 0, /*
-Explode a colon-separated list of paths into a string list.
+Explode a colon-separated list of paths into a list of strings.
 */
 (cd_path))
 {
-if (NILP(cd_path))
+if (NILP (cd_path))
-{
+return Qnil;
-return Qnil;
-}
 CHECK_STRING (cd_path);
-return (!XSTRING_LENGTH(cd_path)) ?
+return !XSTRING_LENGTH (cd_path) ?
-list1(Qnil) :
+list1 (Qnil) :
-decode_path(XSTRING_DATA(cd_path));
+decode_path ((char *) XSTRING_DATA (cd_path));
 }
 Lisp_Object
 decode_path (CONST char *path)
 {
 REGISTER CONST char *p;
 Lisp_Object lpath = Qnil;
-if (!path || !strlen(path)) return Qnil;
+if (!path || !strlen (path)) return Qnil;
 #if defined (MSDOS) || defined (WIN32)
 dostounix_filename (path);
 #endif
 assert_failed (CONST char *file, int line, CONST char *expr)
 {
 stderr_out ("Fatal error: assertion failed, file %s, line %d, %s\n",
 	      file, line, expr);
 #undef abort	/* avoid infinite #define loop... */
-#if defined (_WIN32) && defined (DEBUG_XEMACS)
+#if defined (WINDOWSNT) && defined (DEBUG_XEMACS)
 DebugBreak ();
 #elif !defined (ASSERTIONS_DONT_ABORT)
 abort ();
 #endif
 }
 void
 vars_of_emacs (void)
 {
 DEFVAR_BOOL ("suppress-early-error-handler-backtrace",
-	       &suppress_early_backtrace /*
+	       &suppress_early_error_handler_backtrace /*
-Non-nil means early error handler shouldn't print a backtrace
+Non-nil means early error handler shouldn't print a backtrace.
 */ );
 DEFVAR_LISP ("command-line-args", &Vcommand_line_args /*
 Args passed by shell to XEmacs, as a list of strings.
 */ );
 "installed locations, but we can find them\n"
 "near where the XEmacs executable was found.");
 #endif
 DEFVAR_LISP ("system-type", &Vsystem_type /*
-Value is symbol indicating type of operating system you are using.
+Symbol indicating type of operating system you are using.
 */ );
 Vsystem_type = intern (SYSTEM_TYPE);
 Fprovide (intern(SYSTEM_TYPE));
 #ifndef EMACS_CONFIGURATION
 # define EMACS_CONFIGURATION "UNKNOWN"
 #endif
 DEFVAR_LISP ("system-configuration", &Vsystem_configuration /*
-Value is string indicating configuration XEmacs was built for.
+String naming the configuration XEmacs was built for.
 */ );
 Vsystem_configuration = Fpurecopy (build_string (EMACS_CONFIGURATION));
 #ifndef EMACS_CONFIG_OPTIONS
 # define EMACS_CONFIG_OPTIONS "UNKNOWN"

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 272:c5d627a313b1 r21-0b34