view src/profile.h @ 4477:e34711681f30

Don't determine whether to call general device-type code at startup, rather decide in the device-specific code itself. lisp/ChangeLog addition: 2008-07-07 Aidan Kehoe <kehoea@parhasard.net> Patch to make it up to the device-specific code whether various Lisp functions should be called during device creation, not relying on the startup code to decide this. Also, rename initial-window-system to initial-device-type (which makes more sense in this scheme), always set it. * startup.el (command-line): Use initial-device-type, not initial-window-system; just call #'make-device, leave the special behaviour to be done the first time a console type is initialised to be decided on by the respective console code. * x-init.el (x-app-defaults-directory): Declare that it should be bound. (x-define-dead-key): Have the macro take a DEVICE argument. (x-initialize-compose): Have the function take a DEVICE argument, and use it when checking if various keysyms are available on the keyboard. (x-initialize-keyboard): Have the function take a DEVICE argument, allowing device-specific keyboard initialisation. (make-device-early-x-entry-point-called-p): New. (make-device-late-x-entry-point-called-p): New. Rename pre-x-win-initted, x-win-initted. (make-device-early-x-entry-point): Rename init-pre-x-win, take the call to make-x-device out (it should be called from the device-creation code, not vice-versa). (make-device-late-x-entry-point): Rename init-post-x-win, have it take a DEVICE argument, use that DEVICE argument when working out what device-specific things need doing. Don't use create-console-hook in core code. * x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument; use it. * x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it. * mule/mule-x-init.el: Remove #'init-mule-x-win, an empty function. * tty-init.el (make-device-early-tty-entry-point-called-p): New. Rename pre-tty-win-initted. (make-device-early-tty-entry-point): New. Rename init-pre-tty-win. (make-frame-after-init-entry-point): New. Rename init-post-tty-win to better reflect when it's called. * gtk-init.el (gtk-early-lisp-options-file): New. Move this path to a documented variable. (gtk-command-switch-alist): Wrap the docstring to fewer than 79 columns. (make-device-early-gtk-entry-point-called-p): New. (make-device-late-gtk-entry-point-called-p): New. Renamed gtk-pre-win-initted, gtk-post-win-initted to these. (make-device-early-gtk-entry-point): New. (make-device-late-gtk-entry-point): New. Renamed init-pre-gtk-win, init-post-gtk-win to these. Have make-device-late-gtk-entry-point take a device argument, and use it; have make-device-early-gtk-entry-point load the GTK-specific startup code, instead of doing that in C. (init-gtk-win): Deleted, functionality moved to the GTK device creation code. (gtk-define-dead-key): Have it take a DEVICE argument; use this argument. (gtk-initialize-compose): Ditto. * coding.el (set-terminal-coding-system): Correct the docstring; the function isn't broken. src/ChangeLog addition: 2008-07-07 Aidan Kehoe <kehoea@parhasard.net> Patch to make it up to the device-specific code whether various Lisp functions should be called during device creation, not relying on the startup code to decide this. Also, rename initial-window-system to initial-device-type (which makes more sense in this scheme), always set it. * redisplay.c (Vinitial_device_type): New. (Vinitial_window_system): Removed. Rename initial-window-system to initial-device type, making it a stream if we're noninteractive. Update its docstring. * device-x.c (Qmake_device_early_x_entry_point, Qmake_device_late_x_entry_point): New. Rename Qinit_pre_x_win, Qinit_post_x_win. (x_init_device): Call #'make-device-early-x-entry-point earlier, now we rely on it to find the application class and the app-defaults directory. (x_finish_init_device): Call #'make-device-late-x-entry-point with the created device. (Vx_app_defaults_directory): Always make this available, to simplify code in x-init.el. * device-tty.c (Qmake_device_early_tty_entry_point): New. Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to frame-tty.c as Qmake_frame_after_init_entry_point. (tty_init_device): Call #'make-device-early-tty-entry-point before doing anything. * frame-tty.c (Qmake_frame_after_init_entry_point): New. * frame-tty.c (tty_after_init_frame): Have it call the better-named #'make-frame-after-init-entry-point function instead of #'init-post-tty-win (since it's called after frame, not device, creation). * device-msw.c (Qmake_device_early_mswindows_entry_point, Qmake_device_late_mswindows_entry_point): New. Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win. (mswindows_init_device): Call #'make-device-early-mswindows-entry-point here, instead of having its predecessor call us. (mswindows_finish_init_device): Call #'make-device-early-mswindows-entry-point, for symmetry with the other device types (though it's an empty function). * device-gtk.c (Qmake_device_early_gtk_entry_point, Qmake_device_late_gtk_entry_point): New. Rename Qinit_pre_gtk_win, Qinit_post_gtk_win. (gtk_init_device): Call #'make-device-early-gtk-entry-point; don't load ~/.xemacs/gtk-options.el ourselves, leave that to lisp. (gtk_finish_init_device): Call #'make-device-late-gtk-entry-point with the created device as an argument.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 09 Jul 2008 20:46:22 +0200
parents 8f6a825eb3d3
children 308d34e9f07d
line wrap: on
line source

/* Profiling.
   Copyright (C) 2003, 2005 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.  */

/* Synched up with: Not in FSF. */

/* Authorship:

   Ben Wing: Feb 2003.
 */

#include "backtrace.h"

void mark_profiling_info (void);
void profile_record_unwind (struct backtrace *);
void profile_record_about_to_call (struct backtrace *);
void profile_record_just_called (struct backtrace *);
void profile_record_consing (EMACS_INT size);
void profile_record_unconsing (EMACS_INT size);
extern int profiling_active;

/* We call about_to_call() and just_called() depending on the current
   *dynamic* value of profiling_active (which could change as a result of
   calling the function) but if we push a backtrace, we must pop it later,
   so we need to remember the status of this. */
#define PROFILE_DECLARE()						 \
int do_backtrace = profiling_active || backtrace_with_internal_sections; \
struct backtrace backtrace

/* As just mentioned, we rely on the dynamic value of profiling_active.
   This ensures correct behavior (e.g. we never modify the profiling info
   when profiling is not active) because we seed and reap all functions
   currently on the stack when starting and stopping.  See
   `start-profiling'.

   We check do_backtrace to make sure that the backtrace structure is
   initialised. If it isn't, we can enter a function with profiling turned
   off, and exit it with it turned on, with the consequence that an
   unitialised backtrace structure is passed to
   profile_record_just_called. Since do_backtrace is function-local (apart
   from in the garbage collector) this avoids that.  */
#define PROFILE_ENTER_FUNCTION()		\
do						\
{						\
  if (profiling_active && do_backtrace)		\
    profile_record_about_to_call (&backtrace);	\
}						\
while (0)

#define PROFILE_EXIT_FUNCTION()			\
do						\
{						\
  if (profiling_active && do_backtrace)		\
    profile_record_just_called (&backtrace);	\
}						\
while (0)

/* We are entering a section that we would like to record profile information
   about.  We put this information into the backtrace list, just like
   normal functions do.  That is one easy way to make sure that we always
   record info on the innermost section or function, whether section or
   function. (To do this, we always need some sort of collusion between
   profile and eval; this is one way.) */

/* Or, we could call xzero() to zero the whole thing, and avoid four
   of the statements below; or we could create a global backtrace object,
   uninitialized (i.e. it will be initialized to all 0), and do structure
   copy to initialize.  It's not clear it will make much difference here,
   but someone who really cared about counting cycles could implement it. */
#define PROFILE_RECORD_ENTERING_SECTION(var)		\
do							\
{							\
  if (do_backtrace)					\
    {							\
      backtrace.function = &var;			\
      backtrace.args = NULL;				\
      backtrace.nargs = UNEVALLED;			\
      backtrace.evalargs = 0;				\
      backtrace.pdlcount = specpdl_depth ();		\
      backtrace.debug_on_exit = 0;			\
      backtrace.function_being_called = 0;		\
      PUSH_BACKTRACE (backtrace);			\
    }							\
  PROFILE_ENTER_FUNCTION ();				\
} while (0)

#define PROFILE_RECORD_EXITING_SECTION(var)		\
do							\
{							\
  PROFILE_EXIT_FUNCTION ();				\
  if (do_backtrace)					\
    POP_BACKTRACE (backtrace);				\
} while (0)

#define RETURN_EXIT_PROFILING(tag, type, expr)	\
do						\
{						\
  type _ret_exitpr_ = (expr);			\
  PROFILE_RECORD_EXITING_SECTION (tag);		\
  RETURN_SANS_WARNINGS _ret_exitpr_;		\
} while (0)

#define RETURN_LISP_EXIT_PROFILING(tag, expr)		\
  RETURN_EXIT_PROFILING (tag, Lisp_Object, expr)
  
#define RETURN_UNGCPRO_EXIT_PROFILING(tag, expr)	\
do							\
{							\
  Lisp_Object ret_ungc_val = (expr);			\
  UNGCPRO;						\
  PROFILE_RECORD_EXITING_SECTION (tag);			\
  RETURN_SANS_WARNINGS ret_ungc_val;			\
} while (0)

#ifdef DEBUG_XEMACS
extern Lisp_Object QSin_temp_spot_1;
extern Lisp_Object QSin_temp_spot_2;
extern Lisp_Object QSin_temp_spot_3;
extern Lisp_Object QSin_temp_spot_4;
extern Lisp_Object QSin_temp_spot_5;
#endif /* DEBUG_XEMACS */