Make it possible to not clobber object.util in sort_in_topological_order (take 2)

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/commit.c b/commit.c
index 06d5439152cd835e4de11552ef09438ce14b4d1d..eb42d517a4959d83593b7ba9e8fcbc650fea7a5e 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -569,10 +569,28 @@ int count_parents(struct commit * commit)
         return count;
 }
 
         return count;
 }
 

+void topo_sort_default_setter(struct commit *c, void *data)
+{
+       c->object.util = data;
+}
+
+void *topo_sort_default_getter(struct commit *c)
+{
+       return c->object.util;
+}
+

 /*
  * Performs an in-place topological sort on the list supplied.
  */
 void sort_in_topological_order(struct commit_list ** list, int lifo)
 /*
  * Performs an in-place topological sort on the list supplied.
  */
 void sort_in_topological_order(struct commit_list ** list, int lifo)

+{
+       sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
+                                    topo_sort_default_getter);
+}
+
+void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
+                                 topo_sort_set_fn_t setter,
+                                 topo_sort_get_fn_t getter)

 {
        struct commit_list * next = *list;
        struct commit_list * work = NULL, **insert;
 {
        struct commit_list * next = *list;
        struct commit_list * work = NULL, **insert;


@@ -596,7 +614,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
        next=*list;
        while (next) {
                next_nodes->list_item = next;
        next=*list;
        while (next) {
                next_nodes->list_item = next;

-               next->item->object.util = next_nodes;
+               setter(next->item, next_nodes);

                next_nodes++;
                next = next->next;
        }
                next_nodes++;
                next = next->next;
        }


@@ -606,8 +624,8 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
                struct commit_list * parents = next->item->parents;
                while (parents) {
                        struct commit * parent=parents->item;
                struct commit_list * parents = next->item->parents;
                while (parents) {
                        struct commit * parent=parents->item;

-                       struct sort_node * pn = (struct sort_node *)parent->object.util;
-                       
+                       struct sort_node * pn = (struct sort_node *) getter(parent);
+

                        if (pn)
                                pn->indegree++;
                        parents=parents->next;
                        if (pn)
                                pn->indegree++;
                        parents=parents->next;


@@ -624,7 +642,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
        next=*list;
        insert = &work;
        while (next) {
        next=*list;
        insert = &work;
        while (next) {

-               struct sort_node * node = (struct sort_node *)next->item->object.util;
+               struct sort_node * node = (struct sort_node *) getter(next->item);

 
                if (node->indegree == 0) {
                        insert = &commit_list_insert(next->item, insert)->next;
 
                if (node->indegree == 0) {
                        insert = &commit_list_insert(next->item, insert)->next;


@@ -637,15 +655,15 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
                sort_by_date(&work);
        while (work) {
                struct commit * work_item = pop_commit(&work);
                sort_by_date(&work);
        while (work) {
                struct commit * work_item = pop_commit(&work);

-               struct sort_node * work_node = (struct sort_node *)work_item->object.util;
+               struct sort_node * work_node = (struct sort_node *) getter(work_item);

                struct commit_list * parents = work_item->parents;
 
                while (parents) {
                        struct commit * parent=parents->item;
                struct commit_list * parents = work_item->parents;
 
                while (parents) {
                        struct commit * parent=parents->item;

-                       struct sort_node * pn = (struct sort_node *)parent->object.util;
-                       
+                       struct sort_node * pn = (struct sort_node *) getter(parent);
+

                        if (pn) {
                        if (pn) {

-                               /* 
+                               /*

                                 * parents are only enqueued for emission 
                                  * when all their children have been emitted thereby
                                  * guaranteeing topological order.
                                 * parents are only enqueued for emission 
                                  * when all their children have been emitted thereby
                                  * guaranteeing topological order.


@@ -667,7 +685,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
                *pptr = work_node->list_item;
                pptr = &(*pptr)->next;
                *pptr = NULL;
                *pptr = work_node->list_item;
                pptr = &(*pptr)->next;
                *pptr = NULL;

-               work_item->object.util = NULL;
+               setter(work_item, NULL);

        }
        free(nodes);
 }
        }
        free(nodes);
 }

diff --git a/commit.h b/commit.h
index 70a7c75e6590ae7f8eef50f91a495fc6138fda4a..98682b232a2c28a4baa970ec81dfb027c196872f 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -65,15 +65,29 @@ int count_parents(struct commit * commit);
 /*
  * Performs an in-place topological sort of list supplied.
  *
 /*
  * Performs an in-place topological sort of list supplied.
  *

- * Pre-conditions:
+ * Pre-conditions for sort_in_topological_order:

  *   all commits in input list and all parents of those
  *   commits must have object.util == NULL
  *   all commits in input list and all parents of those
  *   commits must have object.util == NULL

- *        
- * Post-conditions: 
+ *
+ * Pre-conditions for sort_in_topological_order_fn:
+ *   all commits in input list and all parents of those
+ *   commits must have getter(commit) == NULL
+ *
+ * Post-conditions:

  *   invariant of resulting list is:
  *      a reachable from b => ord(b) < ord(a)
  *   in addition, when lifo == 0, commits on parallel tracks are
  *   sorted in the dates order.
  */
  *   invariant of resulting list is:
  *      a reachable from b => ord(b) < ord(a)
  *   in addition, when lifo == 0, commits on parallel tracks are
  *   sorted in the dates order.
  */

+
+typedef void (*topo_sort_set_fn_t)(struct commit*, void *data);
+typedef void* (*topo_sort_get_fn_t)(struct commit*);
+
+void topo_sort_default_setter(struct commit *c, void *data);
+void *topo_sort_default_getter(struct commit *c);
+

 void sort_in_topological_order(struct commit_list ** list, int lifo);
 void sort_in_topological_order(struct commit_list ** list, int lifo);

+void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
+                                 topo_sort_set_fn_t setter,
+                                 topo_sort_get_fn_t getter);

 #endif /* COMMIT_H */
 #endif /* COMMIT_H */