* [PATCH 2/2] debuginfod: ensure X-DEBUGINFOD-SIZE contains file size
@ 2022-04-22 22:26 Aaron Merey
2022-04-22 22:31 ` Aaron Merey
2022-04-22 23:27 ` Frank Ch. Eigler
0 siblings, 2 replies; 4+ messages in thread
From: Aaron Merey @ 2022-04-22 22:26 UTC (permalink / raw)
To: elfutils-devel
For archived files X-DEBUGINFOD-SIZE currently contains the size of the
archive instead of the size of the uncompressed file. Fix this.
Also add testcases to verify X-DEBUGINFOD-SIZE contains uncompressed
file sizes.
Signed-off-by: Aaron Merey <amerey@redhat.com>
---
debuginfod/debuginfod.cxx | 11 +++++++++--
| 8 ++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 9c0217f6..d61757ae 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -1789,11 +1789,18 @@ handle_buildid_r_match (bool internal_req_p,
std::string file = b_source1.substr(b_source1.find_last_of("/")+1, b_source1.length());
add_mhd_response_header (r, "Content-Type",
"application/octet-stream");
- add_mhd_response_header (r, "X-DEBUGINFOD-SIZE",
- to_string(fs.st_size).c_str());
add_mhd_response_header (r, "X-DEBUGINFOD-ARCHIVE",
b_source0.c_str());
add_mhd_response_header (r, "X-DEBUGINFOD-FILE", file.c_str());
+ rc = fstat (fd, &fs);
+ if (rc == 0)
+ add_mhd_response_header (r, "X-DEBUGINFOD-SIZE",
+ to_string(fs.st_size).c_str());
+ else
+ {
+ close (fd);
+ throw libc_exception (errno, string("stat ") + b_source1 + " archive " + b_source0);
+ }
add_mhd_last_modified (r, archive_entry_mtime(e));
if (verbose > 1)
obatched(clog) << "serving archive " << b_source0 << " file " << b_source1 << endl;
--git a/tests/run-debuginfod-response-headers.sh b/tests/run-debuginfod-response-headers.sh
index 10b2ab49..62c43887 100755
--- a/tests/run-debuginfod-response-headers.sh
+++ b/tests/run-debuginfod-response-headers.sh
@@ -86,6 +86,14 @@ grep 'X-DEBUGINFOD-FILE: ' vlog-find$PORT1.2
grep 'X-DEBUGINFOD-SIZE: ' vlog-find$PORT1.2
grep 'X-DEBUGINFOD-ARCHIVE: ' vlog-find$PORT1.2
+# Check that X-DEBUGINFOD-SIZE matches the size of each file
+for file in vlog-find$PORT1.1 vlog-find$PORT1.2
+do
+ st_size=$(stat -c%s $(tail -n 1 $file))
+ x_debuginfod_size=$(grep 'X-DEBUGINFOD-SIZE' $file | egrep -o '[0-9]+')
+ test $st_size -eq $x_debuginfod_size
+done
+
kill $PID1
wait $PID1
PID1=0
--
2.35.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] debuginfod: ensure X-DEBUGINFOD-SIZE contains file size
2022-04-22 22:26 [PATCH 2/2] debuginfod: ensure X-DEBUGINFOD-SIZE contains file size Aaron Merey
@ 2022-04-22 22:31 ` Aaron Merey
2022-04-22 23:27 ` Frank Ch. Eigler
1 sibling, 0 replies; 4+ messages in thread
From: Aaron Merey @ 2022-04-22 22:31 UTC (permalink / raw)
To: elfutils-devel
Please ignore the "2/2" in the subject line, this patch is not part of a series.
Aaron
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] debuginfod: ensure X-DEBUGINFOD-SIZE contains file size
2022-04-22 22:26 [PATCH 2/2] debuginfod: ensure X-DEBUGINFOD-SIZE contains file size Aaron Merey
2022-04-22 22:31 ` Aaron Merey
@ 2022-04-22 23:27 ` Frank Ch. Eigler
2022-04-25 15:14 ` [PATCH] " Aaron Merey
1 sibling, 1 reply; 4+ messages in thread
From: Frank Ch. Eigler @ 2022-04-22 23:27 UTC (permalink / raw)
To: Aaron Merey; +Cc: elfutils-devel
Hi -
> - add_mhd_response_header (r, "X-DEBUGINFOD-SIZE",
> - to_string(fs.st_size).c_str());
> + rc = fstat (fd, &fs);
> + if (rc == 0)
> + add_mhd_response_header (r, "X-DEBUGINFOD-SIZE",
> + to_string(fs.st_size).c_str());
> + else
> + {
> + close (fd);
> + throw libc_exception (errno, string("stat ") + b_source1 + " archive " + b_source0);
> + }
It shouldn't require a new fstat -- the archive component file's size
should be available from libarchive already: archive_entry_size(e);
- FChE
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] debuginfod: ensure X-DEBUGINFOD-SIZE contains file size
2022-04-22 23:27 ` Frank Ch. Eigler
@ 2022-04-25 15:14 ` Aaron Merey
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Merey @ 2022-04-25 15:14 UTC (permalink / raw)
To: fche; +Cc: elfutils-devel, Aaron Merey
Hi Frank,
On Fri, Apr 22, 2022 at 7:27 PM Frank Ch. Eigler <fche@redhat.com> wrote:
> > - add_mhd_response_header (r, "X-DEBUGINFOD-SIZE",
> > - to_string(fs.st_size).c_str());
>
> > + rc = fstat (fd, &fs);
> > + if (rc == 0)
> > + add_mhd_response_header (r, "X-DEBUGINFOD-SIZE",
> > + to_string(fs.st_size).c_str());
> > + else
> > + {
> > + close (fd);
> > + throw libc_exception (errno, string("stat ") + b_source1 + " archive " + b_source0);
> > + }
>
> It shouldn't require a new fstat -- the archive component file's size
> should be available from libarchive already: archive_entry_size(e);
Fixed.
Aaron
From 08e448456e27339aeb326828d44069028518038a Mon Sep 17 00:00:00 2001
From: Aaron Merey <amerey@redhat.com>
Date: Mon, 25 Apr 2022 11:10:46 -0400
For archived files X-DEBUGINFOD-SIZE currently contains the size of the
archive instead of the size of the uncompressed file. Fix this.
Also add testcases to verify X-DEBUGINFOD-SIZE contains uncompressed
file sizes.
Signed-off-by: Aaron Merey <amerey@redhat.com>
---
debuginfod/debuginfod.cxx | 2 +-
| 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index adca8208..4aaf41c0 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -1790,7 +1790,7 @@ handle_buildid_r_match (bool internal_req_p,
add_mhd_response_header (r, "Content-Type",
"application/octet-stream");
add_mhd_response_header (r, "X-DEBUGINFOD-SIZE",
- to_string(fs.st_size).c_str());
+ to_string(archive_entry_size(e)).c_str());
add_mhd_response_header (r, "X-DEBUGINFOD-ARCHIVE",
b_source0.c_str());
add_mhd_response_header (r, "X-DEBUGINFOD-FILE", file.c_str());
--git a/tests/run-debuginfod-response-headers.sh b/tests/run-debuginfod-response-headers.sh
index 10b2ab49..62c43887 100755
--- a/tests/run-debuginfod-response-headers.sh
+++ b/tests/run-debuginfod-response-headers.sh
@@ -86,6 +86,14 @@ grep 'X-DEBUGINFOD-FILE: ' vlog-find$PORT1.2
grep 'X-DEBUGINFOD-SIZE: ' vlog-find$PORT1.2
grep 'X-DEBUGINFOD-ARCHIVE: ' vlog-find$PORT1.2
+# Check that X-DEBUGINFOD-SIZE matches the size of each file
+for file in vlog-find$PORT1.1 vlog-find$PORT1.2
+do
+ st_size=$(stat -c%s $(tail -n 1 $file))
+ x_debuginfod_size=$(grep 'X-DEBUGINFOD-SIZE' $file | egrep -o '[0-9]+')
+ test $st_size -eq $x_debuginfod_size
+done
+
kill $PID1
wait $PID1
PID1=0
--
2.35.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-25 15:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-22 22:26 [PATCH 2/2] debuginfod: ensure X-DEBUGINFOD-SIZE contains file size Aaron Merey
2022-04-22 22:31 ` Aaron Merey
2022-04-22 23:27 ` Frank Ch. Eigler
2022-04-25 15:14 ` [PATCH] " Aaron Merey
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).