aboutsummaryrefslogtreecommitdiff
path: root/src/pies.h
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2016-01-02 23:58:06 +0200
committerSergey Poznyakoff <gray@gnu.org>2016-01-02 23:58:06 +0200
commit6db017a32e379bb2eb7878771dea969f77c3168c (patch)
tree0e1563b8239f7c681708c64c0d693f6541e4e155 /src/pies.h
parent061afaf6385340f87bbeaa6d7e8ff6befa532551 (diff)
downloadpies-6db017a32e379bb2eb7878771dea969f77c3168c.tar.gz
pies-6db017a32e379bb2eb7878771dea969f77c3168c.tar.bz2
Switch to new control interface.
Old control options (--status, --restart-components) rewritten using piesctl. SIGUSR1 and SIGUSR2 no longer handled. * lib/arraymember.c (array_index): New function. * lib/libpies.h: Likewise. * src/cmdline.opt: Fix copyright years. * src/piesctl-cl.opt: Likewise. * src/ctl.c (ctlio_do_command): Implement restart. (pies_control_url): New function. (eval_env): rename json to result. New member cond. Restore pcond_ functions. (json_to_pcond): New function. (res_programs): Conditional selection of programs to list. Implement restart. * src/pies.c (ctlfile, statfile): Remove. (pies_keywords): Mark control-file and stat-file as inactive. (default_sigv): Remove SIGUSR1 and SIGUSR2 (pies_check_status): Don't send SIGUSR2. (stop_components): Remove. (request_restart_components): Rewrite as a wrapper. Call piesctl to do the job. (list_components): New function. * src/pies.h (ACTION_COMPRELOAD) (ACTION_DUMPSTATS): Remove. All callers changed. (progman_dump_stats): Remove. * src/piesctl.c (shttp_request_send): Don't initialize conn->req; the caller is responsible for that. (parse_condition, json_to_string) (parse_condition_to_uri): New functions. (com_list): Read conditional expression from the command line. (com_restart): Implement. * src/progman.c (progman_dump_stats): Remove.
Diffstat (limited to 'src/pies.h')
-rw-r--r--src/pies.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/pies.h b/src/pies.h
index afdac66..4bc57bd 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -1,5 +1,5 @@
1/* This file is part of GNU Pies. 1/* This file is part of GNU Pies.
2 Copyright (C) 2008, 2009, 2010, 2011, 2013-2015 Sergey Poznyakoff 2 Copyright (C) 2008-2011, 2013-2016 Sergey Poznyakoff
3 3
4 GNU Pies is free software; you can redistribute it and/or modify 4 GNU Pies is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
@@ -267,8 +267,6 @@ enum pies_action {
267 ACTION_CONT, 267 ACTION_CONT,
268 ACTION_STOP, 268 ACTION_STOP,
269 ACTION_RESTART, 269 ACTION_RESTART,
270 ACTION_COMPRELOAD,
271 ACTION_DUMPSTATS,
272 ACTION_CTRLALTDEL, 270 ACTION_CTRLALTDEL,
273 ACTION_KBREQUEST 271 ACTION_KBREQUEST
274}; 272};
@@ -317,7 +315,6 @@ void progman_cleanup (int expect_term);
317void progman_filter (int (*filter) (struct component *, void *data), 315void progman_filter (int (*filter) (struct component *, void *data),
318 void *data); 316 void *data);
319void progman_stop_tag (const char *name); 317void progman_stop_tag (const char *name);
320void progman_dump_stats (const char *filename);
321void progman_dump_prereq (void); 318void progman_dump_prereq (void);
322void progman_dump_depmap (void); 319void progman_dump_depmap (void);
323int progman_accept (int socket, void *data); 320int progman_accept (int socket, void *data);
@@ -541,3 +538,4 @@ struct control
541extern struct control control; 538extern struct control control;
542 539
543void ctl_open(void); 540void ctl_open(void);
541char const *pies_control_url (void);

Return to:

Send suggestions and report system problems to the System administrator.