xemacs-beta: src/alloc.c comparison

comparison src/alloc.c @ 2666:7bf1f40e6acb

[xemacs-hg @ 2005-03-15 11:56:32 by crestani] * alloc.c: Dynamically allocate KKCC backtrace stack and some minor typo-fixes for KKCC functions. * alloc.c (lispdesc_indirect_count_1): Condition kkcc_backtrace on DEBUG_XEMACS. * alloc.c (kkcc_bt_init): New. * alloc.c (kkcc_bt_stack_realloc): New. * alloc.c (kkcc_bt_free): New. * alloc.c (kkcc_bt_push): If stack size is exhausted, realloc the stack. * alloc.c (kkcc_marking): Init and free backtrace stack.

author	crestani
date	Tue, 15 Mar 2005 11:56:35 +0000
parents	674ee2dfe5fc
children	6fa9919a9a0b

comparison

equal deleted inserted replaced

-:bac3173b2665
+:7bf1f40e6acb
 count = * (long *) irdata;
 break;
 default:
 stderr_out ("Unsupported count type : %d (line = %d, code = %ld)\n",
 		  idesc[line].type, line, (long) code);
-#ifdef USE_KKCC
+#if defined(USE_KKCC) && defined(DEBUG_XEMACS)
 if (gc_in_progress)
 	kkcc_backtrace ();
 #endif
 #ifdef PDUMP
 if (in_pdump)
 #ifdef USE_KKCC
 /* The following functions implement the new mark algorithm.
 They mark objects according to their descriptions.  They
 are modeled on the corresponding pdumper procedures. */
-/* Object memory descriptions are in the lrecord_implementation structure.
+#ifdef DEBUG_XEMACS
-But copying them to a parallel array is much more cache-friendly. */
+/* The backtrace for the KKCC mark functions. */
-const struct memory_description *lrecord_memory_descriptions[countof (lrecord_implementations_table)];
+#define KKCC_INIT_BT_STACK_SIZE 4096
-/* the initial stack size in kkcc_gc_stack_entries */
-#define KKCC_INIT_GC_STACK_SIZE 16384
 typedef struct
-{
-void *data;
-const struct memory_description *desc;
-#ifdef DEBUG_XEMACS
-int level;
-int pos;
-#endif
-} kkcc_gc_stack_entry;
-static kkcc_gc_stack_entry *kkcc_gc_stack_ptr;
-static kkcc_gc_stack_entry *kkcc_gc_stack_top;
-static kkcc_gc_stack_entry *kkcc_gc_stack_last_entry;
-static int kkcc_gc_stack_size;
-#ifdef DEBUG_XEMACS
-#define KKCC_BT_STACK_SIZE 524288
-static struct
 {
 void *obj;
 const struct memory_description *desc;
 int pos;
-} kkcc_bt[KKCC_BT_STACK_SIZE];
+} kkcc_bt_stack_entry;
+static kkcc_bt_stack_entry *kkcc_bt;
+static int kkcc_bt_stack_size;
 static int kkcc_bt_depth = 0;
-#define KKCC_BT_INIT() kkcc_bt_depth = 0;
+static void
+kkcc_bt_init (void)
+{
+kkcc_bt_depth = 0;
+kkcc_bt_stack_size = KKCC_INIT_BT_STACK_SIZE;
+kkcc_bt = (kkcc_bt_stack_entry *)
+malloc (kkcc_bt_stack_size * sizeof (kkcc_bt_stack_entry));
+if (!kkcc_bt)
+{
+stderr_out ("KKCC backtrace stack init failed for size %d\n",
+		  kkcc_bt_stack_size);
+ABORT ();
+}
+}
 void
 kkcc_backtrace (void)
 {
 int i;
 	stderr_out ("root set)\n");
 }
 }
 static void
+kkcc_bt_stack_realloc (void)
+{
+kkcc_bt_stack_size *= 2;
+kkcc_bt = (kkcc_bt_stack_entry *)
+realloc (kkcc_bt, kkcc_bt_stack_size * sizeof (kkcc_bt_stack_entry));
+if (!kkcc_bt)
+{
+stderr_out ("KKCC backtrace stack realloc failed for size %d\n",
+		  kkcc_bt_stack_size);
+ABORT ();
+}
+}
+static void
+kkcc_bt_free (void)
+{
+free (kkcc_bt);
+kkcc_bt = 0;
+kkcc_bt_stack_size = 0;
+}
+static void
 kkcc_bt_push (void *obj, const struct memory_description *desc,
 	      int level, int pos)
 {
 kkcc_bt_depth = level;
 kkcc_bt[kkcc_bt_depth].obj = obj;
 kkcc_bt[kkcc_bt_depth].desc = desc;
 kkcc_bt[kkcc_bt_depth].pos = pos;
 kkcc_bt_depth++;
-if (kkcc_bt_depth > KKCC_BT_STACK_SIZE)
+if (kkcc_bt_depth >= kkcc_bt_stack_size)
-{
+kkcc_bt_stack_realloc ();
-stderr_out ("KKCC backtrace overflow, adjust KKCC_BT_STACK_SIZE.\n");
-stderr_out ("Maybe it is a loop?\n");
-ABORT ();
-}
 }
 #else /* not DEBUG_XEMACS */
-#define KKCC_BT_INIT()
+#define kkcc_bt_init()
 #define kkcc_bt_push(obj, desc, level, pos)
 #endif /* not DEBUG_XEMACS */
+/* Object memory descriptions are in the lrecord_implementation structure.
+But copying them to a parallel array is much more cache-friendly. */
+const struct memory_description *lrecord_memory_descriptions[countof (lrecord_implementations_table)];
+/* the initial stack size in kkcc_gc_stack_entries */
+#define KKCC_INIT_GC_STACK_SIZE 16384
+typedef struct
+{
+void *data;
+const struct memory_description *desc;
+#ifdef DEBUG_XEMACS
+int level;
+int pos;
+#endif
+} kkcc_gc_stack_entry;
+static kkcc_gc_stack_entry *kkcc_gc_stack_ptr;
+static kkcc_gc_stack_entry *kkcc_gc_stack_top;
+static kkcc_gc_stack_entry *kkcc_gc_stack_last_entry;
+static int kkcc_gc_stack_size;
 static void
 kkcc_gc_stack_init (void)
 {
 kkcc_gc_stack_size = KKCC_INIT_GC_STACK_SIZE;
 kkcc_gc_stack_ptr = (kkcc_gc_stack_entry *)
 malloc (kkcc_gc_stack_size * sizeof (kkcc_gc_stack_entry));
 if (!kkcc_gc_stack_ptr)
 {
 stderr_out ("stack init failed for size %d\n", kkcc_gc_stack_size);
-exit(23);
+ABORT ();
 }
 kkcc_gc_stack_top = kkcc_gc_stack_ptr - 1;
 kkcc_gc_stack_last_entry = kkcc_gc_stack_ptr + kkcc_gc_stack_size - 1;
 }
 realloc (kkcc_gc_stack_ptr,
 	     kkcc_gc_stack_size * sizeof (kkcc_gc_stack_entry));
 if (!kkcc_gc_stack_ptr)
 {
 stderr_out ("stack realloc failed for size %d\n", kkcc_gc_stack_size);
-exit(23);
+ABORT ();
 }
 kkcc_gc_stack_top = kkcc_gc_stack_ptr + current_offset;
 kkcc_gc_stack_last_entry = kkcc_gc_stack_ptr + kkcc_gc_stack_size - 1;
 }
 GC_CHECK_LHEADER_INVARIANTS (lheader);
 desc = RECORD_DESCRIPTION (lheader);
 if (! MARKED_RECORD_HEADER_P (lheader))
 	{
 	  MARK_RECORD_HEADER (lheader);
-	  kkcc_gc_stack_push((void*) lheader, desc, level, pos);
+	  kkcc_gc_stack_push ((void*) lheader, desc, level, pos);
 	}
 }
 }
 #ifdef DEBUG_XEMACS
 void *data = 0;
 const struct memory_description *desc = 0;
 int pos;
 #ifdef DEBUG_XEMACS
 int level = 0;
-KKCC_BT_INIT ();
+kkcc_bt_init ();
 #endif
 while ((stack_entry = kkcc_gc_stack_pop ()) != 0)
 {
 data = stack_entry->data;
 	      kkcc_backtrace ();
 	      ABORT ();
 	    }
 	}
 }
+#ifdef DEBUG_XEMACS
+kkcc_bt_free ();
+#endif
 }
 #endif /* USE_KKCC */
 /* Mark reference to a Lisp_Object.  If the object referred to has not been
 seen yet, recursively mark all the references contained in it. */

Mercurial > hg > xemacs-beta

comparison src/alloc.c @ 2666:7bf1f40e6acb