Commit a90a04a1 authored by Niels Möller's avatar Niels Möller
Browse files

(reap): Deleted this super class. Updated users.

Rev: src/lsh.h:1.25
Rev: src/lsh_proxy.c:1.31
Rev: src/lshd.c:1.135
Rev: src/reaper.c:1.23
Rev: src/reaper.h:1.11
Rev: src/server_userauth.h:1.20
parent a202edc7
......@@ -127,7 +127,7 @@ struct randomness;
/* reaper.h */
struct exit_callback;
struct reap;
struct reaper;
/* resource.h */
struct resource;
......
......@@ -550,7 +550,7 @@ int main(int argc, char **argv)
struct alist *keys;
struct reap *reaper;
struct reaper *reaper;
struct randomness *r;
struct alist *algorithms_server, *algorithms_client;
......
......@@ -149,7 +149,7 @@ const char *argp_program_bug_address = BUG_ADDRESS;
(vars
(e object exception_handler)
(reaper object reap)
(reaper object reaper)
(random object randomness)
(signature_algorithms object alist)
......
......@@ -44,19 +44,9 @@
#include "reaper.c.x"
/* GABA:
(class
(name reaper)
(super reap)
(vars
; Mapping of from pids to exit-callbacks.
; NOTE: This assumes that a pid_t fits in an int.
(children object alist)))
*/
static void
do_reap(struct reap *c,
pid_t pid, struct exit_callback *callback)
do_reap(struct reaper *c,
pid_t pid, struct exit_callback *callback)
{
CAST(reaper, closure, c);
......@@ -153,15 +143,15 @@ make_reaper_callback(struct reaper *reaper)
return &self->super;
}
struct reap *
struct reaper *
make_reaper(void)
{
NEW(reaper, self);
self->super.reap = do_reap;
self->reap = do_reap;
self->children = make_linked_alist(0, -1);
io_signal_handler(SIGCHLD, make_reaper_callback(self));
return &self->super;
return self;
}
......@@ -44,14 +44,17 @@
/* GABA:
(class
(name reap)
(name reaper)
(vars
; Use callback == NULL to cancel a previous callback.
(reap method void "pid_t pid" "struct exit_callback *callback")))
(reap method void "pid_t pid" "struct exit_callback *callback")
; Mapping of from pids to exit-callbacks.
; NOTE: This assumes that a pid_t fits in an int.
(children object alist)))
*/
#define REAP(r, p, c) ((r)->reap((r), (p), (c)))
struct reap *make_reaper(void);
struct reaper *make_reaper(void);
#endif /* LSH_REAPER_H_INCLUDED */
......@@ -54,7 +54,7 @@
#define USER_LOOKUP(db, n, f) ((db)->lookup((db), (n), (f)))
struct user_db *
make_unix_user_db(struct reap *reaper,
make_unix_user_db(struct reaper *reaper,
const char *pw_helper, const char *login_shell,
int allow_root);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment