Mercurial > hg > xemacs-beta
view src/profile.h @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
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 */