xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 3092:141c2920ea48

[xemacs-hg @ 2005-11-25 01:41:31 by crestani] Incremental Garbage Collector

author	crestani
date	Fri, 25 Nov 2005 01:42:08 +0000
parents	b7f26b2f78bd
children	ad2f4ae9895b

comparison

equal deleted inserted replaced

-:c22d8984148c
+:141c2920ea48
 /* First, do really basic environment initialization -- catching signals
 and the like.  These functions have no dependence on any part of
 the Lisp engine and need to be done both at dump time and at run time. */
 init_signals_very_early ();
+#ifdef NEW_GC
+vdb_install_signal_handler ();
+#endif
 init_data_very_early (); /* Catch math errors. */
 init_floatfns_very_early (); /* Catch floating-point math errors. */
 init_process_times_very_early (); /* Initialize our process timers.
 				       As early as possible, of course,
 				       so we can be fairly accurate. */
 purify_flag = 1;
 #endif
 init_alloc_early ();
+init_gc_early ();
 if (!initialized)
 {
 /* Initialize things so that new Lisp objects
 	 can be created and objects can be staticpro'd.
 	 Must be basically the very first thing done
 	 because pretty much all of the initialization
 	 routines below create new objects. */
 init_alloc_once_early ();
+init_gc_once_early ();
 /* Initialize Qnil, Qt, Qunbound, and the
 	 obarray.  After this, symbols can be
 	 interned.  This depends on init_alloc_once_early(). */
 init_symbols_once_early ();
 syms_of_abbrev ();
 syms_of_alloc ();
 #ifdef MC_ALLOC
 syms_of_mc_alloc ();
 #endif /* MC_ALLOC */
+syms_of_gc ();
+#ifdef NEW_GC
+syms_of_vdb ();
+#endif /* NEW_GC */
 syms_of_buffer ();
 syms_of_bytecode ();
 syms_of_callint ();
 syms_of_casefiddle ();
 syms_of_casetab ();
 #ifdef PDUMP
 else if (!restart)	      /* after successful pdump_load()
 				 (note, we are inside ifdef PDUMP) */
 {
 reinit_alloc_early ();
+reinit_gc_early ();
 reinit_symbols_early ();
 #ifndef MC_ALLOC
 reinit_opaque_early ();
 #endif /* not MC_ALLOC */
 reinit_eistring_early ();
 vars_of_fns ();
 #ifdef USE_C_FONT_LOCK
 vars_of_font_lock ();
 #endif /* USE_C_FONT_LOCK */
 vars_of_frame ();
+vars_of_gc ();
 vars_of_glyphs ();
 vars_of_glyphs_eimage ();
 vars_of_glyphs_widget ();
 vars_of_gui ();
 vars_of_gutter ();
 #ifdef HAVE_MS_WINDOWS
 complex_vars_of_glyphs_mswindows ();
 #endif
 /* This calls Fmake_glyph_internal(). */
-complex_vars_of_alloc ();
-/* This calls Fmake_glyph_internal(). */
 #ifdef HAVE_MENUBARS
 complex_vars_of_menubar ();
 #endif
 #ifdef HAVE_SCROLLBARS
 /* These two might call Ffile_name_as_directory(), which
 	 might depend on all sorts of things; I'm not sure. */
 complex_vars_of_emacs ();
+complex_vars_of_gc ();
 /* This creates a couple of basic keymaps and depends on Lisp
 	 hash tables and Ffset() (both of which depend on some variables
 	 initialized in the vars_of_*() section) and possibly other
 	 stuff. */
 complex_vars_of_keymap ();
 #ifdef ERROR_CHECK_GC
 {
 	extern int always_gc;
 	if (always_gc)                /* purification debugging hack */
+#ifdef NEW_GC
+	  gc_full ();
+#else /* not NEW_GC */
 	  garbage_collect_1 ();
+#endif /* not NEW_GC */
 }
 #endif
 }
 else
 {
 tools like Purify or tcov that get confused by XEmacs' dumping.  */
 (int nargs, Lisp_Object *args))
 {
 int i;
+#ifdef NEW_GC
+if (gc_in_progress) gc_full ();
+#else /* not NEW_GC */
 assert (!gc_in_progress);
+#endif /* not NEW_GC */
 if (run_temacs_argc < 0)
 invalid_operation ("I've lost my temacs-hood", Qunbound);
 run_temacs_argc = nargs + 1;
 /* Also arrange for warnings when nearly out of space.  */
 #ifndef SYSTEM_MALLOC
 memory_warnings (my_edata, malloc_warning);
 #endif
+#ifdef NEW_GC
+gc_full ();
+#else /* not NEW_GC */
 garbage_collect_1 ();
+#endif /* not NEW_GC */
 #ifdef PDUMP
 pdump ();
 #elif defined (WIN32_NATIVE)
 unexec (XSTRING_DATA (filename),
 code below, we avoid a deadlock. */
 EMACS_UNBLOCK_SIGNAL (sig);
 guts_of_fatal_error_signal (sig);
+#ifdef NEW_GC
+/* This time the signal will really be fatal. To be able to debug
+SIGSEGV and SIGBUS also during write barrier, send SIGABRT. */
+#ifdef WIN32_NATIVE
+if (sig == SIGSEGV)
+raise (SIGABRT);
+else
+raise (sig);
+#else
+if ((sig == SIGSEGV) || (sig == SIGBUS))
+kill (qxe_getpid (), SIGABRT);
+else
+kill (qxe_getpid (),  sig);
+#endif
+#else /* not NEW_GC */
 /* Signal the same code; this time it will really be fatal. */
 #ifdef WIN32_NATIVE
 raise (sig);
 #else
 kill (qxe_getpid (), sig);
 #endif
+#endif /* not NEW_GC */
 SIGRETURN;
 }
 #ifdef _MSC_VER

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 3092:141c2920ea48