Mercurial > hg > xemacs-beta
view src/profile.h @ 4908:b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* compiler.h:
Create a USED() macro to force unused-var warnings to go away,
in certain cases where it's inconvenient to do otherwise (e.g.
when THIS_IS_GTK in redisplay-xlike-inc.c).
* console-x.h:
Remove unneeded decls, make some static.
* redisplay-xlike-inc.c:
* console-xlike-inc.h: New file. Include defns from
redisplay-xlike-inc.c that may be useful in other XLIKE files.
Correct the handling of colors and font-style setting functions
in the xlike defns. Lots of fixes in the GTK-specific defns.
* depend: Regenerate.
* event-xlike-inc.c:
* event-xlike-inc.c (USE_UNICODE_MAP):
* event-xlike-inc.c (endif):
* gccache-gtk.c:
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (FROB):
* gtk-glue.c (face_to_gc):
* gtk-glue.c (face_to_style):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.h (struct _GtkXEmacs):
* gtk-xemacs.h (struct _GtkXEmacsClass):
* objects-xlike-inc.c:
Cosmetic, comment fixes.
* glyphs.c (pixmap_to_lisp_data):
Unused var fixes.
* gtk-glue.c:
* gccache-gtk.c:
* gtk-xemacs.c:
* gtk-xemacs.h:
* objects-xlike-inc.c:
* ui-gtk.c:
* ui-gtk.h:
* xgccache.c:
* xgccache.c (GC_CACHE_SIZE):
* xgccache.h:
Misc include-file fixes.
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xlistfonts_checking_charset):
Combine some ifdeffed stuff using defs in console-xlike-inc.h.
* redisplay-gtk.c:
* redisplay-gtk.c (THIS_IS_GTK):
* redisplay-gtk.c (XLIKE_bevel_area):
* redisplay-gtk.c (XLIKE_ring_bell):
* redisplay-gtk.c (gdk_draw_text_image):
Fix numerous compile problems. Delete gtk_output_shadows(),
which mostly duplicates generic bevel_modeline(). Fix up
gtk_bevel_modeline() into XLIKE_bevel_area() and make use of
the style var properly to set the appropriate GTK constant.
* redisplay-x.c:
* redisplay-x.c (XLIKE_window_output_begin):
* redisplay-x.c (XLIKE_window_output_end):
* redisplay-x.c (XLIKE_bevel_area):
* redisplay-x.c (x_output_shadows):
* redisplay-x.c (XLIKE_ring_bell):
Make x_output_shadows be static. Change the defn of various
functions to look like XLIKE_foo() so it matches the calling
convention elsewhere.
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (NEED_GCCACHE_H):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR):
* redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_flash):
Lots of header fixes. Lots of stuff moved to console-xlike-inc.h.
Use XFUN() to generate function names instead of directly
calling XLIKE_PASTE(). Remove unnecessary prototypes.
Unify calls to text_width funs. Make XLIKE_get_gc non-static
since it's called from gtk. Change the color-function calls
and fill-style-setting calls to match the changes in
console-xlike-inc.h. Use USED() to avoid some warnings.
* symsinit.h:
Sort the prototypes, and add a fun `sort-symsinit' in a comment
that does the sorting (using sort-regexp-fields).
* symsinit.h (init_number):
* sysgtk.h: New file, wraps the various GTK headers.
* sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to
* event-gtk.h: Delete. Combine stuff into console-gtk.h.
help isolate X-specific code from GTK.
* device-gtk.c:
* event-gtk.c:
* console-gtk.h:
* frame-gtk.c:
* gccache-gtk.c:
* gccache-gtk.h:
* glyphs-gtk.c (gtk_colorize_image_instance):
* glyphs-gtk.h:
* gtk-xemacs.h:
* objects-gtk.c:
* objects-gtk.c (MAX_FONT_COUNT):
* ui-gtk.h:
Use sysgtk.h or sysgdkx.h instead of directly including GTK
headers. Don't include event-gtk.h.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 02:15:28 -0600 |
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 */