X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=init%2Fbootchartd.c;h=92aaade0ffd9ac9c8a90f582b8d60046041f3514;hb=31c765081dc41f158786545fbea9294be4685bd2;hp=2d9770c4c123915ade1cffa3151fbcf0d31ae3ba;hpb=6d9c88ad982dbe9cb9d5c375f42a4eb8d4aef39f;p=oweals%2Fbusybox.git diff --git a/init/bootchartd.c b/init/bootchartd.c index 2d9770c4c..92aaade0f 100644 --- a/init/bootchartd.c +++ b/init/bootchartd.c @@ -1,8 +1,12 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//applet:IF_BOOTCHARTD(APPLET(bootchartd, BB_DIR_SBIN, BB_SUID_DROP)) + +//kbuild:lib-$(CONFIG_BOOTCHARTD) += bootchartd.o + //config:config BOOTCHARTD //config: bool "bootchartd" //config: default y @@ -18,7 +22,7 @@ //config: and stopped using bootchartd stop. //config: //config:config FEATURE_BOOTCHARTD_BLOATED_HEADER -//config: bool "bootchartd" +//config: bool "Compatible, bloated header" //config: default y //config: depends on BOOTCHARTD //config: help @@ -35,7 +39,7 @@ //config: makes bootchartd applet to dump a subset of it. //config: //config:config FEATURE_BOOTCHARTD_CONFIG_FILE -//config: bool "bootchartd" +//config: bool "Support bootchartd.conf" //config: default y //config: depends on BOOTCHARTD //config: help @@ -43,14 +47,24 @@ //config: and /etc/bootchartd.conf files. #include "libbb.h" +#include "common_bufsiz.h" /* After libbb.h, since it needs sys/types.h on some systems */ #include -#include -#ifndef MS_SILENT -# define MS_SILENT (1 << 15) + +#ifdef __linux__ +# include +# ifndef MS_SILENT +# define MS_SILENT (1 << 15) +# endif +# ifndef MNT_DETACH +# define MNT_DETACH 0x00000002 +# endif #endif -#ifndef MNT_DETACH -# define MNT_DETACH 0x00000002 + +#if !ENABLE_TAR && !ENABLE_WERROR +# warning Note: bootchartd requires tar command, but you did not select it. +#elif !ENABLE_FEATURE_SEAMLESS_GZ && !ENABLE_WERROR +# warning Note: bootchartd requires tar -z support, but you did not select it. #endif #define BC_VERSION_STR "0.8" @@ -102,8 +116,8 @@ struct globals { char jiffy_line[COMMON_BUFSIZE]; } FIX_ALIASING; -#define G (*(struct globals*)&bb_common_bufsiz1) -#define INIT_G() do { } while (0) +#define G (*(struct globals*)bb_common_bufsiz1) +#define INIT_G() do { setup_common_bufsiz(); } while (0) static void dump_file(FILE *fp, const char *filename) { @@ -156,7 +170,7 @@ static int dump_procs(FILE *fp, int look_for_login_process) continue; p++; strchrnul(p, ')')[0] = '\0'; - /* If is gdm, kdm or a getty? */ + /* Is it gdm, kdm or a getty? */ if (((p[0] == 'g' || p[0] == 'k' || p[0] == 'x') && p[1] == 'd' && p[2] == 'm') || strstr(p, "getty") ) { @@ -174,12 +188,13 @@ static char *make_tempdir(void) char template[] = "/tmp/bootchart.XXXXXX"; char *tempdir = xstrdup(mkdtemp(template)); if (!tempdir) { +#ifdef __linux__ /* /tmp is not writable (happens when we are used as init). * Try to mount a tmpfs, them cd and lazily unmount it. * Since we unmount it at once, we can mount it anywhere. * Try a few locations which are likely ti exist. */ - static const char dirs[] = "/mnt\0""/tmp\0""/boot\0""/proc\0"; + static const char dirs[] ALIGN1 = "/mnt\0""/tmp\0""/boot\0""/proc\0"; const char *try_dir = dirs; while (mount("none", try_dir, "tmpfs", MS_SILENT, "size=16m") != 0) { try_dir += strlen(try_dir) + 1; @@ -191,26 +206,28 @@ static char *make_tempdir(void) if (umount2(try_dir, MNT_DETACH) != 0) { bb_perror_msg_and_die("can't %smount tmpfs", "un"); } +#else + bb_perror_msg_and_die("can't create temporary directory"); +#endif } else { xchdir(tempdir); } return tempdir; } -static void do_logging(int sample_pariod_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"); FILE *proc_ps = xfopen("proc_ps.log", "w"); int look_for_login_process = (getppid() == 1); - unsigned count = 60*1000*1000 / (200*1000); /* ~1 minute */ + 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; @@ -235,18 +252,16 @@ static void do_logging(int sample_pariod_us) /* dump_procs saw a getty or {g,k,x}dm * stop logging in 2 seconds: */ - if (count > 2*1000*1000 / (200*1000)) - count = 2*1000*1000 / (200*1000); + if (count > 2*1000*1000 / sample_period_us) + count = 2*1000*1000 / sample_period_us; } fflush_all(); wait_more: - usleep(sample_pariod_us); + 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= @@ -254,17 +269,19 @@ 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); fputs("version = "BC_VERSION_STR"\n", header_fp); - if (ENABLE_FEATURE_BOOTCHARTD_BLOATED_HEADER) { char *hostname; char *kcmdline; time_t t; struct tm tm_time; - /* x2 for possible localized data */ + /* x2 for possible localized weekday/month names */ char date_buf[sizeof("Mon Jun 21 05:29:03 CEST 2010") * 2]; struct utsname unamebuf; @@ -297,7 +314,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"); @@ -305,6 +322,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); } @@ -313,22 +332,22 @@ static void finalize(char *tempdir, const char *prog) */ } -/* Usage: - * bootchartd start [PROG ARGS]: start logging in background, USR1 stops it. - * With PROG, runs PROG, then kills background logging. - * bootchartd stop: same as "killall -USR1 bootchartd" - * bootchartd init: start logging in background - * Stop when getty/gdm is seen (if AUTO_STOP_LOGGER = yes). - * Meant to be used from init scripts. - * bootchartd (pid==1): as init, but then execs $bootchart_init, /init, /sbin/init - * Meant to be used as kernel's init process. - */ +//usage:#define bootchartd_trivial_usage +//usage: "start [PROG ARGS]|stop|init" +//usage:#define bootchartd_full_usage "\n\n" +//usage: "Create /var/log/bootchart.tgz with boot chart data\n" +//usage: "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1" +//usage: "\nstop: send USR1 to all bootchartd processes" +//usage: "\ninit: start background logging; stop when getty/xdm is seen (for init scripts)" +//usage: "\nUnder PID 1: as init, then exec $bootchart_init, /init, /sbin/init" + int bootchartd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int bootchartd_main(int argc UNUSED_PARAM, char **argv) { - int sample_pariod_us; + unsigned sample_period_us; pid_t parent_pid, logger_pid; smallint cmd; + int process_accounting; enum { CMD_STOP = 0, CMD_START, @@ -358,10 +377,11 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv) cmd = CMD_PID1; } - /* Here we are in START or INIT state */ + /* Here we are in START, INIT or CMD_PID1 state */ /* Read config file: */ - sample_pariod_us = 200 * 1000; + 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); @@ -369,9 +389,16 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv) parser = config_open2("/etc/bootchartd.conf", fopen_for_read); while (config_read(parser, token, 2, 0, "#=", PARSE_NORMAL & ~PARSE_COLLAPSE)) { if (strcmp(token[0], "SAMPLE_PERIOD") == 0 && token[1]) - sample_pariod_us = atof(token[1]) * 1000000; + 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 */ } /* Create logger child: */ @@ -400,13 +427,15 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv) putenv((char*)bb_PATH_root_path); tempdir = make_tempdir(); - do_logging(sample_pariod_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") @@ -422,17 +451,14 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv) execl(bootchart_init, bootchart_init, NULL); execl("/init", "init", NULL); execl("/sbin/init", "init", NULL); - bb_perror_msg_and_die("can't exec '%s'", "/sbin/init"); + bb_perror_msg_and_die("can't execute '%s'", "/sbin/init"); } if (cmd == CMD_START && argv[2]) { /* "start PROG ARGS" */ - pid_t pid = vfork(); - if (pid < 0) - bb_perror_msg_and_die("vfork"); + pid_t pid = xvfork(); if (pid == 0) { /* child */ argv += 2; - execvp(argv[0], argv); - bb_perror_msg_and_die("can't exec '%s'", argv[0]); + BB_EXECVP_or_die(argv); } /* parent */ waitpid(pid, NULL, 0);