From: Elijah Conners <business@elijahpepe.com>
To: "git" <git@vger.kernel.org>
Cc: "hanwen" <hanwen@google.com>
Subject: [PATCH] reftable: pass pq_entry by address
Date: Mon, 12 Sep 2022 21:53:41 -0700 [thread overview]
Message-ID: <183353220fe.d7826593472673.3445243727369286065@elijahpepe.com> (raw)
In-Reply-To:
In merged_iter_pqueue_add, the pq_entry parameter is passed by value,
although it exceeds 64 bytes.
Signed-off-by: Elijah Conners <business@elijahpepe.com>
---
reftable/merged.c | 4 ++--
reftable/pq.c | 4 ++--
reftable/pq.h | 2 +-
reftable/pq_test.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/reftable/merged.c b/reftable/merged.c
index 2a6efa110d..5ded470c08 100644
--- a/reftable/merged.c
+++ b/reftable/merged.c
@@ -36,7 +36,7 @@ static int merged_iter_init(struct merged_iter *mi)
.rec = rec,
.index = i,
};
- merged_iter_pqueue_add(&mi->pq, e);
+ merged_iter_pqueue_add(&mi->pq, &e);
}
}
@@ -71,7 +71,7 @@ static int merged_iter_advance_nonnull_subiter(struct merged_iter *mi,
return 0;
}
- merged_iter_pqueue_add(&mi->pq, e);
+ merged_iter_pqueue_add(&mi->pq, &e);
return 0;
}
diff --git a/reftable/pq.c b/reftable/pq.c
index 96ca6dd37b..156f78a064 100644
--- a/reftable/pq.c
+++ b/reftable/pq.c
@@ -71,7 +71,7 @@ struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
return e;
}
-void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e)
+void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry *e)
{
int i = 0;
@@ -81,7 +81,7 @@ void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e)
pq->cap * sizeof(struct pq_entry));
}
- pq->heap[pq->len++] = e;
+ pq->heap[pq->len++] = *e;
i = pq->len - 1;
while (i > 0) {
int j = (i - 1) / 2;
diff --git a/reftable/pq.h b/reftable/pq.h
index 56fc1b6d87..e5e9234baf 100644
--- a/reftable/pq.h
+++ b/reftable/pq.h
@@ -26,7 +26,7 @@ struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq);
int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq);
void merged_iter_pqueue_check(struct merged_iter_pqueue pq);
struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq);
-void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e);
+void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry *e);
void merged_iter_pqueue_release(struct merged_iter_pqueue *pq);
int pq_less(struct pq_entry *a, struct pq_entry *b);
diff --git a/reftable/pq_test.c b/reftable/pq_test.c
index 7de5e886f3..011b5c7502 100644
--- a/reftable/pq_test.c
+++ b/reftable/pq_test.c
@@ -46,7 +46,7 @@ static void test_pq(void)
.u.ref = {
.refname = names[i],
} } };
- merged_iter_pqueue_add(&pq, e);
+ merged_iter_pqueue_add(&pq, &e);
merged_iter_pqueue_check(pq);
i = (i * 7) % N;
} while (i != 1);
--
2.29.2.windows.2
next reply other threads:[~2022-09-13 5:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 4:53 Elijah Conners [this message]
2022-09-13 9:11 ` [PATCH] reftable: pass pq_entry by address Han-Wen Nienhuys
2022-09-13 15:55 ` Junio C Hamano
2022-09-13 17:34 ` Elijah Conners
2022-09-13 17:36 ` Han-Wen Nienhuys
2022-09-13 18:03 ` Elijah Conners
2022-09-15 7:49 ` Han-Wen Nienhuys
2022-09-15 2:27 ` Junio C Hamano
2022-09-14 23:54 ` [PATCH] reftable: use const with the pq_entry param Elijah Conners
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=183353220fe.d7826593472673.3445243727369286065@elijahpepe.com \
--to=business@elijahpepe.com \
--cc=git@vger.kernel.org \
--cc=hanwen@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).