Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/init/bootchartd.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/init/bootchartd.c (modified) (13 diffs)

branches/3.2/mindi-busybox/init/bootchartd.c

@@ -4 +4 @@
  */
 
-//applet:IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP))
+//applet:IF_BOOTCHARTD(APPLET(bootchartd, BB_DIR_SBIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_BOOTCHARTD) += bootchartd.o
@@ -209 +209 @@
 }
 
-static void do_logging(unsigned sample_period_us)
-{
-    //# Enable process accounting if configured
-    //if [ "$PROCESS_ACCOUNTING" = "yes" ]; then
-    //  [ -e kernel_pacct ] || : > kernel_pacct
-    //  accton kernel_pacct
-    //fi
-
+static void do_logging(unsigned sample_period_us, int process_accounting)
+{
     FILE *proc_stat = xfopen("proc_stat.log", "w");
     FILE *proc_diskstats = xfopen("proc_diskstats.log", "w");
@@ -223 +217 @@
     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) {
@@ -254 +253 @@
         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
@@ -265 +262 @@
 
     FILE *header_fp = xfopen("header", "w");
+
+    if (process_accounting)
+        acct(NULL);
 
     if (prog)
@@ -308 +308 @@
 
     /* 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) {
@@ -316 +316 @@
         //unlink("proc_netdev.log");
         unlink("proc_ps.log");
+        if (process_accounting)
+            unlink("kernel_pacct");
         rmdir(tempdir);
     }
@@ -328 +330 @@
 //usage:#define bootchartd_full_usage "\n\n"
 //usage:       "Create /var/log/bootchart.tgz with boot chart data\n"
-//usage:     "\nOptions:"
 //usage:     "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1"
 //usage:     "\nstop: send USR1 to all bootchartd processes"
@@ -340 +341 @@
     pid_t parent_pid, logger_pid;
     smallint cmd;
+    int process_accounting;
     enum {
         CMD_STOP = 0,
@@ -373 +375 @@
     /* Read config file: */
     sample_period_us = 200 * 1000;
+    process_accounting = 0;
     if (ENABLE_FEATURE_BOOTCHARTD_CONFIG_FILE) {
         char* token[2];
@@ -381 +384 @@
             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: */
@@ -413 +421 @@
 
         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) {
@@ -442 +452 @@
         if (pid == 0) { /* child */
             argv += 2;
-            execvp(argv[0], argv);
-            bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+            BB_EXECVP_or_die(argv);
         }
         /* parent */