Changeset 752 for trunk/server/lib/talloc/talloc.c

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/talloc/talloc.c (modified) (5 diffs)

trunk/server/lib/talloc/talloc.c

@@ -839 +839 @@
                 if (tc->prev) tc->prev->next = tc->next;
                 if (tc->next) tc->next->prev = tc->prev;
+                tc->prev = tc->next = NULL;
         }
 
@@ -926 +927 @@
                 if (tc->prev) tc->prev->next = tc->next;
                 if (tc->next) tc->next->prev = tc->prev;
+                tc->prev = tc->next = NULL;
         }
 
@@ -1252 +1254 @@
                         if (p) new_parent = TC_PTR_FROM_CHUNK(p);
                 }
-                /* finding the parent here is potentially quite
-                   expensive, but the alternative, which is to change
-                   talloc to always have a valid tc->parent pointer,
-                   makes realloc more expensive where there are a
-                   large number of children.
-
-                   The reason we need the parent pointer here is that
-                   if _talloc_free_internal() fails due to references
-                   or a failing destructor we need to re-parent, but
-                   the free call can invalidate the prev pointer.
-                */
-                if (new_parent == null_context && (tc->child->refs || tc->child->destructor)) {
-                        old_parent = talloc_parent_chunk(ptr);
-                }
                 if (unlikely(_talloc_free_internal(child, location) == -1)) {
                         if (new_parent == null_context) {
-                                struct talloc_chunk *p = old_parent;
+                                struct talloc_chunk *p = talloc_parent_chunk(ptr);
                                 if (p) new_parent = TC_PTR_FROM_CHUNK(p);
                         }
@@ -1283 +1271 @@
 _PUBLIC_ void talloc_free_children(void *ptr)
 {
+        struct talloc_chunk *tc_name = NULL;
         struct talloc_chunk *tc;
 
@@ -1291 +1280 @@
         tc = talloc_chunk_from_ptr(ptr);
 
+        /* we do not want to free the context name if it is a child .. */
+        if (likely(tc->child)) {
+                for (tc_name = tc->child; tc_name; tc_name = tc_name->next) {
+                        if (tc->name == TC_PTR_FROM_CHUNK(tc_name)) break;
+                }
+                if (tc_name) {
+                        _TLIST_REMOVE(tc->child, tc_name);
+                        if (tc->child) {
+                                tc->child->parent = tc;
+                        }
+                }
+        }
+
         _talloc_free_children_internal(tc, ptr, __location__);
+
+        /* .. so we put it back after all other children have been freed */
+        if (tc_name) {
+                if (tc->child) {
+                        tc->child->parent = NULL;
+                }
+                tc_name->parent = tc;
+                _TLIST_ADD(tc->child, tc_name);
+        }
 }