/[magellan-source]/trunk/mkinitrd-magellan/busybox/procps/top.c

Diff of /trunk/mkinitrd-magellan/busybox/procps/top.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 4
   *
   * This is written specifically for the linux /proc/<PID>/stat(m)
   * files format.
+  *
   * This reads the PIDs of all processes and their status and shows
   * the status of processes (first ones that fit to screen) at given
   * intervals.
 Line 22
   * - CPU where Process was last seen running
   *   (to see effect of sched_setaffinity() etc)
   * - CPU Time Split (idle/IO/wait etc) PER CPU
-  */
+  *
- /* Original code Copyrights */
- /*
   * Copyright (c) 1992 Branko Lankester
   * Copyright (c) 1992 Roger Binns
   * Copyright (C) 1994-1996 Charles L. Blake.
   * Copyright (C) 1992-1998 Michael K. Johnson
-  * May be distributed under the conditions of the
+  *
-  * GNU Library General Public License
+  * Licensed under GPLv2, see file LICENSE in this tarball for details.
   */
  #include "libbb.h"
-Line 53 
 typedef struct top_status_t {
+Line 50 
 typedef struct top_status_t {
  } top_status_t;
  typedef struct jiffy_counts_t {
- 	unsigned long long usr,nic,sys,idle,iowait,irq,softirq,steal;
+ 	/* Linux 2.4.x has only first four */
+ 	unsigned long long usr, nic, sys, idle;
+ 	unsigned long long iowait, irq, softirq, steal;
  	unsigned long long total;
  	unsigned long long busy;
  } jiffy_counts_t;
-Line 132 
 enum {
+Line 131 
 enum {
  	OPT_d = (1 << 0),
  	OPT_n = (1 << 1),
  	OPT_b = (1 << 2),
- 	OPT_EOF = (1 << 3), /* pseudo: "we saw EOF in stdin" */
+ 	OPT_m = (1 << 3),
+ 	OPT_EOF = (1 << 4), /* pseudo: "we saw EOF in stdin" */
  };
  #define OPT_BATCH_MODE (option_mask32 & OPT_b)
 Line 182 
 static int mult_lvl_cmp(void* a, void* b
  	return 0;
  }
- /* NOINLINE so that complier doesn't unfold the call
-  * causing multiple copies of the arithmatic instrns
-  */
  static NOINLINE int read_cpu_jiffy(FILE *fp, jiffy_counts_t *p_jif)
  {
  #if !ENABLE_FEATURE_TOP_SMP_CPU
- 	static const char fmt[] = "cpu %lld %lld %lld %lld %lld %lld %lld %lld";
+ 	static const char fmt[] = "cpu %llu %llu %llu %llu %llu %llu %llu %llu";
  #else
- 	static const char fmt[] = "cp%*s %lld %lld %lld %lld %lld %lld %lld %lld";
+ 	static const char fmt[] = "cp%*s %llu %llu %llu %llu %llu %llu %llu %llu";
  #endif
  	int ret;
-Line 351 
 static void display_cpus(int scr_width,
+Line 348 
 static void display_cpus(int scr_width,
  	unsigned total_diff;
  	jiffy_counts_t *p_jif, *p_prev_jif;
  	int i;
+ # if ENABLE_FEATURE_TOP_SMP_CPU
- #if ENABLE_FEATURE_TOP_SMP_CPU
  	int n_cpu_lines;
- #endif
+ # endif
  	/* using (unsigned) casts to make operations cheaper */
- #define  CALC_TOT_DIFF  ((unsigned)(p_jif->total - p_prev_jif->total) ? : 1)
+ # define  CALC_TOTAL_DIFF do { \
+ 	total_diff = (unsigned)(p_jif->total - p_prev_jif->total); \
+ 	if (total_diff == 0) total_diff = 1; \
+ } while (0)
- #if ENABLE_FEATURE_TOP_DECIMALS
+ # if ENABLE_FEATURE_TOP_DECIMALS
- #define CALC_STAT(xxx) char xxx[8]
+ #  define CALC_STAT(xxx) char xxx[8]
- #define SHOW_STAT(xxx) fmt_100percent_8(xxx, (unsigned)(p_jif->xxx - p_prev_jif->xxx), total_diff)
+ #  define SHOW_STAT(xxx) fmt_100percent_8(xxx, (unsigned)(p_jif->xxx - p_prev_jif->xxx), total_diff)
- #define FMT "%s"
+ #  define FMT "%s"
- #else
+ # else
- #define CALC_STAT(xxx) unsigned xxx = 100 * (unsigned)(p_jif->xxx - p_prev_jif->xxx) / total_diff
+ #  define CALC_STAT(xxx) unsigned xxx = 100 * (unsigned)(p_jif->xxx - p_prev_jif->xxx) / total_diff
- #define SHOW_STAT(xxx) xxx
+ #  define SHOW_STAT(xxx) xxx
- #define FMT "%4u%% "
+ #  define FMT "%4u%% "
- #endif
+ # endif
- #if !ENABLE_FEATURE_TOP_SMP_CPU
+ # if !ENABLE_FEATURE_TOP_SMP_CPU
  	{
  		i = 1;
  		p_jif = &cur_jif;
  		p_prev_jif = &prev_jif;
- #else
+ # else
  	/* Loop thru CPU(s) */
  	n_cpu_lines = smp_cpu_info ? num_cpus : 1;
  	if (n_cpu_lines > *lines_rem_p)
-Line 383 
 static void display_cpus(int scr_width,
+Line 382 
 static void display_cpus(int scr_width,
  	for (i = 0; i < n_cpu_lines; i++) {
  		p_jif = &cpu_jif[i];
  		p_prev_jif = &cpu_prev_jif[i];
- #endif
+ # endif
- 		total_diff = CALC_TOT_DIFF;
+ 		CALC_TOTAL_DIFF;
  		{ /* Need a block: CALC_STAT are declarations */
  			CALC_STAT(usr);
-Line 398 
 static void display_cpus(int scr_width,
+Line 397 
 static void display_cpus(int scr_width,
  			snprintf(scrbuf, scr_width,
  				/* Barely fits in 79 chars when in "decimals" mode. */
- #if ENABLE_FEATURE_TOP_SMP_CPU
+ # if ENABLE_FEATURE_TOP_SMP_CPU
  				"CPU%s:"FMT"usr"FMT"sys"FMT"nic"FMT"idle"FMT"io"FMT"irq"FMT"sirq",
  				(smp_cpu_info ? utoa(i) : ""),
- #else
+ # else
  				"CPU:"FMT"usr"FMT"sys"FMT"nic"FMT"idle"FMT"io"FMT"irq"FMT"sirq",
- #endif
+ # endif
  				SHOW_STAT(usr), SHOW_STAT(sys), SHOW_STAT(nic), SHOW_STAT(idle),
  				SHOW_STAT(iowait), SHOW_STAT(irq), SHOW_STAT(softirq)
  				/*, SHOW_STAT(steal) - what is this 'steal' thing? */
-Line 412 
 static void display_cpus(int scr_width,
+Line 411 
 static void display_cpus(int scr_width,
  			puts(scrbuf);
  		}
  	}
- #undef SHOW_STAT
+ # undef SHOW_STAT
- #undef CALC_STAT
+ # undef CALC_STAT
- #undef FMT
+ # undef FMT
  	*lines_rem_p -= i;
  }
  #else  /* !ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS */
- #define display_cpus(scr_width, scrbuf, lines_rem) ((void)0)
+ # define display_cpus(scr_width, scrbuf, lines_rem) ((void)0)
  #endif
  static unsigned long display_header(int scr_width, int *lines_rem_p)
-Line 515 
 static NOINLINE void display_process_lis
+Line 514 
 static NOINLINE void display_process_lis
  	 * expensive divides with multiply and shift */
  	unsigned pmem_shift, pmem_scale, pmem_half;
  #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+ 	unsigned tmp_unsigned;
  	unsigned pcpu_shift, pcpu_scale, pcpu_half;
  	unsigned busy_jifs;
  #endif
 Line 522 
 static NOINLINE void display_process_lis
  	/* what info of the processes is shown */
  	printf(OPT_BATCH_MODE ? "%.*s" : "\e[7m%.*s\e[0m", scr_width,
  		"  PID  PPID USER     STAT   VSZ %MEM"
- #if ENABLE_FEATURE_TOP_SMP_PROCESS
+ 		IF_FEATURE_TOP_SMP_PROCESS(" CPU")
- 		" CPU"
+ 		IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(" %CPU")
- #endif
- #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
- 		" %CPU"
- #endif
  		" COMMAND");
  	lines_rem--;
  #if ENABLE_FEATURE_TOP_DECIMALS
- #define UPSCALE 1000
+ # define UPSCALE 1000
- #define CALC_STAT(name, val) div_t name = div((val), 10)
+ # define CALC_STAT(name, val) div_t name = div((val), 10)
- #define SHOW_STAT(name) name.quot, '0'+name.rem
+ # define SHOW_STAT(name) name.quot, '0'+name.rem
- #define FMT "%3u.%c"
+ # define FMT "%3u.%c"
  #else
- #define UPSCALE 100
+ # define UPSCALE 100
- #define CALC_STAT(name, val) unsigned name = (val)
+ # define CALC_STAT(name, val) unsigned name = (val)
- #define SHOW_STAT(name) name
+ # define SHOW_STAT(name) name
- #define FMT "%4u%%"
+ # define FMT "%4u%%"
  #endif
  	/*
  	 * MEM% = s->vsz/MemTotal
-Line 568 
 static NOINLINE void display_process_lis
+Line 564 
 static NOINLINE void display_process_lis
  	 * we assume that unsigned is at least 32-bit.
  	 */
  	pcpu_shift = 6;
- 	pcpu_scale = (UPSCALE*64 * (uint16_t)busy_jifs ? : 1);
+ 	pcpu_scale = UPSCALE*64 * (uint16_t)busy_jifs;
+ 	if (pcpu_scale == 0)
+ 		pcpu_scale = 1;
  	while (pcpu_scale < (1U << (BITS_PER_INT-2))) {
  		pcpu_scale *= 4;
  		pcpu_shift += 2;
  	}
- 	pcpu_scale /= ( (uint16_t)(cur_jif.total - prev_jif.total) * total_pcpu ? : 1);
+ 	tmp_unsigned = (uint16_t)(cur_jif.total - prev_jif.total) * total_pcpu;
+ 	if (tmp_unsigned != 0)
+ 		pcpu_scale /= tmp_unsigned;
  	/* we want (s->pcpu * pcpu_scale) to never overflow */
  	while (pcpu_scale >= 1024) {
  		pcpu_scale /= 4;
 Line 602 
 static NOINLINE void display_process_lis
  		/* PID PPID USER STAT VSZ %MEM [%CPU] COMMAND */
  		col = snprintf(line_buf, scr_width,
  				"\n" "%5u%6u %-8.8s %s%s" FMT
- #if ENABLE_FEATURE_TOP_SMP_PROCESS
+ 				IF_FEATURE_TOP_SMP_PROCESS(" %3d")
- 				" %3d"
+ 				IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(FMT)
- #endif
- #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
- 				FMT
- #endif
  				" ",
  				s->pid, s->ppid, get_cached_username(s->uid),
  				s->state, vsz_str_buf,
  				SHOW_STAT(pmem)
- #if ENABLE_FEATURE_TOP_SMP_PROCESS
+ 				IF_FEATURE_TOP_SMP_PROCESS(, s->last_seen_on_cpu)
- 				, s->last_seen_on_cpu
+ 				IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(, SHOW_STAT(pcpu))
- #endif
- #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
- 				, SHOW_STAT(pcpu)
- #endif
  		);
  		if ((int)(col + 1) < scr_width)
- 			read_cmdline(line_buf + col, scr_width - col - 1, s->pid, s->comm);
+ 			read_cmdline(line_buf + col, scr_width - col, s->pid, s->comm);
  		fputs(line_buf, stdout);
  		/* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu,
  			cur_jif.busy - prev_jif.busy, cur_jif.total - prev_jif.total); */
-Line 628 
 static NOINLINE void display_process_lis
+Line 620 
 static NOINLINE void display_process_lis
  	}
  	/* printf(" %d", hist_iterations); */
  	bb_putchar(OPT_BATCH_MODE ? '\n' : '\r');
- 	fflush(stdout);
+ 	fflush_all();
  }
  #undef UPSCALE
  #undef SHOW_STAT
-Line 644 
 static void clearmems(void)
+Line 636 
 static void clearmems(void)
  }
  #if ENABLE_FEATURE_USE_TERMIOS
- #include <termios.h>
- #include <signal.h>
  static void reset_term(void)
  {
  	tcsetattr_stdin_TCSANOW(&initial_settings);
  	if (ENABLE_FEATURE_CLEAN_UP) {
  		clearmems();
- #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+ # if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
  		free(prev_hist);
- #endif
+ # endif
  	}
  }
-Line 854 
 static NOINLINE void display_topmem_proc
+Line 844 
 static NOINLINE void display_topmem_proc
  		s++;
  	}
  	bb_putchar(OPT_BATCH_MODE ? '\n' : '\r');
- 	fflush(stdout);
+ 	fflush_all();
  #undef HDR_STR
  #undef MIN_WIDTH
  }
-Line 877 
 enum {
+Line 867 
 enum {
  		| PSSCAN_UTIME
  		| PSSCAN_STATE
  		| PSSCAN_COMM
- #if ENABLE_FEATURE_TOP_SMP_PROCESS
  		| PSSCAN_CPU
- #endif
  		| PSSCAN_UIDGID,
  	TOPMEM_MASK = 0
  		| PSSCAN_PID
-Line 895 
 int top_main(int argc UNUSED_PARAM, char
+Line 883 
 int top_main(int argc UNUSED_PARAM, char
  	int lines_rem;
  	unsigned interval;
  	char *str_interval, *str_iterations;
- 	SKIP_FEATURE_TOPMEM(const) unsigned scan_mask = TOP_MASK;
+ 	unsigned scan_mask = TOP_MASK;
  #if ENABLE_FEATURE_USE_TERMIOS
  	struct termios new_settings;
  	struct pollfd pfd[1];
-Line 903 
 int top_main(int argc UNUSED_PARAM, char
+Line 891 
 int top_main(int argc UNUSED_PARAM, char
  	pfd[0].fd = 0;
  	pfd[0].events = POLLIN;
- #endif /* FEATURE_USE_TERMIOS */
+ #endif
  	INIT_G();
-Line 917 
 int top_main(int argc UNUSED_PARAM, char
+Line 905 
 int top_main(int argc UNUSED_PARAM, char
  #endif
  	/* all args are options; -n NUM */
- 	opt_complementary = "-";
+ 	opt_complementary = "-"; /* options can be specified w/o dash */
- 	col = getopt32(argv, "d:n:b", &str_interval, &str_iterations);
+ 	col = getopt32(argv, "d:n:b"IF_FEATURE_TOPMEM("m"), &str_interval, &str_iterations);
+ #if ENABLE_FEATURE_TOPMEM
+ 	if (col & OPT_m) /* -m (busybox specific) */
+ 		scan_mask = TOPMEM_MASK;
+ #endif
  	if (col & OPT_d) {
- 		/* work around for "-d 1" -> "-d -1" done by getopt32 */
+ 		/* work around for "-d 1" -> "-d -1" done by getopt32
+ 		 * (opt_complementary == "-" does this) */
  		if (str_interval[0] == '-')
  			str_interval++;
  		/* Need to limit it to not overflow poll timeout */
-Line 942 
 int top_main(int argc UNUSED_PARAM, char
+Line 935 
 int top_main(int argc UNUSED_PARAM, char
  	bb_signals(BB_FATAL_SIGS, sig_catcher);
  	tcsetattr_stdin_TCSANOW(&new_settings);
- #endif /* FEATURE_USE_TERMIOS */
+ #endif
  #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
  	sort_function[0] = pcpu_sort;
-Line 950 
 int top_main(int argc UNUSED_PARAM, char
+Line 943 
 int top_main(int argc UNUSED_PARAM, char
  	sort_function[2] = time_sort;
  #else
  	sort_function[0] = mem_sort;
- #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */
+ #endif
  	while (1) {
  		procps_status_t *p = NULL;
-Line 964 
 int top_main(int argc UNUSED_PARAM, char
+Line 957 
 int top_main(int argc UNUSED_PARAM, char
  			sleep(interval);
  			continue;
  		}
- #endif /* FEATURE_USE_TERMIOS */
+ #endif
  		if (col > LINE_BUF_SIZE-2) /* +2 bytes for '\n', NUL, */
  			col = LINE_BUF_SIZE-2;
  		/* read process IDs & status for all the processes */
  		while ((p = procps_scan(p, scan_mask)) != NULL) {
  			int n;
- 			if (scan_mask == TOP_MASK) {
+ #if ENABLE_FEATURE_TOPMEM
+ 			if (scan_mask != TOPMEM_MASK)
+ #endif
+ 			{
  				n = ntop;
  				top = xrealloc_vector(top, 6, ntop++);
  				top[n].pid = p->pid;
-Line 986 
 int top_main(int argc UNUSED_PARAM, char
+Line 982 
 int top_main(int argc UNUSED_PARAM, char
  #if ENABLE_FEATURE_TOP_SMP_PROCESS
  				top[n].last_seen_on_cpu = p->last_seen_on_cpu;
  #endif
- 			} else { /* TOPMEM */
+ 			}
  #if ENABLE_FEATURE_TOPMEM
+ 			else { /* TOPMEM */
  				if (!(p->mapped_ro | p->mapped_rw))
  					continue; /* kernel threads are ignored */
  				n = ntop;
-Line 1002 
 int top_main(int argc UNUSED_PARAM, char
+Line 999 
 int top_main(int argc UNUSED_PARAM, char
  				topmem[n].dirty    = p->private_dirty + p->shared_dirty;
  				topmem[n].dirty_sh = p->shared_dirty;
  				topmem[n].stack    = p->stack;
- #endif
  			}
+ #endif
  		} /* end of "while we read /proc" */
  		if (ntop == 0) {
  			bb_error_msg("no process info in /proc");
  			break;
  		}
- 		if (scan_mask == TOP_MASK) {
+ 		if (scan_mask != TOPMEM_MASK) {
  #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
  			if (!prev_hist_count) {
  				do_stats();
-Line 1023 
 int top_main(int argc UNUSED_PARAM, char
+Line 1020 
 int top_main(int argc UNUSED_PARAM, char
  			qsort(top, ntop, sizeof(top_status_t), (void*)mult_lvl_cmp);
  #else
  			qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0]));
- #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */
+ #endif
  		}
  #if ENABLE_FEATURE_TOPMEM
  		else { /* TOPMEM */
-Line 1034 
 int top_main(int argc UNUSED_PARAM, char
+Line 1031 
 int top_main(int argc UNUSED_PARAM, char
  		if (OPT_BATCH_MODE) {
  			lines_rem = INT_MAX;
  		}
- 		if (scan_mask == TOP_MASK)
+ 		if (scan_mask != TOPMEM_MASK)
  			display_process_list(lines_rem, col);
  #if ENABLE_FEATURE_TOPMEM
  		else
-Line 1060 
 int top_main(int argc UNUSED_PARAM, char
+Line 1057 
 int top_main(int argc UNUSED_PARAM, char
  			if (c == 'q')
  				break;
  			if (c == 'n') {
- 				USE_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
+ 				IF_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
  				sort_function[0] = pid_sort;
  			}
  			if (c == 'm') {
- 				USE_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
+ 				IF_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
  				sort_function[0] = mem_sort;
- #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+ # if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
  				sort_function[1] = pcpu_sort;
  				sort_function[2] = time_sort;
- #endif
+ # endif
  			}
- #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+ # if ENABLE_FEATURE_SHOW_THREADS
+ 			if (c == 'h'
+ 			 IF_FEATURE_TOPMEM(&& scan_mask != TOPMEM_MASK)
+ 			) {
+ 				scan_mask ^= PSSCAN_TASKS;
+ 			}
+ # endif
+ # if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
  			if (c == 'p') {
- 				USE_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
+ 				IF_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
  				sort_function[0] = pcpu_sort;
  				sort_function[1] = mem_sort;
  				sort_function[2] = time_sort;
  			}
  			if (c == 't') {
- 				USE_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
+ 				IF_FEATURE_TOPMEM(scan_mask = TOP_MASK;)
  				sort_function[0] = time_sort;
  				sort_function[1] = mem_sort;
  				sort_function[2] = pcpu_sort;
  			}
- #if ENABLE_FEATURE_TOPMEM
+ #  if ENABLE_FEATURE_TOPMEM
  			if (c == 's') {
  				scan_mask = TOPMEM_MASK;
  				free(prev_hist);
-Line 1094 
 int top_main(int argc UNUSED_PARAM, char
+Line 1098 
 int top_main(int argc UNUSED_PARAM, char
  			}
  			if (c == 'r')
  				inverted ^= 1;
- #endif
+ #  endif
- #if ENABLE_FEATURE_TOP_SMP_CPU
+ #  if ENABLE_FEATURE_TOP_SMP_CPU
  			/* procps-2.0.18 uses 'C', 3.2.7 uses '1' */
  			if (c == 'c' || c == '1') {
  				/* User wants to toggle per cpu <> aggregate */
-Line 1112 
 int top_main(int argc UNUSED_PARAM, char
+Line 1116 
 int top_main(int argc UNUSED_PARAM, char
  				smp_cpu_info = !smp_cpu_info;
  				get_jiffy_counts();
  			}
- #endif
+ #  endif
- #endif
+ # endif
  		}
  #endif /* FEATURE_USE_TERMIOS */
  	} /* end of "while (1)" */

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984