bleak_house 4.4 → 4.5

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v4.5. Enable SET_CURRENT_SOURCE() for better reporting (tmm1, joedamato).
+
 v4.4. Switch to Ruby 1.8.7p174.
 
 v4.3. Build against OpenSSL 0.9.8j or later (kennethkalmer). Bugfixes (Pete Hodgson, joshuabates).

data/Manifest

@@ -14,10 +14,8 @@ ext/snapshot.h
 lib/bleak_house.rb
 lib/bleak_house/analyzer.rb
 lib/bleak_house/hook.rb
-ruby/openssl.patch
 ruby/ruby-1.8.7-p174.tar.bz2
-ruby/ruby187.patch
-ruby/valgrind.patch
+ruby/ruby-1.8.7.patch
 test/benchmark/bench.rb
 test/test_helper.rb
 test/unit/test_bleak_house.rb

data/README

@@ -87,11 +87,13 @@ You can send <tt>SIGUSR2</tt> to a BleakHouse-instrumented program to snag a dum
 
 Do not try to detect Rails leaks in <tt>development</tt> mode. Make a separate <tt>benchmark</tt> environment if you need to, and make sure all your production caching is turned on.
 
-It is normal to see lots of <tt>null:null</tt> references, especially for nodes. Using <tt>eval()</tt> too much can be a cause of node leaks. You can track <tt>eval()</tt> by using sourceline macros in your code:
+It is normal to see lots of <tt>null:null</tt> references, especially for nodes. Using <tt>eval()</tt> too much can be a cause of node leaks. You can sometimes track <tt>eval()</tt> by using sourceline macros in your code:
 
   eval("CODE", nil, __FILE__, __LINE__)
 
-You may get library require errors if you install <tt>ruby-bleak-house</tt> 1.8.6 alongside a different verson of Ruby. You could try to patch your local version of Ruby instead, or you could just upgrade to 1.8.6, which has a good trackrecord of stability.
+You may get library require errors if you install <tt>ruby-bleak-house</tt> 1.8.7 alongside a different verson of Ruby. You could try to patch your local version of Ruby instead, or you can get <tt>ruby-bleak-house</tt> to lie about its version. Just make sure that the <tt>bleak-house</tt> library is the first thing required (even before Rubygems):
+
+  ruby-bleak-house -I `ruby -e 'puts \`gem which bleak_house\`.split("\n")[1][0..-16]'` -rbleak_house
 
 It is not recommended that you use <tt>ruby-bleak-house</tt> as your production Ruby binary, since it will be slightly slower and use slightly more memory. It is unlikely, however, to affect stability.
 

data/bleak_house.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bleak_house}
-  s.version = "4.4"
+  s.version = "4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.executables = ["bleak"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "LICENSE_BSD", "README", "TODO", "ext/snapshot.c", "lib/bleak_house.rb", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "LICENSE_BSD", "Manifest", "README", "Rakefile", "TODO", "bin/bleak", "ext/build_ruby.rb", "ext/build_snapshot.rb", "ext/extconf.rb", "ext/snapshot.c", "ext/snapshot.h", "lib/bleak_house.rb", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb", "ruby/openssl.patch", "ruby/ruby-1.8.7-p174.tar.bz2", "ruby/ruby187.patch", "ruby/valgrind.patch", "test/benchmark/bench.rb", "test/test_helper.rb", "test/unit/test_bleak_house.rb", "bleak_house.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "LICENSE_BSD", "Manifest", "README", "Rakefile", "TODO", "bin/bleak", "ext/build_ruby.rb", "ext/build_snapshot.rb", "ext/extconf.rb", "ext/snapshot.c", "ext/snapshot.h", "lib/bleak_house.rb", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb", "ruby/ruby-1.8.7-p174.tar.bz2", "ruby/ruby-1.8.7.patch", "test/benchmark/bench.rb", "test/test_helper.rb", "test/unit/test_bleak_house.rb", "bleak_house.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/bleak_house/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Bleak_house", "--main", "README"]
   s.require_paths = ["lib", "ext"]

data/ext/build_ruby.rb

@@ -1,13 +1,7 @@
 
 # Extension abuse in order to build our patched binary as part of the gem install process.
 
-if RUBY_PLATFORM =~ /win32|windows/
-  raise "Windows is not supported."
-end
-
-unless RUBY_VERSION == '1.8.7'
-  raise "Wrong Ruby version, you're at '#{RUBY_VERSION}', need 1.8.7"
-end
+raise "Windows is not supported." if RUBY_PLATFORM =~ /win32|windows/
 
 source_dir = File.expand_path(File.dirname(__FILE__)) + "/../ruby"
 tmp = "/tmp/"
@@ -32,7 +26,7 @@ def which(basename)
 end
 
 if which('ruby-bleak-house') and
-  (patchlevel  = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 904
+  (patchlevel  = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 905
   puts "** Binary `ruby-bleak-house` is already available (patchlevel #{patchlevel})"
 else
   # Build
@@ -60,7 +54,7 @@ else
         Dir.chdir("ruby-1.8.7-p174") do
 
           puts "** Patch Ruby"
-          execute("patch -p1 < '#{source_dir}/ruby187.patch'")
+          execute("patch -p1 < '#{source_dir}/ruby-1.8.7.patch'")
 
           env = Config::CONFIG.map do |key, value|
             "#{key}=#{value.inspect}" if key.upcase == key and value

data/ext/build_snapshot.rb

@@ -1,3 +1,4 @@
+RUBY_VERSION = `ruby -v`.split(" ")[1]
 require 'mkmf'
 $CFLAGS = ENV['CFLAGS']
 dir_config('snapshot')

data/lib/bleak_house.rb

@@ -1,7 +1,8 @@
 
-unless RUBY_PATCHLEVEL >= 904
+unless RUBY_PATCHLEVEL >= 905
   raise "This build of Ruby has not been successfully patched for BleakHouse."
 end
 
+RUBY_VERSION = `ruby -v`.split(" ")[1]
 require 'snapshot'
 require 'bleak_house/hook'

data/ruby/{ruby187.patch → ruby-1.8.7.patch}

@@ -290,6 +290,15 @@ index 11264f7..09ec7a6 100644
  #include <stdio.h>
  
  #include "st.h"
+@@ -1149,7 +1149,7 @@ static VALUE trace_func = 0;
+ static int tracing = 0;
+ static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));
+ 
+-#if 0
++#if 1
+ #define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
+ 			      ruby_sourceline = nd_line(ruby_current_node))
+ #else
 @@ -5290,6 +5296,9 @@ assign(self, lhs, val, pcall)
      int pcall;
  {
@@ -370,18 +379,17 @@ index 45facf0..933b76e 100644
  #define HEAP_MIN_SLOTS 10000
  static int heap_slots = HEAP_MIN_SLOTS;
  
-@@ -442,6 +463,11 @@ rb_newobj()
+@@ -438,10 +438,8 @@ rb_newobj()
+     obj = (VALUE)freelist;
+     freelist = freelist->as.free.next;
+     MEMZERO((void*)obj, RVALUE, 1);
+-#ifdef GC_DEBUG
      RANY(obj)->file = ruby_sourcefile;
      RANY(obj)->line = ruby_sourceline;
- #endif
-+
-+    if (ruby_current_node && ruby_current_node->nd_file) {
-+      RANY(obj)->file = ruby_current_node->nd_file;
-+      RANY(obj)->line = nd_line(ruby_current_node);
-+    }
+-#endif
      return obj;
  }
- 
+
 @@ -678,6 +704,9 @@ mark_locations_array(x, n)
      register long n;
  {
@@ -411,6 +419,28 @@ index 45facf0..933b76e 100644
      if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
  	if (!mark_stack_overflow) {
  	    if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
+@@ -1077,6 +1078,10 @@ gc_mark(ptr, lev)
+     if (obj->as.basic.flags == 0) return;       /* free cell */
+     if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
+     obj->as.basic.flags |= FL_MARK;
++
++    /* mark our new reference point for sourcefile objects */
++    mark_source_filename(RANY(obj)->file);
++
+ 
+     if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
+ 	if (!mark_stack_overflow) {
+@@ -1115,6 +1120,10 @@ gc_mark_children(ptr, lev)
+     if (obj->as.basic.flags == 0) return;       /* free cell */
+     if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
+     obj->as.basic.flags |= FL_MARK;
++
++    /* mark our new reference point for sourcefile objects */
++    mark_source_filename(RANY(obj)->file);
++
+ 
+   marking:
+     if (FL_TEST(obj, FL_EXIVAR)) {
 diff --git a/parse.c b/parse.c
 index 6b3d80d..b320cf2 100644
 --- a/parse.c
@@ -449,5 +479,5 @@ index 70fc28a..76aa188 100644
 +++ b/version.h
 @@ -5,2 +5,2 @@
 -#define RUBY_PATCHLEVEL 174
-+#define RUBY_PATCHLEVEL 904
++#define RUBY_PATCHLEVEL 905
 

data/test/unit/test_bleak_house.rb

@@ -3,10 +3,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../lib")
 
 ENV['NO_EXIT_HANDLER'] = "1"
 
+require 'bleak_house'
 require 'rubygems'
 require 'echoe'
 require 'test/unit'
-require 'bleak_house'
 
 class BleakHouseTest < Test::Unit::TestCase
 
@@ -38,7 +38,7 @@ class BleakHouseTest < Test::Unit::TestCase
       # require 'ruby-debug/debugger'
       assert_match(/top 20 most common/, output[0])
       assert_match(/free heap/, output[3])
-      assert_match(/\d+ __null__:__null__:__node__/, output[4])
+      assert_match(/\d+ __null__:__null__:__node__/, output[5])
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: "4.4"
+  version: "4.5"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -67,10 +67,8 @@ files:
 - lib/bleak_house.rb
 - lib/bleak_house/analyzer.rb
 - lib/bleak_house/hook.rb
-- ruby/openssl.patch
 - ruby/ruby-1.8.7-p174.tar.bz2
-- ruby/ruby187.patch
-- ruby/valgrind.patch
+- ruby/ruby-1.8.7.patch
 - test/benchmark/bench.rb
 - test/test_helper.rb
 - test/unit/test_bleak_house.rb

data/ruby/openssl.patch

@@ -1,157 +0,0 @@
-This patch backports changes from ruby 1.8.7 which only includes the
-openssl prototypes for functions that are not in the system openssl
-library. This fixes #254307 and protects against similar issues with
-future openssl versions.
-
-diff -u ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/extconf.rb ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/extconf.rb
---- ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/openssl_missing.c	2007-02-13 00:01:19.000000000 +0100
-+++ ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/openssl_missing.c	2008-05-19 05:00:52.000000000 +0200
-@@ -22,17 +22,15 @@
- #include "openssl_missing.h"
- 
- #if !defined(HAVE_HMAC_CTX_COPY)
--int
-+void
- HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
- {
--    if (!out || !in) return 0;
-+    if (!out || !in) return;
-     memcpy(out, in, sizeof(HMAC_CTX));
- 
--    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)
--	    || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)
--	    || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx))
--	return 0;
--    return 1;
-+    EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
-+    EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
-+    EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
- }
- #endif /* HAVE_HMAC_CTX_COPY */
- #endif /* NO_HMAC */
-diff -u ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/openssl_missing.h ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/openssl_missing.h
---- ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/openssl_missing.h	2008-08-04 06:43:34.000000000 +0200
-+++ ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/openssl_missing.h	2008-08-04 06:44:17.000000000 +0200
-@@ -60,14 +60,33 @@
- 	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
- #endif
- 
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
- void HMAC_CTX_init(HMAC_CTX *ctx);
--int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_COPY)
-+void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_CLEANUP)
- void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-+#endif
- 
-+#if !defined(HAVE_EVP_MD_CTX_CREATE)
- EVP_MD_CTX *EVP_MD_CTX_create(void);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
- void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
- int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
- void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-+#endif
- 
- #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
- int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
-@@ -111,19 +130,54 @@
- #define OPENSSL_cleanse(p, l) memset(p, 0, l)
- #endif
- 
-+#if !defined(HAVE_X509_STORE_SET_EX_DATA)
- void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
- int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_VERSION)
- int X509_CRL_set_version(X509_CRL *x, long version);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
- int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SORT)
- int X509_CRL_sort(X509_CRL *c);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
- int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SQR)
- int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_ADD)
- int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SUB)
- int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_RAND_RANGE)
- int BN_rand_range(BIGNUM *r, BIGNUM *range);
-+#endif
-+
-+#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
- int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
-+#endif
-+
-+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
- char *CONF_get1_default_config_file(void);
-+#endif
-+
-+#if !defined(HAVE_PEM_DEF_CALLBACK)
- int PEM_def_callback(char *buf, int num, int w, void *key);
-+#endif
- 
- #if defined(__cplusplus)
- }
-diff -u ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/ossl_hmac.c ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/ossl_hmac.c
---- ruby-1.8.6_p287-r10/work/ruby-1.8.6-p287/ext/openssl/ossl_hmac.c	2007-03-12 05:12:32.000000000 +0100
-+++ ruby-1.8.7_p72-r1/work/ruby-1.8.7-p72/ext/openssl/ossl_hmac.c	2008-05-19 05:00:52.000000000 +0200
-@@ -81,12 +87,15 @@
-     GetHMAC(self, ctx1);
-     SafeGetHMAC(other, ctx2);
- 
--    if (!HMAC_CTX_copy(ctx1, ctx2)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(ctx1, ctx2);
-     return self;
- }
- 
-+/*
-+ *  call-seq:
-+ *     hmac.update(string) -> self
-+ *
-+ */
- static VALUE
- ossl_hmac_update(VALUE self, VALUE data)
- {
-@@ -104,9 +113,7 @@
- {
-     HMAC_CTX final;
- 
--    if (!HMAC_CTX_copy(&final, ctx)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(&final, ctx);
-     if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
- 	HMAC_CTX_cleanup(&final);
- 	OSSL_Debug("Allocating %d mem", HMAC_size(&final));

data/ruby/valgrind.patch

@@ -1,123 +0,0 @@
-Index: Makefile.in
-===================================================================
---- Makefile.in	(revision 6439)
-+++ Makefile.in	(working copy)
-@@ -34,7 +34,7 @@
-
- empty =
- OUTFLAG = @OUTFLAG@$(empty)
--CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
-+CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@ @VALGRIND_CFLAGS@
- CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
- LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
- EXTLDFLAGS =
-Index: configure.in
-===================================================================
---- configure.in	(revision 6439)
-+++ configure.in	(working copy)
-@@ -895,6 +895,22 @@
-     fi
- fi
-
-+AC_ARG_ENABLE(valgrind,
-+       [  --enable-valgrind       use valgrind support],
-+       [want_valgrind=$enableval], [want_valgrind=auto])
-+
-+if test x"$want_valgrind" != xno; then
-+  AC_CHECK_HEADERS(valgrind/memcheck.h, have_valgrind=yes, have_valgrind=no)
-+	if test x"$have_valgrind" = xyes; then
-+		AC_DEFINE(HAVE_VALGRIND)
-+		VALGRIND_CFLAGS="";
-+	elif test x"$want_valgrind" = xyes -a x"$have_valgrind" = xno; then
-+		AC_MSG_ERROR(valgrind support requested but valgrind not found)
-+	else
-+	  VALGRIND_CFLAGS="";
-+	fi
-+fi
-+
- dnl default value for $KANJI
- DEFAULT_KCODE="KCODE_NONE"
-
-@@ -1504,6 +1520,7 @@
- esac
-
- AC_SUBST(XCFLAGS)dnl
-+AC_SUBST(VALGRIND_CFLAGS)dnl
- AC_SUBST(XLDFLAGS)dnl
- AC_SUBST(LIBRUBY_LDSHARED)
- AC_SUBST(LIBRUBY_DLDFLAGS)
-Index: eval.c
-===================================================================
---- eval.c	(revision 6439)
-+++ eval.c	(working copy)
-@@ -28,6 +28,12 @@
- #define EXIT_FAILURE 1
- #endif
-
-+#ifdef HAVE_VALGRIND
-+#include <valgrind/memcheck.h>
-+#else
-+#define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
-+#endif
-+
- #include <stdio.h>
-
- #include "st.h"
-@@ -5225,6 +5231,9 @@
-     int pcall;
- {
-     ruby_current_node = lhs;
-+
-+    VALGRIND_MAKE_MEM_DEFINED(&val, sizeof(val));
-+
-     if (val == Qundef) {
- 	rb_warning("assigning void value");
- 	val = Qnil;
-Index: gc.c
-===================================================================
---- gc.c	(revision 6439)
-+++ gc.c	(working copy)
-@@ -30,6 +30,12 @@
- #include <sys/resource.h>
- #endif
-
-+#ifdef HAVE_VALGRIND
-+#include <valgrind/memcheck.h>
-+#else
-+#define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
-+#endif
-+
- #if defined _WIN32 || defined __CYGWIN__
- #include <windows.h>
- #endif
-@@ -93,6 +99,9 @@
- {
-     void *mem;
-
-+    VALGRIND_MAKE_MEM_DEFINED(&malloc_increase, sizeof(malloc_increase));
-+    VALGRIND_MAKE_MEM_DEFINED(&malloc_limit, sizeof(malloc_limit));
-+
-     if (size < 0) {
- 	rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
-     }
-@@ -623,6 +632,9 @@
-     register long n;
- {
-     VALUE v;
-+
-+    VALGRIND_MAKE_MEM_DEFINED(x, sizeof(*x) * n);
-+
-     while (n--) {
-         v = *x;
- 	if (is_pointer_to_heap((void *)v)) {
-@@ -713,7 +725,10 @@
- {
-     register RVALUE *obj;
-
-+    VALGRIND_MAKE_MEM_DEFINED(&ptr, sizeof(ptr));
-     obj = RANY(ptr);
-+    VALGRIND_MAKE_MEM_DEFINED(obj, sizeof(*obj));
-+
-     if (rb_special_const_p(ptr)) return; /* special const not marked */
-     if (obj->as.basic.flags == 0) return;       /* free cell */
-     if (obj->as.basic.flags & FL_MARK) return;  /* already marked */