Add support for post-commit/rollback callbacks

New test: common/transaction/callback.

6 files changed, 343 insertions, 8 deletions

diff --git a/common/transaction/driver.cxx b/common/transaction/basics/driver.cxx
index f785870..984e9e8 100644
--- a/common/transaction/driver.cxx
+++ b/common/transaction/basics/driver.cxx
@@ -1,8 +1,8 @@
-// file      : common/transaction/driver.cxx
+// file      : common/transaction/basics/driver.cxx
 // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-// Test transaction operations.
+// Test basic transaction operations.
 //
 
 #include <string>
diff --git a/common/transaction/makefile b/common/transaction/basics/makefile
index 516990c..dbee915 100644
--- a/common/transaction/makefile
+++ b/common/transaction/basics/makefile
@@ -1,8 +1,8 @@
-# file      : common/transaction/makefile
+# file      : common/transaction/basics/makefile
 # copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
@@ -40,10 +40,10 @@ $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
 $(call vc10projs,$(name)) $(call vc11projs,$(name))
 $(dist):
 	$(call dist-data,$(sources) $(headers) $(data_dist))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
+	$(call meta-automake,../../template/Makefile.am)
+	$(call meta-vc9projs,../../template/template,$(name))
+	$(call meta-vc10projs,../../template/template,$(name))
+	$(call meta-vc11projs,../../template/template,$(name))
 
 # Test.
 #
diff --git a/common/transaction/test.std b/common/transaction/basics/test.std
index 37d3598..37d3598 100644
--- a/common/transaction/test.std
+++ b/common/transaction/basics/test.std
diff --git a/common/transaction/callback/driver.cxx b/common/transaction/callback/driver.cxx
new file mode 100644
index 0000000..b74df4c
--- /dev/null
+++ b/common/transaction/callback/driver.cxx
@@ -0,0 +1,212 @@
+// file      : common/transaction/callback/driver.cxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test transaction callbacks.
+//
+
+#include <cstddef> // std::size_t
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <common/common.hxx>
+
+using namespace std;
+using namespace odb::core;
+
+struct callback
+{
+  callback (unsigned short v): v_ (v), t_ (0) {}
+  callback (unsigned short v, transaction& t): v_ (v), t_ (0) {register_ (t);}
+  ~callback () {if (t_ != 0) unregister ();}
+
+  void
+  register_ (transaction& t)
+  {
+    t_ = &t;
+    t.register_ (&func, this, transaction::event_all, v_, &t_);
+  }
+
+  void
+  unregister ()
+  {
+    cout << "  unregister callback " << v_ << endl;
+    t_->unregister (this);
+    t_ = 0;
+  }
+
+private:
+  static void
+  func (unsigned short event, void* key, unsigned long long data)
+  {
+    callback& c (*static_cast<callback*> (key));
+
+    const char* en;
+    switch (event)
+    {
+    case transaction::event_commit:
+      en = "commit";
+      break;
+    case transaction::event_rollback:
+      en = "rollback";
+      break;
+    default:
+      en = "unknown";
+    }
+
+    cout << "  callback " << c.v_ << " " << en << endl;
+
+    assert (data == c.v_);
+    assert (c.t_ == 0);
+  }
+
+  unsigned short v_;
+  transaction* t_;
+};
+
+struct failed {};
+
+static void
+throw_func (unsigned short, void*, unsigned long long)
+{
+  throw failed ();
+}
+
+static void
+dummy_func (unsigned short, void* key, unsigned long long data)
+{
+  assert (reinterpret_cast<unsigned long long> (key) == data);
+}
+
+static void
+fill (transaction& t)
+{
+  // 20 is from odb/transaction.hxx.
+  //
+  for (size_t i (0); i < 20; ++i)
+    t.register_ (&dummy_func,
+                 reinterpret_cast<void*> (i),
+                 transaction::event_all,
+                 i);
+}
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv, false));
+
+    // We want to test both stack and dynamic slots.
+    //
+    for (unsigned short i (1); i < 3; ++i)
+    {
+      // Test basic logic.
+      //
+      cout << "test " << i << "/001" << endl;
+
+      // Commit callback.
+      //
+      {
+        transaction t (db->begin ());
+        if (i == 2) fill (t);
+        callback c1 (1, t);
+        t.commit ();
+      }
+
+      // Rollback callback.
+      //
+      {
+        transaction t (db->begin ());
+        if (i == 2) fill (t);
+        callback c1 (1, t);
+        t.rollback ();
+      }
+
+      // Rollback via exception callback.
+      //
+      {
+        callback c1 (1);
+
+        try
+        {
+          transaction t (db->begin ());
+          if (i == 2) fill (t);
+          c1.register_ (t);
+          throw failed ();
+        }
+        catch (const failed&)
+        {
+        }
+      }
+
+      // Unregister callback at the end.
+      //
+      {
+        transaction t (db->begin ());
+        if (i == 2) fill (t);
+        callback c1 (1, t);
+        c1.unregister ();
+        t.unregister (&c1); // Test unregistering non-registered key.
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        if (i == 2) fill (t);
+        callback c1 (1, t);
+        c1.unregister ();
+        callback c2 (2, t);
+        t.commit ();
+      }
+
+      // Unregister callback in the middle.
+      //
+      cout << "test " << i << "/002" << endl;
+      {
+        transaction t (db->begin ());
+        if (i == 2) fill (t);
+        callback c1 (1, t);
+        callback c2 (2, t);
+        callback c3 (3, t);
+        c2.unregister ();
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        if (i == 2) fill (t);
+        callback c1 (1, t);
+        callback c2 (2, t);
+        callback c3 (3, t);
+        c2.unregister ();
+        callback c4 (4, t); // Using the free slot.
+        t.commit ();
+      }
+
+      // Test a callback in the middle that throws.
+      //
+      cout << "test " << i << "/003" << endl;
+      try
+      {
+        transaction t (db->begin ());
+        if (i == 2) fill (t);
+        callback c1 (1, t);
+        t.register_ (&throw_func, 0);
+        callback c2 (2, t);
+        t.commit ();
+      }
+      catch (const failed&)
+      {
+      }
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/common/transaction/callback/makefile b/common/transaction/callback/makefile
new file mode 100644
index 0000000..936a02d
--- /dev/null
+++ b/common/transaction/callback/makefile
@@ -0,0 +1,89 @@
+# file      : common/transaction/callback/makefile
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
+cxx_od  := $(cxx_obj:.o=.o.d)
+
+common.l             := $(out_root)/libcommon/common/common.l
+common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
+
+driver  := $(out_base)/driver
+dist    := $(out_base)/.dist
+test    := $(out_base)/.test
+clean   := $(out_base)/.clean
+
+# Build.
+#
+$(driver): $(cxx_obj) $(common.l)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
+
+$(call include-dep,$(cxx_od))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): data_dist := test.std
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
+$(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(data_dist))
+	$(call meta-automake,../../template/Makefile.am)
+	$(call meta-vc9projs,../../template/template,$(name))
+	$(call meta-vc10projs,../../template/template,$(name))
+	$(call meta-vc11projs,../../template/template,$(name))
+
+# Test.
+#
+$(test): $(driver) $(src_base)/test.std
+	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))
+	$(call message,,rm -f $(out_base)/test.out)
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+# How to.
+#
+$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/vc11proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(call include,$(bld_root)/cxx/cxx-d.make)
+$(call include,$(bld_root)/cxx/cxx-o.make)
+$(call include,$(bld_root)/cxx/o-e.make)
+
+# Dependencies.
+#
+$(call import,$(src_root)/libcommon/makefile)
diff --git a/common/transaction/callback/test.std b/common/transaction/callback/test.std
new file mode 100644
index 0000000..f86579b
--- /dev/null
+++ b/common/transaction/callback/test.std
@@ -0,0 +1,34 @@
+test 1/001
+  callback 1 commit
+  callback 1 rollback
+  callback 1 rollback
+  unregister callback 1
+  unregister callback 1
+  callback 2 commit
+test 1/002
+  unregister callback 2
+  callback 1 commit
+  callback 3 commit
+  unregister callback 2
+  callback 1 commit
+  callback 4 commit
+  callback 3 commit
+test 1/003
+  callback 1 commit
+test 2/001
+  callback 1 commit
+  callback 1 rollback
+  callback 1 rollback
+  unregister callback 1
+  unregister callback 1
+  callback 2 commit
+test 2/002
+  unregister callback 2
+  callback 1 commit
+  callback 3 commit
+  unregister callback 2
+  callback 1 commit
+  callback 4 commit
+  callback 3 commit
+test 2/003
+  callback 1 commit