Mercurial > hg > xemacs-beta

diff src/alloc.c @ 1292:f3437b56874d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-02-13 09:57:04 by ben] profile updates profile.c: Major reworking. Keep track of new information -- total function timing (includes descendants), GC usage, total GC usage (includes descendants). New functions to be called appropriately from eval.c, alloc.c to keep track of this information. Keep track of when we're actually in a function vs. in its profile, for more accurate timing counts. Track profile overhead separately. Create new mechanism for specifying "internal sections" that are tracked just like regular Lisp functions and even appear in the backtrace if `backtrace-with-internal-sections' is non-nil (t by default for error-checking builds). Add some KKCC information for the straight (non-Elisp) hash table used by profile, which contains Lisp objects in its keys -- but not used yet. Remove old ad-hoc methods for tracking garbage collection, redisplay (which was incorrect anyway when Lisp was called within these sections). Don't record any tick info when blocking under MS Windows, since the timer there is in real time rather than in process time. Make `start-profiling', `stop-profiling' interactive. Be consistent wrt. recursive functions and functions currently on the stack when starting or stopping -- together these make implementing the `total' values extremely difficult. When we start profiling, we act as if we just entered all the functions currently on the stack. Likewise when exiting. Create vars in_profile for tracking time spent inside of profiling, and profiling_lock for setting exclusive access to the main hash table when reading from it or modifying it. (protects against getting screwed up by the signal handle going off at the same time. profile.h: New file. Create macros for declaring internal profiling sections. lisp.h: Move profile-related stuff to profile.h. alloc.c: Keep track of total consing, for profile. Tell profile when we are consing. Use new profile-section method for noting garbage-collection. alloc.c: Abort if we attempt to call the allocator reentrantly. backtrace.h, eval.c: Add info for use by profile in the backtrace frame and transfer PUSH_BACKTRACE/POP_BACKTRACE from eval.c, for use with profile. elhash.c: Author comment. eval.c, lisp.h: New Lisp var `backtrace-with-internal-sections'. Set to t when error-checking is on. eval.c: When unwinding, eval.c: Report to profile when we are about-to-call and just-called wrt. a function. alloc.c, eval.c: Allow for "fake" backtrace frames, for internal sections (used by profile and `backtrace-with-internal-sections'. event-Xt.c, event-gtk.c, event-msw.c, event-tty.c: Record when we are actually blocking on an event, for profile's sake. event-stream.c: Record internal profiling sections for getting, dispatching events. extents.c: Record internal profiling sections for map_extents. hash.c, hash.h: Add pregrow_hash_table_if_necessary(). (Used in profile code since the signal handler is the main grower but can't allow a realloc(). We make sure, at critical points, that the table is large enough.) lread.c: Create internal profiling sections for `load' (which may be triggered internally by autoload, etc.). redisplay.c: Remove old profile_redisplay_flag. Use new macros to declare internal profiling section for redisplay. text.c: Use new macros to declare internal profiling sections for char-byte conversion and internal-external conversion. SEMI-UNRELATED CHANGES: ----------------------- text.c: Update the long comments.
author ben
date Thu, 13 Feb 2003 09:57:08 +0000
parents beb703ae34fd
children 70921960b980
line wrap: on
line diff
--- a/src/alloc.c	Wed Feb 12 22:52:33 2003 +0000
+++ b/src/alloc.c	Thu Feb 13 09:57:08 2003 +0000
@@ -56,6 +56,7 @@
 #include "opaque.h"
 #include "lstream.h"
 #include "process.h"
+#include "profile.h"
 #include "redisplay.h"
 #include "specifier.h"
 #include "sysfile.h"
@@ -92,6 +93,8 @@
 
 /* Number of bytes of consing done since the last gc */
 static EMACS_INT consing_since_gc;
+EMACS_UINT total_consing;
+
 int need_to_garbage_collect;
 int need_to_check_c_alloca;
 int need_to_signal_post_gc;
@@ -105,6 +108,9 @@
 do						\
 {						\
   consing_since_gc += (size);			\
+  total_consing += (size);			\
+  if (profiling_active)				\
+    profile_record_consing (size);		\
   recompute_need_to_garbage_collect ();		\
 } while (0)
 
@@ -143,6 +149,9 @@
 
 #define DECREMENT_CONS_COUNTER(size) do {	\
   consing_since_gc -= (size);			\
+  total_consing -= (size);			\
+  if (profiling_active)				\
+    profile_record_unconsing (size);		\
   if (consing_since_gc < 0)			\
     consing_since_gc = 0;			\
   recompute_need_to_garbage_collect ();		\
@@ -190,6 +199,8 @@
 static const Char_ASCII gc_default_message[] = "Garbage collecting";
 Lisp_Object Qgarbage_collecting;
 
+static Lisp_Object QSin_garbage_collection;
+
 /* Non-zero means we're in the process of doing the dump */
 int purify_flag;
 
@@ -302,11 +313,21 @@
 
 /* like malloc and realloc but check for no memory left. */
 
+static int in_malloc;
+
 #undef xmalloc
 void *
 xmalloc (Bytecount size)
 {
-  void *val = malloc (size);
+  void *val;
+#ifdef ERROR_CHECK_MALLOC
+  assert (!in_malloc);
+  in_malloc = 1;
+#endif
+  val = malloc (size);
+#ifdef ERROR_CHECK_MALLOC
+  in_malloc = 0;
+#endif
   if (!val && (size != 0)) memory_full ();
   set_alloc_mins_and_maxes (val, size);
   return val;
@@ -316,7 +337,15 @@
 static void *
 xcalloc (Elemcount nelem, Bytecount elsize)
 {
-  void *val = calloc (nelem, elsize);
+  void *val;
+#ifdef ERROR_CHECK_MALLOC
+  assert (!in_malloc);
+  in_malloc = 1;
+#endif
+  val= calloc (nelem, elsize);
+#ifdef ERROR_CHECK_MALLOC
+  in_malloc = 0;
+#endif
 
   if (!val && (nelem != 0)) memory_full ();
   set_alloc_mins_and_maxes (val, nelem * elsize);
@@ -333,7 +362,14 @@
 void *
 xrealloc (void *block, Bytecount size)
 {
+#ifdef ERROR_CHECK_MALLOC
+  assert (!in_malloc);
+  in_malloc = 1;
+#endif
   block = realloc (block, size);
+#ifdef ERROR_CHECK_MALLOC
+  in_malloc = 0;
+#endif
 
   if (!block && (size != 0)) memory_full ();
   set_alloc_mins_and_maxes (block, size);
@@ -353,8 +389,13 @@
      the one that comes with Solaris 2.3.  FMH!! */
   assert (block != (void *) 0xDEADBEEF);
   assert (block);
+  assert (!in_malloc);
+  in_malloc = 1;
 #endif /* ERROR_CHECK_MALLOC */
   free (block);
+#ifdef ERROR_CHECK_MALLOC
+  in_malloc = 0;
+#endif
 }
 
 #ifdef ERROR_CHECK_GC
@@ -4363,6 +4404,7 @@
   int cursor_changed;
   Lisp_Object pre_gc_cursor;
   struct gcpro gcpro1;
+  PROFILE_DECLARE ();
 
   assert (!in_display || gc_currently_forbidden);
 
@@ -4372,6 +4414,8 @@
       || preparing_for_armageddon)
     return;
 
+  PROFILE_RECORD_ENTERING_SECTION (QSin_garbage_collection);
+
   /* We used to call selected_frame() here.
 
      The following functions cannot be called inside GC
@@ -4530,7 +4574,9 @@
 	int i;
 
 	mark_object (*backlist->function);
-	if (nargs < 0 /* nargs == UNEVALLED || nargs == MANY */)
+	if (nargs < 0 /* nargs == UNEVALLED || nargs == MANY */
+	    /* might be fake (internal profiling entry) */
+	    && backlist->args)
 	  mark_object (backlist->args[0]);
 	else
 	  for (i = 0; i < nargs; i++)
@@ -4620,6 +4666,8 @@
   need_to_signal_post_gc = 1;
   funcall_allocation_flag = 1;
 
+  PROFILE_RECORD_EXITING_SECTION (QSin_garbage_collection);
+
   return;
 }
 
@@ -5148,6 +5196,9 @@
 void
 vars_of_alloc (void)
 {
+  QSin_garbage_collection = build_msg_string ("(in garbage collection)");
+  staticpro (&QSin_garbage_collection);
+
   DEFVAR_INT ("gc-cons-threshold", &gc_cons_threshold /*
 *Number of bytes of consing between garbage collections.
 \"Consing\" is a misnomer in that this actually counts allocation