* [committed] Handle skip_multifile in encode/decode_child_exit_status
@ 2021-03-29 7:46 Tom de Vries
0 siblings, 0 replies; only message in thread
From: Tom de Vries @ 2021-03-29 7:46 UTC (permalink / raw)
To: dwz, jakub, mark
Hi,
Handle skip_multifile in encode_child_exit_status and
decode_child_exit_status. This is a preparation for running write_multifile
in parallel.
Committed to trunk.
Thanks,
- Tom
Handle skip_multifile in encode/decode_child_exit_status
2021-03-29 Tom de Vries <tdevries@suse.de>
* dwz.c (encode_child_exit_status, decode_child_exit_status): Handle
skip_multifile.
---
dwz.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/dwz.c b/dwz.c
index de600c1..9adc9df 100644
--- a/dwz.c
+++ b/dwz.c
@@ -16417,12 +16417,13 @@ update_hardlinks (int nr_files, char *files[], struct file_result *resa)
static int
encode_child_exit_status (int thisret, struct file_result *res)
{
+ assert (thisret == 0 || thisret == 1);
if (thisret == 0 && res->low_mem_p)
thisret = 2;
- assert (thisret >= 0 && thisret <= 2);
- assert (res->res >= -3);
- thisret = thisret + ((res->res + 3) << 2);
- return thisret;
+ assert (res->res >= -3 && res->res <= 1);
+ return (thisret
+ + ((res->res + 3) << 2)
+ + ((res->skip_multifile ? 1 : 0) << 5));
}
/* Decode child process exit status. */
@@ -16432,14 +16433,21 @@ decode_child_exit_status (int state, struct file_result *res)
int ret;
if (!WIFEXITED (state))
error (1, 0, "Child dwz process got killed");
- ret = WEXITSTATUS (state) & 0x3;
+ int status = WEXITSTATUS (state);
+ ret = status & 0x3;
+ status >>= 2;
+
res->low_mem_p = false;
if (ret == 2)
{
ret = 0;
res->low_mem_p = true;
}
- res->res = (int)((WEXITSTATUS (state) & ~0x3) >> 2) - 3;
+
+ res->res = (int)(status & 0x7) - 3;
+ status >>= 3;
+
+ res->skip_multifile = (status & 0x1) ? true : false;
return ret;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-29 7:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-29 7:46 [committed] Handle skip_multifile in encode/decode_child_exit_status Tom de Vries
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).