libbb: introduce and use xsettimeofday()
function old new delta xsettimeofday - 25 +25 rdate_main 274 260 -14 step_time 348 331 -17 set_kernel_timezone_and_clock 119 102 -17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/3 up/down: 25/-48) Total: -23 bytes text data bss dec hex filename 1020753 559 5052 1026364 fa93c busybox_old 1020708 559 5052 1026319 fa90f busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
d3c36882dc
commit
eb0c2e218c
@ -657,6 +657,8 @@ void parse_datestr(const char *date_str, struct tm *ptm) FAST_FUNC;
|
|||||||
time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC;
|
time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC;
|
||||||
char *strftime_HHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
|
char *strftime_HHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
|
||||||
char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
|
char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
|
||||||
|
void xsettimeofday(const struct timeval *tv) FAST_FUNC;
|
||||||
|
|
||||||
|
|
||||||
int xsocket(int domain, int type, int protocol) FAST_FUNC;
|
int xsocket(int domain, int type, int protocol) FAST_FUNC;
|
||||||
void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC;
|
void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC;
|
||||||
|
@ -417,15 +417,3 @@ int FAST_FUNC wait4pid(pid_t pid)
|
|||||||
return WTERMSIG(status) + 0x180;
|
return WTERMSIG(status) + 0x180;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Useful when we do know that pid is valid, and we just want to wait
|
|
||||||
// for it to exit. Not existing pid is fatal. waitpid() status is not returned.
|
|
||||||
int FAST_FUNC wait_for_exitstatus(pid_t pid)
|
|
||||||
{
|
|
||||||
int exit_status, n;
|
|
||||||
|
|
||||||
n = safe_waitpid(pid, &exit_status, 0);
|
|
||||||
if (n < 0)
|
|
||||||
bb_simple_perror_msg_and_die("waitpid");
|
|
||||||
return exit_status;
|
|
||||||
}
|
|
||||||
|
@ -702,3 +702,21 @@ void FAST_FUNC xvfork_parent_waits_and_exits(void)
|
|||||||
}
|
}
|
||||||
/* Child continues */
|
/* Child continues */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Useful when we do know that pid is valid, and we just want to wait
|
||||||
|
// for it to exit. Not existing pid is fatal. waitpid() status is not returned.
|
||||||
|
int FAST_FUNC wait_for_exitstatus(pid_t pid)
|
||||||
|
{
|
||||||
|
int exit_status, n;
|
||||||
|
|
||||||
|
n = safe_waitpid(pid, &exit_status, 0);
|
||||||
|
if (n < 0)
|
||||||
|
bb_simple_perror_msg_and_die("waitpid");
|
||||||
|
return exit_status;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FAST_FUNC xsettimeofday(const struct timeval *tv)
|
||||||
|
{
|
||||||
|
if (settimeofday(tv, NULL))
|
||||||
|
bb_simple_perror_msg_and_die("settimeofday");
|
||||||
|
}
|
||||||
|
@ -1147,8 +1147,7 @@ step_time(double offset)
|
|||||||
gettimeofday(&tvc, NULL); /* never fails */
|
gettimeofday(&tvc, NULL); /* never fails */
|
||||||
dtime = tvc.tv_sec + (1.0e-6 * tvc.tv_usec) + offset;
|
dtime = tvc.tv_sec + (1.0e-6 * tvc.tv_usec) + offset;
|
||||||
d_to_tv(dtime, &tvn);
|
d_to_tv(dtime, &tvn);
|
||||||
if (settimeofday(&tvn, NULL) == -1)
|
xsettimeofday(&tvn);
|
||||||
bb_simple_perror_msg_and_die("settimeofday");
|
|
||||||
|
|
||||||
VERB2 {
|
VERB2 {
|
||||||
tval = tvc.tv_sec;
|
tval = tvc.tv_sec;
|
||||||
|
@ -184,10 +184,8 @@ static void set_kernel_timezone_and_clock(int utc, const struct timeval *hctosys
|
|||||||
/*tz.tz_dsttime = 0; already is */
|
/*tz.tz_dsttime = 0; already is */
|
||||||
set_kernel_tz(&tz); /* MIGHT warp_clock() if 1st call since boot */
|
set_kernel_tz(&tz); /* MIGHT warp_clock() if 1st call since boot */
|
||||||
|
|
||||||
if (hctosys) { /* it's --hctosys: set time too */
|
if (hctosys) /* it's --hctosys: set time too */
|
||||||
if (settimeofday(hctosys, NULL))
|
xsettimeofday(hctosys);
|
||||||
bb_simple_perror_msg_and_die("settimeofday");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void to_sys_clock(const char **pp_rtcname, int utc)
|
static void to_sys_clock(const char **pp_rtcname, int utc)
|
||||||
|
@ -96,11 +96,10 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
if (time(NULL) == remote_time)
|
if (time(NULL) == remote_time)
|
||||||
bb_simple_error_msg("current time matches remote time");
|
bb_simple_error_msg("current time matches remote time");
|
||||||
else {
|
else {
|
||||||
struct timespec ts;
|
struct timeval ts;
|
||||||
ts.tv_sec = remote_time;
|
ts.tv_sec = remote_time;
|
||||||
ts.tv_nsec = 0;
|
ts.tv_usec = 0;
|
||||||
if (clock_settime(CLOCK_REALTIME, &ts) < 0)
|
xsettimeofday(&ts);
|
||||||
bb_simple_perror_msg_and_die("can't set time of day");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user