|
From: <jsa...@us...> - 2008-06-06 23:04:59
|
Revision: 1257
http://como.svn.sourceforge.net/como/?rev=1257&view=rev
Author: jsanjuas
Date: 2008-06-06 16:04:57 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
. Created a signal handler that just calls exit (using exit as a signal handler may result in awkward exit codes.)
. Removed prototype for spawn_child
. Fix to storage that registered sighandlers twice.
Modified Paths:
--------------
src/branches/2.0/base/capture.c
src/branches/2.0/base/export.c
src/branches/2.0/base/storage.c
src/branches/2.0/base/supervisor.c
src/branches/2.0/base/util-process.c
src/branches/2.0/include/comopriv.h
Modified: src/branches/2.0/base/capture.c
===================================================================
--- src/branches/2.0/base/capture.c 2008-06-06 22:37:57 UTC (rev 1256)
+++ src/branches/2.0/base/capture.c 2008-06-06 23:04:57 UTC (rev 1257)
@@ -1701,8 +1701,8 @@
/* register handlers for signals */
signal(SIGPIPE, SIG_IGN);
- signal(SIGINT, exit);
- signal(SIGTERM, exit);
+ signal(SIGINT, sighdlr_exit);
+ signal(SIGTERM, sighdlr_exit);
signal(SIGHUP, SIG_IGN);
atexit(cleanup);
Modified: src/branches/2.0/base/export.c
===================================================================
--- src/branches/2.0/base/export.c 2008-06-06 22:37:57 UTC (rev 1256)
+++ src/branches/2.0/base/export.c 2008-06-06 23:04:57 UTC (rev 1257)
@@ -483,7 +483,6 @@
return IPC_OK;
}
-
/*
* -- export_main
*
@@ -519,9 +518,9 @@
#endif
/* register handlers for signals */
- signal(SIGPIPE, exit);
- signal(SIGINT, exit);
- signal(SIGTERM, exit);
+ signal(SIGPIPE, sighdlr_exit);
+ signal(SIGINT, sighdlr_exit);
+ signal(SIGTERM, sighdlr_exit);
signal(SIGHUP, SIG_IGN); /* ignore SIGHUP */
/* register handlers for IPC messages */
Modified: src/branches/2.0/base/storage.c
===================================================================
--- src/branches/2.0/base/storage.c 2008-06-06 22:37:57 UTC (rev 1256)
+++ src/branches/2.0/base/storage.c 2008-06-06 23:04:57 UTC (rev 1257)
@@ -1801,9 +1801,9 @@
log_set_program("ST");
/* register handlers for signals */
- signal(SIGPIPE, exit);
- signal(SIGINT, exit);
- signal(SIGTERM, exit);
+ signal(SIGPIPE, sighdlr_exit);
+ signal(SIGINT, sighdlr_exit);
+ signal(SIGTERM, sighdlr_exit);
signal(SIGHUP, SIG_IGN); /* ignore SIGHUP */
if (como_config->inline_mode)
@@ -1823,12 +1823,6 @@
/* if needed, wait for debugger */
DEBUGGER_WAIT_ATTACH("st");
- /* register handlers for signals */
- signal(SIGPIPE, exit);
- signal(SIGINT, exit);
- signal(SIGTERM, exit);
- signal(SIGHUP, SIG_IGN); /* ignore SIGHUP */
-
/* run */
como_st_run();
Modified: src/branches/2.0/base/supervisor.c
===================================================================
--- src/branches/2.0/base/supervisor.c 2008-06-06 22:37:57 UTC (rev 1256)
+++ src/branches/2.0/base/supervisor.c 2008-06-06 23:04:57 UTC (rev 1257)
@@ -651,8 +651,8 @@
memmap_stats_t *mem_stats;
/* catch some signals */
- signal(SIGINT, exit); /* catch SIGINT to clean up */
- signal(SIGTERM, exit); /* catch SIGTERM to clean up */
+ signal(SIGINT, sighdlr_exit); /* catch SIGINT to clean up */
+ signal(SIGTERM, sighdlr_exit); /* catch SIGTERM to clean up */
signal(SIGCHLD, defchld); /* catch SIGCHLD (defunct children) */
signal(SIGHUP, set_reconfigure_flag); /* catch SIGHUP to update cfg */
Modified: src/branches/2.0/base/util-process.c
===================================================================
--- src/branches/2.0/base/util-process.c 2008-06-06 22:37:57 UTC (rev 1256)
+++ src/branches/2.0/base/util-process.c 2008-06-06 23:04:57 UTC (rev 1257)
@@ -222,4 +222,14 @@
return 1;
}
+/*
+ * -- sighdlr_exit
+ *
+ * Signal handler that just calls exit.
+ */
+void
+sighdlr_exit(UNUSED int i)
+{
+ exit(0);
+}
Modified: src/branches/2.0/include/comopriv.h
===================================================================
--- src/branches/2.0/include/comopriv.h 2008-06-06 22:37:57 UTC (rev 1256)
+++ src/branches/2.0/include/comopriv.h 2008-06-06 23:04:57 UTC (rev 1257)
@@ -199,8 +199,7 @@
pid_t start_child (ipc_peer_full_t * child, mainloop_fn mainloop,
memmap_t * shmemmap, FILE *client_stream, como_node_t * node);
int handle_children ();
-pid_t spawn_child (ipc_peer_full_t * child, const char *descr,
- const char * path, ...);
+void sighdlr_exit(int);
#define GR_LOSTSYNC ((void *) -1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|