wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-24 11:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to libuev v1.2.0

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2015-06-09 14:57:41 +02:00
1 parent 4e904142cb
commit 66edb42e06
4 files changed
+10 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

inetd.c
+2 -3
View File
@@ -21,8 +21,6 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "inetd.h" /* XXX: Move back down after upgrading to libuEv >1.0.4 */
#include <ifaddrs.h> #include <ifaddrs.h>
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
@@ -32,6 +30,7 @@
#include "libite/lite.h" #include "libite/lite.h"
#include "finit.h" #include "finit.h"
#include "inetd.h"
#include "helpers.h" #include "helpers.h"
#include "private.h" #include "private.h"
#include "service.h" #include "service.h"
@@ -45,7 +44,7 @@
} while (0); } while (0);
/* Socket callback, looks up correct svc and starts it as an inetd service */ /* Socket callback, looks up correct svc and starts it as an inetd service */
static void socket_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *arg, int UNUSED(events)) static void socket_cb(uev_t *w, void *arg, int UNUSED(events))
{ {
svc_t *svc = (svc_t *)arg; svc_t *svc = (svc_t *)arg;
libuev
+1 -1
Submodule libuev updated: 63697e9eda...6397edc2c4.
plugin.c
+1 -1
View File
@@ -178,7 +178,7 @@ void plugin_run_hooks(hook_point_t no)
} }
/* Generic libev I/O callback, looks up correct plugin and calls its callback */ /* Generic libev I/O callback, looks up correct plugin and calls its callback */
static void generic_io_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *arg, int events) static void generic_io_cb(uev_t *w, void *arg, int events)
{ {
plugin_t *p = (plugin_t *)arg; plugin_t *p = (plugin_t *)arg;
sig.c
+6 -6
View File
@@ -91,7 +91,7 @@ void do_shutdown(int sig)
/* /*
* Reload .conf files in /etc/finit.d/ * Reload .conf files in /etc/finit.d/
*/ */
static void sighup_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events)) static void sighup_cb(uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
{ {
reload_finit_d(); reload_finit_d();
} }
@@ -99,7 +99,7 @@ static void sighup_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg
/* /*
* Shut down on INT PWR * Shut down on INT PWR
*/ */
static void sigint_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *UNUSED(arg), int UNUSED(events)) static void sigint_cb(uev_t *w, void *UNUSED(arg), int UNUSED(events))
{ {
do_shutdown(w->signo); do_shutdown(w->signo);
} }
@@ -107,7 +107,7 @@ static void sigint_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *UNUSED(arg), int U
/* /*
* SIGCHLD: one of our children has died * SIGCHLD: one of our children has died
*/ */
static void sigchld_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events)) static void sigchld_cb(uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
{ {
pid_t pid; pid_t pid;
@@ -124,7 +124,7 @@ static void sigchld_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(ar
/* /*
* SIGSEGV: mostly if service callbacks segfault * SIGSEGV: mostly if service callbacks segfault
*/ */
static void sigsegv_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events)) static void sigsegv_cb(uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
{ {
_e("PID %d caused a segfault!\n", getpid()); _e("PID %d caused a segfault!\n", getpid());
exit(-1); exit(-1);
@@ -133,7 +133,7 @@ static void sigsegv_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(ar
/* /*
* SIGSTOP/SIGTSTP: Paused by user or netflash * SIGSTOP/SIGTSTP: Paused by user or netflash
*/ */
static void sigstop_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events)) static void sigstop_cb(uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
{ {
touch(SYNC_STOPPED); touch(SYNC_STOPPED);
stopped++; stopped++;
@@ -142,7 +142,7 @@ static void sigstop_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(ar
/* /*
* SIGCONT: Restart service monitor * SIGCONT: Restart service monitor
*/ */
static void sigcont_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events)) static void sigcont_cb(uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
{ {
stopped = 0; stopped = 0;
erase(SYNC_STOPPED); erase(SYNC_STOPPED);