From e31de24c6f882a41ed13086712e97539cbf7b1a2 Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Thu, 31 Aug 2017 17:25:00 +0200 Subject: fix bug on successive guidance launches with create/delete route The bug has been fixed by a navit patch :-( it still needs to be investigated with navit team --- .../genivi_mapviewer_mapviewercontrol.cxx | 10 +- .../genivi_navigationcore_guidance.cxx | 131 +++++++++++---------- .../genivi_navigationcore_locationinput.cxx | 4 +- .../genivi_navigationcore_routing.cxx | 4 +- ...on-guidance-when-delete-and-recreate-route.diff | 13 ++ .../poi-cam/genivi_poiservice_cam_navit.cxx | 26 ++-- src/navigation/update_navit.sh | 1 + src/navigation/update_third_party.sh | 2 +- 8 files changed, 102 insertions(+), 89 deletions(-) create mode 100644 src/navigation/patches/avoid-crash-on-guidance-when-delete-and-recreate-route.diff (limited to 'src') diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx index a26583a..6082063 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -1048,7 +1048,7 @@ MapViewerControlObj::SetMapViewPerspective(uint32_t SessionHandle, uint16_t MapV transform_set_pitch(trans, 40); break; } - navit_draw_async(m_navit.u.navit, 1); + navit_draw(m_navit.u.navit); } } @@ -1266,7 +1266,7 @@ MapViewerControlObj::SetCameraHeadingAngle(uint32_t sessionHandle, int32_t angle struct attr orientation={attr_orientation}; orientation.u.num=angle; navit_set_attr(m_navit.u.navit, &orientation); - navit_draw_async(m_navit.u.navit, 1); + navit_draw(m_navit.u.navit); } void @@ -1356,7 +1356,7 @@ MapViewerControlObj::SetCameraHeadingTrackUp(uint32_t sessionHandle) struct attr orientation={attr_orientation}; orientation.u.num=-1; navit_set_attr(m_navit.u.navit, &orientation); - navit_draw_async(m_navit.u.navit, 1); + navit_draw(m_navit.u.navit); } void @@ -1368,7 +1368,7 @@ MapViewerControlObj::SetTargetPoint(uint32_t SessionHandle, ::DBus::Struct< doub g.lat=target._1; g.lng=target._2; navit_set_attr(m_navit.u.navit, ¢er); - navit_draw_async(m_navit.u.navit, 1); + navit_draw(m_navit.u.navit); } void @@ -1877,7 +1877,7 @@ DisplayedRoute::WriteSegment(FILE *out) { if (m_coordinates.size()) { int i; - uint32_t header[3]={2+2*m_coordinates.size(),type_street_route,2*m_coordinates.size()}; + uint32_t header[3]={2+2*(uint32_t)m_coordinates.size(),type_street_route,2*(uint32_t)m_coordinates.size()}; fwrite(header, sizeof(header), 1, out); for (i = 0 ; i < m_coordinates.size() ; i++) fwrite(&m_coordinates[i], sizeof(struct coord), 1, out); diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx index 42a649a..cc64b72 100644 --- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx +++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx @@ -106,7 +106,8 @@ class GuidanceObj public: struct callback *m_guidance_callback; struct attr m_route, m_vehicleprofile, m_tracking_callback; - uint32_t m_session,m_route_handle; + struct attr m_vehicle_speed; + uint32_t m_session,m_route_handle; Guidance *m_guidance; #if (SPEECH_ENABLED) SpeechOutput *m_speechoutput; @@ -133,8 +134,6 @@ class GuidanceObj }; void GuidanceObj_Callback(GuidanceObj *obj); -static class GuidanceObj *s_guidance; -static struct attr vehicle_speed={attr_speed,(char *)40}; static struct navit * get_navit(void) @@ -218,12 +217,11 @@ class Guidance void StartGuidance(const uint32_t& SessionHandle, const uint32_t& RouteHandle) { - dbg(lvl_debug,"enter\n"); if (m_guidance_active) { - dbg(lvl_debug,"guidance already active\n"); - throw DBus::ErrorFailed("guidance already active"); + LOG_ERROR_MSG(gCtx,"guidance already active"); + throw DBus::ErrorFailed("guidance already active"); } else { - s_guidance=new GuidanceObj(this, SessionHandle, RouteHandle); + mp_guidance=new GuidanceObj(this, SessionHandle, RouteHandle); m_guidance_active=true; LOG_INFO_MSG(gCtx,"Guidance started"); } @@ -232,12 +230,11 @@ class Guidance void StopGuidance(const uint32_t& SessionHandle) { - dbg(lvl_debug,"enter\n"); if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); - throw DBus::ErrorFailed("no guidance active"); + LOG_ERROR_MSG(gCtx,"no guidance active"); + throw DBus::ErrorFailed("no guidance active"); } else { - delete(s_guidance); + delete(mp_guidance); m_guidance_active=false; LOG_INFO_MSG(gCtx,"Guidance stopped"); } @@ -246,12 +243,11 @@ class Guidance void GetDestinationInformation(uint32_t& offset, uint32_t& travelTime, int32_t& direction, int32_t& side, int16_t& timeZone, int16_t& daylightSavingTime) { - dbg(lvl_debug,"enter\n"); if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); - throw DBus::ErrorFailed("no guidance active"); + LOG_ERROR_MSG(gCtx,"no guidance active"); + throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->GetDestinationInformation(offset, travelTime, direction, timeZone); + mp_guidance->GetDestinationInformation(offset, travelTime, direction, timeZone); } } @@ -270,10 +266,10 @@ class Guidance PauseGuidance(const uint32_t& sessionHandle) { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); + LOG_ERROR_MSG(gCtx,"no guidance active"); throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->PauseGuidance(sessionHandle); + mp_guidance->PauseGuidance(sessionHandle); } } @@ -281,10 +277,10 @@ class Guidance ResumeGuidance(const uint32_t& sessionHandle) { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); - throw DBus::ErrorFailed("no guidance active"); + LOG_ERROR_MSG(gCtx,"no guidance active"); + throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->ResumeGuidance(sessionHandle); + mp_guidance->ResumeGuidance(sessionHandle); } } @@ -292,10 +288,10 @@ class Guidance SetVoiceGuidance(const bool& activate, const std::string& voice) { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); + LOG_ERROR_MSG(gCtx,"no guidance active"); throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->SetVoiceGuidance(activate,voice); + mp_guidance->SetVoiceGuidance(activate,voice); } return(0); //not implemented yet } @@ -304,10 +300,10 @@ class Guidance GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, int32_t& maneuver) { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); - throw DBus::ErrorFailed("no guidance active"); + LOG_ERROR_MSG(gCtx,"no guidance active"); + throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->GetGuidanceDetails(voiceGuidance, vehicleOnTheRoad, isDestinationReached, maneuver); + mp_guidance->GetGuidanceDetails(voiceGuidance, vehicleOnTheRoad, isDestinationReached, maneuver); } } @@ -315,10 +311,10 @@ class Guidance PlayVoiceManeuver() { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); + LOG_ERROR_MSG(gCtx,"no guidance active"); throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->PlayVoiceManeuver(); + mp_guidance->PlayVoiceManeuver(); } return(0); //not implemented yet } @@ -333,10 +329,10 @@ class Guidance GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, int32_t& error, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::vector< ::DBus::Struct< std::string, std::vector< ::DBus::Struct< int32_t, std::string > >, std::string > >, std::string, std::string, std::string, std::string, uint16_t, int32_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > > >& maneuversList) { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); - throw DBus::ErrorFailed("no guidance active"); + LOG_ERROR_MSG(gCtx,"no guidance active"); + throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->GetManeuversList(requestedNumberOfManeuvers, maneuverOffset, numberOfManeuvers, maneuversList); + mp_guidance->GetManeuversList(requestedNumberOfManeuvers, maneuverOffset, numberOfManeuvers, maneuversList); } error=0; //not used } @@ -358,7 +354,7 @@ class Guidance GetGuidanceStatus(int32_t& guidanceStatus, uint32_t& routeHandle) { if (m_guidance_active==true) { - s_guidance->GetGuidanceStatus(guidanceStatus, routeHandle); + mp_guidance->GetGuidanceStatus(guidanceStatus, routeHandle); } else { guidanceStatus=GENIVI_NAVIGATIONCORE_INACTIVE; routeHandle=0; @@ -369,10 +365,10 @@ class Guidance SetVoiceGuidanceSettings(const int32_t& promptMode) { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); + LOG_ERROR_MSG(gCtx,"no guidance active"); throw DBus::ErrorFailed("no guidance active"); } else { - s_guidance->SetVoiceGuidanceSettings(promptMode); + mp_guidance->SetVoiceGuidanceSettings(promptMode); } return(0); //not implemented yet } @@ -381,10 +377,10 @@ class Guidance GetVoiceGuidanceSettings() { if (m_guidance_active==false) { - dbg(lvl_debug,"no guidance active\n"); + LOG_ERROR_MSG(gCtx,"no guidance active"); throw DBus::ErrorFailed("no guidance active"); } else { - return s_guidance->GetVoiceGuidanceSettings(); + return mp_guidance->GetVoiceGuidanceSettings(); } } @@ -400,6 +396,8 @@ class Guidance throw DBus::ErrorNotSupported("Not yet supported"); } + GuidanceObj *mp_guidance; + bool m_simulationMode; bool m_guidance_active; }; @@ -428,7 +426,7 @@ GuidanceObj::GetDestinationInformation(uint32_t& Distance, uint32_t& TravelTime, if (!idx) throw DBus::ErrorFailed("internal error:navigation has only one coordinate"); if (destination_time.u.num == -1 || destination_length.u.num == -1) { - dbg(lvl_debug,"time %d length %d\n",(int) destination_time.u.num, (int) destination_length.u.num); + LOG_ERROR(gCtx,"time %d length %d",(int) destination_time.u.num, (int) destination_length.u.num); throw DBus::ErrorFailed("internal error:failed to get time or length"); } Distance=destination_length.u.num; @@ -588,7 +586,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& DistanceToManeuver, int32_ data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_RIGHT); break; default: - dbg(lvl_error,"Unable to convert type %s\n",item_to_name(item->type)); + LOG_ERROR(gCtx,"Unable to convert type %s",item_to_name(item->type)); Maneuver=GENIVI_NAVIGATIONCORE_INVALID; index = GENIVI_NAVIGATIONCORE_INVALID; data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_INVALID); @@ -668,7 +666,7 @@ GuidanceObj::ResumeGuidance(uint32_t sessionHandle) GuidanceObj_Callback(this); if (vehicle) { - vehicle_set_attr(vehicle, &vehicle_speed); + vehicle_set_attr(vehicle, &m_vehicle_speed); } m_paused=false; } @@ -717,19 +715,17 @@ GuidanceObj_Callback(GuidanceObj *obj) struct attr level; struct map_rect *mr; struct item *item; - dbg(lvl_debug,"enter\n"); if (obj->m_paused) return; - mr=obj->get_map_rect(); + mr=obj->get_map_rect(); if (!mr) { LOG_ERROR_MSG(gCtx,"Failed to get map rect"); - dbg(lvl_debug,"failed to get map rect\n"); return; } item=obj->get_item(mr); if (item && item_attr_get(item, attr_level, &level)) { int maneuver; - dbg(lvl_debug,"level=%d\n",(int) level.u.num); + LOG_INFO(gCtx,"Level: %d",(int) level.u.num); switch(level.u.num) { case 3: maneuver=GENIVI_NAVIGATIONCORE_PASSED; @@ -750,7 +746,6 @@ GuidanceObj_Callback(GuidanceObj *obj) LOG_INFO(gCtx,"Maneuver: %d",maneuver); } else { LOG_ERROR(gCtx,"Maneuver item not found: %p",item); - dbg(lvl_debug,"failed to get level item=%p\n",item); } } @@ -766,9 +761,8 @@ variant_double(double d) void GuidanceObj_TrackingCallback(GuidanceObj *obj) { - dbg(lvl_debug,"enter\n"); struct attr attr; - route_set_position_from_tracking(obj->m_route.u.route, get_tracking(), projection_mg); + route_set_position_from_tracking(obj->m_route.u.route, get_tracking(), projection_mg); if (!obj->m_paused) obj->m_guidance->PositionOnRouteChanged(0); //to do return the current offset on the route in meters from the beginning of the route @@ -806,14 +800,15 @@ GuidanceObj::GuidanceObj(Guidance *guidance, uint32_t SessionHandle, uint32_t Ro m_guidance=guidance; m_session=SessionHandle; m_route_handle=RouteHandle; - m_guidance_callback=callback_new_1(reinterpret_cast(GuidanceObj_Callback), this); - m_paused=false; + m_guidance_callback=callback_new_1(reinterpret_cast(GuidanceObj_Callback), this); + m_paused=false; m_voice_guidance=false; m_kind_of_voice="DEFAULT"; m_prompt_mode=GENIVI_NAVIGATIONCORE_MANUAL_PROMPT; m_tracking_callback.type=attr_callback; m_tracking_callback.u.callback=NULL; struct attr id={attr_id}; + m_vehicle_speed={attr_speed,(char *)40}; id.u.num=RouteHandle; struct attr *in[]={&id, NULL}; struct attr **ret=NULL; @@ -825,22 +820,21 @@ GuidanceObj::GuidanceObj(Guidance *guidance, uint32_t SessionHandle, uint32_t Ro #endif if (navit_get_attr(navit, attr_callback_list, &callback_list, NULL)) { callback_list_call_attr_4(callback_list.u.callback_list, attr_command, "navit_genivi_get_route", in, &ret, NULL); - if (ret && ret[0] && ret[1] && ret[0]->type == attr_route && ret[1]->type == attr_vehicleprofile) { + if (ret && ret[0] && ret[1] && ret[0]->type == attr_route && ret[1]->type == attr_vehicleprofile) { struct tracking *tracking=get_tracking(); - m_route=*ret[0]; - m_vehicleprofile=*ret[1]; + m_route=*ret[0]; + m_vehicleprofile=*ret[1]; m_tracking_callback.u.callback=callback_new_attr_1(reinterpret_cast(GuidanceObj_TrackingCallback), attr_position_coord_geo, this); - tracking_add_attr(tracking, &m_tracking_callback); - struct vehicle *demo=get_vehicle("demo:"); - if (demo) { - vehicle_set_attr(demo, &m_route); - vehicle_set_attr(demo, &vehicle_speed); + tracking_add_attr(tracking, &m_tracking_callback); + struct vehicle *vehicle=get_vehicle("demo:"); + if (vehicle) { + vehicle_set_attr(vehicle, &m_route); + vehicle_set_attr(vehicle, &m_vehicle_speed); } - navigation_set_route(get_navigation(), m_route.u.route); - tracking_set_route(get_tracking(), m_route.u.route); - navigation_register_callback(get_navigation(), attr_navigation_speech, m_guidance_callback); - GuidanceObj_Callback(this); - } + tracking_set_route(get_tracking(), m_route.u.route); + navigation_set_route(get_navigation(), m_route.u.route); + navigation_register_callback(get_navigation(), attr_navigation_speech, m_guidance_callback); + } g_free(ret); } m_guidance->GuidanceStatusChanged(GENIVI_NAVIGATIONCORE_ACTIVE, RouteHandle); @@ -849,16 +843,23 @@ GuidanceObj::GuidanceObj(Guidance *guidance, uint32_t SessionHandle, uint32_t Ro GuidanceObj::~GuidanceObj() { - if (m_tracking_callback.u.callback) { + navigation_unregister_callback(get_navigation(), attr_navigation_speech, m_guidance_callback); + + struct vehicle *vehicle=get_vehicle("demo:"); + if (vehicle) { + vehicle_remove_attr(vehicle,&m_route); + vehicle_remove_attr(vehicle,&m_vehicle_speed); + } + + if (m_tracking_callback.u.callback) { struct tracking *tracking=get_tracking(); if (tracking) tracking_remove_attr(tracking, &m_tracking_callback); callback_destroy(m_tracking_callback.u.callback); } - if (m_guidance_callback) { - navigation_unregister_callback(get_navigation(), attr_navigation_speech, m_guidance_callback); - callback_destroy(m_guidance_callback); - } + + callback_destroy(m_guidance_callback); + m_guidance->GuidanceStatusChanged(GENIVI_NAVIGATIONCORE_INACTIVE, m_route_handle); #if (SPEECH_ENABLED) delete(m_speechoutput); diff --git a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx index 7cdfa95..ea1458b 100644 --- a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx +++ b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx @@ -294,7 +294,7 @@ LocationInputObj::Spell(uint32_t SessionHandle, const std::string& InputCharacte char *newstr; const char *input=InputCharacter.c_str(); int len=strlen(input)+1; - LOG_DEBUG(gCtx,"Input '%s' (%d)",input,strlen(input)); + LOG_DEBUG(gCtx,"Input '%s' (%lu)",input,strlen(input)); if (m_search.u.str && strlen(m_search.u.str)) { const char *i=input; char c; @@ -318,7 +318,7 @@ LocationInputObj::Spell(uint32_t SessionHandle, const std::string& InputCharacte newstr=NULL; } g_free(m_search.u.str); - LOG_DEBUG(gCtx,"Search string '%s' (%d)",newstr,strlen(newstr)); + LOG_DEBUG(gCtx,"Search string '%s' (%lu)",newstr,strlen(newstr)); m_search.u.str=newstr; m_windowsize=MaxWindowSize; diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx index d2cc16f..99156d6 100644 --- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx +++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx @@ -914,7 +914,7 @@ RoutingObj::RoutingObj(Routing *routing, uint32_t session, uint32_t handle) struct attr callback; m_routing=routing; - m_session=session; + m_session=session; m_handle=handle; m_route.type=attr_route; m_route.u.route=route_new(NULL, NULL); @@ -935,7 +935,7 @@ RoutingObj::~RoutingObj() callback.type=attr_callback; callback.u.callback=m_callback; - route_remove_attr(m_route.u.route, &callback); + route_remove_attr(m_route.u.route, &callback); callback_destroy(m_callback); route_destroy(m_route.u.route); } diff --git a/src/navigation/patches/avoid-crash-on-guidance-when-delete-and-recreate-route.diff b/src/navigation/patches/avoid-crash-on-guidance-when-delete-and-recreate-route.diff new file mode 100644 index 0000000..90fae7d --- /dev/null +++ b/src/navigation/patches/avoid-crash-on-guidance-when-delete-and-recreate-route.diff @@ -0,0 +1,13 @@ +Index: navit/navit/route.c +=================================================================== +--- navit/route.c (revision 5827) ++++ navit/route.c (working copy) +@@ -4103,7 +4103,7 @@ route_remove_attr(struct route *this_, struct attr *attr) + dbg(lvl_debug,"enter\n"); + switch (attr->type) { + case attr_callback: +- callback_list_remove(this_->cbl2, attr->u.callback); ++// callback_list_remove(this_->cbl2, attr->u.callback); + return 1; + case attr_vehicle: + this_->v=NULL; diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx index 65c38f9..9680be7 100644 --- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx +++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx @@ -174,7 +174,7 @@ class ContentAccessModule class PoiContentAccess *pca; pca=new PoiContentAccess(*conns[POI_CONTENTACCESS_CONNECTION]); int camid=pca->RegisterContentAccessModule(cam_name); - dbg(lvl_debug,"camid=%d\n",camid); + LOG_INFO(gCtx,"camid=%d",camid); std::vector< ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, DBusCommonAPIVariant, std::string, std::string, DBusCommonAPIVariant >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, DBusCommonAPIVariant > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > > poiCategories1; ::DBus::Struct< ::DBus::Struct< std::vector< uint32_t >, DBusCommonAPIVariant, std::string, std::string, DBusCommonAPIVariant >, std::vector< ::DBus::Struct< uint32_t, std::string, int32_t, std::vector< ::DBus::Struct< int32_t, std::string, DBusCommonAPIVariant > > > >, std::vector< ::DBus::Struct< uint32_t, std::string > > > poiCategory; size_t i; @@ -239,7 +239,7 @@ class ContentAccessModule { struct attr label; struct coord c; - dbg(lvl_debug,"adding poi\n"); + LOG_DEBUG_MSG(gCtx,"adding poi"); ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > result; ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > attribute; bool stringMatched=false; @@ -372,7 +372,7 @@ class ContentAccessModule { struct attr navit; struct coord_geo g; - dbg(lvl_debug,"enter handle=%d size=%d location=%f,%f,%d string='%s' sortOption=%d\n",poiSearchHandle, maxSize, location._1,location._2,location._3, inputString.c_str(), sortOption); + LOG_DEBUG(gCtx,"enter handle=%d size=%d location=%f,%f,%f string='%s' sortOption=%d",poiSearchHandle, maxSize, location._1,location._2,location._3, inputString.c_str(), sortOption); m_max_requested_size=maxSize; m_resultList.resize(0); m_max_radius=0; @@ -380,7 +380,7 @@ class ContentAccessModule poiCategoryIdRadius categoryIdRadius; m_poiCategoriesIdRadius.clear(); for (int i = 0 ; i < poiCategories.size(); i++) { - dbg(lvl_debug,"category %d %d\n",poiCategories[i]._1,poiCategories[i]._2); + LOG_DEBUG(gCtx,"category %d %d",poiCategories[i]._1,poiCategories[i]._2); categoryIdRadius.givenId=poiCategories[i]._1; categoryIdRadius.radius=poiCategories[i]._2; m_poiCategoriesIdRadius.push_back(categoryIdRadius); @@ -388,21 +388,21 @@ class ContentAccessModule m_max_radius=poiCategories[i]._2; } for (int i = 0 ; i < poiAttributes.size(); i++) { - dbg(lvl_debug,"attribute %d %d %d %d %d\n",poiAttributes[i]._1, poiAttributes[i]._2, poiAttributes[i]._3, poiAttributes[i]._5, poiAttributes[i]._6); + LOG_DEBUG(gCtx,"attribute %d %d %d %d %d",poiAttributes[i]._1, poiAttributes[i]._2, poiAttributes[i]._3, poiAttributes[i]._5, poiAttributes[i]._6); } - dbg(lvl_debug,"max radius %d\n",m_max_radius); + LOG_DEBUG(gCtx,"max radius %d",m_max_radius); if (!m_mapset) { if (!config_get_attr(config, attr_navit, &navit, NULL)) { - dbg(lvl_debug,"failed to get navit\n"); + LOG_ERROR_MSG(gCtx,"failed to get navit"); return; } m_mapset=navit_get_mapset(navit.u.navit); } - dbg(lvl_debug,"mapset %p\n",m_mapset); + LOG_DEBUG(gCtx,"mapset %p",m_mapset); g.lat=location._1; g.lng=location._2; transform_from_geo(projection_mg, &g, &m_center); - dbg(lvl_debug,"c 0x%x,0x%x\n",m_center.x,m_center.y); + LOG_DEBUG(gCtx,"c 0x%x,0x%x",m_center.x,m_center.y); m_scale=transform_scale(m_center.y); int d=m_max_radius*10/m_scale; m_selection.next=NULL; @@ -464,8 +464,8 @@ class ContentAccessModule void PoiSearchCanceled(const uint32_t& poiSearchHandle) { - dbg(lvl_debug,"enter\n"); - } + //to do something + } void ResultListRequested(const uint8_t& camId, const uint32_t& poiSearchHandle, const std::vector< uint32_t >& attributeList, int32_t& statusValue, uint16_t& resultListSize, std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >& resultList) @@ -507,7 +507,6 @@ class ContentAccessModule std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > PoiDetailsRequested(const std::vector< uint32_t >& source_id) { - dbg(lvl_debug,"enter\n"); std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > ret; for (int i = 0 ; i < source_id.size() ; i++) { int sid=source_id[i]; @@ -533,7 +532,6 @@ plugin_init(void) DLT_REGISTER_APP("POIC","POI CONTENT ACCESS MODULE SERVER"); DLT_REGISTER_CONTEXT(gCtx,"POIC","Global Context"); - dbg(lvl_debug,"enter\n"); event_request_system("glib","genivi_poiservice"); int i; for (i = 0 ; i < CONNECTION_AMOUNT ; i++) { @@ -549,6 +547,6 @@ plugin_init(void) try { server->register_cam(); } catch(...) { - dbg(lvl_debug,"Exception during register_cam\n"); + LOG_ERROR_MSG(gCtx,"Exception during register_cam"); } } diff --git a/src/navigation/update_navit.sh b/src/navigation/update_navit.sh index 615fb40..671aaa7 100755 --- a/src/navigation/update_navit.sh +++ b/src/navigation/update_navit.sh @@ -17,6 +17,7 @@ cd navit git checkout $navit_version patch -p0 -i ../patches/search_list_get_unique.diff patch -p0 -i ../patches/fsa_issue_padding.diff +patch -p0 -i ../patches/avoid-crash-on-guidance-when-delete-and-recreate-route.diff cd ../ diff --git a/src/navigation/update_third_party.sh b/src/navigation/update_third_party.sh index 784f8b6..712ebb4 100755 --- a/src/navigation/update_third_party.sh +++ b/src/navigation/update_third_party.sh @@ -1,7 +1,7 @@ #!/bin/bash positioning_version='9725fe1f553197042d6445997690d452a73490c0' -navit_version='28478e7f26c1a0eedc06fb4765e2f736079c6f0c' +navit_version='f5abdd317e10d56226300d001469595658a605e4' echo "version of positioning is: $positioning_version" echo "version of navit is: $navit_version" -- cgit v1.2.1