Menu
▾
▴
[oprof-cvs] CVS: oprofile/daemon opd_util.c,1.4,1.5 opd_util.h,1.3,1.4 oprofiled.c,1.46,1.47
|
From: Philippe E. <ph...@us...> - 2003-09-22 01:28:14
|
Update of /cvsroot/oprofile/oprofile/daemon
In directory sc8-pr-cvs1:/tmp/cvs-serv27237/daemon
Modified Files:
opd_util.c opd_util.h oprofiled.c
Log Message:
dae/ daemon/ share opd_setup_signals, handle signal in read loop
Index: opd_util.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/opd_util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- opd_util.c 15 Sep 2003 00:21:12 -0000 1.4
+++ opd_util.c 22 Sep 2003 01:28:10 -0000 1.5
@@ -24,6 +24,12 @@
#include <unistd.h>
#include <errno.h>
+
+sig_atomic_t signal_alarm;
+sig_atomic_t signal_hup;
+sig_atomic_t signal_term;
+
+
void opd_open_logfile(void)
{
if (open(OP_LOG_FILE, O_WRONLY|O_CREAT|O_NOCTTY|O_APPEND, 0755) == -1) {
@@ -91,4 +97,64 @@ void opd_write_abi(void)
op_write_abi_to_file(cbuf);
free(cbuf);
#endif
+}
+
+
+/**
+ * opd_alarm - sync files and report stats
+ */
+static void opd_alarm(int val __attribute__((unused)))
+{
+ signal_alarm = 1;
+}
+
+
+/* re-open logfile for logrotate */
+static void opd_sighup(int val __attribute__((unused)))
+{
+ signal_hup = 1;
+}
+
+
+static void opd_sigterm(int val __attribute__((unused)))
+{
+ signal_term = 1;
+}
+
+
+void opd_setup_signals(void)
+{
+ struct sigaction act;
+
+ act.sa_handler = opd_alarm;
+ act.sa_flags = 0;
+ sigemptyset(&act.sa_mask);
+
+ if (sigaction(SIGALRM, &act, NULL)) {
+ perror("oprofiled: install of SIGALRM handler failed: ");
+ exit(EXIT_FAILURE);
+ }
+
+ act.sa_handler = opd_sighup;
+ act.sa_flags = 0;
+ sigemptyset(&act.sa_mask);
+ sigaddset(&act.sa_mask, SIGALRM);
+
+ if (sigaction(SIGHUP, &act, NULL)) {
+ perror("oprofiled: install of SIGHUP handler failed: ");
+ exit(EXIT_FAILURE);
+ }
+
+ act.sa_handler = opd_sigterm;
+ act.sa_flags = 0;
+ sigemptyset(&act.sa_mask);
+ sigaddset(&act.sa_mask, SIGTERM);
+
+ if (sigaction(SIGTERM, &act, NULL)) {
+ perror("oprofiled: install of SIGTERM handler failed: ");
+ exit(EXIT_FAILURE);
+ }
+
+ /* clean up every 10 minutes */
+ alarm(60*10);
}
Index: opd_util.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/opd_util.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- opd_util.h 15 Sep 2003 00:21:12 -0000 1.3
+++ opd_util.h 22 Sep 2003 01:28:10 -0000 1.4
@@ -11,6 +11,8 @@
#ifndef OPD_UTIL_H
+#include <signal.h>
+
/**
* opd_open_logfile - open the log file
*
@@ -38,5 +40,16 @@ void opd_go_daemon(void);
* opd_write_abi - write out the ABI description if needed
*/
void opd_write_abi(void);
+
+
+/**
+ * opd_setup_signals - setup signal handler
+ */
+void opd_setup_signals(void);
+
+/** global variable positionned by signal handler */
+extern sig_atomic_t signal_alarm;
+extern sig_atomic_t signal_hup;
+extern sig_atomic_t signal_term;
#endif /* OPD_UTIL_H */
Index: oprofiled.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/oprofiled.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- oprofiled.c 21 Sep 2003 23:45:56 -0000 1.46
+++ oprofiled.c 22 Sep 2003 01:28:10 -0000 1.47
@@ -71,10 +71,11 @@ static char * kernel_range;
static int showvers;
static u32 ctr_enabled[OP_MAX_COUNTERS];
static int opd_buf_size;
-static sigset_t maskset;
static fd_t devfd;
-static void opd_sighup(int val);
+static void opd_sighup(void);
+static void opd_alarm(void);
+static void opd_sigterm(void);
static struct poptOption options[] = {
{ "kernel-range", 'r', POPT_ARG_STRING, &kernel_range, 0, "Kernel VMA range", "start-end", },
@@ -272,8 +273,6 @@ static void complete_dump()
* @param opd_buf buffer to process
*
* Process a buffer of samples.
- * The signals specified by the global variable maskset are
- * masked.
*
* If the sample could be processed correctly, it is written
* to the relevant sample file.
@@ -282,9 +281,6 @@ static void opd_do_samples(char const *
{
size_t num = count / kernel_pointer_size;
- /* prevent signals from messing us up */
- sigprocmask(SIG_BLOCK, &maskset, NULL);
-
opd_stats[OPD_DUMP_COUNT]++;
printf("Read buffer of %d entries.\n", (unsigned int)num);
@@ -292,8 +288,6 @@ static void opd_do_samples(char const *
opd_process_samples(opd_buf, num);
complete_dump();
-
- sigprocmask(SIG_UNBLOCK, &maskset, NULL);
}
@@ -313,6 +307,21 @@ static void opd_do_read(char * buf, size
/* loop to handle EINTR */
while (count < 0) {
count = op_read_device(devfd, buf, size);
+
+ // we can lost a signal alarm or a signal hup but we
+ // don't take care.
+ if (signal_alarm) {
+ signal_alarm = 0;
+ opd_alarm();
+ }
+
+ if (signal_hup) {
+ signal_hup = 0;
+ opd_sighup();
+ }
+
+ if (signal_term)
+ opd_sigterm();
}
opd_do_samples(buf, count);
@@ -323,7 +332,7 @@ static void opd_do_read(char * buf, size
/**
* opd_alarm - sync files and report stats
*/
-static void opd_alarm(int val __attribute__((unused)))
+static void opd_alarm(void)
{
opd_for_each_image(opd_sync_image_samples_files);
opd_print_stats();
@@ -332,7 +341,7 @@ static void opd_alarm(int val __attribut
/* re-open logfile for logrotate */
-static void opd_sighup(int val __attribute__((unused)))
+static void opd_sighup(void)
{
printf("Received SIGHUP.\n");
close(1);
@@ -349,58 +358,14 @@ static void clean_exit(void)
}
-static void opd_sigterm(int val __attribute__((unused)))
+static void opd_sigterm(void)
{
opd_print_stats();
printf("oprofiled stopped %s", op_get_time());
- clean_exit();
exit(EXIT_FAILURE);
}
-static void setup_signals(void)
-{
- struct sigaction act;
-
- act.sa_handler = opd_alarm;
- act.sa_flags = 0;
- sigemptyset(&act.sa_mask);
-
- if (sigaction(SIGALRM, &act, NULL)) {
- perror("oprofiled: install of SIGALRM handler failed: ");
- exit(EXIT_FAILURE);
- }
-
- act.sa_handler = opd_sighup;
- act.sa_flags = 0;
- sigemptyset(&act.sa_mask);
- sigaddset(&act.sa_mask, SIGALRM);
-
- if (sigaction(SIGHUP, &act, NULL)) {
- perror("oprofiled: install of SIGHUP handler failed: ");
- exit(EXIT_FAILURE);
- }
-
- act.sa_handler = opd_sigterm;
- act.sa_flags = 0;
- sigemptyset(&act.sa_mask);
- sigaddset(&act.sa_mask, SIGTERM);
-
- if (sigaction(SIGTERM, &act, NULL)) {
- perror("oprofiled: install of SIGTERM handler failed: ");
- exit(EXIT_FAILURE);
- }
-
- sigemptyset(&maskset);
- sigaddset(&maskset, SIGALRM);
- sigaddset(&maskset, SIGHUP);
- sigaddset(&maskset, SIGTERM);
-
- /* clean up every 10 minutes */
- alarm(60*10);
-}
-
-
static size_t opd_pointer_size(void)
{
size_t size;
@@ -496,7 +461,7 @@ int main(int argc, char const * argv[])
opd_stats[i] = 0;
}
- setup_signals();
+ opd_setup_signals();
err = setrlimit(RLIMIT_NOFILE, &rlim);
if (err) {
|