@matheusbsbs / matheus-bagliano / commits / c18eecbe5c

reftable: use a pointer for pq_entry param

The speed of the merged_iter_pqueue_add() can be improved by using a pointer to the pq_entry struct, which is 96 bytes. Since the pq_entry param is worked directly on the stack and does not currently have a pointer to it, the merged_iter_pqueue_add() function is slightly slower. References to pq_entry in reftable have typically included pointers, such as both of the params for pq_less(). Since we are working with pointers in the pq_entry param, as keenly pointed out, the pq_entry param has also been made into a const since the contents of the pq_entry param are copied and not manipulated. Signed-off-by: Elijah Conners <business@elijahpepe.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Conners committed Sep 14, 2022 at 20:37 UTC c18eecbe5c44be4c23f978a3f1c74b802d26c277

4 files changed +6 -6

reftable/merged.c

+2 -2

@@ -36,7 +36,7 @@ static int merged_iter_init(struct merged_iter *mi)

36 .rec = rec,

37 .index = i,

38 };

39 - merged_iter_pqueue_add(&mi->pq, e);

39 + merged_iter_pqueue_add(&mi->pq, &e);

40 }

41 }

@@ -71,7 +71,7 @@ static int merged_iter_advance_nonnull_subiter(struct merged_iter *mi,

71 return 0;

72 }

74 - merged_iter_pqueue_add(&mi->pq, e);

74 + merged_iter_pqueue_add(&mi->pq, &e);

75 return 0;

76 }

reftable/pq.c

+2 -2

@@ -71,7 +71,7 @@ struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)

71 return e;

72 }

74 -void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e)

74 +void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e)

75 {

76 int i = 0;

@@ -81,7 +81,7 @@ void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e)

81 pq->cap * sizeof(struct pq_entry));

82 }

84 - pq->heap[pq->len++] = e;

84 + pq->heap[pq->len++] = *e;

85 i = pq->len - 1;

86 while (i > 0) {

87 int j = (i - 1) / 2;

reftable/pq.h

+1 -1

@@ -26,7 +26,7 @@ struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq);

26 int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq);

27 void merged_iter_pqueue_check(struct merged_iter_pqueue pq);

28 struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq);

29 -void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e);

29 +void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e);

30 void merged_iter_pqueue_release(struct merged_iter_pqueue *pq);

31 int pq_less(struct pq_entry *a, struct pq_entry *b);

reftable/pq_test.c

+1 -1

@@ -46,7 +46,7 @@ static void test_pq(void)

46 .u.ref = {

47 .refname = names[i],

48 } } };

49 - merged_iter_pqueue_add(&pq, e);

49 + merged_iter_pqueue_add(&pq, &e);

50 merged_iter_pqueue_check(pq);

51 i = (i * 7) % N;

52 } while (i != 1);