Merge branch 'busybox' into merge

Conflicts:
	Makefile.flags

2 files changed, 87 insertions, 22 deletions

diff --git a/init/bootchartd.c b/init/bootchartd.c
index 5f6121fa4..9fd623357 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -208,14 +208,8 @@ static char *make_tempdir(void)
         return tempdir;
 }
 
-static void do_logging(unsigned sample_period_us)
+static void do_logging(unsigned sample_period_us, int process_accounting)
 {
-        //# Enable process accounting if configured
-        //if [ "$PROCESS_ACCOUNTING" = "yes" ]; then
-        //      [ -e kernel_pacct ] || : > kernel_pacct
-        //      accton kernel_pacct
-        //fi
-
         FILE *proc_stat = xfopen("proc_stat.log", "w");
         FILE *proc_diskstats = xfopen("proc_diskstats.log", "w");
         //FILE *proc_netdev = xfopen("proc_netdev.log", "w");
@@ -223,6 +217,11 @@ static void do_logging(unsigned sample_period_us)
         int look_for_login_process = (getppid() == 1);
         unsigned count = 60*1000*1000 / sample_period_us; /* ~1 minute */
 
+        if (process_accounting) {
+                close(xopen("kernel_pacct", O_WRONLY | O_CREAT | O_TRUNC));
+                acct("kernel_pacct");
+        }
+
         while (--count && !bb_got_signal) {
                 char *p;
                 int len = open_read_close("/proc/uptime", G.jiffy_line, sizeof(G.jiffy_line)-2);
@@ -253,11 +252,9 @@ static void do_logging(unsigned sample_period_us)
  wait_more:
                 usleep(sample_period_us);
         }
-
-        // [ -e kernel_pacct ] && accton off
 }
 
-static void finalize(char *tempdir, const char *prog)
+static void finalize(char *tempdir, const char *prog, int process_accounting)
 {
         //# Stop process accounting if configured
         //local pacct=
@@ -265,6 +262,9 @@ static void finalize(char *tempdir, const char *prog)
 
         FILE *header_fp = xfopen("header", "w");
 
+        if (process_accounting)
+                acct(NULL);
+
         if (prog)
                 fprintf(header_fp, "profile.process = %s\n", prog);
 
@@ -307,7 +307,7 @@ static void finalize(char *tempdir, const char *prog)
         fclose(header_fp);
 
         /* Package log files */
-        system("tar -zcf /var/log/bootchart.tgz header *.log"); // + $pacct
+        system(xasprintf("tar -zcf /var/log/bootlog.tgz header %s *.log", process_accounting ? "kernel_pacct" : ""));
         /* Clean up (if we are not in detached tmpfs) */
         if (tempdir) {
                 unlink("header");
@@ -315,6 +315,8 @@ static void finalize(char *tempdir, const char *prog)
                 unlink("proc_diskstats.log");
                 //unlink("proc_netdev.log");
                 unlink("proc_ps.log");
+                if (process_accounting)
+                        unlink("kernel_pacct");
                 rmdir(tempdir);
         }
 
@@ -338,6 +340,7 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv)
         unsigned sample_period_us;
         pid_t parent_pid, logger_pid;
         smallint cmd;
+        int process_accounting;
         enum {
                 CMD_STOP = 0,
                 CMD_START,
@@ -371,6 +374,7 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv)
 
         /* Read config file: */
         sample_period_us = 200 * 1000;
+        process_accounting = 0;
         if (ENABLE_FEATURE_BOOTCHARTD_CONFIG_FILE) {
                 char* token[2];
                 parser_t *parser = config_open2("/etc/bootchartd.conf" + 5, fopen_for_read);
@@ -379,11 +383,16 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv)
                 while (config_read(parser, token, 2, 0, "#=", PARSE_NORMAL & ~PARSE_COLLAPSE)) {
                         if (strcmp(token[0], "SAMPLE_PERIOD") == 0 && token[1])
                                 sample_period_us = atof(token[1]) * 1000000;
+                        if (strcmp(token[0], "PROCESS_ACCOUNTING") == 0 && token[1]
+                         && (strcmp(token[1], "on") == 0 || strcmp(token[1], "yes") == 0)
+                        ) {
+                                process_accounting = 1;
+                        }
                 }
                 config_close(parser);
+                if ((int)sample_period_us <= 0)
+                        sample_period_us = 1; /* prevent division by 0 */
         }
-        if ((int)sample_period_us <= 0)
-                sample_period_us = 1; /* prevent division by 0 */
 
         /* Create logger child: */
         logger_pid = fork_or_rexec(argv);
@@ -411,13 +420,15 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv)
                         putenv((char*)bb_PATH_root_path);
 
                 tempdir = make_tempdir();
-                do_logging(sample_period_us);
-                finalize(tempdir, cmd == CMD_START ? argv[2] : NULL);
+                do_logging(sample_period_us, process_accounting);
+                finalize(tempdir, cmd == CMD_START ? argv[2] : NULL, process_accounting);
                 return EXIT_SUCCESS;
         }
 
         /* parent */
 
+        USE_FOR_NOMMU(argv[0][0] &= 0x7f); /* undo fork_or_rexec() damage */
+
         if (DO_SIGNAL_SYNC) {
                 /* Wait for logger child to set handlers, then unpause it.
                  * Otherwise with short-lived PROG (e.g. "bootchartd start true")
diff --git a/init/init.c b/init/init.c
index 645f694c0..724894698 100644
--- a/init/init.c
+++ b/init/init.c
@@ -108,6 +108,8 @@
 //config:         Note that on Linux, init attempts to detect serial terminal and
 //config:         sets TERM to "vt102" if one is found.
 
+#define DEBUG_SEGV_HANDLER 0
+
 #include "libbb.h"
 #include <syslog.h>
 #include <paths.h>
@@ -118,6 +120,15 @@
 #endif
 #include "reboot.h" /* reboot() constants */
 
+#if DEBUG_SEGV_HANDLER
+# undef _GNU_SOURCE
+# define _GNU_SOURCE 1
+# undef __USE_GNU
+# define __USE_GNU 1
+# include <execinfo.h>
+# include <sys/ucontext.h>
+#endif
+
 /* Used only for sanitizing purposes in set_sane_term() below. On systems where
  * the baud rate is stored in a separate field, we can safely disable them. */
 #ifndef CBAUD
@@ -523,15 +534,17 @@ static struct init_action *mark_terminated(pid_t pid)
         struct init_action *a;
 
         if (pid > 0) {
+                update_utmp(pid, DEAD_PROCESS,
+                                /*tty_name:*/ NULL,
+                                /*username:*/ NULL,
+                                /*hostname:*/ NULL
+                );
                 for (a = init_action_list; a; a = a->next) {
                         if (a->pid == pid) {
                                 a->pid = 0;
                                 return a;
                         }
                 }
-                update_utmp(pid, DEAD_PROCESS, /*tty_name:*/ NULL,
-                                /*username:*/ NULL,
-                                /*hostname:*/ NULL);
         }
         return NULL;
 }
@@ -596,7 +609,7 @@ static void new_init_action(uint8_t action_type, const char *command, const char
          */
         nextp = &init_action_list;
         while ((a = *nextp) != NULL) {
-                /* Don't enter action if it's already in the list,
+                /* Don't enter action if it's already in the list.
                  * This prevents losing running RESPAWNs.
                  */
                 if (strcmp(a->command, command) == 0
@@ -608,14 +621,15 @@ static void new_init_action(uint8_t action_type, const char *command, const char
                         while (*nextp != NULL)
                                 nextp = &(*nextp)->next;
                         a->next = NULL;
-                        break;
+                        goto append;
                 }
                 nextp = &a->next;
         }
 
-        if (!a)
-                a = xzalloc(sizeof(*a));
+        a = xzalloc(sizeof(*a));
+
         /* Append to the end of the list */
+ append:
         *nextp = a;
         a->action_type = action_type;
         safe_strncpy(a->command, command, sizeof(a->command));
@@ -954,6 +968,33 @@ static int check_delayed_sigs(void)
         }
 }
 
+#if DEBUG_SEGV_HANDLER
+static
+void handle_sigsegv(int sig, siginfo_t *info, void *ucontext)
+{
+        long ip;
+        ucontext_t *uc;
+
+        uc = ucontext;
+        ip = uc->uc_mcontext.gregs[REG_EIP];
+        fdprintf(2, "signal:%d address:0x%lx ip:0x%lx\n",
+                        sig,
+                        /* this is void*, but using %p would print "(null)"
+                         * even for ptrs which are not exactly 0, but, say, 0x123:
+                         */
+                        (long)info->si_addr,
+                        ip);
+        {
+                /* glibc extension */
+                void *array[50];
+                int size;
+                size = backtrace(array, 50);
+                backtrace_symbols_fd(array, size, 2);
+        }
+        for (;;) sleep(9999);
+}
+#endif
+
 int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int init_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -961,6 +1002,19 @@ int init_main(int argc UNUSED_PARAM, char **argv)
                 return kill(1, SIGHUP);
         }
 
+#if DEBUG_SEGV_HANDLER
+        {
+                struct sigaction sa;
+                memset(&sa, 0, sizeof(sa));
+                sa.sa_sigaction = handle_sigsegv;
+                sa.sa_flags = SA_SIGINFO;
+                sigaction(SIGSEGV, &sa, NULL);
+                sigaction(SIGILL, &sa, NULL);
+                sigaction(SIGFPE, &sa, NULL);
+                sigaction(SIGBUS, &sa, NULL);
+        }
+#endif
+
         if (!DEBUG_INIT) {
                 /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
                 if (getpid() != 1