RubyGems - localmemcache - Versions diffs - 0.4.3 → 0.4.4 - Mend

localmemcache 0.4.3 → 0.4.4

Files changed (20) hide show

data/VERSION +1 -1
data/site/index.html +124 -38
data/src/lmc_common.c +4 -3
data/src/lmc_valloc.c +13 -6
data/src/lmc_valloc.h +1 -0
data/src/localmemcache.c +1 -0
data/src/ruby-binding/localmemcache.rb +5 -1
data/src/ruby-binding/rblocalmemcache.c +59 -5
data/src/tests/bench.rb +1 -1
data/src/tests/console +6 -0
data/src/tests/console.rb +4 -0
data/src/tests/crash.rb +1 -1
data/src/tests/iter.rb +1 -1
data/src/tests/lmc.rb +29 -10
data/src/tests/run-all-tests +2 -0
data/src/tests/ttlmc-consistency +11 -0
data/src/tests/ttlmc-consistency.rb +57 -0
data/src/tests/ttlmc.rb +5 -5
metadata +6 -3
data/site/style.css +0 -37

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.4.3
1	+ 0.4.4

data/site/index.html CHANGED

@@ -1,14 +1,96 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Localmemcache</title>
-    <link type="text/css" rel="stylesheet" href="style.css" media="screen"/>
+    <title>Localmemcache: mmap -> lmc_valloc -> hashtable. BAM database</title>
+<script type="text/javascript">
+// <![CDATA[
+function show_complete_history() {
+  var e = document.getElementById('old-news')
+  e.style.display = e.style.display == "none" ? "block" : "none";
+  return false;
+}
+// ]]
+</script>
+<style type="text/css">
+body {
+  background: #FFF;
+  color: #333;
+  font-family: "Helvetica Neue", Helvetica, "Trebuchet MS", "Lucida Grande", Verdana, sans-serif;
+  margin: 0;
+  font-size: 17pt;
+  line-height: 1.3em;
+}
+h1, h2, h3, h4 {
+  color: #0;
+  padding: 0;
+  margin: 1em 0;
+}
+#opener-background {
+  background-color: #333;
+  padding-bottom: 10px;
+}
+#opener {
+  width: 1024px;
+}
+#opener, #opener * {
+  font: 40pt/44pt "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: bold;
+  letter-spacing: -0.75pt;
+  margin: auto ;
+  color: #aaa;
+  background-color: #333;
+}
+#opener em {
+  color: #fff;
+}
+#content em {
+  color: #aaa;
+  font: 50pt/40pt "Helvetica Neue", Helvetica, Arial, sans-serif;
+  letter-spacing: -0.75pt;
+  font-weight: bold;
+}
+#opener #title {
+  line-height: 1.9em;
+}
+pre, code {
+  font-family: Courier;
+  font-size: 17pt;
+  overflow: auto;
+}
+a { color: #0088FF; text-decoration: none }
+a:hover { color: #fff; background-color: #0088FF }
+#content {
+  margin: 0 auto ;
+  width: 1024px;
+}
+ol, ul { padding-left: 0; }
+</style>
   </head>
-  <body>
+<body>
+<div id="opener-background">
+<div id="opener">
+<div id="title">How would one design a database today?</div>
+<table cellspacing=0 cellpadding=0 width="100%">
+<tr><td><em>then</em></td><td>memory scarce, open, read, write</td></tr>
+<tr><td><em>today</em></td><td>64bit, mmap, sparse files</td></tr>
+</table>
+</div>
+</div>
 <div id="content">
-<h1>A persistent key-value database based on mmap()'ed shared memory</h1>
 <p><b>Localmemcache</b> is a library for <b>C</b> and <b>Ruby</b> that aims
 to provide
 an interface similar to memcached but for accessing local data instead of
@@ -17,6 +99,17 @@ speed</b>.
 Since version 0.3.0 it supports <b>persistence</b>, also making it <b>a fast
 alternative to GDBM, Berkeley DB, and Tokyo Cabinet</b>.
+<h2>Version 0.4.4: Bugfixes for OS X and Autorepair</h2>
+Version 0.4.4 brings fixes for coredumps on OS X and bugs in the
+autorepair (now also better covered by tests).  <br>
+New methods: <b>shm_status</b>, <b>has_key?</b><br>
+(Thanks to <b>Max Sch&ouml;fmann</b> and <b>Florian D&uuml;tsch</b> for feedback/bug reports.)
+<p>
+<a href="#" onclick="return show_complete_history()" />Previous Releases</a>
+<div id='old-news' style='display:none'>
 <h2>Version 0.4.3: Improving Iteration and bugfixes (2009-10-02)</h2>
 Fixes by <b>Paul Mineiro</b> (thanks!):
@@ -26,26 +119,13 @@ faster</b>.</li>
 <li><b>fix for leak</b> in local_memcache_free()</li>
 <li><b>C API</b>: Some C API functions were not yet covered by tests.  This
 has been fixed.</li>
-<p>
 Other fixes:
 <li><b>autorepair</b> fixed: Autorepair of namespaces did sometimes wrongly
 report corrupt namespaces.
 <li><b>:min_alloc_size</b> now also works on Ruby 1.9.</li>
-<script type="text/javascript">
-// <![CDATA[
-function show_complete_history() {
-  var e = document.getElementById('old-news')
-  e.style.display = e.style.display == "none" ? "block" : "none";
-  return false;
-}
-// ]]
-</script>
-<a href="#" onclick="show_complete_history()" />Previous Releases</a>
-<div id='old-news' style='display:none'><h2>Version 0.4.2: Improving Append Performance (2009-08-10)</h2>
+<h2>Version 0.4.2: Improving Append Performance (2009-08-10)</h2>
 In 0.4.2 the <b>:min_alloc_size</b> parameter was introduced to help with use
 cases that intend to use a hash table with growing values. This is
@@ -54,24 +134,15 @@ with a large list of unusable free blocks. By setting the
 <b>:min_alloc_size</b> parameter you help the allocator to plan better
 ahead. (<a href="http://localmemcache.rubyforge.org/doc/classes/LocalMemCache.html#M000001">more</a>)
-</div>
-<h2>Key features as of 0.4.0 (2009-05-16)</h2>
+<h2>Key features as of 0.4.4 (2009-11-10)</h2>
 <li><a href="#performance">blazingly fast</a></li>
 <li>a very simple API</li>
 <li>persistent</li>
 <li>parallel writes are supported by default</li>
 <li>uses transactions internally to avoid data corruption</li>
-<li>lightweight: the core library is just about <b>1400</b> lines of <b>C</b> code</li>
+<li>lightweight: the core library is just about <b>1500</b> lines of <b>C</b> code</li>
-<h2>Requirements</h2>
-<li>a &gt;=64bit Unix (32bit is possible but you'll run out of virtual address space quickly)</li>
-<li>a file system that offers <a href="http://en.wikipedia.org/wiki/Sparse_file">sparse files</a></li>
-Note for <b>OS X</b>: <b>OS X</b> disqualifies as <b>HFS+</b> doesn't
-have sparse files and <b>sem_timedwait</b>() and <b>sem_getvalue</b>() aren't
-supported as well.<br>
-Note for <b>FreeBSD</b>: It has been reported that localmemcache
-sometimes hangs there, it is not yet clear what the problem is.
+</div>
 <h2>Install</h2>
@@ -83,6 +154,16 @@ sometimes hangs there, it is not yet clear what the problem is.
 If you just want to use the <b>C API</b>, download the .tar.gz from <a href="http://rubyforge.org/frs/?group_id=7925">here</a>.
+<h2>Requirements</h2>
+<li>a &gt;=64bit Unix (32bit is possible but you'll run out of virtual address space quickly)</li>
+<li>a file system that offers <a href="http://en.wikipedia.org/wiki/Sparse_file">sparse files</a></li>
+Note for <b>OS X</b>: <b>OS X</b> disqualifies as <b>HFS+</b> doesn't
+have sparse files and <b>sem_timedwait</b>() and <b>sem_getvalue</b>() aren't
+supported as well.<br>
+Note for <b>FreeBSD</b>: It has been reported that localmemcache
+sometimes hangs there, it is not yet clear what the problem is.
 <h2>Using</h2>
 <b>API</b>:&nbsp;<a href="http://github.com/sck/localmemcache/blob/d72a5bd825b0fb573f1048ea9cae92d8c143525c/src/localmemcache.h">C</a>|<a href="http://localmemcache.rubyforge.org/doc/">Ruby</a><br>
 <p><pre><code>require 'localmemcache'
@@ -130,6 +211,16 @@ data on disk is about <b>10</b>% slower than keeping them in memory in a
 Ruby hash of strings.  It's about <b>40</b>% faster than <b>Tokyo Cabinet</b>
 (which offers features similar to <b>LocalMemCache</b>).
+<h2>Who uses Localmemcache?</h2>
+<a href="http://www.personifi.com">Personifi</a> use localmemcache to
+serve billions of hits each month.  Armin Roehrl: "we use
+localmemcache because it solves one problem very well and we love it!"
+<h2>Slides for my talk at the <a href="http://www.munich-on-rails.com/">Ruby on Rails Group Munich</a></h2>
+Now available on github&nbsp;&nbsp;&lt;&nbsp;<a href="http://cloud.github.com/downloads/sck/localmemcache/localmemcache.pdf">pdf</a>&nbsp;|&nbsp;<a href="http://cloud.github.com/downloads/sck/localmemcache/localmemcache.key">key</a>&nbsp;&gt;&nbsp;(German)
 <h2>Source code</h2>
 <p>The source code is hosted on <a href="http://github.com/sck/localmemcache/tree/master">github</a>. It
@@ -140,18 +231,13 @@ can be retrieved by executing</p>
 <h2>Caveats</h2>
-<li>Localmemcache's .lmc files are not binary compatible, they are essentially
+<li>Localmemcache's .lmc files are not binary compatible across different
+CPU architectures, they are essentially
 memory mapped c structs</li>
 <li>Because of the convenient auto repair feature after a lock timeout,
 localmemcache is allergic to SIGSTOP (If you manage to SIGSTOP a process
 while localmemcache is currently possessing a lock, that is)</li>
-<h2>Who uses Localmemcache?</h2>
-<a href="http://www.personifi.com">Personifi</a> use localmemcache to
-serve billions of hits each month.  Armin Roehrl: "we use
-localmemcache because it solves one problem very well and we love it!"
 <h2>Tips for backups</h2>
 Note that you cannot copy localmemcache's .lmc files while other

data/src/lmc_common.c CHANGED

@@ -43,9 +43,10 @@ size_t lmc_test_valloc_fail(const char *file, int line, const char *function,
 }
 void lmc_clean_string(char *result, const char *source) {
-  size_t n = strlen(source);
-  if (n > 256) { n = 256; }
-  const char *s = source;
+  size_t nn = strlen(source);
+  size_t n = nn;
+  if (n > 20) { n = 20; }
+  const char *s = source + nn - n;
   char *d = result;
   char ch;
   for (; n--; d++, s++) {

data/src/lmc_valloc.c CHANGED

@@ -39,7 +39,6 @@ void lmc_dump_chunk_brief(char *who, void *base, lmc_mem_chunk_descriptor_t* c)
   printf("[%s] chunk %zd:\n", who, va_c);
 }
 void lmc_dump(void *base) {
   lmc_mem_chunk_descriptor_t* c = md_first_free(base);
   size_t free = 0;
@@ -85,6 +84,11 @@ int lmc_is_va_valid(void *base, size_t va) {
       (base + md->total_size + sizeof(lmc_mem_descriptor_t)) < (void *)c);
 }
+size_t lmc_total_shm_size(void *base) {
+  lmc_mem_descriptor_t *md = base;
+  return md->total_size + sizeof(lmc_mem_descriptor_t);
+}
 lmc_mem_status_t lmc_status(void *base, char *where) {
   lmc_mem_descriptor_t *md = base;
   lmc_mem_chunk_descriptor_t* c = md_first_free(base);
@@ -93,6 +97,7 @@ lmc_mem_status_t lmc_status(void *base, char *where) {
   size_t largest_chunk = 0;
   long chunks = 0;
   ms.total_mem = md->total_size;
+  ms.total_shm_size = lmc_total_shm_size(base);
   while (c) {
     if (!lmc_is_va_valid(base, (void *)c - base)) {
       printf("[localmemcache] [%s] invalid pointer detected: %zd...\n", where,
@@ -379,11 +384,12 @@ int lmc_um_find_leaks(void *base, char *bf) {
   size_t gap_count = 0;
   size_t space = 0;
   memset(&m, 0xFF, sizeof(m));
-  for (i = 0; i < md->total_size; ++i) {
+  size_t tts = lmc_total_shm_size(md);
+  for (i = 0; i < tts; ++i) {
     if (!gap) {
       size_t *b = (void *)bf + i / 8;
-      size_t ee = md->total_size - sizeof(size_t) * 8;
-      while (*b == m && i < ee) {
+      size_t ee = tts - sizeof(size_t) * 8;
+      while (i < ee && *b == m) {
         i += sizeof(size_t) * 8; b++;
       }
     }
@@ -417,10 +423,11 @@ int lmc_um_check_unmarked(void *base, char *bf, size_t va, size_t size) {
   for (i = va; i < va + size; ++i) {
     size_t *b = (void *)bf + i / 8;
     size_t ee = end - sizeof(size_t) * 8;
-    while (*b == n && i < ee) {
+    while (i < ee && *b == n) {
       i += sizeof(size_t) * 8; b++;
     }
     if (lmc_um_getbit(bf, i) != 0) {
+      printf("i: %zd marked!\n", i);
       return 0;
     }
   }
@@ -464,7 +471,7 @@ int lmc_um_mark_allocated(void *base, char *bf, size_t va) {
 char *lmc_um_new_mem_usage_bitmap(void *base) {
   lmc_mem_descriptor_t *md = base;
-  size_t ts = ((md->total_size + 7) / 8);
+  size_t ts = ((lmc_total_shm_size(md) + 7) / 8);
   char *bf = calloc(1, ts);
   size_t va = md->first_free;
   if (!lmc_um_mark(base, bf, 0, sizeof(lmc_mem_descriptor_t))) goto failed;

data/src/lmc_valloc.h CHANGED

@@ -9,6 +9,7 @@ typedef struct {
   size_t free_chunks;
   size_t total_mem;
   size_t total_free_mem;
+  size_t total_shm_size;
   size_t free_mem;
   size_t largest_chunk;
 } lmc_mem_status_t;

data/src/localmemcache.c CHANGED

@@ -155,6 +155,7 @@ local_memcache_t *local_memcache_create(const char *namespace,
   char clean_ns[1024];
   double s = size_mb == 0.0 ? 1024.0 : size_mb;
   size_t si = s * 1024 * 1024;
+  if (si < 1024 * 1024) { si =  1024 * 1024; }
   //printf("size: %f, s: %f, si: %zd\n", size_mb, s, si);
   if (!lmc_namespace_or_filename((char *)clean_ns, namespace, filename, e))
       return 0;

data/src/ruby-binding/localmemcache.rb CHANGED

@@ -53,13 +53,17 @@ class LocalMemCache
     o = { :size_mb => 0 }.update(options || {})
     _new(o);
   end
+  def has_key?(k) !get(k).nil? end
   #  <code>SharedObjectStorage</code> inherits from class LocalMemCache but
   #  stores Ruby objects as values instead of just strings (It still uses
   #  strings for the keys, though).
   class SharedObjectStorage < LocalMemCache
+    alias __super_get get
     def []=(key,val) super(key, Marshal.dump(val)) end
     def [](key) v = super(key); v.nil? ? nil : Marshal.load(v) end
+    alias set []=
+    alias get []
     def each_pair(&block)
       super {|k, mv| block.call(k, Marshal.load(mv)) }
     end
@@ -67,6 +71,6 @@ class LocalMemCache
       rp = super
       rp.nil? ? nil : [rp.first, Marshal.load(rp.last)]
     end
+    def has_key?(k) !__super_get(k).nil?  end
   end
 end

data/src/ruby-binding/rblocalmemcache.c CHANGED

@@ -34,6 +34,24 @@ long long_value(VALUE i) { return NIL_P(i) ? 0 : NUM2LONG(rb_Integer(i)); }
 double double_value(VALUE i) { return NUM2DBL(i); }
 /* :nodoc: */
 VALUE num2string(long i) { return rb_big2str(rb_int2big(i), 10); }
+typedef struct {
+  char *cstr;
+  size_t len;
+} lmc_rb_str_d_t;
+/* :nodoc: */
+void rstring_acquire(VALUE s, lmc_rb_str_d_t *d) {
+  if (NIL_P(s)) {
+    d->cstr = "nil";
+    d->len = 0;
+    return;
+  }
+  VALUE v = TYPE(s) == T_STRING ? s : rb_funcall(s, rb_intern("to_s"), 0);
+  d->cstr = RSTRING_PTR(v);
+  d->len = RSTRING_LEN(v);
+}
 /* :nodoc: */
 char *rstring_ptr(VALUE s) {
   char* r = NIL_P(s) ? "nil" : RSTRING_PTR(rb_String(s));
@@ -218,8 +236,10 @@ static VALUE LocalMemCache__disable_test_crash(VALUE klass) {
  */
 static VALUE LocalMemCache__get(VALUE obj, VALUE key) {
   size_t l;
+  lmc_rb_str_d_t k;
+  rstring_acquire(key, &k);
   const char* r = __local_memcache_get(get_LocalMemCache(obj),
-      rstring_ptr(key), rstring_length(key), &l);
+      k.cstr, k.len, &l);
   VALUE rr = lmc_ruby_string2(r, l);
   lmc_unlock_shm_region("local_memcache_get", get_LocalMemCache(obj));
   return rr;
@@ -256,8 +276,10 @@ static VALUE LocalMemCache__random_pair(VALUE obj) {
  */
 static VALUE LocalMemCache__set(VALUE obj, VALUE key, VALUE value) {
   local_memcache_t *lmc = get_LocalMemCache(obj);
-  if (!local_memcache_set(lmc, rstring_ptr(key), rstring_length(key),
-      rstring_ptr(value), rstring_length(value))) {
+  lmc_rb_str_d_t k, v;
+  rstring_acquire(key, &k);
+  rstring_acquire(value, &v);
+  if (!local_memcache_set(lmc, k.cstr, k.len, v.cstr, v.len)) {
     rb_lmc_raise_exception(&lmc->error);
   }
   return Qnil;
@@ -283,8 +305,9 @@ static VALUE LocalMemCache__clear(VALUE obj) {
  *  Deletes key from hashtable.  The key is converted to string.
  */
 static VALUE LocalMemCache__delete(VALUE obj, VALUE key) {
-  return local_memcache_delete(get_LocalMemCache(obj),
-      rstring_ptr(key), rstring_length(key));
+  lmc_rb_str_d_t k;
+  rstring_acquire(key, &k);
+  return local_memcache_delete(get_LocalMemCache(obj), k.cstr, k.len);
   return Qnil;
 }
@@ -414,6 +437,36 @@ static VALUE LocalMemCache__size(VALUE obj) {
   return rb_int2big(ht->size);
 }
+/*
+ *  call-seq:
+ *     lmc.shm_status -> hash
+ *
+ *  Some status information on the shared memory:
+ *
+ *    :total_bytes # the total size of the shm in bytes
+ *    :used_bytes  # how many bytes are used in this shm
+ *                 # For exmpty namespaces this will reflect the amount
+ *                 # of memory used for the hash buckets and some other
+ *                 # administrative data structures.
+ *    :free_bytes  # how many bytes are free
+ */
+static VALUE LocalMemCache__shm_status(VALUE obj) {
+  VALUE hash = rb_hash_new();
+  local_memcache_t *lmc = get_LocalMemCache(obj);
+  if (!lmc_lock_shm_region("shm_status", lmc)) return Qnil;
+  lmc_mem_status_t ms = lmc_status(lmc->base, "shm_status");
+  if (!lmc_unlock_shm_region("shm_status", lmc)) return Qnil;
+  rb_hash_aset(hash, ID2SYM(rb_intern("free_bytes")),
+      rb_int2big(ms.total_free_mem));
+  rb_hash_aset(hash, ID2SYM(rb_intern("total_bytes")),
+      rb_int2big(ms.total_shm_size));
+  rb_hash_aset(hash, ID2SYM(rb_intern("used_bytes")), rb_int2big(
+      ms.total_shm_size - ms.total_free_mem));
+  return hash;
+}
 /*
  * internal, do not use
  */
@@ -500,6 +553,7 @@ void Init_rblocalmemcache() {
       0);
   rb_define_method(LocalMemCache, "close", LocalMemCache__close, 0);
   rb_define_method(LocalMemCache, "size", LocalMemCache__size, 0);
+  rb_define_method(LocalMemCache, "shm_status", LocalMemCache__shm_status, 0);
   rb_define_method(LocalMemCache, "check_consistency",
       LocalMemCache__check_consistency, 0);

data/src/tests/bench.rb CHANGED

@@ -7,7 +7,7 @@ require 'localmemcache'
 Bacon.summary_on_exit
 LocalMemCache.drop :namespace => "speed-comparison", :force => true
-$lm2 = LocalMemCache.new :namespace=>"speed-comparison"
+$lm2 = LocalMemCache.new :namespace=>"speed-comparison", :size_mb => 200
 def compare_speed(n)

data/src/tests/console ADDED

@@ -0,0 +1,6 @@
+#! /bin/sh
+D=`dirname $0`
+DIR=`cd $D; pwd`
+script=$DIR/console.rb
+irb -r $script

data/src/tests/console.rb ADDED

@@ -0,0 +1,4 @@
+$DIR=File.dirname(__FILE__)
+['.', '..', '../ruby-binding/'].each {|p| $:.unshift File.join($DIR, p) }
+require 'localmemcache'

data/src/tests/crash.rb CHANGED

@@ -10,7 +10,7 @@ $pids = []
   lm = LocalMemCache.new :namespace=>"crash-t"
   puts "pid: #{$$}"
   c = 0;
-  40000000.times {
+  40_000_000.times {
       c += 1
       r = rand(10000).to_s
       lm.set(r, r)

data/src/tests/iter.rb CHANGED

@@ -22,7 +22,7 @@ def compare_speed(n)
   puts "rhash: filling dict"
   $hh = {}
-  measure_time(1) { n.times {|i| $hh[i] = i } }
+  measure_time(1) { n.times {|i| $hh[i.to_s] = i.to_s } }
   puts "rhash: iterating"
   c = 0
   measure_time(1) {

data/src/tests/lmc.rb CHANGED

@@ -7,7 +7,7 @@ require 'localmemcache'
 Bacon.summary_on_exit
 LocalMemCache.drop :namespace => "test", :force => true
-$lm = LocalMemCache.new :namespace=>"test", :size_mb => 20
+$lm = LocalMemCache.new :namespace=>"test", :size_mb => 2
 LocalMemCache.drop :namespace => "test-small", :force => true
 $lms = LocalMemCache.new :namespace=>"test-small", :size_mb => 1;
@@ -20,6 +20,14 @@ describe 'LocalMemCache' do
     $lm.get("foo").should.equal "1"
   end
+  it 'should support has_key?' do
+    $lm.has_key?("foo").should.be.true
+    $lm.has_key?("non-existant").should.be.false
+    $lm[:bar] = nil
+    $lm.has_key?(:bar).should.be.true
+    $lm.delete(:bar)
+  end
   it 'should support the [] and []= operators' do
     $lm["boo"] = "2"
     $lm["boo"].should.equal "2"
@@ -48,12 +56,12 @@ describe 'LocalMemCache' do
   it 'should support random_pair' do
     $lm.random_pair.size.should.equal 2
-    LocalMemCache.drop :namespace => :empty, :force => true
-    ll = LocalMemCache.new :namespace => :empty
+    LocalMemCache.drop :namespace => :empty, :force => true, :size_mb => 2
+    ll = LocalMemCache.new :namespace => :empty, :size_mb => 2
     ll.random_pair.should.be.nil
   end
-  it 'should allow be consistent' do
+  it 'should be consistent' do
     $lm.check_consistency.should.be.true
   end
@@ -75,6 +83,12 @@ describe 'LocalMemCache' do
     should.raise(LocalMemCache::MemoryPoolFull) { $lms["two"] = "b" * 8000000; }
   end
+  it 'should set a minimum size' do
+    LocalMemCache.drop :namespace => :toosmall, :force => true
+    ll = LocalMemCache.new :namespace => :toosmall, :size_mb => 0.1
+    ll.shm_status[:total_bytes].should.equal 1024*1024
+  end
   it 'should support clearing of the hashtable' do
     ($lms.size > 0).should.be.true
@@ -98,13 +112,10 @@ describe 'LocalMemCache' do
     ll.size.should.equal 0
   end
   it 'should support checking of namespaces' do
     LocalMemCache.check :namespace => "test"
   end
   it 'should support dropping of namespaces' do
     LocalMemCache.drop :namespace => "test"
   end
@@ -123,13 +134,14 @@ end
 LocalMemCache.drop :namespace => "test-shared-os", :force => true
 $lmsh = LocalMemCache::SharedObjectStorage.new :namespace=>"test-shared-os",
-    :size_mb => 20
+    :size_mb => 2
 describe 'LocalMemCache::SharedObjectStorage' do
   it 'should allow to set and query for ruby objects' do
     $lmsh["non-existant"].should.be.nil
-    $lmsh["array"] = [:foo, :boo]
+    $lmsh.set("array", [:foo, :boo])
     $lmsh["array"].should.be.kind_of? Array
+    $lmsh.get("array").should.be.kind_of? Array
   end
   it 'support iteration' do
@@ -139,5 +151,12 @@ describe 'LocalMemCache::SharedObjectStorage' do
   it 'support random_pair' do
     $lmsh.random_pair.last.should.be.kind_of? Array
   end
-end
+  it 'should support has_key?' do
+    $lmsh[:foo] = 1
+    $lmsh.has_key?(:foo).should.be.true
+    $lmsh.has_key?(:non_existant).should.be.false
+    $lmsh[:bar] = nil
+    $lmsh.has_key?(:bar).should.be.true
+  end
+end

data/src/tests/run-all-tests CHANGED

@@ -15,6 +15,8 @@ echo "bench-append"
 echo "ttlmc"
 ./ttlmc
+echo "ttlmc-consistency"
+./ttlmc-consistency
 echo "ttrandom_pair"
 ./ttrandom_pair
 echo "ttalloc"

data/src/tests/ttlmc-consistency ADDED

@@ -0,0 +1,11 @@
+#! /bin/sh
+D=`dirname $0`
+DIR=`cd $D; pwd`
+script=$DIR/ttlmc-consistency.rb
+if test "x$1" = "x-d"; then
+  irb -r $script
+else
+  time ruby $script
+  #valgrind --leak-check=full --tool=memcheck ruby $script
+fi

data/src/tests/ttlmc-consistency.rb ADDED

@@ -0,0 +1,57 @@
+$DIR=File.dirname(__FILE__)
+['.', '../', '../ruby-binding/'].each {|p| $:.unshift File.join($DIR, p) }
+require 'torture'
+require 'localmemcache'
+LocalMemCache.drop :namespace => "torture", :force => true
+$h = LocalMemCache.new :namespace=>'torture', :size_mb => 200
+puts "STARTED: #{$$}"
+class LocalMemCache
+  def __set(k, v)
+    set(k, v)
+    if get(k) != v.to_s
+      puts "Set FAILED!"
+    end
+    raise "Consistency failed" if !check_consistency
+  end
+  def __delete(k)
+    delete(k)
+    raise "Consistency failed" if !check_consistency
+  end
+  def __clear
+    clear if rand * 100 > 99
+  end
+  def __each_pair
+    each_pair { } if rand * 100 > 99
+  end
+  def __keys
+    keys if rand * 100 > 99
+  end
+end
+class TortureTesting
+  def self.rand_index
+    rand(9999)
+  end
+end
+TortureTesting.no_progress
+TortureTesting.run(2_000,
+  [$h, :get, [:rand_index]],
+  [$h, :__set, [:rand_index, :any]],
+  [$h, :__delete, [:rand_index]],
+  [$h, :__clear],
+  [$h, :__keys],
+  [$h, :random_pair],
+  [$h, :__each_pair]
+) {|e| raise e }

data/src/tests/ttlmc.rb CHANGED

@@ -7,15 +7,15 @@ require 'localmemcache'
 LocalMemCache.drop :namespace => "torture", :force => true
 $h = LocalMemCache.new :namespace=>'torture', :size_mb => 200
 puts "STARTED: #{$$}"
 class LocalMemCache
   def __set(k, v)
     set(k, v)
-    #if get(k) != v.to_s
-    #  puts "Set FAILED!"
-    #  raise "set failed"
-    #end
+    if get(k) != v.to_s
+      puts "Set FAILED!"
+    end
   end
   def __delete(k)
     delete(k)
@@ -52,4 +52,4 @@ TortureTesting.run(200_000,
   [$h, :__keys],
   [$h, :random_pair],
   [$h, :__each_pair]
-)
+) {|e| raise e }

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localmemcache
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Sven C. Koehler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-10-02 00:00:00 +00:00
+date: 2009-11-10 00:00:00 +00:00
 default_executable:
 dependencies: []
@@ -100,7 +100,6 @@ files:
 - site/doc/index.html
 - site/doc/rdoc-style.css
 - site/index.html
-- site/style.css
 - src/Makefile.in
 - src/lmc_common.c
 - src/lmc_common.h
@@ -133,6 +132,8 @@ files:
 - src/tests/bench_keys.rb
 - src/tests/capi.c
 - src/tests/capi.sh
+- src/tests/console
+- src/tests/console.rb
 - src/tests/crash
 - src/tests/crash-small
 - src/tests/crash-small.rb
@@ -156,6 +157,8 @@ files:
 - src/tests/ttkeys
 - src/tests/ttkeys.rb
 - src/tests/ttlmc
+- src/tests/ttlmc-consistency
+- src/tests/ttlmc-consistency.rb
 - src/tests/ttlmc.rb
 - src/tests/ttrandom_pair
 - src/tests/ttrandom_pair.rb

data/site/style.css DELETED

@@ -1,37 +0,0 @@
-body {
-  background: #FFF;
-  color: #333;
-  font-family: "Helvetica Neue", Helvetica, "Trebuchet MS", "Lucida Grande", Verdana, sans-serif;
-  line-height: 15pt;
-  margin: 0;
-  font-size: 12pt;
-  line-height: 1.6em;
-}
-h1, h2, h3, h4 {
-  color: #0;
-  padding: 0;
-  margin: 1em 0;
-}
-pre, code {
-  font-family: Courier;
-  font-size: 11pt;
-  overflow: auto;
-}
-a { color: #0088FF; text-decoration: none }
-a:hover { color: #fff; background-color: #0088FF }
-#content {
-  margin: 1em auto ;
-  max-width: 35em;
-}
-ol, ul { padding-left: 0; }
-#content p {
-}
-#about {
-  list-style:none;
-}