diff options
| author | Rory Dudley | 2024-02-26 23:14:13 -0700 |
|---|---|---|
| committer | Rory Dudley | 2024-02-26 23:14:13 -0700 |
| commit | 0548e74cb3227716cf445f27bd64b8c0b4d0f981 (patch) | |
| tree | 569003df69a1a81cbaa859b2bbd7cfb178020d1c /src/poem/recite.rs | |
| parent | b6fc81066cfcc29d4519191eae5ba19581ad2774 (diff) | |
| download | dwarvish-0548e74cb3227716cf445f27bd64b8c0b4d0f981.tar.gz | |
Cleanup recite(), custom errors, fixed forking
First off, moved the giant match statements out of recite(), and into
macros in src/recite/ps.rs. There still needs to be two, since any verse
using the 'couplet' meter will need to redirect its STDOUT. Now the
recite() function returns a Result<(), Mishap>, which can be invoked
when calling the incant_ functions.
Custom errors were added in the form of 'Mishap''s. They are intended to
be returned from the incant_ functions, in the event that something goes
wrong with the Command::spawn() or Child::wait(). They each take a
String, which should be the verb or stanza that was entered by the user.
The incant_ functions separate the functionality of each type of meter
from the recite() function. They return a Result<i32, Mishap>, where
i32 is the exit code of the program that ran, and Mishap is a possible
error.
Before, the shell was cheating at forking a process to the background.
It would actually spawn a thread to wait for that process to finish.
Now, the program simply registers a handler for SIGCHLD, and uses libc's
waitpid() function to reap the child process, and print some output to
the user, indicating that it's finished.
Notes
Notes:
This was a huge patch which did some desperately needed cleanup of the
recite() function. Moving forward, will need to add more documentation,
and will probably scrap the custom errors, since this implementation is
a little half-baked. It's worth looking into in the future, but we can
probably live with io::Error's for the time being.
Fixing forking was a pretty big deal, though. In Linux, and other
u**x-like operating systems, parent processes need to reap their child
processes, otherwise they become zombies. Previously, the dwvsh did this
by spawning a separate thread to wait for child processes that were
forked to the background. Now, we are registering a handle for SIGCHLD,
which is a signal that gets sent to the parent when one of their
children finishes, or is killed. Using waitpid(2), we can determine
which process ended, and do something about it. In the case of a
processes that was forked into the background, when it finished,
waitpid(2) will return its PID. For foreground processes, it returns -1.
Diffstat (limited to 'src/poem/recite.rs')
0 files changed, 0 insertions, 0 deletions