X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/dc3a1898ea557d5c3b2cfff97238debb3a8832ff..5ff75d1ed34298a223c651d46fe2aa000db3e459:/src/vikgpslayer.c diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index 6ef1c779..d06f5a32 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -24,12 +24,16 @@ #endif #include +#ifdef HAVE_MATH_H #include +#endif #include "viking.h" #include "icons/icons.h" #include "babel.h" +#ifdef HAVE_STRING_H #include +#endif #include #include #include @@ -37,6 +41,12 @@ #include #endif +#if ! GLIB_CHECK_VERSION(2,14,0) +inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data) { + return g_timeout_add(interval*1000, function, data); +} +#endif + #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val) static VikGpsLayer *vik_gps_layer_create (VikViewport *vp); static void vik_gps_layer_realize ( VikGpsLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter ); @@ -129,12 +139,13 @@ static VikLayerParam gps_layer_params[] = { { "moving_map_method", VIK_LAYER_PARAM_UINT, GROUP_REALTIME_MODE, N_("Moving Map Method:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_vehicle_position, NULL}, { "gpsd_host", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Host:"), VIK_LAYER_WIDGET_ENTRY}, { "gpsd_port", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Port:"), VIK_LAYER_WIDGET_ENTRY}, + { "gpsd_retry_interval", VIK_LAYER_PARAM_STRING, GROUP_REALTIME_MODE, N_("Gpsd Retry Interval (seconds):"), VIK_LAYER_WIDGET_ENTRY}, #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ }; enum { PARAM_PROTOCOL=0, PARAM_PORT, #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_VEHICLE_POSITION, PARAM_GPSD_HOST, PARAM_GPSD_PORT, + PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_VEHICLE_POSITION, PARAM_GPSD_HOST, PARAM_GPSD_PORT, PARAM_GPSD_RETRY_INTERVAL, #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ NUM_PARAMS}; @@ -219,18 +230,16 @@ struct _VikGpsLayer { #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING VglGpsd *vgpsd; gboolean realtime_tracking; /* set/reset only by the callback */ - gboolean realtime_waiting;/* after activated, before first gps data arrives */ - GMutex *realtime_tracking_mutex; + gboolean first_realtime_trackpoint; GpsFix realtime_fix; GpsFix last_fix; - enum unit realtime_gpsd_unit; - VikTrack *realtime_track; gchar *realtime_track_name; GIOChannel *realtime_io_channel; guint realtime_io_watch_id; + guint realtime_retry_timer; GdkGC *realtime_track_gc; GdkGC *realtime_track_bg_gc; GdkGC *realtime_track_pt_gc; @@ -240,9 +249,9 @@ struct _VikGpsLayer { /* params */ gchar *gpsd_host; gchar *gpsd_port; + gint gpsd_retry_interval; gboolean realtime_record; gboolean realtime_jump_to_start; -// gboolean realtime_keep_at_center; guint vehicle_position; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ guint protocol_id; @@ -355,7 +364,6 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara { switch ( id ) { - /* TODO: gpsd_host, gpsd_port */ case PARAM_PROTOCOL: if (data.u < NUM_PROTOCOLS) vgl->protocol_id = data.u; @@ -379,6 +387,9 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara g_free(vgl->gpsd_port); vgl->gpsd_port = g_strdup(data.s); /* TODO: check for number */ break; + case PARAM_GPSD_RETRY_INTERVAL: + vgl->gpsd_retry_interval = strtol(data.s, NULL, 10); + break; case PARAM_REALTIME_REC: vgl->realtime_record = data.b; break; @@ -401,7 +412,6 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ) VikLayerParamData rv; switch ( id ) { - /* TODO: gpsd_host, gpsd_port */ case PARAM_PROTOCOL: rv.u = vgl->protocol_id; break; @@ -415,6 +425,9 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ) case PARAM_GPSD_PORT: rv.s = vgl->gpsd_port ? vgl->gpsd_port : g_strdup(DEFAULT_GPSD_PORT); break; + case PARAM_GPSD_RETRY_INTERVAL: + rv.s = g_strdup_printf("%d", vgl->gpsd_retry_interval); + break; case PARAM_REALTIME_REC: rv.b = vgl->realtime_record; break; @@ -444,17 +457,17 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->cur_read_child = 0; #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - vgl->realtime_tracking_mutex = g_mutex_new(); vgl->realtime_tracking = FALSE; - vgl->realtime_waiting = FALSE; + vgl->first_realtime_trackpoint = FALSE; vgl->vgpsd = NULL; + vgl->realtime_io_channel = NULL; + vgl->realtime_io_watch_id = 0; + vgl->realtime_retry_timer = 0; vgl->realtime_track_gc = vik_viewport_new_gc ( vp, "#203070", 2 ); vgl->realtime_track_bg_gc = vik_viewport_new_gc ( vp, "grey", 2 ); vgl->realtime_track_pt1_gc = vik_viewport_new_gc ( vp, "red", 2 ); vgl->realtime_track_pt2_gc = vik_viewport_new_gc ( vp, "green", 2 ); vgl->realtime_track_pt_gc = vgl->realtime_track_pt1_gc; - vgl->realtime_gpsd_unit = gpsd_units(); - // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit); vgl->realtime_track = NULL; /* Setting params here */ @@ -463,6 +476,7 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->realtime_record = TRUE; vgl->realtime_jump_to_start = TRUE; vgl->vehicle_position = VEHICLE_POSITION_ON_SCREEN; + vgl->gpsd_retry_interval = 10; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ vgl->protocol_id = 0; vgl->serial_port_id = 0; @@ -586,8 +600,6 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl ) g_object_unref(vgl->realtime_track_pt1_gc); if (vgl->realtime_track_pt2_gc != NULL) g_object_unref(vgl->realtime_track_pt2_gc); - if (vgl->realtime_tracking_mutex != NULL) - g_mutex_free(vgl->realtime_tracking_mutex); #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ } @@ -1055,6 +1067,9 @@ static void gps_empty_all_cb( gpointer layer_and_vlp[2] ) } #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +static void rt_gpsd_disconnect(VikGpsLayer *vgl); +static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed); + static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) { struct LatLon ll; @@ -1117,7 +1132,6 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) } } -/* lock/unlock realtime_tracking_mutex when call this */ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) { struct LatLon ll; @@ -1163,7 +1177,6 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) tp->course = vgl->realtime_fix.fix.track; tp->nsats = vgl->realtime_fix.satellites_used; tp->fix_mode = vgl->realtime_fix.fix.mode; - tp->extended = TRUE; ll.lat = vgl->realtime_fix.fix.latitude; ll.lon = vgl->realtime_fix.fix.longitude; @@ -1179,7 +1192,7 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) } -void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) +static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) { gboolean update_all = FALSE; VikGpsLayer *vgl = vgpsd->vgl; @@ -1196,7 +1209,6 @@ void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); VikViewport *vvp = vik_window_viewport(vw); - g_mutex_lock(vgl->realtime_tracking_mutex); vgl->realtime_fix.fix = vgpsd->gpsd.fix; vgl->realtime_fix.satellites_used = vgpsd->gpsd.satellites_used; vgl->realtime_fix.dirty = TRUE; @@ -1210,7 +1222,7 @@ void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) vik_trw_layer_get_coord_mode(vgl->trw_children[TRW_REALTIME]), &ll); if ((vgl->vehicle_position == VEHICLE_POSITION_CENTERED) || - (vgl->realtime_jump_to_start && vgl->realtime_waiting)) { + (vgl->realtime_jump_to_start && vgl->first_realtime_trackpoint)) { vik_viewport_set_center_coord(vvp, &vehicle_coord); update_all = TRUE; } @@ -1236,9 +1248,8 @@ void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) update_all = FALSE; } - vgl->realtime_waiting = FALSE; + vgl->first_realtime_trackpoint = FALSE; create_realtime_trackpoint(vgl, FALSE); - g_mutex_unlock(vgl->realtime_tracking_mutex); vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME])); } @@ -1247,8 +1258,16 @@ void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition, gpointer data) { VikGpsLayer *vgl = data; - gps_poll(&vgl->vgpsd->gpsd); - return TRUE; + if (condition == G_IO_IN) { + if (!gps_poll(&vgl->vgpsd->gpsd)) + return TRUE; + else { + g_warning("Disconnected from gpsd. Trying to reconnect"); + rt_gpsd_disconnect(vgl); + rt_gpsd_connect(vgl, FALSE); + } + } + return FALSE; /* no further calling */ } static gchar *make_track_name(VikTrwLayer *vtl) @@ -1267,6 +1286,102 @@ static gchar *make_track_name(VikTrwLayer *vtl) } +static gboolean rt_gpsd_try_connect(gpointer *data) +{ + VikGpsLayer *vgl = (VikGpsLayer *)data; + struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); + + if (gpsd == NULL) { + g_warning("Failed to connect to gpsd at %s (port %s). Will retry in %d seconds", + vgl->gpsd_host, vgl->gpsd_port, vgl->gpsd_retry_interval); + return TRUE; /* keep timer running */ + } + + vgl->vgpsd = g_realloc(gpsd, sizeof(VglGpsd)); + vgl->vgpsd->vgl = vgl; + + vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE; + /* track alt/time graph uses VIK_DEFAULT_ALTITUDE (0.0) as invalid */ + vgl->realtime_fix.fix.altitude = vgl->last_fix.fix.altitude = VIK_DEFAULT_ALTITUDE; + vgl->realtime_fix.fix.speed = vgl->last_fix.fix.speed = NAN; + + if (vgl->realtime_record) { + VikTrwLayer *vtl = vgl->trw_children[TRW_REALTIME]; + vgl->realtime_track = vik_track_new(); + vgl->realtime_track->visible = TRUE; + vgl->realtime_track_name = make_track_name(vtl); + vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); + } + + gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); + vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); + vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl); + gps_query(&vgl->vgpsd->gpsd, "w+x"); + return FALSE; /* no longer called by timeout */ +} + +static gboolean rt_ask_retry(VikGpsLayer *vgl) +{ + GtkWidget *dialog = gtk_message_dialog_new (VIK_GTK_WINDOW_FROM_LAYER(vgl), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "Failed to connect to gpsd at %s (port %s)\n" + "Should Viking keep trying (every %d seconds)?", + vgl->gpsd_host, vgl->gpsd_port, + vgl->gpsd_retry_interval); + + gint res = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + return (res == GTK_RESPONSE_YES); +} + +static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed) +{ + vgl->realtime_retry_timer = 0; + if (rt_gpsd_try_connect((gpointer *)vgl)) { + if (vgl->gpsd_retry_interval <= 0) { + g_warning("Failed to connect to gpsd but will not retry because retry intervel was set to %d (which is 0 or negative)", vgl->gpsd_retry_interval); + return FALSE; + } + else if (ask_if_failed && !rt_ask_retry(vgl)) + return FALSE; + else + vgl->realtime_retry_timer = g_timeout_add_seconds(vgl->gpsd_retry_interval, + (GSourceFunc)rt_gpsd_try_connect, (gpointer *)vgl); + } + return TRUE; +} + +static void rt_gpsd_disconnect(VikGpsLayer *vgl) +{ + if (vgl->realtime_io_watch_id) { + g_source_remove(vgl->realtime_io_watch_id); + vgl->realtime_io_watch_id = 0; + } + if (vgl->realtime_retry_timer) { + g_source_remove(vgl->realtime_retry_timer); + vgl->realtime_retry_timer = 0; + } + if (vgl->realtime_io_channel) { + GError *error = NULL; + g_io_channel_shutdown (vgl->realtime_io_channel, FALSE, &error); + vgl->realtime_io_channel = NULL; + } + if (vgl->vgpsd) { + gps_close(&vgl->vgpsd->gpsd); + vgl->vgpsd = NULL; + } + + if (vgl->realtime_record && vgl->realtime_track) { + create_realtime_trackpoint(vgl, TRUE); + if ((vgl->realtime_track->trackpoints == NULL) || (vgl->realtime_track->trackpoints->next == NULL)) + vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track_name); + vgl->realtime_track = NULL; + } +} + static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2]) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; @@ -1276,61 +1391,15 @@ static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2]) g_assert((VIK_GPS_MODE_2D == MODE_2D) && (VIK_GPS_MODE_3D == MODE_3D)); if (vgl->realtime_tracking) { - struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); - if (gpsd == NULL) { - GtkWidget *dialog = gtk_message_dialog_new (VIK_GTK_WINDOW_FROM_LAYER(vgl), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "Failed to connect to gpsd at %s (port %s)", - vgl->gpsd_host, vgl->gpsd_port); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - + vgl->first_realtime_trackpoint = TRUE; + if (!rt_gpsd_connect(vgl, TRUE)) { + vgl->first_realtime_trackpoint = FALSE; vgl->realtime_tracking = FALSE; - return; } - vgl->vgpsd = g_realloc(gpsd, sizeof(VglGpsd)); - vgl->vgpsd->vgl = vgl; - - vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE; - /* track alt/time graph uses VIK_DEFAULT_ALTITUDE (0.0) as invalid */ - vgl->realtime_fix.fix.altitude = vgl->last_fix.fix.altitude = VIK_DEFAULT_ALTITUDE; - vgl->realtime_fix.fix.speed = vgl->last_fix.fix.speed = NAN; - - if (vgl->realtime_record) { - VikTrwLayer *vtl = vgl->trw_children[TRW_REALTIME]; - vgl->realtime_track = vik_track_new(); - vgl->realtime_track->visible = TRUE; - vgl->realtime_track_name = make_track_name(vtl); - vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); - } - - vgl->realtime_waiting = TRUE; - gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); - vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); - vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, - G_IO_IN, gpsd_data_available, vgl); - - gps_query(&vgl->vgpsd->gpsd, "w+x"); - } else { /* stop realtime tracking */ - /* TODO: handle race condition here , make sure vgpsd is NULL */ - g_mutex_lock(vgl->realtime_tracking_mutex); - vgl->realtime_waiting = FALSE; - gps_close(&vgl->vgpsd->gpsd); - vgl->vgpsd = NULL; - // g_source_remove(vgl->realtime_timeout); - g_source_remove(vgl->realtime_io_watch_id); - g_io_channel_unref (vgl->realtime_io_channel); - - if (vgl->realtime_record) { - create_realtime_trackpoint(vgl, TRUE); - if ((vgl->realtime_track->trackpoints == NULL) || (vgl->realtime_track->trackpoints->next == NULL)) - vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track_name); - } - g_mutex_unlock(vgl->realtime_tracking_mutex); + vgl->first_realtime_trackpoint = FALSE; + rt_gpsd_disconnect(vgl); } } #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */