mirror of
https://git.busybox.net/busybox.git
synced 2024-11-24 06:03:27 +08:00
22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
370 lines
10 KiB
C
370 lines
10 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini hwclock implementation for busybox
|
|
*
|
|
* Copyright (C) 2002 Robert Griebl <griebl@gmx.de>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config HWCLOCK
|
|
//config: bool "hwclock (5.8 kb)"
|
|
//config: default y
|
|
//config: select PLATFORM_LINUX
|
|
//config: help
|
|
//config: The hwclock utility is used to read and set the hardware clock
|
|
//config: on a system. This is primarily used to set the current time on
|
|
//config: shutdown in the hardware clock, so the hardware will keep the
|
|
//config: correct time when Linux is _not_ running.
|
|
//config:
|
|
//config:config FEATURE_HWCLOCK_ADJTIME_FHS
|
|
//config: bool "Use FHS /var/lib/hwclock/adjtime"
|
|
//config: default n # util-linux-ng in Fedora 13 still uses /etc/adjtime
|
|
//config: depends on HWCLOCK
|
|
//config: help
|
|
//config: Starting with FHS 2.3, the adjtime state file is supposed to exist
|
|
//config: at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish
|
|
//config: to use the FHS behavior, answer Y here, otherwise answer N for the
|
|
//config: classic /etc/adjtime path.
|
|
//config:
|
|
//config: pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
|
|
|
|
//applet:IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_HWCLOCK) += hwclock.o
|
|
|
|
#include "libbb.h"
|
|
/* After libbb.h, since it needs sys/types.h on some systems */
|
|
#include <sys/utsname.h>
|
|
#include "rtc_.h"
|
|
|
|
/* diff code is disabled: it's not sys/hw clock diff, it's some useless
|
|
* "time between hwclock was started and we saw CMOS tick" quantity.
|
|
* It's useless since hwclock is started at a random moment,
|
|
* thus the quantity is also random, useless. Showing 0.000000 does not
|
|
* deprive us from any useful info.
|
|
*
|
|
* SHOW_HWCLOCK_DIFF code in this file shows the difference between system
|
|
* and hw clock. It is useful, but not compatible with standard hwclock.
|
|
* Thus disabled.
|
|
*/
|
|
#define SHOW_HWCLOCK_DIFF 0
|
|
|
|
|
|
#if !SHOW_HWCLOCK_DIFF
|
|
# define read_rtc(pp_rtcname, sys_tv, utc) read_rtc(pp_rtcname, utc)
|
|
#endif
|
|
static time_t read_rtc(const char **pp_rtcname, struct timeval *sys_tv, int utc)
|
|
{
|
|
struct tm tm_time;
|
|
int fd;
|
|
|
|
fd = rtc_xopen(pp_rtcname, O_RDONLY);
|
|
|
|
rtc_read_tm(&tm_time, fd);
|
|
|
|
#if SHOW_HWCLOCK_DIFF
|
|
{
|
|
int before = tm_time.tm_sec;
|
|
while (1) {
|
|
rtc_read_tm(&tm_time, fd);
|
|
gettimeofday(sys_tv, NULL);
|
|
if (before != (int)tm_time.tm_sec)
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
close(fd);
|
|
|
|
return rtc_tm2time(&tm_time, utc);
|
|
}
|
|
|
|
static void show_clock(const char **pp_rtcname, int utc)
|
|
{
|
|
#if SHOW_HWCLOCK_DIFF
|
|
struct timeval sys_tv;
|
|
#endif
|
|
time_t t = read_rtc(pp_rtcname, &sys_tv, utc);
|
|
|
|
#if ENABLE_LOCALE_SUPPORT
|
|
/* Standard hwclock uses locale-specific output format */
|
|
char cp[64];
|
|
struct tm *ptm = localtime(&t);
|
|
strftime(cp, sizeof(cp), "%c", ptm);
|
|
#else
|
|
char *cp = ctime(&t);
|
|
chomp(cp);
|
|
#endif
|
|
|
|
#if !SHOW_HWCLOCK_DIFF
|
|
printf("%s 0.000000 seconds\n", cp);
|
|
#else
|
|
{
|
|
long diff = sys_tv.tv_sec - t;
|
|
if (diff < 0 /*&& tv.tv_usec != 0*/) {
|
|
/* Why we need diff++? */
|
|
/* diff >= 0 is ok: | diff < 0, can't just use tv.tv_usec: */
|
|
/* 45.520820 | 43.520820 */
|
|
/* - 44.000000 | - 45.000000 */
|
|
/* = 1.520820 | = -1.479180, not -2.520820! */
|
|
diff++;
|
|
/* Should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
|
|
sys_tv.tv_usec = 999999 - sys_tv.tv_usec;
|
|
}
|
|
printf("%s %ld.%06lu seconds\n", cp, diff, (unsigned long)sys_tv.tv_usec);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static void to_sys_clock(const char **pp_rtcname, int utc)
|
|
{
|
|
struct timeval tv;
|
|
struct timezone tz;
|
|
|
|
tz.tz_minuteswest = timezone/60;
|
|
/* ^^^ used to also subtract 60*daylight, but it's wrong:
|
|
* daylight!=0 means "this timezone has some DST
|
|
* during the year", not "DST is in effect now".
|
|
*/
|
|
tz.tz_dsttime = 0;
|
|
|
|
tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
|
|
tv.tv_usec = 0;
|
|
if (settimeofday(&tv, &tz))
|
|
bb_perror_msg_and_die("settimeofday");
|
|
}
|
|
|
|
static void from_sys_clock(const char **pp_rtcname, int utc)
|
|
{
|
|
#if 1
|
|
struct timeval tv;
|
|
struct tm tm_time;
|
|
int rtc;
|
|
|
|
rtc = rtc_xopen(pp_rtcname, O_WRONLY);
|
|
gettimeofday(&tv, NULL);
|
|
/* Prepare tm_time */
|
|
if (sizeof(time_t) == sizeof(tv.tv_sec)) {
|
|
if (utc)
|
|
gmtime_r((time_t*)&tv.tv_sec, &tm_time);
|
|
else
|
|
localtime_r((time_t*)&tv.tv_sec, &tm_time);
|
|
} else {
|
|
time_t t = tv.tv_sec;
|
|
if (utc)
|
|
gmtime_r(&t, &tm_time);
|
|
else
|
|
localtime_r(&t, &tm_time);
|
|
}
|
|
#else
|
|
/* Bloated code which tries to set hw clock with better precision.
|
|
* On x86, even though code does set hw clock within <1ms of exact
|
|
* whole seconds, apparently hw clock (at least on some machines)
|
|
* doesn't reset internal fractional seconds to 0,
|
|
* making all this a pointless exercise.
|
|
*/
|
|
/* If we see that we are N usec away from whole second,
|
|
* we'll sleep for N-ADJ usecs. ADJ corrects for the fact
|
|
* that CPU is not infinitely fast.
|
|
* On infinitely fast CPU, next wakeup would be
|
|
* on (exactly_next_whole_second - ADJ). On real CPUs,
|
|
* this difference between current time and whole second
|
|
* is less than ADJ (assuming system isn't heavily loaded).
|
|
*/
|
|
/* Small value of 256us gives very precise sync for 2+ GHz CPUs.
|
|
* Slower CPUs will fail to sync and will go to bigger
|
|
* ADJ values. qemu-emulated armv4tl with ~100 MHz
|
|
* performance ends up using ADJ ~= 4*1024 and it takes
|
|
* 2+ secs (2 tries with successively larger ADJ)
|
|
* to sync. Even straced one on the same qemu (very slow)
|
|
* takes only 4 tries.
|
|
*/
|
|
#define TWEAK_USEC 256
|
|
unsigned adj = TWEAK_USEC;
|
|
struct tm tm_time;
|
|
struct timeval tv;
|
|
int rtc = rtc_xopen(pp_rtcname, O_WRONLY);
|
|
|
|
/* Try to catch the moment when whole second is close */
|
|
while (1) {
|
|
unsigned rem_usec;
|
|
time_t t;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
t = tv.tv_sec;
|
|
rem_usec = 1000000 - tv.tv_usec;
|
|
if (rem_usec < adj) {
|
|
/* Close enough */
|
|
small_rem:
|
|
t++;
|
|
}
|
|
|
|
/* Prepare tm_time from t */
|
|
if (utc)
|
|
gmtime_r(&t, &tm_time); /* may read /etc/xxx (it takes time) */
|
|
else
|
|
localtime_r(&t, &tm_time); /* same */
|
|
|
|
if (adj >= 32*1024) {
|
|
break; /* 32 ms diff and still no luck?? give up trying to sync */
|
|
}
|
|
|
|
/* gmtime/localtime took some time, re-get cur time */
|
|
gettimeofday(&tv, NULL);
|
|
|
|
if (tv.tv_sec < t /* we are still in old second */
|
|
|| (tv.tv_sec == t && tv.tv_usec < adj) /* not too far into next second */
|
|
) {
|
|
break; /* good, we are in sync! */
|
|
}
|
|
|
|
rem_usec = 1000000 - tv.tv_usec;
|
|
if (rem_usec < adj) {
|
|
t = tv.tv_sec;
|
|
goto small_rem; /* already close to next sec, don't sleep */
|
|
}
|
|
|
|
/* Try to sync up by sleeping */
|
|
usleep(rem_usec - adj);
|
|
|
|
/* Jump to 1ms diff, then increase fast (x2): EVERY loop
|
|
* takes ~1 sec, people won't like slowly converging code here!
|
|
*/
|
|
//bb_error_msg("adj:%d tv.tv_usec:%d", adj, (int)tv.tv_usec);
|
|
if (adj < 512)
|
|
adj = 512;
|
|
/* ... and if last "overshoot" does not look insanely big,
|
|
* just use it as adj increment. This makes convergence faster.
|
|
*/
|
|
if (tv.tv_usec < adj * 8) {
|
|
adj += tv.tv_usec;
|
|
continue;
|
|
}
|
|
adj *= 2;
|
|
}
|
|
/* Debug aid to find "optimal" TWEAK_USEC with nearly exact sync.
|
|
* Look for a value which makes tv_usec close to 999999 or 0.
|
|
* For 2.20GHz Intel Core 2: optimal TWEAK_USEC ~= 200
|
|
*/
|
|
//bb_error_msg("tv.tv_usec:%d", (int)tv.tv_usec);
|
|
#endif
|
|
|
|
tm_time.tm_isdst = 0;
|
|
xioctl(rtc, RTC_SET_TIME, &tm_time);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
close(rtc);
|
|
}
|
|
|
|
/*
|
|
* At system boot, kernel may set system time from RTC,
|
|
* but it knows nothing about timezones. If RTC is in local time,
|
|
* then system time is wrong - it is offset by timezone.
|
|
* This option corrects system time if RTC is in local time,
|
|
* and (always) sets in-kernel timezone.
|
|
*
|
|
* This is an alternate option to --hctosys that does not read the
|
|
* hardware clock.
|
|
*/
|
|
static void set_system_clock_timezone(int utc)
|
|
{
|
|
struct timeval tv;
|
|
struct tm *broken;
|
|
struct timezone tz;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
broken = localtime(&tv.tv_sec);
|
|
tz.tz_minuteswest = timezone / 60;
|
|
if (broken->tm_isdst > 0)
|
|
tz.tz_minuteswest -= 60;
|
|
tz.tz_dsttime = 0;
|
|
gettimeofday(&tv, NULL);
|
|
if (!utc)
|
|
tv.tv_sec += tz.tz_minuteswest * 60;
|
|
if (settimeofday(&tv, &tz))
|
|
bb_perror_msg_and_die("settimeofday");
|
|
}
|
|
|
|
//usage:#define hwclock_trivial_usage
|
|
//usage: IF_LONG_OPTS(
|
|
//usage: "[-r|--show] [-s|--hctosys] [-w|--systohc] [--systz]"
|
|
//usage: " [--localtime] [-u|--utc]"
|
|
//usage: " [-f|--rtc FILE]"
|
|
//usage: )
|
|
//usage: IF_NOT_LONG_OPTS(
|
|
//usage: "[-r] [-s] [-w] [-t] [-l] [-u] [-f FILE]"
|
|
//usage: )
|
|
//usage:#define hwclock_full_usage "\n\n"
|
|
//usage: "Query and set hardware clock (RTC)\n"
|
|
//usage: "\n -r Show hardware clock time"
|
|
//usage: "\n -s Set system time from hardware clock"
|
|
//usage: "\n -w Set hardware clock from system time"
|
|
//usage: IF_LONG_OPTS(
|
|
//usage: "\n --systz Set in-kernel timezone, correct system time"
|
|
//usage: )
|
|
//usage: "\n if hardware clock is in local time"
|
|
//usage: "\n -u Assume hardware clock is kept in UTC"
|
|
//usage: IF_LONG_OPTS(
|
|
//usage: "\n --localtime Assume hardware clock is kept in local time"
|
|
//usage: )
|
|
//usage: "\n -f FILE Use specified device (e.g. /dev/rtc2)"
|
|
|
|
//TODO: get rid of incompatible -t and -l aliases to --systz and --localtime
|
|
|
|
#define HWCLOCK_OPT_LOCALTIME 0x01
|
|
#define HWCLOCK_OPT_UTC 0x02
|
|
#define HWCLOCK_OPT_SHOW 0x04
|
|
#define HWCLOCK_OPT_HCTOSYS 0x08
|
|
#define HWCLOCK_OPT_SYSTOHC 0x10
|
|
#define HWCLOCK_OPT_SYSTZ 0x20
|
|
#define HWCLOCK_OPT_RTCFILE 0x40
|
|
|
|
int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int hwclock_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
const char *rtcname = NULL;
|
|
unsigned opt;
|
|
int utc;
|
|
|
|
#if ENABLE_LONG_OPTS
|
|
static const char hwclock_longopts[] ALIGN1 =
|
|
"localtime\0" No_argument "l" /* short opt is non-standard */
|
|
"utc\0" No_argument "u"
|
|
"show\0" No_argument "r"
|
|
"hctosys\0" No_argument "s"
|
|
"systohc\0" No_argument "w"
|
|
"systz\0" No_argument "t" /* short opt is non-standard */
|
|
"rtc\0" Required_argument "f"
|
|
;
|
|
#endif
|
|
|
|
/* Initialize "timezone" (libc global variable) */
|
|
tzset();
|
|
|
|
opt = getopt32long(argv,
|
|
"^lurswtf:" "\0" "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l",
|
|
hwclock_longopts,
|
|
&rtcname
|
|
);
|
|
|
|
/* If -u or -l wasn't given check if we are using utc */
|
|
if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
|
|
utc = (opt & HWCLOCK_OPT_UTC);
|
|
else
|
|
utc = rtc_adjtime_is_utc();
|
|
|
|
if (opt & HWCLOCK_OPT_HCTOSYS)
|
|
to_sys_clock(&rtcname, utc);
|
|
else if (opt & HWCLOCK_OPT_SYSTOHC)
|
|
from_sys_clock(&rtcname, utc);
|
|
else if (opt & HWCLOCK_OPT_SYSTZ)
|
|
set_system_clock_timezone(utc);
|
|
else
|
|
/* default HWCLOCK_OPT_SHOW */
|
|
show_clock(&rtcname, utc);
|
|
|
|
return 0;
|
|
}
|