diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-11 20:59:02 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-11 20:59:02 +0000 |
| commit | 1db39b2f51c2877ad4b5c0094f2e1f8d6449ca91 (patch) | |
| tree | c3e9787a51628fbb2314ade4785d7a6d887686e1 /include | |
| parent | 1114de7219f8e42d6d883c476a9458f637806365 (diff) | |
| download | busybox-w32-1db39b2f51c2877ad4b5c0094f2e1f8d6449ca91.tar.gz busybox-w32-1db39b2f51c2877ad4b5c0094f2e1f8d6449ca91.tar.bz2 busybox-w32-1db39b2f51c2877ad4b5c0094f2e1f8d6449ca91.zip | |
nmeter: new applet. ~4k
Fix build proble on x86_64
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 1 | ||||
| -rw-r--r-- | include/usage.h | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h index 328848478..3b759de20 100644 --- a/include/applets.h +++ b/include/applets.h | |||
| @@ -207,6 +207,7 @@ USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER)) | |||
| 207 | USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 207 | USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| 208 | USE_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_NEVER)) | 208 | USE_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_NEVER)) |
| 209 | USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER)) | 209 | USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER)) |
| 210 | USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | ||
| 210 | USE_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 211 | USE_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| 211 | USE_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 212 | USE_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| 212 | USE_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 213 | USE_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
diff --git a/include/usage.h b/include/usage.h index ef348a2a9..b119c55c1 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -2172,6 +2172,30 @@ USE_FEATURE_MDEV_CONFIG( \ | |||
| 2172 | "Options:\n" \ | 2172 | "Options:\n" \ |
| 2173 | "\t-n ADJUST\tAdjust the scheduling priority by ADJUST" | 2173 | "\t-n ADJUST\tAdjust the scheduling priority by ADJUST" |
| 2174 | 2174 | ||
| 2175 | #define nmeter_trivial_usage \ | ||
| 2176 | "format_string" | ||
| 2177 | #define nmeter_full_usage \ | ||
| 2178 | "Nmeter monitors your system in real time.\n\n" \ | ||
| 2179 | "Format specifiers:\n" \ | ||
| 2180 | "%Nc or %[cN] monitor CPU. N - bar size, default 10\n" \ | ||
| 2181 | " (displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \ | ||
| 2182 | "%[niface] monitor network interface 'iface'\n" \ | ||
| 2183 | "%m monitor allocated memory\n" \ | ||
| 2184 | "%[mf] monitor free memory\n" \ | ||
| 2185 | "%[mt] monitor total memory\n" \ | ||
| 2186 | "%s monitor allocated swap\n" \ | ||
| 2187 | "%f monitor number of used file descriptors\n" \ | ||
| 2188 | "%Ni monitor total/specific IRQ rate\n" \ | ||
| 2189 | "%x monitor context switch rate\n" \ | ||
| 2190 | "%p monitor forks\n" \ | ||
| 2191 | "%[pn] monitor # of processes\n" \ | ||
| 2192 | "%b monitor block io\n" \ | ||
| 2193 | "%Nt show time (with N decimal points)\n" \ | ||
| 2194 | "%Nd milliseconds between updates (default=1000)\n" \ | ||
| 2195 | "%r print <cr> instead of <lf> at EOL" | ||
| 2196 | #define nmeter_example_usage \ | ||
| 2197 | "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'" | ||
| 2198 | |||
| 2175 | #define nohup_trivial_usage \ | 2199 | #define nohup_trivial_usage \ |
| 2176 | "COMMAND [ARGS]" | 2200 | "COMMAND [ARGS]" |
| 2177 | #define nohup_full_usage \ | 2201 | #define nohup_full_usage \ |
