Mainloop: Fixed +1 error in heap usage.

[libucw.git] / ucw / resource.c

diff --git a/ucw/resource.c b/ucw/resource.c
index c4bed3ad449b46dcecc7a001ceff59bdc8d1f61d..86cc8ab385d3c810480e99b4a31c623ce9bd95a5 100644 (file)
--- a/ucw/resource.c
+++ b/ucw/resource.c
@@ -7,9 +7,9 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/resource.h"
-#include "ucw/mempool.h"
+#include <ucw/lib.h>
+#include <ucw/resource.h>
+#include <ucw/mempool.h>
 
 #include <stdio.h>
 
@@ -100,20 +100,38 @@ res_alloc(const struct res_class *rc)
 {
   struct respool *rp = rp_current();
   ASSERT(rp);
-
   uns size = (rc->res_size ? : sizeof(struct resource));
-  struct resource *r = (rp->mpool ? mp_alloc_fast(rp->mpool, size) : xmalloc(size));
+  struct resource *r;
+  if (rp->mpool)
+    {
+      r = mp_alloc_fast(rp->mpool, size);
+      r->flags = 0;
+    }
+  else
+    {
+      r = xmalloc(size);
+      r->flags = RES_FLAG_XFREE;
+    }
+  res_add(r);
+  return r;
+}
+
+void
+res_add(struct resource *r)
+{
+  struct respool *rp = rp_current();
+  ASSERT(rp);
   r->rpool = rp;
   clist_add_tail(&rp->resources, &r->n);
-  r->flags = rp->default_res_flags;
-  return r;
+  r->flags &= ~RES_FLAG_TEMP;
+  r->flags |= rp->default_res_flags & RES_FLAG_TEMP;
 }
 
 void
 res_drop(struct resource *r)
 {
   clist_remove(&r->n);
-  if (!r->rpool->mpool)
+  if (r->flags & RES_FLAG_XFREE)
     xfree(r);
 }
 
@@ -149,7 +167,7 @@ res_dump(struct resource *r, uns indent)
 
 #ifdef TEST
 
-#include "ucw/fastbuf.h"
+#include <ucw/fastbuf.h>
 
 int main(void)
 {