make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-03-15 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (c_readonly): * alloc.c (deadbeef_memory): * alloc.c (make_compiled_function): * alloc.c (make_button_data): * alloc.c (make_motion_data): * alloc.c (make_process_data): * alloc.c (make_timeout_data): * alloc.c (make_magic_data): * alloc.c (make_magic_eval_data): * alloc.c (make_eval_data): * alloc.c (make_misc_user_data): * alloc.c (noseeum_make_marker): * alloc.c (ADDITIONAL_FREE_string): * alloc.c (common_init_alloc_early): * alloc.c (init_alloc_once_early): * bytecode.c (print_compiled_function): * bytecode.c (mark_compiled_function): * casetab.c: * casetab.c (print_case_table): * console.c: * console.c (print_console): * database.c (print_database): * database.c (finalize_database): * device-msw.c (sync_printer_with_devmode): * device-msw.c (print_devmode): * device-msw.c (finalize_devmode): * device.c: * device.c (print_device): * elhash.c: * elhash.c (print_hash_table): * eval.c (print_multiple_value): * eval.c (mark_multiple_value): * events.c (deinitialize_event): * events.c (print_event): * events.c (event_equal): * extents.c: * extents.c (soe_dump): * extents.c (soe_insert): * extents.c (soe_delete): * extents.c (soe_move): * extents.c (extent_fragment_update): * extents.c (print_extent_1): * extents.c (print_extent): * extents.c (vars_of_extents): * frame.c: * frame.c (print_frame): * free-hook.c: * free-hook.c (check_free): * glyphs.c: * glyphs.c (print_image_instance): * glyphs.c (print_glyph): * gui.c: * gui.c (copy_gui_item): * hash.c: * hash.c (NULL_ENTRY): * hash.c (KEYS_DIFFER_P): * keymap.c (print_keymap): * keymap.c (MARKED_SLOT): * lisp.h: * lrecord.h: * lrecord.h (LISP_OBJECT_UID): * lrecord.h (set_lheader_implementation): * lrecord.h (struct old_lcrecord_header): * lstream.c (print_lstream): * lstream.c (finalize_lstream): * marker.c (print_marker): * marker.c (marker_equal): * mc-alloc.c (visit_all_used_page_headers): * mule-charset.c: * mule-charset.c (print_charset): * objects.c (print_color_instance): * objects.c (print_font_instance): * objects.c (finalize_font_instance): * opaque.c (print_opaque): * opaque.c (print_opaque_ptr): * opaque.c (equal_opaque_ptr): * print.c (internal_object_printer): * print.c (enum printing_badness): * rangetab.c (print_range_table): * rangetab.c (range_table_equal): * specifier.c (print_specifier): * specifier.c (finalize_specifier): * symbols.c: * symbols.c (print_symbol_value_magic): * tooltalk.c: * tooltalk.c (print_tooltalk_message): * tooltalk.c (print_tooltalk_pattern): * window.c (print_window): * window.c (debug_print_window): (1) Make lrecord UID's have a separate UID space for each object. Otherwise, with 20-bit UID's, we rapidly wrap around, especially when common objects like conses and strings increment the UID value for every object created. (Originally I tried making two UID spaces, one for objects that always print readably and hence don't display the UID, and one for other objects. But certain objects like markers for which a UID is displayed are still generated rapidly enough that UID overflow is a serious issue.) This also has the advantage of making UID values smaller, hence easier to remember -- their main purpose is to make it easier to keep track of different objects of the same type when debugging code. Make sure we dump lrecord UID's so that we don't have problems with pdumped and non-dumped objects having the same UID. (2) Display UID's consistently whenever an object (a) doesn't consistently print readably (objects like cons and string, which always print readably, can't display a UID), and (b) doesn't otherwise have a unique property that makes objects of a particular type distinguishable. (E.g. buffers didn't and still don't print an ID, but the buffer name uniquely identifies the buffer.) Some types, such as event, extent, compiled-function, didn't always (or didn't ever) display an ID; others (such as marker, extent, lstream, opaque, opaque-ptr, any object using internal_object_printer()) used to display the actual machine pointer instead. (3) Rename NORMAL_LISP_OBJECT_UID to LISP_OBJECT_UID; make it work over all Lisp objects and take a Lisp object, not a struct pointer. (4) Some misc cleanups in alloc.c, elhash.c. (5) Change code in events.c that "deinitializes" an event so that it doesn't increment the event UID counter in the process. Also use deadbeef_memory() to overwrite memory instead of doing the same with custom code. In the process, make deadbeef_memory() in alloc.c always available, and delete extraneous copy in mc-alloc.c. Also capitalize all uses of 0xDEADBEEF. Similarly in elhash.c call deadbeef_memory(). (6) Resurrect "debug SOE" code in extents.c. Make it conditional on DEBUG_XEMACS and on a `debug-soe' variable, rather than on SOE_DEBUG. Make it output to stderr, not stdout. (7) Delete some custom print methods that were identical to external_object_printer().

/*
 * Copyright (c) 2000, Red Hat, 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 of the License, or
 *     (at your option) any later version.
 *
 *     A copy of the GNU General Public License can be found at
 *     http://www.gnu.org/
 *
 * Written by DJ Delorie <dj@cygnus.com>
 *
 */

/* The purpose of this file is to handle the case where we're
   installing from files that already exist in the current directory.
   If a setup.ini file is present, we set the mirror site to "." and
   pretend we're installing from the `internet' ;-) else we have to
   find all the .tar.gz files, deduce their versions, and try to
   compare versions in the case where the current directory contains
   multiple versions of any given package.  We do *not* try to compare
   versions with already installed packages; we always choose a
   package in the current directory over one that's already installed
   (otherwise, why would you have asked to install it?).  Note
   that we search recursively. */

#include "win32.h"

#include <stdio.h>
#include <stdlib.h>
#include <io.h>
#include <ctype.h>
#ifndef WIN32_NATIVE
#include <unistd.h>
#endif

#include "ini.h"
#include "resource.h"
#include "concat.h"
#include "state.h"
#include "dialog.h"
#include "msg.h"
#include "find.h"
#include "version.h"

#include "port.h"

static int
is_test_version (char *v)
{
  int i;
  for (i=0; v[i] && isdigit (v[i]); i++) ;
  return (i >= 6) ? 1 : 0;
}

char *
canonicalize_version (char *v)
{
  static char nv[3][100];
  static int idx = 0;
  char *np, *dp;
  int i;

  idx = (idx+1) % 3;
  np = nv[idx];

  while (*v)
    {
      if (isdigit (*v))
	{
	  for (dp=v; *dp && isdigit (*dp); dp++) ;
	  for (i=dp-v; i<12; i++)
	    *np++ = '0';
	  while (v < dp)
	    *np++ = *v++;
	}
      else
	*np++ = *v++;
    }
  *np++ = 0;
  return nv[idx];
}

static void
found_file (char *path, unsigned int fsize)
{
  char base[_MAX_PATH], *ver;

  int l = strlen (path);

  if (strcmp (path + l - 7, ".tar.gz") != 0)
    return;
  if (strstr (path, "-src."))
    return;
  if (strstr (path, "-patch."))
    return;

  char *sl = strrchr (path, '/');
  if (sl)
    sl ++;
  else
    sl = path;
  strcpy (base, sl);
  base[strlen (base) - 7] = 0; /* remove .tar.gz */
  for (ver=base; *ver; ver++)
    if ((*ver == '-' || *ver == '_') && isdigit (ver[1]))
      {
	*ver++ = 0;
	break;
      }

  Package *p = 0;
  int i;

  for (i=0; i<npackages; i++)
    if (strcmp (package[i].name, base) == 0)
      {
	p = package + i;
	break;
      }
  if (p == 0)
      p = new_package (strdup (base));

  int trust = is_test_version (ver) ? TRUST_TEST : TRUST_CURR;
  if (!*ver)
    trust = TRUST_PREV;

  /* See if this version is older than what we have */
  if (p->info[trust].version)
    {
      char *ov = canonicalize_version (p->info[trust].version);
      char *nv = canonicalize_version (ver);
      if (strcmp (ov, nv) > 0)
	return;
    }

  l = strlen (base);
  if (l >= 5 && strcmp (base + l - 5, "win32") == 0)
    p->type = TY_NATIVE;
  if (l >= 8 && strcmp (base + l - 8, "cygwin32") == 0)
    p->type = TY_CYGWIN;

  p->info[trust].version = strdup (ver);
  p->info[trust].install = strdup (path);
  p->info[trust].install_size = fsize;
}

void
do_fromcwd (HINSTANCE h)
{
  if (_access ("./setup.ini", 0) == 0)
    {
      mirror_site = ".";
      next_dialog = IDD_S_LOAD_INI;
      return;
    }

  next_dialog = IDD_CHOOSE;

  find (".", found_file);

  // Now see about source tarballs
  int i, t;
  Package *p;
  char srcpath[_MAX_PATH];
  for (i=0; i<npackages; i++)
    {
      p = package+i;
      for (t=TRUST_PREV; t<=TRUST_TEST; t++)
	if (p->info[t].install)
	  {
	    strcpy (srcpath, p->info[t].install);
	    strcpy (srcpath + strlen (srcpath) - 7, "-src.tar.gz");
	    msg ("looking for %s", srcpath);

	    WIN32_FIND_DATA wfd;
	    HANDLE h = FindFirstFile (srcpath, &wfd);
	    if (h != INVALID_HANDLE_VALUE)
	      {
		msg("-- got it");
		FindClose (h);
		p->info[t].source = strdup (srcpath);
		p->info[t].source_size = wfd.nFileSizeLow;
	      }
	  }
    }

  return;
}