emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ntpd: show at loglevel 2 and export in env current poll interval

Browse Source 
function                                             old     new   delta
run_script                                           273     340     +67
ntpd_main                                            832     845     +13

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-07 11:51:13 +01:00
parent 053ffeeeda
commit ae47335dc4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
networking/ntpd.c
View File

@ -689,7 +689,7 @@ send_query_to_peer(peer_t *p)
static void run_script(const char *action) static void run_script(const char *action)
{ {
char *argv[3]; char *argv[3];
char *env1, *env2; char *env1, *env2, *env3;
if (!G.script_name) if (!G.script_name)
return; return;
@ -700,12 +700,14 @@ static void run_script(const char *action)
VERB1 bb_error_msg("executing '%s %s'", G.script_name, action); VERB1 bb_error_msg("executing '%s %s'", G.script_name, action);
env1 = xasprintf("stratum=%u", G.stratum); env1 = xasprintf("%s=%u", "stratum", G.stratum);
putenv(env1); putenv(env1);
env2 = xasprintf("freq_drift_ppm=%ld", G.kernel_freq_drift); env2 = xasprintf("%s=%ld", "freq_drift_ppm", G.kernel_freq_drift);
putenv(env2); putenv(env2);
env3 = xasprintf("%s=%u", "poll_interval", 1 << G.poll_exp);
putenv(env3);
/* Other items of potential interest: selected peer, /* Other items of potential interest: selected peer,
* rootdelay, reftime, rootdisp, refid, ntp_status, poll_exp, * rootdelay, reftime, rootdisp, refid, ntp_status,
* last_update_offset, last_update_recv_time, discipline_jitter * last_update_offset, last_update_recv_time, discipline_jitter
*/ */
@ -713,12 +715,15 @@ static void run_script(const char *action)
* may take some time (seconds): */ * may take some time (seconds): */
/*wait4pid(spawn(argv));*/ /*wait4pid(spawn(argv));*/
spawn(argv); spawn(argv);
G.last_script_run = G.cur_time;
unsetenv("stratum"); unsetenv("stratum");
unsetenv("freq_drift_ppm"); unsetenv("freq_drift_ppm");
unsetenv("poll_interval");
free(env1); free(env1);
free(env2); free(env2);
free(env3);
G.last_script_run = G.cur_time;
} }
static NOINLINE void static NOINLINE void
@ -1897,7 +1902,7 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
timeout++; /* (nextaction - G.cur_time) rounds down, compensating */ timeout++; /* (nextaction - G.cur_time) rounds down, compensating */
/* Here we may block */ /* Here we may block */
VERB2 bb_error_msg("poll %us, sockets:%u", timeout, i); VERB2 bb_error_msg("poll %us, sockets:%u, poll interval:%us", timeout, i, 1 << G.poll_exp);
nfds = poll(pfd, i, timeout * 1000); nfds = poll(pfd, i, timeout * 1000);
gettime1900d(); /* sets G.cur_time */ gettime1900d(); /* sets G.cur_time */
if (nfds <= 0) { if (nfds <= 0) {