X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=init%2Fbootchartd.c;h=92aaade0ffd9ac9c8a90f582b8d60046041f3514;hb=31c765081dc41f158786545fbea9294be4685bd2;hp=5f6121fa476f8e2e19ea67af3569e46447c4d9ab;hpb=66426760beef7e87c4735f433d123daf911b5b4a;p=oweals%2Fbusybox.git

diff --git a/init/bootchartd.c b/init/bootchartd.c
index 5f6121fa4..92aaade0f 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -47,6 +47,7 @@
 //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 <sys/utsname.h>
 
@@ -60,6 +61,12 @@
 # endif
 #endif
 
+#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"
 
 /* For debugging, set to 0:
@@ -109,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)
 {
@@ -187,7 +194,7 @@ static char *make_tempdir(void)
 		 * 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;
@@ -208,14 +215,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 +224,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 +259,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 +269,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 +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");
@@ -315,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);
 	}
 
@@ -338,6 +347,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 +381,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 +390,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 +427,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")