diff options
Diffstat (limited to 'ppsthread.c')
-rw-r--r-- | ppsthread.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/ppsthread.c b/ppsthread.c index c4514981..88dda666 100644 --- a/ppsthread.c +++ b/ppsthread.c @@ -95,7 +95,7 @@ static int init_kernel_pps(struct gps_device_t *session) session->kernelpps_handle = -1; if ( isatty(session->gpsdata.gps_fd) == 0 ) { - gpsd_notify(&session->context->errout, LOG_INF, "KPPS gps_fd not a tty\n"); + gpsd_report(&session->context->errout, LOG_INF, "KPPS gps_fd not a tty\n"); return -1; } @@ -115,7 +115,7 @@ static int init_kernel_pps(struct gps_device_t *session) /* This activates the magic /dev/pps0 device */ /* Note: this ioctl() requires root */ if ( 0 > ioctl(session->gpsdata.gps_fd, TIOCSETD, &ldisc)) { - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "KPPS cannot set PPS line discipline: %s\n", strerror(errno)); return -1; @@ -144,7 +144,7 @@ static int init_kernel_pps(struct gps_device_t *session) } (void)close(fd); } - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "KPPS checking %s, %s\n", globbuf.gl_pathv[i], path); if ( 0 == strncmp( path, session->gpsdata.dev.path, sizeof(path))) { @@ -159,7 +159,7 @@ static int init_kernel_pps(struct gps_device_t *session) globfree(&globbuf); if ( 0 == (int)pps_num ) { - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "KPPS device not found.\n"); return -1; } @@ -168,13 +168,13 @@ static int init_kernel_pps(struct gps_device_t *session) /* root privs are required for this device open */ if ( 0 != getuid() ) { - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "KPPS only works as root \n"); return -1; } ret = open(path, O_RDWR); if ( 0 > ret ) { - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "KPPS cannot open %s: %s\n", path, strerror(errno)); return -1; } @@ -187,14 +187,14 @@ static int init_kernel_pps(struct gps_device_t *session) ret = session->gpsdata.gps_fd; #endif /* assert(ret >= 0); */ - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "KPPS RFC2783 fd is %d\n", ret); /* RFC 2783 implies the time_pps_setcap() needs priviledges * * keep root a tad longer just in case */ if ( 0 > time_pps_create(ret, &session->kernelpps_handle )) { - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "KPPS time_pps_create(%d) failed: %s\n", ret, strerror(errno)); return -1; @@ -204,10 +204,10 @@ static int init_kernel_pps(struct gps_device_t *session) int caps; /* get features supported */ if ( 0 > time_pps_getcap(session->kernelpps_handle, &caps)) { - gpsd_notify(&session->context->errout, LOG_ERROR, + gpsd_report(&session->context->errout, LOG_ERROR, "KPPS time_pps_getcap() failed\n"); } else { - gpsd_notify(&session->context->errout, + gpsd_report(&session->context->errout, LOG_INF, "KPPS caps %0x\n", caps); } @@ -224,7 +224,7 @@ static int init_kernel_pps(struct gps_device_t *session) #endif /* S_SPLINT_S */ if ( 0 > time_pps_setparams(session->kernelpps_handle, &pp)) { - gpsd_notify(&session->context->errout, LOG_ERROR, + gpsd_report(&session->context->errout, LOG_ERROR, "KPPS time_pps_setparams() failed: %s\n", strerror(errno)); time_pps_destroy(session->kernelpps_handle); return -1; @@ -294,7 +294,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) /* we are lucky to have TIOCMIWAIT, so wait for next edge */ #define PPS_LINE_TIOC (TIOCM_CD|TIOCM_CAR|TIOCM_RI|TIOCM_CTS) if (ioctl(session->gpsdata.gps_fd, TIOCMIWAIT, PPS_LINE_TIOC) != 0) { - gpsd_notify(&session->context->errout, LOG_ERROR, + gpsd_report(&session->context->errout, LOG_ERROR, "PPS ioctl(TIOCMIWAIT) failed: %d %.40s\n", errno, strerror(errno)); break; @@ -310,14 +310,14 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) * not uSec like gettimeofday */ if ( 0 > clock_gettime(CLOCK_REALTIME, &clock_ts) ) { /* uh, oh, can not get time! */ - gpsd_notify(&session->context->errout, LOG_ERROR, + gpsd_report(&session->context->errout, LOG_ERROR, "PPS clock_gettime() failed\n"); break; } #else if ( 0 > gettimeofday(&clock_tv, NULL) ) { /* uh, oh, can not get time! */ - gpsd_notify(&session->context->errout, LOG_ERROR, + gpsd_report(&session->context->errout, LOG_ERROR, "PPS gettimeofday() failed\n"); break; } @@ -329,7 +329,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) * get the edge state */ /*@ +ignoresigns */ if (ioctl(session->gpsdata.gps_fd, TIOCMGET, &state) != 0) { - gpsd_notify(&session->context->errout, LOG_ERROR, + gpsd_report(&session->context->errout, LOG_ERROR, "PPS ioctl(TIOCMGET) failed\n"); break; } @@ -372,7 +372,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) #endif if ( 0 > time_pps_fetch(session->kernelpps_handle, PPS_TSFMT_TSPEC , &pi, &kernelpps_tv)) { - gpsd_notify(&session->context->errout, LOG_ERROR, + gpsd_report(&session->context->errout, LOG_ERROR, "KPPS kernel PPS failed\n"); } else { // find the last edge @@ -396,7 +396,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) * unsigned long as a wider-or-equal type to * accomodate Linux's type. */ - gpsd_notify(&session->context->errout, LOG_PROG, + gpsd_report(&session->context->errout, LOG_PROG, "KPPS assert %ld.%09ld, sequence: %ld - " "clear %ld.%09ld, sequence: %ld\n", pi.assert_timestamp.tv_sec, @@ -405,13 +405,13 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) pi.clear_timestamp.tv_sec, pi.clear_timestamp.tv_nsec, (unsigned long) pi.clear_sequence); - gpsd_notify(&session->context->errout, LOG_PROG, + gpsd_report(&session->context->errout, LOG_PROG, "KPPS data: using %s\n", edge_kpps ? "assert" : "clear"); cycle_kpps = timespec_diff_ns(ts_kpps, pulse_kpps[edge_kpps])/1000; duration_kpps = timespec_diff_ns(ts_kpps, pulse_kpps[(int)(edge_kpps == 0)])/1000; - gpsd_notify(&session->context->errout, LOG_PROG, + gpsd_report(&session->context->errout, LOG_PROG, "KPPS cycle: %7d uSec, duration: %7d uSec @ %lu.%09lu\n", cycle_kpps, duration_kpps, (unsigned long)ts_kpps.tv_sec, @@ -436,18 +436,18 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) if (999000 < cycle && 1001000 > cycle) { duration = 0; unchanged = 0; - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "PPS pps-detect on %s invisible pulse\n", session->gpsdata.dev.path); } else if (++unchanged == 10) { /* not really unchanged, just out of bounds */ unchanged = 1; - gpsd_notify(&session->context->errout, LOG_WARN, + gpsd_report(&session->context->errout, LOG_WARN, "PPS TIOCMIWAIT returns unchanged state, ppsmonitor sleeps 10\n"); (void)sleep(10); } } else { - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "PPS pps-detect on %s changed to %d\n", session->gpsdata.dev.path, state); unchanged = 0; @@ -455,7 +455,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) state_last = state; /* save this edge so we know next cycle time */ pulse[edge] = clock_ts; - gpsd_notify(&session->context->errout, LOG_PROG, + gpsd_report(&session->context->errout, LOG_PROG, "PPS edge: %d, cycle: %7d uSec, duration: %7d uSec @ %lu.%09lu\n", edge, cycle, duration, (unsigned long)clock_ts.tv_sec, @@ -558,7 +558,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) char *log1 = NULL; /* drift.real is the time we think the pulse represents */ struct timedrift_t drift; - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "PPS edge accepted %.100s", log); #if defined(HAVE_SYS_TIMEPPS_H) if ( 0 <= session->kernelpps_handle && ok_kpps) { @@ -595,7 +595,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) offset += ((drift.real.tv_nsec - drift.clock.tv_nsec) / 1e9); delay = (drift.clock.tv_sec + drift.clock.tv_nsec / 1e9) - last_fixtime_clock; if (0.0 > delay || 1.0 < delay) { - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "PPS: no current GPS seconds: %f\n", delay); log1 = "timestamp out of range"; @@ -620,7 +620,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) /*@ +unrecog @*/ /*@+compdef@*/ /*@-type@*/ /* splint is confused about struct timespec */ - gpsd_notify(&session->context->errout, LOG_INF, + gpsd_report(&session->context->errout, LOG_INF, "PPS hooks called with %.20s %lu.%09lu offset %.9f\n", log1, (unsigned long)clock_ts.tv_sec, @@ -629,7 +629,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) /*@+type@*/ } /*@-type@*/ /* splint is confused about struct timespec */ - gpsd_notify(&session->context->errout, LOG_PROG, + gpsd_report(&session->context->errout, LOG_PROG, "PPS edge %.20s %lu.%09lu offset %.9f\n", log1, (unsigned long)clock_ts.tv_sec, @@ -637,20 +637,20 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) offset); /*@+type@*/ } else { - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "PPS edge rejected %.100s", log); } } #if defined(HAVE_SYS_TIMEPPS_H) if (session->kernelpps_handle > 0) { - gpsd_notify(&session->context->errout, LOG_PROG, + gpsd_report(&session->context->errout, LOG_PROG, "PPS descriptor cleaned up\n"); (void)time_pps_destroy(session->kernelpps_handle); } #endif if (session->thread_wrap_hook != NULL) session->thread_wrap_hook(session); - gpsd_notify(&session->context->errout, LOG_PROG, + gpsd_report(&session->context->errout, LOG_PROG, "PPS gpsd_ppsmonitor exited.\n"); return NULL; } @@ -669,14 +669,14 @@ void pps_thread_activate(struct gps_device_t *session) /* some operations in init_kernel_pps() require root privs */ (void)init_kernel_pps( session ); if ( 0 <= session->kernelpps_handle ) { - gpsd_notify(&session->context->errout, LOG_WARN, + gpsd_report(&session->context->errout, LOG_WARN, "KPPS kernel PPS will be used\n"); } #endif /*@-compdef -nullpass@*/ retval = pthread_create(&pt, NULL, gpsd_ppsmonitor, (void *)session); /*@+compdef +nullpass@*/ - gpsd_notify(&session->context->errout, LOG_PROG, "PPS thread %s\n", + gpsd_report(&session->context->errout, LOG_PROG, "PPS thread %s\n", (retval==0) ? "launched" : "FAILED"); } |