@matheusbsbs / matheus-bagliano / commits / f1bf54aee3

reftable: allow inlining of a few functions

We have a few functions which are basically just accessors to structures. As those functions are executed inside the hot loop when iterating through many refs, the fact that they cannot be inlined is costing us some performance. Move the function definitions into their respective headers so that they can be inlined. This results in a performance improvement when iterating over 1 million refs: Benchmark 1: show-ref: single matching ref (revision = HEAD~) Time (mean ± σ): 105.9 ms ± 3.6 ms [User: 103.0 ms, System: 2.8 ms] Range (min … max): 103.1 ms … 133.4 ms 1000 runs Benchmark 2: show-ref: single matching ref (revision = HEAD) Time (mean ± σ): 100.7 ms ± 3.4 ms [User: 97.8 ms, System: 2.8 ms] Range (min … max): 97.8 ms … 124.0 ms 1000 runs Summary show-ref: single matching ref (revision = HEAD) ran 1.05 ± 0.05 times faster than show-ref: single matching ref (revision = HEAD~) Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Mar 4, 2024 at 11:49 UTC f1bf54aee30c879b27602aa159264d5e9803c6b7
4 files changed +20 -25
reftable/pq.c
-10
@@ -20,16 +20,6 @@ int pq_less(struct pq_entry *a, struct pq_entry *b)
20 return cmp < 0;
21 }
22
23 -struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq)
24 -{
25 - return pq.heap[0];
26 -}
27 -
28 -int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq)
29 -{
30 - return pq.len == 0;
31 -}
32 -
23 struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
24 {
25 int i = 0;
reftable/pq.h
+10 -2
@@ -22,12 +22,20 @@ struct merged_iter_pqueue {
22 size_t cap;
23 };
24
25 -struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq);
26 -int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq);
25 void merged_iter_pqueue_check(struct merged_iter_pqueue pq);
26 struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq);
27 void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e);
28 void merged_iter_pqueue_release(struct merged_iter_pqueue *pq);
29 int pq_less(struct pq_entry *a, struct pq_entry *b);
30
31 +static inline struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq)
32 +{
33 + return pq.heap[0];
34 +}
35 +
36 +static inline int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq)
37 +{
38 + return pq.len == 0;
39 +}
40 +
41 #endif
reftable/record.c
-11
@@ -1176,11 +1176,6 @@ void reftable_record_key(struct reftable_record *rec, struct strbuf *dest)
1176 reftable_record_vtable(rec)->key(reftable_record_data(rec), dest);
1177 }
1178
1179 -uint8_t reftable_record_type(struct reftable_record *rec)
1180 -{
1181 - return rec->type;
1182 -}
1183 -
1179 int reftable_record_encode(struct reftable_record *rec, struct string_view dest,
1180 int hash_size)
1181 {
@@ -1302,12 +1297,6 @@ int reftable_log_record_is_deletion(const struct reftable_log_record *log)
1297 return (log->value_type == REFTABLE_LOG_DELETION);
1298 }
1299
1305 -void string_view_consume(struct string_view *s, int n)
1306 -{
1307 - s->buf += n;
1308 - s->len -= n;
1309 -}
1310 -
1300 static void *reftable_record_data(struct reftable_record *rec)
1301 {
1302 switch (rec->type) {
reftable/record.h
+10 -2
@@ -25,7 +25,11 @@ struct string_view {
25 };
26
27 /* Advance `s.buf` by `n`, and decrease length. */
28 -void string_view_consume(struct string_view *s, int n);
28 +static inline void string_view_consume(struct string_view *s, int n)
29 +{
30 + s->buf += n;
31 + s->len -= n;
32 +}
33
34 /* utilities for de/encoding varints */
35
@@ -127,7 +131,6 @@ int reftable_record_cmp(struct reftable_record *a, struct reftable_record *b);
131 int reftable_record_equal(struct reftable_record *a, struct reftable_record *b, int hash_size);
132 void reftable_record_print(struct reftable_record *rec, int hash_size);
133 void reftable_record_key(struct reftable_record *rec, struct strbuf *dest);
130 -uint8_t reftable_record_type(struct reftable_record *rec);
134 void reftable_record_copy_from(struct reftable_record *rec,
135 struct reftable_record *src, int hash_size);
136 uint8_t reftable_record_val_type(struct reftable_record *rec);
@@ -138,6 +141,11 @@ int reftable_record_decode(struct reftable_record *rec, struct strbuf key,
141 int hash_size);
142 int reftable_record_is_deletion(struct reftable_record *rec);
143
144 +static inline uint8_t reftable_record_type(struct reftable_record *rec)
145 +{
146 + return rec->type;
147 +}
148 +
149 /* frees and zeroes out the embedded record */
150 void reftable_record_release(struct reftable_record *rec);
151