-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2006, 2008 Free Software Foundation, Inc.
*
- * This program 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.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * This program 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.
+ * This library 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
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <string.h>
#include <stdio.h>
} \
while (0)
-#ifdef MISSING_BZERO_DECL
-extern void bzero (void *, size_t);
-#endif
-
static void
grow (hash_entry_t **table, int *size)
{
again:
TABLE (new) = realloc (TABLE (new),
sizeof (hash_entry_t) * (SIZE (new) + N_SEEK));
- bzero (TABLE (new), sizeof (hash_entry_t) * (SIZE (new) + N_SEEK));
+ memset (TABLE (new), 0, sizeof (hash_entry_t) * (SIZE (new) + N_SEEK));
for (i = 0; i < oldsize; ++i)
if (oldtable[i].key)
{
if (type == 0)
{
fprintf (stderr,
- "scm_must_free called on object not allocated with scm_must_malloc\n");
+ "scm_gc_free called on object not allocated with scm_gc_malloc\n");
abort ();
}
type->data = (void *) ((int) type->data - 1);
scm_malloc_reregister (void *old, void *new, const char *newwhat)
{
hash_entry_t *object, *type;
- GET_CREATE_HASH_ENTRY (object, object, old, l1);
- type = (hash_entry_t *) object->data;
- if (type == 0)
- {
- fprintf (stderr,
- "scm_must_realloc called on object not allocated with scm_must_malloc\n");
- abort ();
- }
- if (strcmp ((char *) type->key, newwhat) != 0)
+
+ if (old == NULL)
+ scm_malloc_register (new, newwhat);
+ else
{
- if (strcmp (newwhat, "vector-set-length!") != 0)
+ GET_CREATE_HASH_ENTRY (object, object, old, l1);
+ type = (hash_entry_t *) object->data;
+ if (type == 0)
{
fprintf (stderr,
- "scm_must_realloc called with arg %s, was %s\n",
- newwhat,
- (char *) type->key);
+ "scm_gc_realloc called on object not allocated "
+ "with scm_gc_malloc\n");
abort ();
}
- }
- if (new != old)
- {
- object->key = 0;
- CREATE_HASH_ENTRY (object, new, type, l2);
+ if (strcmp ((char *) type->key, newwhat) != 0)
+ {
+ if (strcmp (newwhat, "vector-set-length!") != 0)
+ {
+ fprintf (stderr,
+ "scm_gc_realloc called with arg %s, was %s\n",
+ newwhat,
+ (char *) type->key);
+ abort ();
+ }
+ }
+ if (new != old)
+ {
+ object->key = 0;
+ CREATE_HASH_ENTRY (object, new, type, l2);
+ }
}
}
SCM_DEFINE (scm_malloc_stats, "malloc-stats", 0, 0, 0,
(),
- "Return an alist ((WHAT . N) ...) describing number of malloced objects.\n"
- "WHAT is the second argument to scm_must_malloc, N is the number of objects\n"
- "of that type currently allocated.")
+ "Return an alist ((@var{what} . @var{n}) ...) describing number\n"
+ "of malloced objects.\n"
+ "@var{what} is the second argument to @code{scm_gc_malloc},\n"
+ "@var{n} is the number of objects of that type currently\n"
+ "allocated.")
#define FUNC_NAME s_scm_malloc_stats
{
SCM res = SCM_EOL;
int i;
for (i = 0; i < malloc_type_size + N_SEEK; ++i)
if (malloc_type[i].key)
- res = scm_acons (scm_makfrom0str ((char *) malloc_type[i].key),
- SCM_MAKINUM ((int) malloc_type[i].data),
+ res = scm_acons (scm_from_locale_string ((char *) malloc_type[i].key),
+ scm_from_int ((int) malloc_type[i].data),
res);
return res;
}
{
malloc_type = malloc (sizeof (hash_entry_t)
* (malloc_type_size + N_SEEK));
- bzero (malloc_type, sizeof (hash_entry_t) * (malloc_type_size + N_SEEK));
+ memset (malloc_type, 0, sizeof (hash_entry_t) * (malloc_type_size + N_SEEK));
malloc_object = malloc (sizeof (hash_entry_t)
* (malloc_object_size + N_SEEK));
- bzero (malloc_object, sizeof (hash_entry_t) * (malloc_object_size + N_SEEK));
+ memset (malloc_object, 0, sizeof (hash_entry_t) * (malloc_object_size + N_SEEK));
}
void
{
#include "libguile/debug-malloc.x"
}
+
HCoop / bpt / guile.git / blobdiff