c18eecbe5c
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>
80 lines
1.6 KiB
C
80 lines
1.6 KiB
C
/*
|
|
Copyright 2020 Google LLC
|
|
|
|
Use of this source code is governed by a BSD-style
|
|
license that can be found in the LICENSE file or at
|
|
https://developers.google.com/open-source/licenses/bsd
|
|
*/
|
|
|
|
#include "system.h"
|
|
|
|
#include "basics.h"
|
|
#include "constants.h"
|
|
#include "pq.h"
|
|
#include "record.h"
|
|
#include "reftable-tests.h"
|
|
#include "test_framework.h"
|
|
|
|
void merged_iter_pqueue_check(struct merged_iter_pqueue pq)
|
|
{
|
|
int i;
|
|
for (i = 1; i < pq.len; i++) {
|
|
int parent = (i - 1) / 2;
|
|
|
|
EXPECT(pq_less(&pq.heap[parent], &pq.heap[i]));
|
|
}
|
|
}
|
|
|
|
static void test_pq(void)
|
|
{
|
|
char *names[54] = { NULL };
|
|
int N = ARRAY_SIZE(names) - 1;
|
|
|
|
struct merged_iter_pqueue pq = { NULL };
|
|
char *last = NULL;
|
|
|
|
int i = 0;
|
|
for (i = 0; i < N; i++) {
|
|
char name[100];
|
|
snprintf(name, sizeof(name), "%02d", i);
|
|
names[i] = xstrdup(name);
|
|
}
|
|
|
|
i = 1;
|
|
do {
|
|
struct pq_entry e = { .rec = { .type = BLOCK_TYPE_REF,
|
|
.u.ref = {
|
|
.refname = names[i],
|
|
} } };
|
|
merged_iter_pqueue_add(&pq, &e);
|
|
merged_iter_pqueue_check(pq);
|
|
i = (i * 7) % N;
|
|
} while (i != 1);
|
|
|
|
while (!merged_iter_pqueue_is_empty(pq)) {
|
|
struct pq_entry e = merged_iter_pqueue_remove(&pq);
|
|
struct reftable_record *rec = &e.rec;
|
|
merged_iter_pqueue_check(pq);
|
|
|
|
EXPECT(reftable_record_type(rec) == BLOCK_TYPE_REF);
|
|
if (last) {
|
|
EXPECT(strcmp(last, rec->u.ref.refname) < 0);
|
|
}
|
|
// this is names[i], so don't dealloc.
|
|
last = rec->u.ref.refname;
|
|
rec->u.ref.refname = NULL;
|
|
reftable_record_release(rec);
|
|
}
|
|
for (i = 0; i < N; i++) {
|
|
reftable_free(names[i]);
|
|
}
|
|
|
|
merged_iter_pqueue_release(&pq);
|
|
}
|
|
|
|
int pq_test_main(int argc, const char *argv[])
|
|
{
|
|
RUN_TEST(test_pq);
|
|
return 0;
|
|
}
|