Avoid excess threads with g_mutex_trylock

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 6599964cbc1c23aa2a272171138637db824d95ab..9279b08190ca9c6e1ec314077b2e4cc52d26da73 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -246,7 +246,8 @@ static void _free_tile(GisTile *tile, gpointer _elev)
 static gpointer _update_tiles(gpointer _elev)
 {
        GisPluginElev *elev = _elev;
 static gpointer _update_tiles(gpointer _elev)
 {
        GisPluginElev *elev = _elev;

-       g_mutex_lock(elev->mutex);
+       if (!g_mutex_trylock(elev->mutex))
+               return NULL;

        gdouble lat, lon, elevation;
        gis_viewer_get_location(elev->viewer, &lat, &lon, &elevation);
        gis_tile_update(elev->tiles,
        gdouble lat, lon, elevation;
        gis_viewer_get_location(elev->viewer, &lat, &lon, &elevation);
        gis_tile_update(elev->tiles,

diff --git a/src/plugins/map.c b/src/plugins/map.c
index d30439187dfe13b3cbd67d58f2c9ea4a8d01e3c4..7a2d66d373f91d7d6d6daeb0a6e6ef101767bef7 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -134,7 +134,8 @@ static gpointer _update_tiles(gpointer _map)
 {
        g_debug("GisPluginMap: _update_tiles");
        GisPluginMap *map = _map;
 {
        g_debug("GisPluginMap: _update_tiles");
        GisPluginMap *map = _map;

-       g_mutex_lock(map->mutex);
+       if (!g_mutex_trylock(map->mutex))
+               return NULL;

        gdouble lat, lon, elev;
        gis_viewer_get_location(map->viewer, &lat, &lon, &elev);
        gis_tile_update(map->tiles,
        gdouble lat, lon, elev;
        gis_viewer_get_location(map->viewer, &lat, &lon, &elev);
        gis_tile_update(map->tiles,

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index fae0c37044cb42c23cb9f508f2919a3156f74cb6..1af0bfc7c4e0490884756f53512ae3f27b43c59d 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -125,7 +125,8 @@ static gpointer _update_tiles(gpointer _sat)
 {
        g_debug("GisPluginSat: _update_tiles");
        GisPluginSat *sat = _sat;
 {
        g_debug("GisPluginSat: _update_tiles");
        GisPluginSat *sat = _sat;

-       g_mutex_lock(sat->mutex);
+       if (!g_mutex_trylock(sat->mutex))
+               return NULL;

        gdouble lat, lon, elev;
        gis_viewer_get_location(sat->viewer, &lat, &lon, &elev);
        gis_tile_update(sat->tiles,
        gdouble lat, lon, elev;
        gis_viewer_get_location(sat->viewer, &lat, &lon, &elev);
        gis_tile_update(sat->tiles,