chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phc2sys: autoconfigure realtime clock on demand only 

By default, do not synchronize CLOCK_REALTIME. To do it, -r option is
needed. That will only consider CLOCK_REALTIME as the destination. To
consider it also as a possible time source, use -rr.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
master
Jiri Benc 2014-06-11 21:35:22 +02:00 committed by Richard Cochran
parent 46a0b281b9
commit 3dd4d51c8e
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
phc2sys.c
View File

@ -72,6 +72,7 @@ struct clock {
clockid_t clkid; clockid_t clkid;
int sysoff_supported; int sysoff_supported;
int is_utc; int is_utc;
int dest_only;
int state; int state;
int new_state; int new_state;
struct servo *servo; struct servo *servo;
@ -328,10 +329,16 @@ static void reconfigure(struct node *node)
node->master = NULL; node->master = NULL;
return; return;
} }
if ((!src_cnt && (!rt || rt->dest_only)) ||
(!dst_cnt && !rt)) {
pr_info("nothing to synchronize");
node->master = NULL;
return;
}
if (!src_cnt) { if (!src_cnt) {
src = rt; src = rt;
rt->state = PS_SLAVE; rt->state = PS_SLAVE;
} else { } else if (rt) {
if (rt->state != PS_MASTER) { if (rt->state != PS_MASTER) {
rt->state = PS_MASTER; rt->state = PS_MASTER;
clock_reinit(rt); clock_reinit(rt);
@ -926,7 +933,7 @@ static void close_pmc(struct node *node)
node->pmc = NULL; node->pmc = NULL;
} }
static int auto_init_ports(struct node *node) static int auto_init_ports(struct node *node, int add_rt)
{ {
struct port *port; struct port *port;
struct clock *clock; struct clock *clock;
@ -981,8 +988,13 @@ static int auto_init_ports(struct node *node)
} }
node->state_changed = 1; node->state_changed = 1;
if (!clock_add(node, "CLOCK_REALTIME")) if (add_rt) {
clock = clock_add(node, "CLOCK_REALTIME");
if (!clock)
return -1; return -1;
if (add_rt == 1)
clock->dest_only = 1;
}
/* get initial offset */ /* get initial offset */
if (run_pmc_get_utc_offset(node, 1000) <= 0) { if (run_pmc_get_utc_offset(node, 1000) <= 0) {
@ -1077,6 +1089,8 @@ static void usage(char *progname)
"\n" "\n"
" automatic configuration:\n" " automatic configuration:\n"
" -a turn on autoconfiguration\n" " -a turn on autoconfiguration\n"
" -r synchronize system (realtime) clock\n"
" repeat -r to consider it also as a time source\n"
" manual configuration:\n" " manual configuration:\n"
" -c [dev|name] slave clock (CLOCK_REALTIME)\n" " -c [dev|name] slave clock (CLOCK_REALTIME)\n"
" -d [dev] master PPS device\n" " -d [dev] master PPS device\n"
@ -1109,7 +1123,7 @@ int main(int argc, char *argv[])
char *progname; char *progname;
char *src_name = NULL, *dst_name = NULL; char *src_name = NULL, *dst_name = NULL;
struct clock *src, *dst; struct clock *src, *dst;
int autocfg = 0; int autocfg = 0, rt = 0;
int c, domain_number = 0, pps_fd = -1; int c, domain_number = 0, pps_fd = -1;
int r, wait_sync = 0; int r, wait_sync = 0;
int print_level = LOG_INFO, use_syslog = 1, verbose = 0; int print_level = LOG_INFO, use_syslog = 1, verbose = 0;
@ -1129,11 +1143,14 @@ int main(int argc, char *argv[])
progname = strrchr(argv[0], '/'); progname = strrchr(argv[0], '/');
progname = progname ? 1+progname : argv[0]; progname = progname ? 1+progname : argv[0];
while (EOF != (c = getopt(argc, argv, while (EOF != (c = getopt(argc, argv,
"ac:d:s:E:P:I:S:F:R:N:O:L:i:u:wn:xl:mqvh"))) { "arc:d:s:E:P:I:S:F:R:N:O:L:i:u:wn:xl:mqvh"))) {
switch (c) { switch (c) {
case 'a': case 'a':
autocfg = 1; autocfg = 1;
break; break;
case 'r':
rt++;
break;
case 'c': case 'c':
dst_name = strdup(optarg); dst_name = strdup(optarg);
break; break;
@ -1263,7 +1280,7 @@ int main(int argc, char *argv[])
if (autocfg) { if (autocfg) {
if (init_pmc(&node, domain_number)) if (init_pmc(&node, domain_number))
return -1; return -1;
if (auto_init_ports(&node) < 0) if (auto_init_ports(&node, rt) < 0)
return -1; return -1;
return do_loop(&node, 1); return do_loop(&node, 1);
} }