X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fconf-journal.c;h=7d3ccdce1e7f83347ebe73d8db4de0681cdb3dfa;hb=6c4c397f94ec5f5df6bcc178fb5fa4e84d3505fc;hp=b0b90134f6843795056417cfd72d0d6addf5c1ce;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git

diff --git a/ucw/conf-journal.c b/ucw/conf-journal.c
index b0b90134..7d3ccdce 100644
--- a/ucw/conf-journal.c
+++ b/ucw/conf-journal.c
@@ -2,88 +2,99 @@
  *	UCW Library -- Configuration files: journaling
  *
  *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
- *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/conf.h"
-#include "ucw/getopt.h"
-#include "ucw/conf-internal.h"
-#include "ucw/mempool.h"
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/getopt.h>
+#include <ucw/conf-internal.h>
+#include <ucw/mempool.h>
 
 #include <string.h>
 
-static struct old_pools {
+struct old_pools {
   struct old_pools *prev;
   struct mempool *pool;
-} *pools;			// link-list of older cf_pool's
+};				// link-list of older cf_pool's
 
-uns cf_need_journal = 1;	// some programs do not need journal
-static struct cf_journal_item {
+struct cf_journal_item {
   struct cf_journal_item *prev;
   byte *ptr;
-  uns len;
+  uint len;
   byte copy[0];
-} *journal;
+};
 
 void
-cf_journal_block(void *ptr, uns len)
+cf_set_journalling(int enable)
 {
-  if (!cf_need_journal)
+  struct cf_context *cc = cf_get_context();
+  ASSERT(!cc->journal);
+  cc->enable_journal = enable;
+}
+
+void
+cf_journal_block(void *ptr, uint len)
+{
+  struct cf_context *cc = cf_get_context();
+  if (!cc->enable_journal)
     return;
   struct cf_journal_item *ji = cf_malloc(sizeof(struct cf_journal_item) + len);
-  ji->prev = journal;
+  ji->prev = cc->journal;
   ji->ptr = ptr;
   ji->len = len;
   memcpy(ji->copy, ptr, len);
-  journal = ji;
+  cc->journal = ji;
 }
 
 void
 cf_journal_swap(void)
   // swaps the contents of the memory and the journal, and reverses the list
 {
+  struct cf_context *cc = cf_get_context();
   struct cf_journal_item *curr, *prev, *next;
-  for (next=NULL, curr=journal; curr; next=curr, curr=prev)
+  for (next=NULL, curr=cc->journal; curr; next=curr, curr=prev)
   {
     prev = curr->prev;
     curr->prev = next;
-    for (uns i=0; i<curr->len; i++)
+    for (uint i=0; i<curr->len; i++)
     {
       byte x = curr->copy[i];
       curr->copy[i] = curr->ptr[i];
       curr->ptr[i] = x;
     }
   }
-  journal = next;
+  cc->journal = next;
 }
 
 struct cf_journal_item *
-cf_journal_new_transaction(uns new_pool)
+cf_journal_new_transaction(uint new_pool)
 {
+  struct cf_context *cc = cf_get_context();
   if (new_pool)
-    cf_pool = mp_new(1<<10);
-  struct cf_journal_item *oldj = journal;
-  journal = NULL;
+    cc->pool = mp_new(1<<10);
+  struct cf_journal_item *oldj = cc->journal;
+  cc->journal = NULL;
   return oldj;
 }
 
 void
-cf_journal_commit_transaction(uns new_pool, struct cf_journal_item *oldj)
+cf_journal_commit_transaction(uint new_pool, struct cf_journal_item *oldj)
 {
+  struct cf_context *cc = cf_get_context();
   if (new_pool)
   {
     struct old_pools *p = cf_malloc(sizeof(struct old_pools));
-    p->prev = pools;
-    p->pool = cf_pool;
-    pools = p;
+    p->prev = cc->pools;
+    p->pool = cc->pool;
+    cc->pools = p;
   }
   if (oldj)
   {
-    struct cf_journal_item **j = &journal;
+    struct cf_journal_item **j = &cc->journal;
     while (*j)
       j = &(*j)->prev;
     *j = oldj;
@@ -91,27 +102,27 @@ cf_journal_commit_transaction(uns new_pool, struct cf_journal_item *oldj)
 }
 
 void
-cf_journal_rollback_transaction(uns new_pool, struct cf_journal_item *oldj)
+cf_journal_rollback_transaction(uint new_pool, struct cf_journal_item *oldj)
 {
-  if (!cf_need_journal)
-    die("Cannot rollback the configuration, because the journal is disabled.");
+  struct cf_context *cc = cf_get_context();
+  if (!cc->enable_journal)
+    return;
   cf_journal_swap();
-  journal = oldj;
+  cc->journal = oldj;
   if (new_pool)
   {
-    mp_delete(cf_pool);
-    cf_pool = pools ? pools->pool : NULL;
+    mp_delete(cc->pool);
+    cc->pool = cc->pools ? cc->pools->pool : NULL;
   }
 }
 
 void
 cf_journal_delete(void)
 {
-  for (struct old_pools *p=pools; p; p=pools)
+  struct cf_context *cc = cf_get_context();
+  for (struct old_pools *p=cc->pools; p; p=cc->pools)
   {
-    pools = p->prev;
+    cc->pools = p->prev;
     mp_delete(p->pool);
   }
 }
-
-/* TODO: more space efficient journal */