Resources: res_new() requires an active pool

[libucw.git] / ucw / respool.c

diff --git a/ucw/respool.c b/ucw/respool.c
index 31cfc58a8272cb4bb88eb6fc6d7793a30d6e88ad..64f9a2fc643f14abcbf7d85edbabdb8643aba8a2 100644 (file)
--- a/ucw/respool.c
+++ b/ucw/respool.c
@@ -1,7 +1,7 @@
 /*
  *     The UCW Library -- Resource Pools
  *
 /*
  *     The UCW Library -- Resource Pools
  *

- *     (c) 2008 Martin Mares <mj@ucw.cz>
+ *     (c) 2008--2011 Martin Mares <mj@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.


@@ -27,6 +27,7 @@ rp_new(const char *name, struct mempool *mp)
     rp = xmalloc_zero(sizeof(*rp));
   clist_init(&rp->resources);
   rp->name = name;
     rp = xmalloc_zero(sizeof(*rp));
   clist_init(&rp->resources);
   rp->name = name;

+  rp->default_res_flags = RES_FLAG_TEMP;

   return rp;
 }
 
   return rp;
 }
 


@@ -65,6 +66,21 @@ rp_detach(struct respool *rp)
   rp_free(rp);
 }
 
   rp_free(rp);
 }
 

+void
+rp_commit(struct respool *rp)
+{
+  struct resource *r;
+  while (r = clist_head(&rp->resources))
+    {
+      ASSERT(r->rpool == rp);
+      if (r->flags & RES_FLAG_TEMP)
+       res_free(r);
+      else
+       res_detach(r);
+    }
+  rp_free(rp);
+}
+

 void
 rp_dump(struct respool *rp, uns indent)
 {
 void
 rp_dump(struct respool *rp, uns indent)
 {


@@ -83,13 +99,13 @@ struct resource *
 res_alloc(const struct res_class *rc)
 {
   struct respool *rp = rp_current();
 res_alloc(const struct res_class *rc)
 {
   struct respool *rp = rp_current();

-  if (!rp)
-    return NULL;
+  ASSERT(rp);

 
   uns size = (rc->res_size ? : sizeof(struct resource));
   struct resource *r = (rp->mpool ? mp_alloc_fast(rp->mpool, size) : xmalloc(size));
   r->rpool = rp;
   clist_add_tail(&rp->resources, &r->n);
 
   uns size = (rc->res_size ? : sizeof(struct resource));
   struct resource *r = (rp->mpool ? mp_alloc_fast(rp->mpool, size) : xmalloc(size));
   r->rpool = rp;
   clist_add_tail(&rp->resources, &r->n);

+  r->flags = rp->default_res_flags;

   return r;
 }
 
   return r;
 }
 


@@ -104,6 +120,8 @@ res_drop(struct resource *r)
 void
 res_detach(struct resource *r)
 {
 void
 res_detach(struct resource *r)
 {

+  if (!r)
+    return;

   if (r->rclass->detach)
     r->rclass->detach(r);
   res_drop(r);
   if (r->rclass->detach)
     r->rclass->detach(r);
   res_drop(r);


@@ -112,6 +130,8 @@ res_detach(struct resource *r)
 void
 res_free(struct resource *r)
 {
 void
 res_free(struct resource *r)
 {

+  if (!r)
+    return;

   if (r->rclass->free)
     r->rclass->free(r);
   res_drop(r);
   if (r->rclass->free)
     r->rclass->free(r);
   res_drop(r);


@@ -120,7 +140,7 @@ res_free(struct resource *r)
 void
 res_dump(struct resource *r, uns indent)
 {
 void
 res_dump(struct resource *r, uns indent)
 {

-  printf("%*s%p %s", indent, "", r, r->rclass->name);
+  printf("%*s%p %s %s", indent, "", r, ((r->flags & RES_FLAG_TEMP) ? "TEMP" : "PERM"), r->rclass->name);

   if (r->rclass->dump)
     r->rclass->dump(r, indent+4);
   else
   if (r->rclass->dump)
     r->rclass->dump(r, indent+4);
   else